708 files changed, 7875 insertions, 6766 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 594d47d..0000000
--- a/Makefile
+++ b/dev/null
@@ -1,385 +0,0 @@
-export KDEPIMDIR = $(shell pwd)
-
-export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
-
-ifeq ($(PLATFORM) , zaurus)
-  BUILD_NO_LDAP_PLUGIN=1
-endif
-
-ifneq ($(PLATFORM) , zaurus)
-  BUILD_NO_SHARP_PLUGIN=1
-endif
-
-#opie plugin is deprecated. The qtopia plugin handles the task from now on.
-BUILD_NO_OPIE_PLUGIN=1
-
-SUBDIRS_MICROKDE = \
-   libical/src/libical \
-   libical/src/libicalss \
-   qtcompat \
-   microkde \
-   libkcal \
-   libkdepim \
-   kabc \
-   kabc/formats/binary \
-   kabc/plugins/file \
-   kabc/plugins/dir \
-   korganizer \
-   kalarmd \
-   kaddressbook
-
-SUBDIRS_QTOPIA_PLUGIN = \
-   kabc/plugins/qtopia
-
-SUBDIRS_OPIE_PLUGIN = \
-   kabc/plugins/opie
-
-SUBDIRS_SHARP_PLUGIN = \
-   kabc/plugins/sharpdtm
-
-SUBDIRS_LDAP_PLUGIN = \
-   kabc/plugins/ldap
-
-SUBDIRS_MICROMAIL = \
-   libetpan \
-   kmicromail/libmailwrapper \
-   kmicromail
-
-SUBDIRS_GAMMU = \
-   gammu/emb/common \
-   gammu/emb/gammu
-
-SUBDIRS_PWMANAGER = \
-   pwmanager/libcrypt/mpi  \
-   pwmanager/libcrypt/error  \
-   pwmanager/libcrypt/cipher  \
-   pwmanager/libcrypt/zlib \
-   pwmanager/pwmanager
-
-SUBDIRS = \
-   $(SUBDIRS_MICROKDE) \
-   $(SUBDIRS_QTOPIA_PLUGIN) \
-   $(SUBDIRS_OPIE_PLUGIN) \
-   $(SUBDIRS_SHARP_PLUGIN) \
-   $(SUBDIRS_LDAP_PLUGIN) \
-   $(SUBDIRS_MICROMAIL) \
-   $(SUBDIRS_GAMMU) \
-   $(SUBDIRS_PWMANAGER) 
-
-
-all: build_microkde \
-     build_qtopia_plugin \
-     build_opie_plugin \
-     build_sharp_plugin \
-     build_ldap_plugin \
-     build_micromail \
-     build_gammu \
-     build_pwmanager
-
-
-build_microkde: variable_test tmake
-        for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-
-build_qtopia_plugin: build_microkde
-  ifdef BUILD_NO_QTOPIA_PLUGIN
-        @echo == qtopia plugin not build.
-  else
-        for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-build_opie_plugin: build_microkde
-  ifdef BUILD_NO_OPIE_PLUGIN
-        @echo == opie plugin not build.
-  else
-        for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-build_sharp_plugin: build_microkde
-  ifdef BUILD_NO_SHARP_PLUGIN
-        @echo == ldap plugin not build.
-  else
-        for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-  
-build_ldap_plugin: build_microkde
-  ifdef BUILD_NO_LDAP_PLUGIN
-        @echo == ldap plugin not build.
-  else
-          for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
-            make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-
-build_micromail: build_microkde
-  ifdef BUILD_NO_MICROMAIL
-        @echo == kmicromail not build.
-  else
-        for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-build_gammu: variable_test tmake
-  ifdef BUILD_NO_GAMMU
-        @echo == gammu not build.
-  else
-        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-build_pwmanager: build_microkde
-  ifdef BUILD_NO_PWMANAGER
-        @echo == pwmanager not build.
-  else
-        for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-
-variable_info:
-        @echo --------------------------------------
-        @echo KDEPIM buildsystem, variableinfo...
-        @echo KDEPIMDIR=$(KDEPIMDIR)
-        @echo QTDIR=$(QTDIR)
-        @echo QPEDIR=$(QPEDIR)
-        @echo OPIEDIR=$(OPIEDIR)
-        @echo PLATFORM=$(PLATFORM)
-        @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
-        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
-        @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
-        @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
-        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
-        @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
-        ifndef BUILD_NO_SHARP_PLUGIN
-        @echo SHARPDTMSDK=$(SHARPDTMSDK)
-        endif
-        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
-        @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
-        @echo --------------------------------------
-
-variable_test: variable_info
-        @echo KDEPIM buildsystem, variablecheck...
-  ifndef KDEPIMDIR
-        @echo KDEPIMDIR is not defined.
-        $(error KDEPIMDIR is not defined)
-  endif
-  ifndef PLATFORM
-        @echo PLATFORM is not defined.
-        $(error PLATFORM is not defined)
-  endif
-  ifdef BUILD_NO_LDAP_PLUGIN
-        @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
-  endif
-  ifdef BUILD_NO_OPIE_PLUGIN
-        @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
-  endif
-  ifdef BUILD_NO_QTOPIA_PLUGIN
-        @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
-  endif
-  ifdef BUILD_NO_MICROMAIL
-        @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
-  endif
-  ifdef BUILD_NO_SHARP_PLUGIN
-        @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
-  else
-  ifndef SHARPDTMSDK
-        @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
-        $(error SHARPDTMSDK is not defined)
-  endif
-  endif
-  ifdef BUILD_NO_GAMMU
-        @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
-  endif
-  ifdef BUILD_NO_PWMANAGER
-        @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
-  endif
-        @echo --------------------------------------
-
-
-objects:
-        for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
-        for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
-        mkdir -p libical/lib/$(PLATFORM)
-        mkdir -p dest
-        mkdir -p dest$(LIBICAL_PATH)
-        mkdir -p pwmanager/libcrypt/$(PLATFORM)
-
-clean:
-        rm -rf libical/lib/$(PLATFORM)/*;
-        rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
-        for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
-          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
-          done 
-
-pac:
-        rm -f $(QPEDIR)/lib/libmicro*
-        rm -f $(QPEDIR)/plugins/applets/libkopi*
-        make
-        make install
-        make dist
-install:
-
-        cd bin/kdepim; make install
-        cp -r Pim $(QPEDIR)/apps
-        cp db2file/db2file $(QPEDIR)/bin/db2file
-        chmod ugo+x $(QPEDIR)/bin/db2file
-        cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
-        cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
-        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
-        cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
-    
-dist: 
-        @echo Dont forget to do "make install" before "make dist"
-        rm -f *arm.ipk
-        rm -f *ipk.zip
-        rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
-        rm -f *~
-        cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
-        cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
-        cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
-        mkipks kmicrokdelibs.control
-        mkipks korganizer.control
-        mkipks kaddressbook.control
-  ifndef BUILD_NO_MICROMAIL
-        mkipks kopiemail.control
-  endif
-  ifndef BUILD_NO_SHARP_PLUGIN
-        mkipks ksharpPIM-DTMaccess.control
-  endif
-        mkipks korganizer-alarm.control
-  ifndef BUILD_NO_GAMMU
-        mkipks kmobilephoneaccess.control
-  endif
-  ifndef BUILD_NO_PWMANAGER
-        mkipks pwmanager.control
-  endif
-        mkipks pimTABicon.control
-        zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
-        mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
-        mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
-        mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
-
-tmake: objects \
-       qtcompat/Makefile$(PLATFORM) \
-       microkde/Makefile$(PLATFORM) \
-       libkcal/Makefile$(PLATFORM) \
-       libkdepim/Makefile$(PLATFORM) \
-       korganizer/Makefile$(PLATFORM) \
-       kalarmd/Makefile$(PLATFORM) \
-       libical/src/libical/Makefile$(PLATFORM) \
-       libical/src/libicalss/Makefile$(PLATFORM) \
-       kabc/Makefile$(PLATFORM) \
-       kabc/formats/binary/Makefile$(PLATFORM) \
-       kabc/plugins/file/Makefile$(PLATFORM) \
-       kabc/plugins/dir/Makefile$(PLATFORM) \
-       kabc/plugins/ldap/Makefile$(PLATFORM) \
-       kabc/plugins/opie/Makefile$(PLATFORM) \
-       kabc/plugins/qtopia/Makefile$(PLATFORM) \
-       kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
-       kaddressbook/Makefile$(PLATFORM) \
-       kmicromail/Makefile$(PLATFORM) \
-       libetpan/Makefile$(PLATFORM) \
-       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
-       gammu/emb/common/Makefile$(PLATFORM) \
-       gammu/emb/gammu/Makefile$(PLATFORM) \
-       pwmanager/pwmanager/Makefile$(PLATFORM) \
-       pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
-       pwmanager/libcrypt/error/Makefile$(PLATFORM) \
-       pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
-       pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
-
-qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
-        cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
-
-microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
-        cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
-
-libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
-        cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
-
-
-libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
-        cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
-
-kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
-        cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
-
-korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
-        cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
-
-libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
-        cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
-
-libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
-        cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
-
-kabc/Makefile$(PLATFORM): kabc/kabcE.pro
-        cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
-
-kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
-        cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
-        cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
-        cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
-        cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
-        cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
-        cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
-
-kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
-        cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
-
-kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
-        cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
-
-kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
-        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
-
-libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
-        cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
-
-kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
-        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
-
-gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
-        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
-
-gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
-        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
-
-pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
-        cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
-
-
-pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
-        cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
-
-pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
-        cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
-
-pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
-        cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
-
-pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
-        cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
-
-
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro
index af45382..65fd303 100644
--- a/gammu/emb/common/common.pro
+++ b/gammu/emb/common/common.pro
@@ -167,13 +167,13 @@ phone/nokia/nauto.c \
 phone/nokia/nfunc.c \
 phone/nokia/nfuncold.c \
 phone/obex/obexgen.c \
 phone/symbian/mroutgen.c 
 
 DEFINES += DESKTOP_VERSION
-TARGET = microgammu
+TARGET = xmicrogammu
 CONFIG = warn_off release console
 DESTDIR = ../../../bin
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 
 unix: {
@@ -189,6 +189,8 @@ HEADERS += device/serial/ser_w32.h \
            device/irda/irda_w32.h \
            device/bluetoth/blue_w32.h
 
 SOURCES += device/serial/ser_w32.c \
           device/bluetoth/blue_w32.c  
 }
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/gammu/emb/common/device/bluetoth/blue_w32.c b/gammu/emb/common/device/bluetoth/blue_w32.c
index a631c9f..8a367f4 100644
--- a/gammu/emb/common/device/bluetoth/blue_w32.c
+++ b/gammu/emb/common/device/bluetoth/blue_w32.c
@@ -85,13 +85,13 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR
                 GUID                    protocol;
                 int                     i, result;
                 BYTE                    buffer[2000];
                 char                    addressAsString[1000];
                 DWORD                   bufferLength, addressSize;
                 WSAQUERYSET             *pResults = (WSAQUERYSET*)&buffer;
-                HANDLE                  handle;
+                Qt::HANDLE                      handle;
                 GSM_Error               error;
 
         memset(&querySet, 0, sizeof(querySet));
                 querySet.dwSize   = sizeof(querySet);
                 protocol          = L2CAP_PROTOCOL_UUID;
         querySet.lpServiceClassId = &protocol;
@@ -135,13 +135,13 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR
 GSM_Error bluetooth_findchannel(GSM_StateMachine *s)
 {
                 GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
                 WSADATA                         wsaData;
                 int                     i, protocolInfoSize, result;
                 WSAPROTOCOL_INFO        protocolInfo;
-                HANDLE                          handle;
+                Qt::HANDLE                      handle;
                 DWORD                   flags;
                 WSAQUERYSET             querySet;
                 BYTE                    buffer[2000];
                 char                    addressAsString[1000];
                 DWORD                   bufferLength, addressSize;
                 WSAQUERYSET             *pResults = (WSAQUERYSET*)&buffer;
diff --git a/gammu/emb/common/device/bluetoth/blue_w32.h b/gammu/emb/common/device/bluetoth/blue_w32.h
index e457c92..409f4b1 100644
--- a/gammu/emb/common/device/bluetoth/blue_w32.h
+++ b/gammu/emb/common/device/bluetoth/blue_w32.h
@@ -116,21 +116,21 @@ WSALookupServiceBeginA(
     );
 
 #define WSALookupServiceBegin  WSALookupServiceBeginA
 
 WINSOCK_API_LINKAGE INT WSAAPI
 WSALookupServiceNextA(
-    IN     HANDLE           hLookup,
+    IN     Qt::HANDLE           hLookup,
     IN     DWORD            dwControlFlags,
     IN OUT LPDWORD          lpdwBufferLength,
     OUT    LPWSAQUERYSETA   lpqsResults
     );
 
 #define WSALookupServiceNext  WSALookupServiceNextA
 
-WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN HANDLE hLookup);
+WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN Qt::HANDLE hLookup);
 
 #define MAX_PROTOCOL_CHAIN 7
 
 typedef struct _WSAPROTOCOLCHAIN {
     int ChainLen;                                 /* the length of the chain,     */
                                                   /* length = 0 means layered protocol, */
diff --git a/gammu/emb/common/device/serial/ser_w32.h b/gammu/emb/common/device/serial/ser_w32.h
index d226f32..d1aa37a 100644
--- a/gammu/emb/common/device/serial/ser_w32.h
+++ b/gammu/emb/common/device/serial/ser_w32.h
@@ -3,13 +3,13 @@
 #ifndef winserial_h
 #define winserial_h
 
 #include <windows.h>
 
 typedef struct {
-                HANDLE          hPhone;
+                Qt::HANDLE      hPhone;
                 DCB     old_settings;
                 OVERLAPPED osWrite,osRead;
 } GSM_Device_SerialData;
 
 #endif
 #endif
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index c8aa3f0..e8ccac3 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -44,13 +44,13 @@ SOURCES += gammu.c \
            depend/nokia/dct3trac/wmx-gsm.c \
            depend/nokia/dct3trac/wmx-list.c \
            depend/nokia/dct3trac/wmx-sim.c \
            depend/nokia/dct3trac/wmx-util.c \
            depend/nokia/dct3trac/wmx.c
 unix : {
-LIBS +=      ../../../bin/libmicrogammu.so /usr/lib/libpthread.so
+LIBS +=      ../../../bin/libxmicrogammu.so -lpthread
 # bluetooth disabled for now
 #/usr/lib/libbluetooth.so  /usr/lib/libsdp.so 
 OBJECTS_DIR = obj/unix
 }
 win32 : {
         CONFIG  += qt warn_on 
@@ -60,6 +60,8 @@ LIBS += libc.lib
 QMAKE_LINK += /NODEFAULTLIB:msvcrt
 LIBS +=      ../../../bin/microgammu.lib
 OBJECTS_DIR = obj/win
 }
 DESTDIR = ../../../bin
 TARGET = kammu
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/kabc/address.h b/kabc/address.h
index 38ad20b..41794fe 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -29,13 +29,13 @@ $Id$
 #define KABC_ADDRESS_H
 
 #include <qmap.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 // template tags for address formatting localization
 #define KABC_FMTTAG_realname   QString("%n")
 #define KABC_FMTTAG_REALNAME   QString("%N")
 #define KABC_FMTTAG_company    QString("%cm")
 #define KABC_FMTTAG_COMPANY    QString("%CM")
@@ -65,14 +65,14 @@ class Address
     friend QDataStream &operator>>( QDataStream &, Address & );
 
   public:
     /**
       List of addresses.
     */
-    typedef QValueList<Address> List;
-    typedef QValueList<int> TypeList;
+    typedef Q3ValueList<Address> List;
+    typedef Q3ValueList<int> TypeList;
   
     /**
       Address types:
      
       @li @p Dom -    domestic
       @li @p Intl -   international
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index fe59fcb..c700897 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -34,14 +34,14 @@ $Id$
 #include <kapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 
 #include "errorhandler.h"
 */
-#include <qptrlist.h>
-#include <qtextstream.h>
+#include <q3ptrlist.h>
+#include <q3textstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -241,13 +241,13 @@ AddressBook::AddressBook( const QString &config, const QString &family )
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
   blockLSEchange = false;
   d = new AddressBookData;
   QString fami = family;
-  if (config != 0) {
+  if (!config.isEmpty()) {
       if ( family == "syncContact" ) {
           qDebug("creating sync config ");
           fami = "contact";
           KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
           con->setGroup( "General" );
           con->writeEntry( "ResourceKeys", QString("sync") );
@@ -378,19 +378,19 @@ bool AddressBook::save( Ticket *ticket )
 }
 // exports all Addressees, which are syncable
 void  AddressBook::export2File( QString fileName, QString resourceName )
 {
   
   QFile outFile( fileName );
-  if ( !outFile.open( IO_WriteOnly ) ) {
+  if ( !outFile.open( QIODevice::WriteOnly ) ) {
     QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
     KMessageBox::error( 0, text.arg( fileName ) );
     return ;
   }
-  QTextStream t( &outFile );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( &outFile );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   Iterator it;
   KABC::VCardConverter::Version version;
   version = KABC::VCardConverter::v3_0;
   for ( it = begin(); it != end(); ++it ) { 
       if ( (*it).resource()  ) {
           bool include = (*it).resource()->includeInSync();
@@ -465,16 +465,16 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
       vcard.replace ( QRegExp(";;") , "" );
       datastream += vcard;
      
   }
   
   QFile outFile(fileName);
-  if ( outFile.open(IO_WriteOnly) ) { 
+  if ( outFile.open(QIODevice::WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
-      QTextStream t( &outFile );  // use a text stream
-      t.setEncoding( QTextStream::UnicodeUTF8 );
+      Q3TextStream t( &outFile );  // use a text stream
+      t.setEncoding( Q3TextStream::UnicodeUTF8 );
       t <<datastream;
       t <<  "\r\n\r\n";
       outFile.close();
           
   } else {
       qDebug("Error open temp file ");
@@ -487,13 +487,13 @@ int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
 {
 
     if ( removeOld )
         setUntagged( true, resource );
     KABC::Addressee::List list;
     QFile file( fileName );
-    file.open( IO_ReadOnly );
+    file.open( QIODevice::ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
     if ( replaceLabel ) { 
         data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
         data.replace ( QRegExp("LABEL") , "ADR" );
@@ -631,13 +631,13 @@ void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
 void AddressBook::findNewExtIds(  QString fileName, QString currentSyncDevice  )
 {
  
     setUntagged();
     KABC::Addressee::List list;
     QFile file( fileName );
-    file.open( IO_ReadOnly );
+    file.open( QIODevice::ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
 
     data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
     KABC::VCardTool tool;
@@ -1215,15 +1215,15 @@ bool AddressBook::addResource( Resource *resource )
   d->mManager->add( resource );
   return true;
 }
 void AddressBook::removeResources()
 {
     //remove all possible resources. This should cleanup the configfile.
-    QPtrList<KABC::Resource> mResources = resources();
+    Q3PtrList<KABC::Resource> mResources = resources();
     
-    QPtrListIterator<KABC::Resource> it(mResources);
+    Q3PtrListIterator<KABC::Resource> it(mResources);
     for ( ; it.current(); ++it ) {
         KABC::Resource *res = it.current();
         removeResource(res);
     }
 }
 
@@ -1237,15 +1237,15 @@ bool AddressBook::removeResource( Resource *resource )
   resource->setAddressBook( 0 );
 
   d->mManager->remove( resource );
   return true;
 }
 
-QPtrList<Resource> AddressBook::resources()
+Q3PtrList<Resource> AddressBook::resources()
 {
-  QPtrList<Resource> list;
+  Q3PtrList<Resource> list;
 
 //  qDebug("AddressBook::resources() 1");
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     list.append( *it );
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index a8a9fc1..56fce4d 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -28,13 +28,13 @@ $Id$
 #ifndef KABC_ADDRESSBOOK_H
 #define KABC_ADDRESSBOOK_H
 
 #include <qobject.h>
 
 #include <kresources/manager.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "addressee.h"
 #include "field.h"
 
 namespace KABC {
 
@@ -277,13 +277,13 @@ class AddressBook : public QObject
     void removeResources();
     bool removeResource( Resource * );
 
     /**
       Return pointer list of all resources.
     */
-    QPtrList<Resource> resources();
+    Q3PtrList<Resource> resources();
 
     /**
       Set the @p ErrorHandler, that is used by @ref error() to
       provide gui-independend error messages.
     */
     void setErrorHandler( ErrorHandler * );
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index e8e440c..9994e29 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -388,13 +388,13 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
     detach();
     if ( isSubSet ) {
         if ( mData->name.isEmpty() ) mData->name = ad.mData->name;
         if ( mData->formattedName.isEmpty() ) mData->formattedName  = ad.mData->formattedName;
         if ( mData->familyName.isEmpty()  )  mData->familyName  = ad.mData->familyName;
         if ( mData->givenName.isEmpty() ) mData->givenName   = ad.mData->givenName ;
-        if ( mData->additionalName )  mData->additionalName  = ad.mData->additionalName;
+        if ( mData->additionalName.isEmpty() )  mData->additionalName  = ad.mData->additionalName;
         if ( mData->prefix.isEmpty() )  mData->prefix  = ad.mData->prefix;
         if ( mData->suffix.isEmpty() )  mData->suffix  = ad.mData->suffix;
         if ( mData->title .isEmpty() ) mData->title = ad.mData->title  ;
         if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
         if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
         if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 0ea1803..30dcd5d 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -30,13 +30,13 @@ $Id$
 #define KABC_ADDRESSEE_H
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include <ksharedptr.h>
 #include <kurl.h>
 
 #include "address.h"
 #include "agent.h"
@@ -81,13 +81,13 @@ class Resource;
 class Addressee
 {
     friend QDataStream &operator<<( QDataStream &, const Addressee & );
     friend QDataStream &operator>>( QDataStream &, Addressee & );
 
   public:
-    typedef QValueList<Addressee> List;
+    typedef Q3ValueList<Addressee> List;
 
     /**
       Construct an empty address book entry.
      */
     Addressee();
     ~Addressee();
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 671787e..bda1b9e 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -17,17 +17,20 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qapplication.h>
 #include <qregexp.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
 #include "stdaddressbook.h"
@@ -35,14 +38,14 @@
 #include "addresseedialog.h"
 #include "KDGanttMinimizeSplitter.h"
 //#include "addresseedialog.moc"
 
 using namespace KABC;
 
-AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
-  QListViewItem( parent ),
+AddresseeItem::AddresseeItem( Q3ListView *parent, const Addressee &addressee ) :
+  Q3ListViewItem( parent ),
   mAddressee( addressee )
 {
     setText( Name,addressee.realName());
     setText( Email, addressee.preferredEmail() );
     setText( Category, addressee.categories().join(";") );
 }
@@ -68,26 +71,26 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this );
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   setMainWidget( mMiniSplitter );
 
   QWidget *listWidget = new QWidget( mMiniSplitter );
 
-  QVBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
+  Q3VBoxLayout *listLayout = new Q3VBoxLayout (listWidget) ;
   //topLayout->addLayout( listLayout );
 
   mAddresseeList = new KListView( listWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->addColumn( i18n("Category") );
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
-  connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
+  connect( mAddresseeList, SIGNAL( doubleClicked( Q3ListViewItem * ) ),
            SLOT( slotOk() ) );
   //QHBox* searchBox = new QHBox ( listWidget );
-  QHBox * hb = new QHBox ( listWidget );
+  Q3HBox * hb = new Q3HBox ( listWidget );
   listLayout->addWidget (  hb );
   mAddresseeEdit = new QLineEdit(  hb );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
            SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
   QPushButton *searchButton = new QPushButton( i18n("Search!"),   hb ); 
@@ -98,38 +101,38 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
     mSelectedList->addColumn( i18n("Selected Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
     //connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
     //       SLOT( removeSelected() ) );
-    connect( mSelectedList, SIGNAL( clicked( QListViewItem * ) ),
+    connect( mSelectedList, SIGNAL( clicked( Q3ListViewItem * ) ),
              SLOT( removeSelected() ) );
-    connect( mSelectedList, SIGNAL( returnPressed( QListViewItem *) ),
+    connect( mSelectedList, SIGNAL( returnPressed( Q3ListViewItem *) ),
              SLOT( removeSelected() ) );
 
 #if 0
     QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
     connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
 
 #endif
-    connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
-             SLOT( addSelected( QListViewItem * ) ) );
-    connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
-             SLOT( selectNextItem( QListViewItem * ) ) );
+    connect( mAddresseeList, SIGNAL( clicked( Q3ListViewItem * ) ),
+             SLOT( addSelected( Q3ListViewItem * ) ) );
+    connect( mAddresseeList, SIGNAL( returnPressed( Q3ListViewItem * ) ),
+             SLOT( selectNextItem( Q3ListViewItem * ) ) );
 
   }
 
   mAddressBook = StdAddressBook::self( true );
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
            SLOT( addressBookChanged() ) );
 #if 0
   connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
 #endif
   loadAddressBook();  
-  QValueList<int> splitterSize; 
+  Q3ValueList<int> splitterSize; 
   splitterSize.append( ( width() / 5 ) * 3 );
   splitterSize.append( ( width() / 5 ) *2 );
   mMiniSplitter->setSizes( splitterSize );
 }
 
 AddresseeDialog::~AddresseeDialog()
@@ -169,70 +172,70 @@ void AddresseeDialog::loadAddressBook()
       if (re.match(name) != -1)
 #endif
           AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
   }
 }
 
-void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
+void AddresseeDialog::addCompletionItem( const QString &str, Q3ListViewItem *item )
 {
   if ( str.isEmpty() ) return;
 
   mItemDict.insert( str, item );
   //mAddresseeEdit->completionObject()->addItem( str );
 }
 
 void AddresseeDialog::selectItem( const QString &str )
 {
   if ( str.isEmpty() ) return;
 
-  QListViewItem *item = mItemDict.find( str );
+  Q3ListViewItem *item = mItemDict.find( str );
   if ( item ) {
     mAddresseeList->blockSignals( true );
     mAddresseeList->setSelected( item, true );
     mAddresseeList->ensureItemVisible( item );
     mAddresseeList->blockSignals( false );
   }
 }
 
-void AddresseeDialog::updateEdit( QListViewItem *item )
+void AddresseeDialog::updateEdit( Q3ListViewItem *item )
 {
   mAddresseeEdit->setText( item->text( 0 ) );
   mAddresseeEdit->setSelection( 0, item->text( 0 ).length() );
 }
 
-void AddresseeDialog::selectNextItem( QListViewItem *item )
+void AddresseeDialog::selectNextItem( Q3ListViewItem *item )
 {
     addSelected( item );
-    QListViewItem *next = item->nextSibling();
+    Q3ListViewItem *next = item->nextSibling();
     if ( next ) {
         next->setSelected( true );
         item->setSelected( false );
         mAddresseeList->setCurrentItem( next );
     }
 }
-void AddresseeDialog::addSelected( QListViewItem *item )
+void AddresseeDialog::addSelected( Q3ListViewItem *item )
 {
     AddresseeItem *addrItem = (AddresseeItem *)( item );
   if ( !addrItem ) return;
 
   Addressee a = addrItem->addressee();
 
-  QListViewItem *selectedItem = mSelectedDict.find( a.uid() );
+  Q3ListViewItem *selectedItem = mSelectedDict.find( a.uid() );
   if ( !selectedItem ) {
     selectedItem = new AddresseeItem( mSelectedList, a );
     mSelectedDict.insert( a.uid(), selectedItem );
   }
  
 }
 
 void AddresseeDialog::removeSelected()
 {
-  QListViewItem *item = mSelectedList->selectedItem();
+  Q3ListViewItem *item = mSelectedList->selectedItem();
   AddresseeItem *addrItem = (AddresseeItem *)( item );
   if ( !addrItem ) return;
-  QListViewItem *next =  item->nextSibling();
+  Q3ListViewItem *next =  item->nextSibling();
   mSelectedDict.remove( addrItem->addressee().uid() );
   delete addrItem;
   if ( next )
       next->setSelected( true );
 }
 
@@ -252,13 +255,13 @@ Addressee AddresseeDialog::addressee()
 Addressee::List AddresseeDialog::addressees()
 {
   Addressee::List al;
   AddresseeItem *aItem = 0;
 
   if ( mMultiple ) {
-    QListViewItem *item = mSelectedList->firstChild();
+    Q3ListViewItem *item = mSelectedList->firstChild();
     while( item ) {
         aItem = (AddresseeItem *)( item );
       if ( aItem ) al.append( aItem->addressee() );
       item = item->nextSibling();
     }
   }
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 6fab62d..be7bbb4 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -18,26 +18,26 @@
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KABC_ADDRESSEEDIALOG_H
 #define KABC_ADDRESSEEDIALOG_H
 
-#include <qdict.h>
+#include <q3dict.h>
 
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <klistview.h>
 
 #include "addressbook.h"
 
 namespace KABC {
 
 /**
   @short Special ListViewItem, that is used by the AddresseeDialog.
 */
-class AddresseeItem : public QListViewItem
+class AddresseeItem : public Q3ListViewItem
 {
   public:
 
     /**
       Type of column
       @li @p Name -  Name in Addressee
@@ -48,13 +48,13 @@ class AddresseeItem : public QListViewItem
     /**
       Constructor.
 
       @param parent    The parent listview.
       @param addressee The associated addressee.
     */
-    AddresseeItem( QListView *parent, const Addressee &addressee );
+    AddresseeItem( Q3ListView *parent, const Addressee &addressee );
 
     /**
       Returns the addressee.
     */
     Addressee addressee() const { return mAddressee; }
 
@@ -126,35 +126,35 @@ class AddresseeDialog : public KDialogBase
       addressee list is empty.
     */
     static Addressee::List getAddressees( QWidget *parent );
 
   private slots:
     void selectItem( const QString & );
-    void selectNextItem( QListViewItem *item );
-    void updateEdit( QListViewItem *item );
-    void addSelected( QListViewItem *item );
+    void selectNextItem( Q3ListViewItem *item );
+    void updateEdit( Q3ListViewItem *item );
+    void addSelected( Q3ListViewItem *item );
     void removeSelected();
     void loadAddressBook();
 
   protected slots:
     void addressBookChanged();
 
   private:
-    void addCompletionItem( const QString &str, QListViewItem *item );
+    void addCompletionItem( const QString &str, Q3ListViewItem *item );
 
     bool mMultiple;
 
     KListView *mAddresseeList;
     QLineEdit *mAddresseeEdit;
 
     KListView *mSelectedList;
 
     AddressBook *mAddressBook;
 
-    QDict<QListViewItem> mItemDict;
-    QDict<QListViewItem> mSelectedDict;
+    Q3Dict<Q3ListViewItem> mItemDict;
+    Q3Dict<Q3ListViewItem> mSelectedDict;
 
     class AddresseeDialogPrivate;
     AddresseeDialogPrivate *d;
 };
 
 }
diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp
index 097e162..e1ba1ce 100644
--- a/kabc/addresseelist.cpp
+++ b/kabc/addresseelist.cpp
@@ -25,13 +25,15 @@ Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kdebug.h>
 //US
-#include <qtl.h>
+#include <q3tl.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 
 #include "addresseelist.h"
 #include "field.h"
 
 using namespace KABC;
@@ -118,32 +120,32 @@ bool SortingTraits::GivenName::lt( const Addressee &a1, const Addressee &a2 )
 //
 // AddresseeList
 //
 //
 
 AddresseeList::AddresseeList()
-  : QValueList<Addressee>()
+  : Q3ValueList<Addressee>()
 {
   mReverseSorting = false;
   mActiveSortingCriterion = FormattedName;
   mActiveSortingField = 0;
 }
 
 AddresseeList::~AddresseeList()
 {
 }
 
 AddresseeList::AddresseeList( const AddresseeList &l )
-  : QValueList<Addressee>( l )
+  : Q3ValueList<Addressee>( l )
 {
   mReverseSorting = l.reverseSorting();
   mActiveSortingCriterion = l.sortingCriterion();
 }
 
-AddresseeList::AddresseeList( const QValueList<Addressee> &l )
-  : QValueList<Addressee>( l )
+AddresseeList::AddresseeList( const Q3ValueList<Addressee> &l )
+  : Q3ValueList<Addressee>( l )
 {
   mReverseSorting = false;
 }
 
 void AddresseeList::dump() const
 {
diff --git a/kabc/addresseelist.h b/kabc/addresseelist.h
index 2df252c..6106804 100644
--- a/kabc/addresseelist.h
+++ b/kabc/addresseelist.h
@@ -26,13 +26,13 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KABC_ADDRESSEELIST_H
 #define KABC_ADDRESSEELIST_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "addressee.h"
 
 namespace KABC {
 
 class Field;
@@ -111,19 +111,19 @@ typedef enum { Uid, Name, FormattedName, FamilyName, GivenName } SortingCriterio
  * For the enumeration Type SortingCriterion, which specifies the
  * field by the collection will be sorted, the following values exist:
  * Uid, Name, FormattedName, FamilyName, GivenName.
  * 
  * @author Jost Schenck jost@schenck.de 
  */
-class AddresseeList : public QValueList<Addressee>
+class AddresseeList : public Q3ValueList<Addressee>
 {
   public:
     AddresseeList();
     ~AddresseeList();
     AddresseeList( const AddresseeList & );
-    AddresseeList( const QValueList<Addressee> & );
+    AddresseeList( const Q3ValueList<Addressee> & );
 
     /**
      * Debug output.
      */
     void dump() const;
   
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index cde19a1..425e67c 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -24,29 +24,34 @@
 #include <kabc/phonenumber.h>
 #include <kglobal.h>
 //US#include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
 //US #include <kstringhandler.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qregexp.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qlabel.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qapplication.h>
 #include <qpushbutton.h>
 #ifdef DESKTOP_VERSION 
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #include <qprinter.h>
 #include <qpainter.h>
 #endif
+#include <QDesktopWidget>
 
 
-#include <qstylesheet.h> 
+#include <q3stylesheet.h> 
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QPixmap>
+#include <Q3VBoxLayout>
 #include "externalapphandler.h"
 #include <kabc/addresseeview.h>
 
 
 //US #ifndef DESKTOP_VERSION
 //US #include <qtopia/qcopenvelope_qws.h>
@@ -56,13 +61,13 @@
 //US static int kphoneInstalled = 0;
 
 using namespace KABC;
 bool AddresseeView::sFullDetailsMode = false;
 
 AddresseeView::AddresseeView( QWidget *parent, const char *name )
-  : QTextBrowser( parent, name )
+  : Q3TextBrowser( parent, name )
 
 
 {
 //US  setWrapPolicy( QTextEdit::AtWordBoundary );
   setLinkUnderline( false );
   // setVScrollBarMode( QScrollView::AlwaysOff );
@@ -79,13 +84,13 @@ void AddresseeView::printMe()
 #ifdef DESKTOP_VERSION 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
@@ -399,13 +404,13 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
       picAvailintern = (picture.isIntern() && !picture.data().isNull());
       picAvailUrl = !picture.isIntern() &&  QFile::exists(picture.url() );
   }
   if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) {
       picString =  "<img src=\"myimage\" width=\"50\" height=\"70\">";
       if (  picAvailintern ) {
-          QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
+          Q3MimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
           int wid = picture.data().width();
           int hei = picture.data().height();  
           if ( wid > 128 || hei > 128 ) {
               if ( wid > hei ) {
                   hei = (hei*128)/wid;
                   wid = 128;
@@ -415,13 +420,13 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
               }
           }
           picString =  QString("<img src=\"myimage\" width=\"%1\" height=\"%2\">").arg(wid).arg(hei);
       } else {
           if ( picAvailUrl ) {
               QPixmap picPix( picture.url() );
-              QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", picPix );
+              Q3MimeSourceFactory::defaultFactory()->setPixmap( "myimage", picPix );
               int wid = picPix.width();
               int hei = picPix.height();
               if ( wid > 128 || hei > 128 ) {
                   if ( wid > hei ) {
                       hei = (hei*128)/wid;
                       wid = 128;
@@ -432,47 +437,47 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
               }
               picString =  QString("<img src=\"myimage\" width=\"%1\" height=\"%2\">").arg(wid).arg(hei);
           } else {
               if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {
                   static bool setDefaultImageChildren = false;
                   if ( !setDefaultImageChildren ) {
-                      QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
+                      Q3MimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
                       setDefaultImageChildren = true;
                   }
                   picString =  "<img src=\"familyIcon\" width=\"64\" height=\"64\">";
                   
               } else  if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) {
                   static bool setDefaultImagepouses = false;
                   if ( !setDefaultImagepouses ) {
-                      QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
+                      Q3MimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
                       setDefaultImagepouses = true;
                   }
                   picString =  "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">";
               } else {
                   QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
                   if ( gen == "male" ) {
                       static bool setDefaultImageMale = false;
                       if ( !setDefaultImageMale ) {
-                          QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
+                          Q3MimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
                           setDefaultImageMale = true;
                   }
                       picString =  "<img src=\"MaleIcon\" width=\"64\" height=\"64\">";
                       
                   } else if ( gen == "female" ) {
                   static bool setDefaultImageFemale = false;
                   if ( !setDefaultImageFemale ) {
-                      QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
+                      Q3MimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
                       setDefaultImageFemale = true;
                   }
                   picString =  "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">";
 
                   } else {
                       static bool setDefaultImage = false;
                       if ( !setDefaultImage ) {
                           //qDebug("Setting default pixmap ");
-                          QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
+                          Q3MimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
                           setDefaultImage = true;
                       }
                       picString =  "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";
                   }
               }
           }
@@ -650,13 +655,13 @@ KABC::Addressee AddresseeView::addressee() const
 }
 */
 void AddresseeView::addTag(const QString & tag,const QString & text)
 {
     if ( text.isEmpty() )
         return;
-    int number=text.contains("\n");
+    int number=text.count("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1)
         {
             if (number > 0) {
@@ -685,30 +690,30 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo
 {
     findButton( Close )->setText( i18n("Cancel Sync"));
     findButton( Ok )->setText( i18n("Remote"));
     findButton( User1 )->setText( i18n("Local"));
     QWidget* topframe = new QWidget( this );
     setMainWidget( topframe );
-    QBoxLayout* bl;
+    Q3BoxLayout* bl;
     if ( QApplication::desktop()->width() < 640 ) {
-        bl = new QVBoxLayout( topframe  );
+        bl = new Q3VBoxLayout( topframe  );
     } else {
-        bl = new QHBoxLayout( topframe  );
+        bl = new Q3HBoxLayout( topframe  );
     }
-    QVBox* subframe = new QVBox( topframe );
+    Q3VBox* subframe = new Q3VBox( topframe );
     bl->addWidget(subframe  );
     QLabel* lab = new QLabel( i18n("Local Addressee"), subframe ); 
     if ( takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     AddresseeView * av = new AddresseeView( subframe );
     av->setAddressee( loc );
-    subframe = new QVBox( topframe );
+    subframe = new Q3VBox( topframe );
     bl->addWidget(subframe  );
     lab = new QLabel( i18n("Remote Addressee"), subframe  ); 
     if ( !takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     av = new AddresseeView( subframe );
     av->setAddressee( rem );
     QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); 
     QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); 
 #ifndef DESKTOP_VERSION
     showMaximized();
diff --git a/kabc/addresseeview.h b/kabc/addresseeview.h
index a4de085..f7ce2e0 100644
--- a/kabc/addresseeview.h
+++ b/kabc/addresseeview.h
@@ -23,18 +23,18 @@
 #define KPIM_ADDRESSEEVIEW_H
 
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 
 //US #include <ktextbrowser.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 
 namespace KABC {
 
 //US class AddresseeView : public KTextBrowser
-class AddresseeView : public QTextBrowser
+class AddresseeView : public Q3TextBrowser
 {
 
   public:
     AddresseeView( QWidget *parent = 0, const char *name = 0 );
 
     /**
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index d34ba0b..cf5afa6 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -20,12 +20,14 @@
 
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
 #include "distributionlist.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace KABC;
 
 DistributionList::DistributionList( DistributionListManager *manager,
                                     const QString &name ) :
   mManager( manager ), mName( name )
@@ -51,13 +53,13 @@ QString DistributionList::name() const
 void DistributionList::insertEntry( const Addressee &a, const QString &email )
 {
     QString em = email;
     if (em.isNull() )
         em = a.preferredEmail();
     Entry e( a, em );
-  QValueList<Entry>::Iterator it;
+  Q3ValueList<Entry>::Iterator it;
   for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
     if ( (*it).addressee.uid() == a.uid() ) {
       /**
         We have to check if both email addresses contains no data,
         a simple 'email1 == email2' wont work here
        */
@@ -71,13 +73,13 @@ void DistributionList::insertEntry( const Addressee &a, const QString &email )
   }
   mEntries.append( e );
 }
 
 void DistributionList::removeEntry( const Addressee &a, const QString &email )
 {
-  QValueList<Entry>::Iterator it;
+  Q3ValueList<Entry>::Iterator it;
   for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
     if ( (*it).addressee.uid() == a.uid() && (*it).email == email ) {
       mEntries.remove( it  );
       return;
     }
   }
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index c81e543..8d21a17 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -21,12 +21,15 @@
 #ifndef KABC_DISTRIBUTIONLIST_H
 #define KABC_DISTRIBUTIONLIST_H
 
 //#include <kdirwatch.h>
 
 #include "addressbook.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 namespace KABC {
 
 class DistributionListManager;
 
 /**
@@ -45,13 +48,13 @@ class DistributionList
       This class represents an entry of a distribution list. It consists of an
       addressee and an email address. If the email address is null, the
       preferred email address of the addressee is used.
     */
     struct Entry
     {
-      typedef QValueList<Entry> List;
+      typedef Q3ValueList<Entry> List;
 
       Entry() {}
       Entry( const Addressee &_addressee, const QString &_email ) :
           addressee( _addressee ), email( _email ) {}
 
       Addressee addressee;
@@ -164,13 +167,13 @@ class DistributionListManager
     */
     bool save();
 
   private:
     AddressBook *mAddressBook;
 
-    QPtrList<DistributionList> mLists;
+    Q3PtrList<DistributionList> mLists;
 };
 
 /**
   @short Watchdog for distribution lists
  
   This class provides a @ref changed() signal that i emitted when the
diff --git a/kabc/distributionlistdialog.cpp b/kabc/distributionlistdialog.cpp
index d2e1144..82883e6 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/kabc/distributionlistdialog.cpp
@@ -15,19 +15,25 @@
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 #include <klineeditdlg.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
+#include <Q3Button>
 #include <qradiobutton.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
@@ -57,16 +63,16 @@ DistributionListDialog::~DistributionListDialog()
 
 EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
                                       QWidget *parent ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
                parent )
 {
-  QFrame *topFrame = plainPage();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = plainPage();
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
-  mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   topLayout->addWidget( mButtonGroup );
 
   QStringList::ConstIterator it;
   for( it = emails.begin(); it != emails.end(); ++it ) {
     QRadioButton *button = new QRadioButton( *it, mButtonGroup );
@@ -75,13 +81,13 @@ EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
     }
   }
 }
 
 QString EmailSelector::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
   if ( button ) return button->text();
   return QString::null;
 }
 
 QString EmailSelector::getEmail( const QStringList &emails, const QString &current,
                                      QWidget *parent )
@@ -93,18 +99,18 @@ QString EmailSelector::getEmail( const QStringList &emails, const QString &curre
 
   delete dlg;
 
   return result;
 }
 
-class EntryItem : public QListViewItem
+class EntryItem : public Q3ListViewItem
 {
   public:
-    EntryItem( QListView *parent, const Addressee &addressee,
+    EntryItem( Q3ListView *parent, const Addressee &addressee,
                const QString &email=QString::null ) :
-      QListViewItem( parent ),
+      Q3ListViewItem( parent ),
       mAddressee( addressee ),
       mEmail( email )
     {
       setText( 0, addressee.realName() );
       if( email.isEmpty() ) {
         setText( 1, addressee.preferredEmail() );
@@ -133,16 +139,16 @@ class EntryItem : public QListViewItem
 DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *addressBook, QWidget *parent) :
   QWidget( parent ),
   mAddressBook( addressBook )
 {
   kdDebug(5700) << "DistributionListEditor()" << endl;
 
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
 
-  QBoxLayout *nameLayout = new QHBoxLayout( topLayout) ;
+  Q3BoxLayout *nameLayout = new Q3HBoxLayout( topLayout) ;
 
   mNameCombo = new QComboBox( this );
   nameLayout->addWidget( mNameCombo );
   connect( mNameCombo, SIGNAL( activated( int ) ), SLOT( updateEntryView() ) );
 
   mNewButton = new QPushButton( i18n("New List..."), this );
@@ -154,37 +160,37 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
   connect( mEditButton, SIGNAL( clicked() ), SLOT( editList() ) );
 
   mRemoveButton = new QPushButton( i18n("Remove List"), this );
   nameLayout->addWidget( mRemoveButton );
   connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeList() ) );
 
-  QGridLayout *gridLayout = new QGridLayout( topLayout, 3, 3 );
+  Q3GridLayout *gridLayout = new Q3GridLayout( topLayout, 3, 3 );
   gridLayout->setColStretch(1, 1);
 
   QLabel *listLabel = new QLabel( i18n("Available addresses:"), this );
   gridLayout->addWidget( listLabel, 0, 0 );
 
   mListLabel = new QLabel( this );
   gridLayout->addMultiCellWidget( mListLabel, 0, 0, 1, 2 );
 
-  mAddresseeView = new QListView( this );
+  mAddresseeView = new Q3ListView( this );
   mAddresseeView->addColumn( i18n("Name") );
   mAddresseeView->addColumn( i18n("Preferred Email") );
   mAddresseeView->setAllColumnsShowFocus( true );
   gridLayout->addWidget( mAddresseeView, 1, 0 );
   connect( mAddresseeView, SIGNAL( selectionChanged() ),
            SLOT( slotSelectionAddresseeViewChanged() ) );
-  connect( mAddresseeView, SIGNAL( doubleClicked( QListViewItem * ) ),
+  connect( mAddresseeView, SIGNAL( doubleClicked( Q3ListViewItem * ) ),
            SLOT( addEntry() ) );
 
   mAddEntryButton = new QPushButton( i18n("Add Entry"), this );
   mAddEntryButton->setEnabled(false);
   gridLayout->addWidget( mAddEntryButton, 2, 0 );
   connect( mAddEntryButton, SIGNAL( clicked() ), SLOT( addEntry() ) );
 
-  mEntryView = new QListView( this );
+  mEntryView = new Q3ListView( this );
   mEntryView->addColumn( i18n("Name") );
   mEntryView->addColumn( i18n("Email") );
   mEntryView->addColumn( i18n("Use Preferred") );
   mEntryView->setEnabled(false);
   mEntryView->setAllColumnsShowFocus( true );
   gridLayout->addMultiCellWidget( mEntryView, 1, 1, 1, 2 );
diff --git a/kabc/distributionlistdialog.h b/kabc/distributionlistdialog.h
index b6d3c80..3627431 100644
--- a/kabc/distributionlistdialog.h
+++ b/kabc/distributionlistdialog.h
@@ -19,19 +19,21 @@
 */
 
 #ifndef KABC_DISTRIBUTIONLISTDIALOG_H
 #define KABC_DISTRIBUTIONLISTDIALOG_H
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include <kdialogbase.h>
 
-class QListView;
+class Q3ListView;
 class QLabel;
 class QComboBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 
 namespace KABC {
 
 class AddressBook;
 class DistributionListEditorWidget;
 class DistributionListManager;
@@ -90,13 +92,13 @@ class EmailSelector : public KDialogBase
     QString selected();
 
     static QString getEmail( const QStringList &emails, const QString &current,
         QWidget *parent );
 
   private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
 
 /**
   @short Helper class
 */
 class DistributionListEditorWidget : public QWidget
@@ -121,14 +123,14 @@ class DistributionListEditorWidget : public QWidget
     void slotSelectionAddresseeViewChanged();
     void save();
 
   private:
     QComboBox *mNameCombo;  
     QLabel *mListLabel;
-    QListView *mEntryView;
-    QListView *mAddresseeView;
+    Q3ListView *mEntryView;
+    Q3ListView *mAddresseeView;
 
     AddressBook *mAddressBook;
     DistributionListManager *mManager;
     QPushButton *mNewButton, *mEditButton, *mRemoveButton;
     QPushButton *mChangeEmailButton, *mRemoveEntryButton, *mAddEntryButton;
 
diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp
index 9f5840b..ca5ecb7 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/kabc/distributionlisteditor.cpp
@@ -15,23 +15,27 @@
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #ifdef DESKTOP_VERSION
 #include <qinputdialog.h>
 #else
 #include <qtcompat/qinputdialog.h>
 #endif
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "addressbook.h"
 #include "addresseedialog.h"
@@ -45,16 +49,16 @@ using namespace KABC;
 
 EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString &current,
                                       QWidget *parent ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
                parent )
 {
-  QFrame *topFrame = plainPage();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = plainPage();
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
-  mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   topLayout->addWidget( mButtonGroup );
 
   QStringList::ConstIterator it;
   for( it = emails.begin(); it != emails.end(); ++it ) {
     QRadioButton *button = new QRadioButton( *it, mButtonGroup );
@@ -63,13 +67,13 @@ EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString &
     }
   }
 }
 
 QString EmailSelectDialog::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
   if ( button ) return button->text();
   return QString::null;
 }
 
 QString EmailSelectDialog::getEmail( const QStringList &emails, const QString &current,
                                      QWidget *parent )
@@ -82,18 +86,18 @@ QString EmailSelectDialog::getEmail( const QStringList &emails, const QString &c
 
   delete dlg;
 
   return result;
 }
 
-class EditEntryItem : public QListViewItem
+class EditEntryItem : public Q3ListViewItem
 {
   public:
-    EditEntryItem( QListView *parent, const Addressee &addressee,
+    EditEntryItem( Q3ListView *parent, const Addressee &addressee,
                const QString &email=QString::null ) :
-      QListViewItem( parent ),
+      Q3ListViewItem( parent ),
       mAddressee( addressee ),
       mEmail( email )
     {
       setText( 0, addressee.realName() );
       if( email.isEmpty() ) {
         setText( 1, addressee.preferredEmail() );
@@ -122,17 +126,17 @@ class EditEntryItem : public QListViewItem
 DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidget *parent) :
   QWidget( parent ),
   mAddressBook( addressBook )
 {
   kdDebug(5700) << "DistributionListEditor()" << endl;
 
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setMargin( KDialog::marginHint() );
   topLayout->setSpacing( KDialog::spacingHint() );
 
-  QBoxLayout *nameLayout = new QHBoxLayout( topLayout) ;
+  Q3BoxLayout *nameLayout = new Q3HBoxLayout( topLayout) ;
 
   mNameCombo = new QComboBox( this );
   nameLayout->addWidget( mNameCombo );
   connect( mNameCombo, SIGNAL( activated( int ) ), SLOT( updateEntryView() ) );
 
   newButton = new QPushButton( i18n("New List"), this );
@@ -140,13 +144,13 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidge
   connect( newButton, SIGNAL( clicked() ), SLOT( newList() ) );
 
   removeButton = new QPushButton( i18n("Remove List"), this );
   nameLayout->addWidget( removeButton );
   connect( removeButton, SIGNAL( clicked() ), SLOT( removeList() ) );
 
-  mEntryView = new QListView( this );
+  mEntryView = new Q3ListView( this );
   mEntryView->addColumn( i18n("Name") );
   mEntryView->addColumn( i18n("Email") );
   mEntryView->addColumn( i18n("Use Preferred") );
   topLayout->addWidget( mEntryView );
   connect(mEntryView,SIGNAL(selectionChanged ()),this, SLOT(slotSelectionEntryViewChanged()));
 
@@ -159,13 +163,13 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidge
   connect( removeEntryButton, SIGNAL( clicked() ), SLOT( removeEntry() ) );
 
   addEntryButton = new QPushButton( i18n("Add Entry"), this );
   topLayout->addWidget( addEntryButton );
   connect( addEntryButton, SIGNAL( clicked() ), SLOT( addEntry() ) );
 
-  mAddresseeView = new QListView( this );
+  mAddresseeView = new Q3ListView( this );
   mAddresseeView->addColumn( i18n("Name") );
   mAddresseeView->addColumn( i18n("Preferred Email") );
   topLayout->addWidget( mAddresseeView );
 
 
   connect(mAddresseeView,SIGNAL(selectionChanged ()),this, SLOT(slotSelectionAddresseeViewChanged()));
diff --git a/kabc/distributionlisteditor.h b/kabc/distributionlisteditor.h
index e0b4221..e672a14 100644
--- a/kabc/distributionlisteditor.h
+++ b/kabc/distributionlisteditor.h
@@ -21,15 +21,15 @@
 #define KABC_DISTRIBUTIONLISTEDITOR_H
 
 #include <qwidget.h>
 
 #include <kdialogbase.h>
 
-class QListView;
+class Q3ListView;
 class QComboBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 
 namespace KABC {
 
 class AddressBook;
 class DistributionListManager;
 
@@ -42,13 +42,13 @@ class EmailSelectDialog : public KDialogBase
     QString selected();
 
     static QString getEmail( const QStringList &emails, const QString &current,
                              QWidget *parent );
 
   private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
 
 /**
   @obsolete
 */
 class DistributionListEditor : public QWidget
@@ -69,14 +69,14 @@ class DistributionListEditor : public QWidget
     void updateNameCombo();
     void slotSelectionEntryViewChanged();
     void slotSelectionAddresseeViewChanged();
 
   private:
     QComboBox *mNameCombo;  
-    QListView *mEntryView;
-    QListView *mAddresseeView;
+    Q3ListView *mEntryView;
+    Q3ListView *mAddresseeView;
 
     AddressBook *mAddressBook;
     DistributionListManager *mManager;
     QPushButton *newButton, *removeButton;
     QPushButton *changeEmailButton,*removeEntryButton,*addEntryButton;
 };
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 7c6d7a9..203f696 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -30,12 +30,14 @@ $Id$
 #include <kconfig.h>
 #include <kconfigbase.h>
 #include <kglobal.h>
 
 #include "field.h"
 #include "resource.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace KABC;
 
 class Field::FieldImpl
 {
   public:
@@ -374,13 +376,13 @@ bool Field::setValue( KABC::Addressee &a, const QString &value )
     case FieldImpl::Birthday:
 //US
 //the generated code had the following format: return a.setBirthday( QDate::fromString( value, Qt::ISODate ) );
 // But Qt::IsoDate and QDate::fromString was not specified. Do I have the wrong QT version ?
       {
       QDate dt = KGlobal::locale()->readDate( value, "%Y-%m-%d");  // = Qt::ISODate
-      a.setBirthday(dt);
+      a.setBirthday((QDateTime)dt);
       }
       return true;
     case FieldImpl::CustomField:
       a.insertCustom( mImpl->app(), mImpl->key(), value );
 //US never copy the resourcename back to the adressee. 
     case FieldImpl::Resource:
@@ -490,13 +492,13 @@ void Field::saveFields( const QString &identifier,
   saveFields( cfg, identifier, fields );
 }
 
 void Field::saveFields( KConfig *cfg, const QString &identifier,
                         const Field::List &fields )
 {
-  QValueList<int> fieldIds;
+  Q3ValueList<int> fieldIds;
 
 //US
 //  qDebug("Field::saveFields to %s %s", cfg->getFileName().latin1(), identifier.latin1());
     
   int custom = 0;
   Field::List::ConstIterator it;
@@ -530,20 +532,20 @@ Field::List Field::restoreFields( const QString &identifier )
 
   return l;
 }
 
 Field::List Field::restoreFields( KConfig *cfg, const QString &identifier )
 {
-  QValueList<int> fieldIds = cfg->readIntListEntry( identifier);
+  Q3ValueList<int> fieldIds = cfg->readIntListEntry( identifier);
 //US
 //  qDebug("Field::restoreFields from %s, identifier: %s", cfg->getFileName().latin1(), identifier.latin1());
   
   Field::List fields;
 
   int custom = 0;
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
   for( it = fieldIds.begin(); it != fieldIds.end(); ++it ) {
     FieldImpl *f = 0;
     if ( (*it) == FieldImpl::CustomField ) {
       QStringList customEntry = cfg->readListEntry( "KABC_CustomEntry_" +
                                                  identifier + "_" +
                                                  QString::number( custom++ ) );
diff --git a/kabc/field.h b/kabc/field.h
index 9e06597..55cc705 100644
--- a/kabc/field.h
+++ b/kabc/field.h
@@ -26,13 +26,13 @@ $Id$
 */
 
 #ifndef KABC_FIELD_H
 #define KABC_FIELD_H
 
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "addressee.h"
 
 class KConfig;
 
 namespace KABC {
@@ -40,13 +40,13 @@ namespace KABC {
 class Field
 {
   class FieldImpl;
   friend class FieldImpl;
 
 public:
-  typedef QValueList<Field *> List;
+  typedef Q3ValueList<Field *> List;
 
   /**
    * @li @p All -
    * @li @p Frequent -
    * @li @p Address -
    * @li @p Email -
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp
index 3ae1c27..cbb97a2 100644
--- a/kabc/formatfactory.cpp
+++ b/kabc/formatfactory.cpp
@@ -99,13 +99,13 @@ QStringList FormatFactory::formats()
 {
   QStringList retval;
 
   // make sure 'vcard' is the first entry
   retval << "vcard";
 
-  QDictIterator<FormatInfo> it( mFormatList );
+  Q3DictIterator<FormatInfo> it( mFormatList );
   for ( ; it.current(); ++it )
     if ( it.currentKey() != "vcard" )
       retval << it.currentKey();
 
   return retval;
 }
diff --git a/kabc/formatfactory.h b/kabc/formatfactory.h
index 9612374..de15b17 100644
--- a/kabc/formatfactory.h
+++ b/kabc/formatfactory.h
@@ -18,13 +18,13 @@
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KABC_FORMATFACTORY_H
 #define KABC_FORMATFACTORY_H
 
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 
 #include <kconfig.h>
 #ifndef DESKTOP_VERSION
 #include <klibloader.h>
 #endif
@@ -94,11 +94,11 @@ class FormatFactory
   private:
 #ifndef DESKTOP_VERSION
     KLibrary *openLibrary( const QString& libName );
 #endif
     static FormatFactory *mSelf;
 
-    QDict<FormatInfo> mFormatList;
+    Q3Dict<FormatInfo> mFormatList;
 };
 
 }
 #endif
diff --git a/kabc/formats/binary/kabcformat_binaryE.pro b/kabc/formats/binary/kabcformat_binaryE.pro
index 2d9594d..c71197e 100644
--- a/kabc/formats/binary/kabcformat_binaryE.pro
+++ b/kabc/formats/binary/kabcformat_binaryE.pro
@@ -5,13 +5,13 @@ CONFIG += qt warn_on release
 TARGET = microkabcformat_binary
 #INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 
 INTERFACES = \
 
 HEADERS = \
diff --git a/kabc/formats/vcardformatplugin2.cpp b/kabc/formats/vcardformatplugin2.cpp
index 41b0c9a..fbebe92 100644
--- a/kabc/formats/vcardformatplugin2.cpp
+++ b/kabc/formats/vcardformatplugin2.cpp
@@ -8,13 +8,13 @@ $Id$
 #include "vcardformatplugin2.h"
 
 #include "address.h"
 #include "addressee.h"
 #include "vcardparser/vcardtool.h"
 
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 
 using namespace KABC;
 
 extern "C"
 {
@@ -34,14 +34,14 @@ VCardFormatPlugin2::~VCardFormatPlugin2()
 
 bool VCardFormatPlugin2::load( Addressee &addressee, QFile *file )
 {
   qDebug("VCardFormatPlugin2::load");
   QString data;
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   data = t.read();
 
   VCardTool tool;
   
   Addressee::List l = tool.parseVCards( data );
 
@@ -55,14 +55,14 @@ bool VCardFormatPlugin2::load( Addressee &addressee, QFile *file )
 
 bool VCardFormatPlugin2::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
 {
   qDebug("VCardFormatPlugin2::loadAll");
   QString data;
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   data = t.read();
 
   VCardTool tool;
 
   Addressee::List l = tool.parseVCards( data );
 
@@ -83,14 +83,14 @@ void VCardFormatPlugin2::save( const Addressee &addressee, QFile *file )
   VCardTool tool;
   Addressee::List vcardlist;
 
 
   vcardlist.append( addressee );
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   t << tool.createVCards( vcardlist );
 }
 
 void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *file )
 {
   qDebug("VCardFormatPlugin2::saveAll");
@@ -102,22 +102,22 @@ void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *fi
     if ( (*it).resource() == resource ) {
       (*it).setChanged( false );
       vcardlist.append( *it );
     }
   }
   
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   t << tool.createVCards( vcardlist );
 }
 
 bool VCardFormatPlugin2::checkFormat( QFile *file ) const
 {
   QString line;
 
-  file->readLine( line, 1024 );
+  char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp;
   line = line.stripWhiteSpace();
   if ( line == "BEGIN:VCARD" )
     return true;
   else
     return false;
 }
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 17ebff8..846ed8a 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -1,18 +1,18 @@
         TEMPLATE= lib
 CONFIG += qt warn_on 
 #release debug
 DESTDIR=../bin
 
-TARGET = microkabc
+TARGET = xmicrokabc
 
 include( ../variables.pri )
 
 INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui ..
 
-#LIBS += -lmicrokde -lldap
+#LIBS += -lxmicrokde -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
 unix : {
 
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
@@ -213,6 +213,10 @@ vcard/TextListValue.cpp
 
 
 # plugins/ldap/resourceldap.cpp \
 # plugins/ldap/resourceldapconfig.cpp \
 
 #formats/binary/binaryformat.cpp \
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+QT +=  
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 1d28a4d..6045b68 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,17 +1,17 @@
         TEMPLATE= lib
 CONFIG += qt warn_on 
-TARGET = microkabc
+TARGET = xmicrokabc
 
 
 INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokdepim 
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokdepim 
 #LIBS += -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 
 #enable the following line if you want to get debugoutput while loading adresses
 #DEFINES += VCARD_DEBUG 
@@ -191,6 +191,8 @@ vcard/ClassValue.cpp \
 vcard/FloatValue.cpp \
 vcard/TextListValue.cpp
 
 
 # plugins/ldap/resourceldap.cpp \
 # plugins/ldap/resourceldapconfig.cpp \
+#The following line was inserted by qt3to4
+QT +=  qt3support 
diff --git a/kabc/key.h b/kabc/key.h
index 6ea5b47..313eb7d 100644
--- a/kabc/key.h
+++ b/kabc/key.h
@@ -25,27 +25,27 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KABC_KEY_H
 #define KABC_KEY_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 namespace KABC {
 
 /**
  * @short A class to store an encryption key.
  */
 class Key
 {
   friend QDataStream &operator<<( QDataStream &, const Key & );
   friend QDataStream &operator>>( QDataStream &, Key & );
 
 public:
-  typedef QValueList<Key> List;
-  typedef QValueList<int> TypeList;  
+  typedef Q3ValueList<Key> List;
+  typedef Q3ValueList<int> TypeList;  
 
   /**
    * Key types
    *
    * @li X509   - X509 key
    * @li PGP    - Pretty Good Privacy key
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index feeba6c..6bc89d3 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -25,13 +25,13 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KABC_PHONENUMBER_H
 #define KABC_PHONENUMBER_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qstring.h>
 
 namespace KABC {
 
 /**
   @short Phonenumber information.
@@ -43,14 +43,14 @@ namespace KABC {
 class PhoneNumber
 {
     friend QDataStream &operator<<( QDataStream &, const PhoneNumber & );
     friend QDataStream &operator>>( QDataStream &, PhoneNumber & );
 
   public:
-    typedef QValueList<PhoneNumber> List;
-    typedef QValueList<int> TypeList;
+    typedef Q3ValueList<PhoneNumber> List;
+    typedef Q3ValueList<int> TypeList;
 
     /**
       @li @p Home -  Home number
       @li @p Work -  Office number
       @li @p Msg -   Messaging
       @li @p Pref -  Preferred number
diff --git a/kabc/picture.cpp b/kabc/picture.cpp
index 57aa297..0c59937 100644
--- a/kabc/picture.cpp
+++ b/kabc/picture.cpp
@@ -23,12 +23,14 @@ Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "picture.h"
+//Added by qt3to4:
+#include <QPixmap>
 
 using namespace KABC;
 
 Picture::Picture()
   : mIntern( false )
 {
diff --git a/kabc/picture.h b/kabc/picture.h
index 714d1e2..1b63610 100644
--- a/kabc/picture.h
+++ b/kabc/picture.h
@@ -26,12 +26,14 @@ $Id$
 */
 
 #ifndef KABC_PICTURE_H
 #define KABC_PICTURE_H
 
 #include <qimage.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 namespace KABC {
 
 class Picture
 {
   friend QDataStream &operator<<( QDataStream &, const Picture & );
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index 3e18594..9b3b894 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -1,16 +1,16 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
 include( ../../../variables.pri )
 
-TARGET = microkabc_dir
+TARGET = xmicrokabc_dir
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -lxmicrokde -lxmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcedir.h \
@@ -26,11 +26,15 @@ MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+#The following line was inserted by qt3to4
+QT += xml  
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index cda4e2f..75332a0 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -1,16 +1,16 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
-TARGET = microkabc_dir
+TARGET = xmicrokabc_dir
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcedir.h \
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index c61664b..cc4afee 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -167,13 +167,13 @@ bool ResourceDir::doOpen()
   } else {
     QString testName = dir.entryList( QDir::Files )[0];
     if ( testName.isNull() || testName.isEmpty() ) // no file in directory
       return true;
 
     QFile file( mPath + "/" + testName );
-    if ( file.open( IO_ReadOnly ) )
+    if ( file.open( QIODevice::ReadOnly ) )
       return true;
 
     if ( file.size() == 0 )
       return true;
 
     bool ok = mFormat->checkFormat( &file );
@@ -193,13 +193,13 @@ bool ResourceDir::load()
 
   QStringList::Iterator it;
   bool ok = true;
   for ( it = files.begin(); it != files.end(); ++it ) {
     QFile file( mPath + "/" + (*it) );
 
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
       addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
       ok = false;
       continue;
     }
 
     if ( !mFormat->loadAll( addressBook(), this, &file ) )
@@ -220,13 +220,13 @@ bool ResourceDir::save( Ticket *ticket )
 #endif
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     if ( (*it).resource() != this || !(*it).changed() )
       continue;
 
     QFile file( mPath + "/" + (*it).uid() );
-    if ( !file.open( IO_WriteOnly ) ) {
+    if ( !file.open( QIODevice::WriteOnly ) ) {
       addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
       continue;
     }
 
     mFormat->save( *it, &file );
 
@@ -264,13 +264,13 @@ bool ResourceDir::lock( const QString &path )
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
 
   // Create unique file
   QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
index 98d18fe..8fa48d0 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -24,12 +24,14 @@ Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
@@ -41,13 +43,13 @@ $Id$
 
 using namespace KABC;
 
 ResourceDirConfig::ResourceDirConfig( QWidget* parent,  const char* name )
     : KRES::ConfigWidget( parent, name )
 {
-  QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0, 
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 2, 2, 0, 
       KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18n( "Format:" ), this );
   mFormatBox = new KComboBox( this );
 
   mainLayout->addWidget( label, 0, 0 );
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 2d17313..e4f1270 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -1,17 +1,17 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
 include( ../../../variables.pri )
 
-TARGET = microkabc_file
+TARGET = xmicrokabc_file
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -lxmicrokde -lxmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcefile.h \
@@ -27,11 +27,15 @@ MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+#The following line was inserted by qt3to4
+QT += xml  
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 16707e5..5044cd9 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -1,16 +1,16 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
-TARGET = microkabc_file
+TARGET = xmicrokabc_file
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcefile.h \
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index dad4571..3ed850c 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -198,19 +198,19 @@ bool ResourceFile::doOpen()
 {
   QFile file( fileName() );
   qDebug("ResourceFile::openfile %s ", fileName().latin1());
 
   if ( !file.exists() ) {
     // try to create the file
-    bool ok = file.open( IO_WriteOnly );
+    bool ok = file.open( QIODevice::WriteOnly );
     if ( ok )
       file.close();
 
     return ok;
   } else {
-    if ( !file.open( IO_ReadWrite ) )
+    if ( !file.open( QIODevice::ReadWrite ) )
       return false;
 
     if ( file.size() < 10 ) {
       file.close();
       return true;
     }
@@ -227,13 +227,13 @@ void ResourceFile::doClose()
 }
 
 bool ResourceFile::load()
 {
 
   QFile file( fileName() );
-  if ( !file.open( IO_ReadOnly ) ) {
+  if ( !file.open( QIODevice::ReadOnly ) ) {
     addressBook()->error( i18n( "Unable to open file '%1'." ).arg( fileName() ) );
     return false;
   }
 
 //    qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1());
 
@@ -308,13 +308,13 @@ bool ResourceFile::save( Ticket *ticket )
                 }
           }
       }
   }
   QFile info;
   info.setName( fileName() );
-  bool ok = info.open( IO_WriteOnly );
+  bool ok = info.open( QIODevice::WriteOnly );
   if ( ok ) {
     mFormat->saveAll( addressBook(), this, &info );
 
     info.close();
     ok = true;
   }
@@ -360,13 +360,13 @@ bool ResourceFile::lock( const QString &fileName )
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
    result = ::link( QFile::encodeName( mLockUniqueName ),
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp
index b63775d..70b0bac 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/kabc/plugins/file/resourcefileconfig.cpp
@@ -25,12 +25,14 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 #ifndef _WIN32_
@@ -47,13 +49,13 @@ using namespace KABC;
 
 ResourceFileConfig::ResourceFileConfig( QWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
 {
 //qDebug("ResourceFileConfig::ResourceFileConfig");
   
-  QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0,
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 2, 2, 0,
       KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18n( "Format:" ), this );
   mFormatBox = new KComboBox( this );
 
   mainLayout->addWidget( label, 0, 0 );
diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro
index 57b6f84..c56d24d 100644
--- a/kabc/plugins/ldap/ldapE.pro
+++ b/kabc/plugins/ldap/ldapE.pro
@@ -1,16 +1,16 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
-TARGET = microkabc_ldap
+TARGET = xmicrokabc_ldap
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourceldap.h \
diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro
index 9b95015..ad7e1ef 100644
--- a/kabc/plugins/olaccess/olaccess.pro
+++ b/kabc/plugins/olaccess/olaccess.pro
@@ -1,9 +1,9 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
-TARGET = microkabc_olaccess
+TARGET = xmicrokabc_olaccess
 
 include( ../../../variables.pri )
 
 INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 
 INTERFACES = \
@@ -25,11 +25,11 @@ MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index b7ecbc0..aa6b8ea 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -1,19 +1,19 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
 #release debug
-TARGET = microkabc_opie
+TARGET = xmicrokabc_opie
 
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include $(OPIEDIR)/include
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -L$(OPIEDIR)/lib
 LIBS += -lopie
 LIBS += -lqpe
 LIBS += -lqte
 
diff --git a/kabc/plugins/qtopia/qtopia.pro b/kabc/plugins/qtopia/qtopia.pro
index 64d1abc..d91a2e3 100644
--- a/kabc/plugins/qtopia/qtopia.pro
+++ b/kabc/plugins/qtopia/qtopia.pro
@@ -1,18 +1,18 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 
 include( ../../../variables.pri )
 
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
 
 INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources 
 
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde 
-#LIBS += -lkamicrokabc
+#LIBS += -lxmicrokde 
+#LIBS += -lxkamicrokabc
 
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
 
 INTERFACES = \
 
 HEADERS = \
@@ -33,11 +33,15 @@ MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+QT +=  
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index 700057b..4b174b2 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,18 +1,18 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
 
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
 
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 
 INTERFACES = \
 
 HEADERS = \
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 9693a68..9b3903b 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -31,13 +31,15 @@ $Id$
 
 
 #include "qtopiaconverter.h"
 
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //#include <.h>
 
 #include <libkdepim/ksyncprofile.h>
 
 
 using namespace KABC;
@@ -68,14 +70,14 @@ void QtopiaConverter::deinit()
   }
 }
 QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QString &app )
 {
  startover:
     QStringList dummy;
-    QValueList<OpieCategories>::ConstIterator catIt;
-    QValueList<OpieCategories> categories = m_edit->categories();
+    Q3ValueList<OpieCategories>::ConstIterator catIt;
+    Q3ValueList<OpieCategories> categories = m_edit->categories();
     bool found = false;
     for ( QStringList::ConstIterator listIt = list.begin(); listIt != list.end(); ++listIt ) {
         /* skip empty category name */
         if ( (*listIt).isEmpty() ) continue;
 
         found  = false;
@@ -189,13 +191,13 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
             adr.setAdditionalName( el.attribute( "MiddleName" )  );
             adr.setSuffix( el.attribute( "Suffix" ) );
             adr.setNickName( el.attribute( "Nickname" ) );
 
             QDate date = dateFromString( el.attribute( "Birthday" ) );
             if ( date.isValid() )
-              adr.setBirthday( date );
+              adr.setBirthday( (QDateTime)date );
 
             adr.setRole( el.attribute( "JobTitle" ) );
             if ( !el.attribute( "FileAs" ).isEmpty() )
               adr.setFormattedName( el.attribute( "FileAs" ) );
 
             adr.setOrganization( el.attribute( "Company" ) );
@@ -314,13 +316,13 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
 
             
           }
     return true;
 }
 
-bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, QTextStream *stream )
+bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, Q3TextStream *stream )
 {
             *stream << "<Contact ";
             *stream << "FirstName=\"" << escape(ab.givenName()) << "\" ";
             *stream << "MiddleName=\"" << escape(ab.additionalName()) << "\" ";
             *stream << "LastName=\"" << escape(ab.familyName()) << "\" ";
             *stream << "Suffix=\"" << escape(ab.suffix()) << "\" ";
@@ -481,19 +483,19 @@ CategoryEdit::CategoryEdit(const QString &fileName){
 }
 CategoryEdit::~CategoryEdit(){
 }
 void CategoryEdit::save(const QString& fileName)const{
     QFile file( fileName );
     QString endl = "\n";
-    if ( file.open( IO_WriteOnly ) ) {
-        QTextStream stream( &file );
-        stream.setEncoding( QTextStream::UnicodeUTF8 );
+    if ( file.open( QIODevice::WriteOnly ) ) {
+        Q3TextStream stream( &file );
+        stream.setEncoding( Q3TextStream::UnicodeUTF8 );
         stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
         stream << "<!DOCTYPE CategoryList>" << endl;
         stream << "<Categories>" << endl;
-        for ( QValueList<OpieCategories>::ConstIterator it = m_categories.begin();
+        for ( Q3ValueList<OpieCategories>::ConstIterator it = m_categories.begin();
               it != m_categories.end(); ++it )
         {
             stream << "<Category id=\""<< ( (*it).id() ) << "\" ";
 
             if ( !(*it).app().isEmpty() )
                 stream << " app=\""<< ( (*it).app() ) <<  "\" ";
@@ -534,13 +536,13 @@ int CategoryEdit::addCategory( const QString &appName,  const QString &name,  in
  */
 void CategoryEdit::parse( const QString &tempFile ){
     clear();
 
     QDomDocument doc( "mydocument" );
     QFile f( tempFile );
-    if ( !f.open( IO_ReadOnly ) )
+    if ( !f.open( QIODevice::ReadOnly ) )
         return;
 
     if ( !doc.setContent( &f ) ) {
         f.close();
         return;
     }
@@ -584,13 +586,13 @@ void CategoryEdit::clear()
 {
     ids.clear();
     m_categories.clear();
 }
 QString CategoryEdit::categoryById( const QString &id,  const QString &app )const
 {
-    QValueList<OpieCategories>::ConstIterator it;
+    Q3ValueList<OpieCategories>::ConstIterator it;
     QString category;
     QString fallback;
     for( it = m_categories.begin(); it != m_categories.end(); ++it ){
         if( id.stripWhiteSpace() == (*it).id().stripWhiteSpace() ){
             if( app == (*it).app() ){
                 category = (*it).name();
diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h
index 744dd41..389926c 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.h
+++ b/kabc/plugins/qtopia/qtopiaconverter.h
@@ -25,12 +25,15 @@ $Id$
 */
 
 #ifndef KABC_QTOPIACONVERTER_H
 #define KABC_QTOPIACONVERTER_H
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3TextStream>
 
 #include "addressee.h"
 #ifdef DESKTOP_VERSION
 #include <qdom.h> 
 #else
 #include <xml/qdom.h> 
@@ -73,20 +76,20 @@ class OpieCategories {
         void parse( const QString &fileName );
 
         QString categoryById(const QString &id, const QString &app )const;
         QStringList categoriesByIds( const QStringList& ids,  const QString& app );
 
         void clear();
-        QValueList<OpieCategories> categories()const {  return m_categories; };
+        Q3ValueList<OpieCategories> categories()const {  return m_categories; };
     private:
         /**
          * this function will be used internally to update the kde categories...
          */
         void updateKDE( const QString& app,  const QStringList& categories );
         QMap<int, bool> ids; // from tt Qtopia::UidGen
-        QValueList<OpieCategories> m_categories;
+        Q3ValueList<OpieCategories> m_categories;
     };
 
 
 class QtopiaConverter
 {
 public:
@@ -114,13 +117,13 @@ public:
   /**
    * Converts an addressee to a vcard string.
    *
    * @param addr    The addressee.
    * @param contact The qtopia contact.
    */
-  bool addresseeToQtopia( const Addressee &ab, QTextStream *stream );
+  bool addresseeToQtopia( const Addressee &ab, Q3TextStream *stream );
 
   private:
   QString categoriesToNumber( const QStringList &list, const QString &app );
   QString escape( const QString& s){ return s;};
     CategoryEdit *m_edit;
     QDate fromString( const QString& );
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 79ddaea..a36eb8f 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -28,13 +28,13 @@ $Id$
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -153,13 +153,13 @@ void ResourceQtopia::doClose()
 }
 
 bool ResourceQtopia::load()
 {
 
   QFile file( fileName() );
-  if ( !file.open(IO_ReadOnly ) ) {
+  if ( !file.open(QIODevice::ReadOnly ) ) {
     return false;
   }
 
   QDomDocument doc("mydocument" );
   if ( !doc.setContent( &file ) ) {
     file.close();
@@ -200,18 +200,18 @@ bool ResourceQtopia::save( Ticket *ticket )
 #ifdef _USE_DIRWATCH_
     mDirWatch.stopScan();
 #endif
     KABC::AddressBook::Iterator it;
     bool res;  
     QFile file( fileName() );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return false;
     }
-    QTextStream ts( &file );
-    QTextStream *stream = &ts;
-    stream->setEncoding( QTextStream::UnicodeUTF8 );
+    Q3TextStream ts( &file );
+    Q3TextStream *stream = &ts;
+    stream->setEncoding( Q3TextStream::UnicodeUTF8 );
     *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>" << endl;
     *stream << " <Groups>" << endl;
     *stream << " </Groups>" << endl;
     *stream << " <Contacts> " << endl;
     // for all entries
     KABC::Addressee ab;
@@ -257,13 +257,13 @@ bool ResourceQtopia::lock( const QString &lockfileName )
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
index d5d6141..42fd428 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
@@ -24,12 +24,14 @@ Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
@@ -43,13 +45,13 @@ $Id$
 
 using namespace KABC;
 
 ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
 {
-  QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 1, 2, 0,
       KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18n( "Location:" ), this );
   mFileNameEdit = new KURLRequester( this );
 
   connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ),
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 23b0b76..7fc8ba8 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,19 +1,19 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
-TARGET = microkabc_sharpdtm
+TARGET = xmicrokabc_sharpdtm
 
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include 
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokabc
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokabc
+LIBS += -lxmicrokdepim
 LIBS += -lmicroqtcompat
 LIBS += -L$(QPEDIR)/lib
 LIBS += -ljpeg
 LIBS += -lqpe
 LIBS += -lqte
 LIBS += -lzdtm
diff --git a/kabc/secrecy.h b/kabc/secrecy.h
index b2ff565..0fe956e 100644
--- a/kabc/secrecy.h
+++ b/kabc/secrecy.h
@@ -25,23 +25,23 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KABC_SECRECY_H
 #define KABC_SECRECY_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 namespace KABC {
 
 class Secrecy
 {
     friend QDataStream &operator<<( QDataStream &, const Secrecy & );
     friend QDataStream &operator>>( QDataStream &, Secrecy & );
 
 public:
-  typedef QValueList<int> TypeList;  
+  typedef Q3ValueList<int> TypeList;  
 
   /**
    * Secrecy types
    *
    * @li Public       - for public access
    * @li Private      - only private access
diff --git a/kabc/sound.h b/kabc/sound.h
index 0ec5ec8..9777054 100644
--- a/kabc/sound.h
+++ b/kabc/sound.h
@@ -25,13 +25,13 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KABC_SOUND_H
 #define KABC_SOUND_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qstring.h>
 
 namespace KABC {
 
 class Sound
 {
diff --git a/kabc/tmpaddressbook.cpp b/kabc/tmpaddressbook.cpp
index cfa57e3..5152e00 100644
--- a/kabc/tmpaddressbook.cpp
+++ b/kabc/tmpaddressbook.cpp
@@ -21,13 +21,13 @@
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "tmpaddressbook.h"
 
 using namespace KABC;
 
 #include "resource.h"
diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp
index fa46499..33d358c 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/kabc/vcard/AdrParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardRToken.h>
 #include <VCardAdrParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 AdrParam::AdrParam()
                 :Param()
 {
@@ -35,13 +37,13 @@ AdrParam::AdrParam()
 AdrParam::AdrParam(const AdrParam & x)
                 :Param(x),
                         adrTypeList_(x.adrTypeList_)
 {
 }
 
-AdrParam::AdrParam(const QCString & s)
+AdrParam::AdrParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         AdrParam &
 AdrParam::operator = (AdrParam & x)
@@ -53,13 +55,13 @@ AdrParam::operator = (AdrParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         AdrParam &
-AdrParam::operator = (const QCString & s)
+AdrParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         
         adrTypeList_.clear();
         textParam_.truncate(0);
         
@@ -74,13 +76,13 @@ AdrParam::operator == (AdrParam & x)
         if (!x.textParam().isEmpty())
                 return (x.textParam_ == textParam_);
 
         if (x.adrTypeList().count() != adrTypeList_.count())
                 return false;
         
-        QStrListIterator it(x.adrTypeList_);
+        Q3StrListIterator it(x.adrTypeList_);
         
         for (; it.current(); ++it)
                 if (!adrTypeList_.find(it.current()))
                         return false;
         
         return true;
@@ -111,13 +113,13 @@ AdrParam::_assemble()
 {
         if (!textParam_.isEmpty()) {
                 strRep_ = textParam_;
                 return;
         }
         
-        QStrListIterator it(adrTypeList_);
+        Q3StrListIterator it(adrTypeList_);
         
         for (; it.current(); ++it) {
                 
                 strRep_ += it.current();
                 
                 if (it.current() != adrTypeList_.last())
diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp
index 7ecef33..51ca12a 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/kabc/vcard/AdrValue.cpp
@@ -22,12 +22,15 @@
 */
 
 #include <VCardRToken.h>
 #include <VCardAdrValue.h>
 #include <VCardValue.h>
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3StrList>
+#include <Q3CString>
 
 using namespace VCARD;
 
 AdrValue::AdrValue()
                 :Value()
 {
@@ -42,13 +45,13 @@ AdrValue::AdrValue(const AdrValue & x)
                         region_         (x.region_),
                         postCode_(x.postCode_),
                         countryName_(x.countryName_)
 {
 }
 
-AdrValue::AdrValue(const QCString & s)
+AdrValue::AdrValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         AdrValue &
 AdrValue::operator = (AdrValue & x)
@@ -65,13 +68,13 @@ AdrValue::operator = (AdrValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         AdrValue &
-AdrValue::operator = (const QCString & s)
+AdrValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
@@ -102,13 +105,13 @@ AdrValue::clone()
 
         void
 AdrValue::_parse()
 {
         vDebug("AdrValue::_parse()");
 
-        QStrList l;
+        Q3StrList l;
         RTokenise(strRep_, ";", l);
         
         for (unsigned int i = 0; i < l.count(); i++) {
                 
                 switch (i) {
                         
diff --git a/kabc/vcard/AgentParam.cpp b/kabc/vcard/AgentParam.cpp
index 5625e00..aae35ac 100644
--- a/kabc/vcard/AgentParam.cpp
+++ b/kabc/vcard/AgentParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardAgentParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 AgentParam::AgentParam()
                 :Param()
 {
@@ -36,13 +38,13 @@ AgentParam::AgentParam(const AgentParam & x)
                 :Param(x),
                         refer_(x.refer_),
                         uri_(x.uri_)
 {
 }
 
-AgentParam::AgentParam(const QCString & s)
+AgentParam::AgentParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         AgentParam &
 AgentParam::operator = (AgentParam & x)
@@ -54,13 +56,13 @@ AgentParam::operator = (AgentParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         AgentParam &
-AgentParam::operator = (const QCString & s)
+AgentParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/AgentValue.cpp b/kabc/vcard/AgentValue.cpp
index bccde80..14e73b1 100644
--- a/kabc/vcard/AgentValue.cpp
+++ b/kabc/vcard/AgentValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardAgentValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 AgentValue::AgentValue()
                 :Value()
 {
@@ -34,13 +36,13 @@ AgentValue::AgentValue()
 
 AgentValue::AgentValue(const AgentValue & x)
                 :Value(x)
 {
 }
 
-AgentValue::AgentValue(const QCString & s)
+AgentValue::AgentValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         AgentValue &
 AgentValue::operator = (AgentValue & x)
@@ -49,13 +51,13 @@ AgentValue::operator = (AgentValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         AgentValue &
-AgentValue::operator = (const QCString & s)
+AgentValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/ClassValue.cpp b/kabc/vcard/ClassValue.cpp
index f01e5a6..c088d7c 100644
--- a/kabc/vcard/ClassValue.cpp
+++ b/kabc/vcard/ClassValue.cpp
@@ -23,12 +23,14 @@
 
 #include <VCardClassValue.h>
 
 #include <VCardValue.h>
 
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 ClassValue::ClassValue()
                 :Value()
 {
@@ -37,13 +39,13 @@ ClassValue::ClassValue()
 ClassValue::ClassValue(const ClassValue & x)
                 :Value(x),
                 classType_(x.classType_)
 {
 }
 
-ClassValue::ClassValue(const QCString & s)
+ClassValue::ClassValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         ClassValue &
 ClassValue::operator = (ClassValue & x)
@@ -55,13 +57,13 @@ ClassValue::operator = (ClassValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         ClassValue &
-ClassValue::operator = (const QCString & s)
+ClassValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 0a2f97d..1d4886c 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -18,14 +18,14 @@
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 #include <qregexp.h>
 
 #include <kdebug.h>
 
 #include <VCardAdrParam.h>
 #include <VCardAgentParam.h>
@@ -95,13 +95,13 @@ ContentLine::ContentLine(const ContentLine & x)
         p->setValue( it.current()->value() );
     paramList_.append(p);
   }
 
 }
 
-ContentLine::ContentLine(const QCString & s)
+ContentLine::ContentLine(const Q3CString & s)
                 :Entity(s),
                 value_(0),
                 paramType_( ParamUnknown ),
                 valueType_( ValueUnknown ),
                 entityType_( EntityUnknown )
 {
@@ -126,26 +126,26 @@ ContentLine::operator = (ContentLine & x)
 
         Entity::operator = (x);
         return *this;
 }
 
         ContentLine &
-ContentLine::operator = (const QCString & s)
+ContentLine::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         delete value_;
         value_ = 0;
         return *this;
 }
 
         bool
 ContentLine::operator == (ContentLine & x)
 {
         x.parse();
 
-        QPtrListIterator<Param> it(x.paramList());
+        Q3PtrListIterator<Param> it(x.paramList());
 
         if (!paramList_.find(it.current()))
                 return false;
 
         return true;
 }
@@ -160,27 +160,27 @@ ContentLine::~ContentLine()
 ContentLine::_parse()
 {
         vDebug("parse");
 
     // Unfold folded lines
     // NLR
-    strRep_ = strRep_.replace( QRegExp( "\\r" ), "" );
+    strRep_ = strRep_.replace( "\\r" , "" );
                 // Unqote newlines
-        strRep_ = strRep_.replace( QRegExp( "\\\\n" ), "\n" );
+        strRep_ = strRep_.replace( "\\\\n", "\n" );
     //NLR
-        strRep_ = strRep_.replace( QRegExp( "\\\\r" ), "\r" );
+        strRep_ = strRep_.replace( "\\\\r" , "\r" );
 
         int split = strRep_.find(':');
 
         if (split == -1) { // invalid content line
                 vDebug("No ':'");
                 return;
         }
 
-        QCString firstPart(strRep_.left(split));
-        QCString valuePart(strRep_.mid(split + 1));
+        Q3CString firstPart(strRep_.left(split));
+        Q3CString valuePart(strRep_.mid(split + 1));
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.mid(split + 1);
@@ -189,13 +189,13 @@ ContentLine::_parse()
         vDebug("Group == " + group_);
         vDebug("firstPart == " + firstPart);
         vDebug("valuePart == " + valuePart);
 
         // Now we have the group, the name and param list together and the value.
 
-        QStrList l;
+        Q3StrList l;
 
         RTokenise(firstPart, ";", l);
 
         if (l.count() == 0) {// invalid - no name !
                 vDebug("No name for this content line !");
                 return;
@@ -211,31 +211,31 @@ ContentLine::_parse()
                 paramType_= EntityTypeToParamType(entityType_);
 
         unsigned int i = 0;
 
         // For each parameter, create a new parameter of the correct type.
 
-        QStrListIterator it(l);
+        Q3StrListIterator it(l);
 
         for (; it.current(); ++it, i++) {
 
-                QCString str = *it;
+                Q3CString str = *it;
 
                 split = str.find("=");
                 if (split < 0 ) {
                         vDebug("No '=' in paramter.");
                         continue;
                 }
 
-                QCString paraName = str.left(split);
-                QCString paraValue = str.mid(split + 1);
+                Q3CString paraName = str.left(split);
+                Q3CString paraValue = str.mid(split + 1);
 
-                QStrList paraValues;
+                Q3StrList paraValues;
                 RTokenise(paraValue, ",", paraValues);
 
-                QStrListIterator it2( paraValues );
+                Q3StrListIterator it2( paraValues );
 
                 for(; it2.current(); ++it2) {
 
                         Param *p = new Param;
                         p->setName( paraName );
                         p->setValue( *it2 );
@@ -306,13 +306,13 @@ ContentLine::_assemble()
     strRep_ = cut.latin1();
     //qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
 #if 0
         vDebug("Assemble (argl) - my name is \"" + name_ + "\"");
         strRep_.truncate(0);
 
-        QCString line;
+        Q3CString line;
 
         if (!group_.isEmpty())
                 line += group_ + '.';
 
         line += name_;
 
diff --git a/kabc/vcard/DateParam.cpp b/kabc/vcard/DateParam.cpp
index 52af089..52fb828 100644
--- a/kabc/vcard/DateParam.cpp
+++ b/kabc/vcard/DateParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardDateParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 DateParam::DateParam()
                 :Param()
 {
@@ -34,13 +36,13 @@ DateParam::DateParam()
 
 DateParam::DateParam(const DateParam & x)
                 :Param(x)
 {
 }
 
-DateParam::DateParam(const QCString & s)
+DateParam::DateParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         DateParam &
 DateParam::operator = (DateParam & x)
@@ -49,13 +51,13 @@ DateParam::operator = (DateParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         DateParam &
-DateParam::operator = (const QCString & s)
+DateParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp
index c5c5c85..87c7007 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/kabc/vcard/DateValue.cpp
@@ -19,12 +19,14 @@
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kdebug.h>
 
 #include <VCardDefines.h>
 #include <VCardDateValue.h>
 #include <VCardValue.h>
@@ -102,13 +104,13 @@ DateValue::DateValue(const DateValue & x)
         zoneHour_ = x.zoneHour_;
         zoneMinute_ = x.zoneMinute_;
         secFrac_ = x.secFrac_;
         hasTime_ = x.hasTime_;
 }
 
-DateValue::DateValue(const QCString & s)
+DateValue::DateValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         DateValue &
 DateValue::operator = (DateValue & x)
@@ -117,13 +119,13 @@ DateValue::operator = (DateValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         DateValue &
-DateValue::operator = (const QCString & s)
+DateValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
@@ -151,14 +153,14 @@ DateValue::_parse()
         // date = date-full-year ["-"] date-month ["-"] date-mday
         // time = time-hour [":"] time-minute [":"] time-second [":"]
         // [time-secfrac] [time-zone]
         
         int timeSep = strRep_.find('T');
         
-        QCString dateStr;
-        QCString timeStr;
+        Q3CString dateStr;
+        Q3CString timeStr;
         
         if (timeSep == -1) {
                 
                 dateStr = strRep_;
                 vDebug("Has date string \"" + dateStr + "\"");
                 
@@ -170,13 +172,13 @@ DateValue::_parse()
                 timeStr = strRep_.mid(timeSep + 1);
                 vDebug("Has time string \"" + timeStr + "\"");
         }
         
         /////////////////////////////////////////////////////////////// DATE
         
-        dateStr.replace(QRegExp("-"), "");
+        dateStr.replace("-", "");
 
         kdDebug(5710) << "dateStr: " << dateStr << endl;
 
                 year_= dateStr.left(4).toInt();
                 month_= dateStr.mid(4, 2).toInt();
                 day_= dateStr.right(2).toInt();
@@ -193,13 +195,13 @@ DateValue::_parse()
         /////////////////////////////////////////////////////////////// ZONE
         
         int zoneSep = timeStr.find('Z');
         
         if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
                 
-                QCString zoneStr(timeStr.mid(zoneSep + 1));
+                Q3CString zoneStr(timeStr.mid(zoneSep + 1));
                 vDebug("zoneStr == " + zoneStr);
 
                         zonePositive_= (zoneStr[0] == '+');
                         zoneHour_       = zoneStr.mid(1, 2).toInt();
                         zoneMinute_     = zoneStr.right(2).toInt();
                 
@@ -208,47 +210,47 @@ DateValue::_parse()
 
         //////////////////////////////////////////////////// SECOND FRACTION
         
         int secFracSep = timeStr.findRev(',');
         
         if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
-                QCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
+                Q3CString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
                 secFrac_ = quirkafleeg.toDouble();
         }
         
         /////////////////////////////////////////////////////////////// HMS
 
-        timeStr.replace(QRegExp(":"), "");
+        timeStr.replace(":", "");
         
                 hour_= timeStr.left(2).toInt();
                 minute_= timeStr.mid(2, 2).toInt();
                 second_= timeStr.mid(4, 2).toInt();
 }
 
         void
 DateValue::_assemble()
 {
         vDebug("DateValue::_assemble");
 
-        QCString year;
-        QCString month;
-        QCString day;
+        Q3CString year;
+        Q3CString month;
+        Q3CString day;
         
         year.setNum( year_ );
         month.setNum( month_ );
         day.setNum( day_ );
 
         if ( month.length() < 2 ) month.prepend( "0" );
         if ( day.length() < 2 ) day.prepend( "0" );
 
         strRep_ = year + '-' + month + '-' + day;
 
         if ( hasTime_ ) {
-            QCString hour;
-            QCString minute;
-            QCString second;
+            Q3CString hour;
+            Q3CString minute;
+            Q3CString second;
 
             hour.setNum( hour_ );
             minute.setNum( minute_ );
             second.setNum( second_ );
 
             if ( hour.length() < 2 ) hour.prepend( "0" );
diff --git a/kabc/vcard/EmailParam.cpp b/kabc/vcard/EmailParam.cpp
index 8c87477..877af60 100644
--- a/kabc/vcard/EmailParam.cpp
+++ b/kabc/vcard/EmailParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardEmailParam.h>
 #include <VCardParam.h>
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 EmailParam::EmailParam()
                 :Param()
 {
@@ -37,13 +39,13 @@ EmailParam::EmailParam(const EmailParam & x)
                 :Param(x),
                         emailType_(x.emailType_),
                         pref_   (x.pref_)
 {
 }
 
-EmailParam::EmailParam(const QCString & s)
+EmailParam::EmailParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         EmailParam &
 EmailParam::operator = (EmailParam & x)
@@ -55,13 +57,13 @@ EmailParam::operator = (EmailParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         EmailParam &
-EmailParam::operator = (const QCString & s)
+EmailParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/Entity.cpp b/kabc/vcard/Entity.cpp
index b7d09e0..e38fa11 100644
--- a/kabc/vcard/Entity.cpp
+++ b/kabc/vcard/Entity.cpp
@@ -19,12 +19,14 @@
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardEntity.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 Entity::Entity()
                 :       parsed_         (false),
                         assembled_(true)
@@ -37,13 +39,13 @@ Entity::Entity(const Entity & e)
                         parsed_         (e.parsed_),
                         assembled_(e.assembled_)
 {
         // empty
 }
                 
-Entity::Entity(const QCString & s)
+Entity::Entity(const Q3CString & s)
                 :       strRep_         (s),
                         parsed_         (false),
                         assembled_(true)
 {
         // empty
 }
@@ -58,13 +60,13 @@ Entity::operator = (const Entity & e)
                 assembled_= e.assembled_;
 
         return *this;
 }
                 
         Entity &
-Entity::operator = (const QCString & s)
+Entity::operator = (const Q3CString & s)
 {
                 strRep_         = s;
                 parsed_         = false;
                 assembled_= true;
         
         return *this;
@@ -80,29 +82,29 @@ Entity::operator == (Entity & e)
 Entity::operator != (Entity & e)
 {
         return !(*this == e);
 }
                 
         bool
-Entity::operator == (const QCString & s)
+Entity::operator == (const Q3CString & s)
 {
         return asString() == s;
 }
                 
         bool
-Entity::operator != (const QCString & s)
+Entity::operator != (const Q3CString & s)
 {
         return !(*this == s);
 }
                 
 Entity::~Entity()
 {
         // empty
 }
                 
-        QCString
+        Q3CString
 Entity::asString()
 {
         //vDebug("Entity::asString()");
         assemble();
 
         return strRep_;
diff --git a/kabc/vcard/Enum.cpp b/kabc/vcard/Enum.cpp
index cc48b5a..036324c 100644
--- a/kabc/vcard/Enum.cpp
+++ b/kabc/vcard/Enum.cpp
@@ -18,21 +18,21 @@
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <ctype.h>
 
 #include <VCardEnum.h>
 
 using namespace VCARD;
 
 // There are 31 possible types, not including extensions.
-        const QCString
+        const Q3CString
 VCARD::paramNames [] =
 {
         "NAME",
         "PROFILE",
         "SOURCE",
         "FN",
@@ -219,21 +219,21 @@ VCARD::EntityTypeToValueType(EntityType e)
 
         }
         
         return t;
 }
 
-        QCString
+        Q3CString
 VCARD::EntityTypeToParamName(EntityType e)
 {
         if ( e > EntityUnknown ) e = EntityUnknown;
         return paramNames[ int( e ) ];
 }
 
         EntityType
-VCARD::EntityNameToEntityType(const QCString & s)
+VCARD::EntityNameToEntityType(const Q3CString & s)
 {
         if (s.isEmpty()) return EntityUnknown;
         
         EntityType t(EntityUnknown);
         
         switch (s[0]) {
diff --git a/kabc/vcard/FloatValue.cpp b/kabc/vcard/FloatValue.cpp
index 15bb664..7065081 100644
--- a/kabc/vcard/FloatValue.cpp
+++ b/kabc/vcard/FloatValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardFloatValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 FloatValue::FloatValue()
                 :Value()
 {
@@ -42,13 +44,13 @@ FloatValue::FloatValue(float f)
 FloatValue::FloatValue(const FloatValue & x)
                 :Value(x)
 {
         value_ = x.value_;
 }
 
-FloatValue::FloatValue(const QCString & s)
+FloatValue::FloatValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         FloatValue &
 FloatValue::operator = (FloatValue & x)
@@ -60,13 +62,13 @@ FloatValue::operator = (FloatValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         FloatValue &
-FloatValue::operator = (const QCString & s)
+FloatValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
@@ -98,13 +100,13 @@ FloatValue::_parse()
                 value_ = -value_;
 }
 
         void
 FloatValue::_assemble()
 {
-        strRep_ = QCString().setNum(value_);
+        strRep_ = Q3CString().setNum(value_);
 }
 
         float
 FloatValue::value()
 {
         parse();
diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp
index e02b402..ba57a6b 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/kabc/vcard/GeoValue.cpp
@@ -20,12 +20,14 @@
 
 #include <VCardGeoValue.h>
 
 #include <VCardValue.h>
 
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 GeoValue::GeoValue()
                 :Value()
 {
@@ -33,13 +35,13 @@ GeoValue::GeoValue()
 
 GeoValue::GeoValue(const GeoValue & x)
                 :Value(x), latitude_(x.latitude_), longitude_(x.longitude_)
 {
 }
 
-GeoValue::GeoValue(const QCString & s)
+GeoValue::GeoValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         GeoValue &
 GeoValue::operator = (GeoValue & x)
@@ -51,13 +53,13 @@ GeoValue::operator = (GeoValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         GeoValue &
-GeoValue::operator = (const QCString & s)
+GeoValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/ImageParam.cpp b/kabc/vcard/ImageParam.cpp
index c9cf6fd..6da317d 100644
--- a/kabc/vcard/ImageParam.cpp
+++ b/kabc/vcard/ImageParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardImageParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 ImageParam::ImageParam()
                 :Param()
 {
@@ -34,13 +36,13 @@ ImageParam::ImageParam()
 
 ImageParam::ImageParam(const ImageParam & x)
                 :Param(x)
 {
 }
 
-ImageParam::ImageParam(const QCString & s)
+ImageParam::ImageParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         ImageParam &
 ImageParam::operator = (ImageParam & x)
@@ -49,13 +51,13 @@ ImageParam::operator = (ImageParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         ImageParam &
-ImageParam::operator = (const QCString & s)
+ImageParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/ImageValue.cpp b/kabc/vcard/ImageValue.cpp
index 4630fac..678a81c 100644
--- a/kabc/vcard/ImageValue.cpp
+++ b/kabc/vcard/ImageValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardImageValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 ImageValue::ImageValue()
                 :Value()
 {
@@ -34,13 +36,13 @@ ImageValue::ImageValue()
 
 ImageValue::ImageValue(const ImageValue & x)
                 :Value(x)
 {
 }
 
-ImageValue::ImageValue(const QCString & s)
+ImageValue::ImageValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         ImageValue &
 ImageValue::operator = (ImageValue & x)
@@ -49,13 +51,13 @@ ImageValue::operator = (ImageValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         ImageValue &
-ImageValue::operator = (const QCString & s)
+ImageValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/ImgValue.cpp b/kabc/vcard/ImgValue.cpp
index 7b961f8..1b289df 100644
--- a/kabc/vcard/ImgValue.cpp
+++ b/kabc/vcard/ImgValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardImgValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 ImgValue::ImgValue()
                 :Value()
 {
@@ -34,13 +36,13 @@ ImgValue::ImgValue()
 
 ImgValue::ImgValue(const ImgValue & x)
                 :Value(x)
 {
 }
 
-ImgValue::ImgValue(const QCString & s)
+ImgValue::ImgValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         ImgValue &
 ImgValue::operator = (ImgValue & x)
@@ -49,13 +51,13 @@ ImgValue::operator = (ImgValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         ImgValue &
-ImgValue::operator = (const QCString & s)
+ImgValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp
index edf1804..52a0204 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/kabc/vcard/LangValue.cpp
@@ -23,12 +23,15 @@
 
 #include <VCardRToken.h>
 
 #include <VCardLangValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3StrList>
 
 using namespace VCARD;
 
 LangValue::LangValue()
                 :Value()
 {
@@ -36,13 +39,13 @@ LangValue::LangValue()
 
 LangValue::LangValue(const LangValue & x)
                 :Value(x)
 {
 }
 
-LangValue::LangValue(const QCString & s)
+LangValue::LangValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         LangValue &
 LangValue::operator = (LangValue & x)
@@ -51,13 +54,13 @@ LangValue::operator = (LangValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         LangValue &
-LangValue::operator = (const QCString & s)
+LangValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
@@ -71,13 +74,13 @@ LangValue::~LangValue()
 {
 }
 
         void
 LangValue::_parse()
 {
-        QStrList l;
+        Q3StrList l;
         RTokenise(strRep_, "-", l);
         
         if (l.count() == 0) return;
         
         primary_ = l.at(0);
         
@@ -88,40 +91,41 @@ LangValue::_parse()
 
         void
 LangValue::_assemble()
 {
         strRep_ = primary_;
         
-        QStrListIterator it(subtags_);
+        Q3StrListIterator it(subtags_);
         
-        for (; it.current(); ++it)
-                strRep_ += QCString('-') + it.current();
+        for (; it.current(); ++it) {
+                strRep_ += Q3CString('-'); strRep_ += it.current();
+        }
 }
 
-        QCString
+        Q3CString
 LangValue::primary()
 {
         parse();
         return primary_;
 }
         
-        QStrList
+        Q3StrList
 LangValue::subtags()
 {
         parse();
         return subtags_;
 }
         
         void
-LangValue::setPrimary(const QCString & s)
+LangValue::setPrimary(const Q3CString & s)
 {
         parse();
         primary_ = s;
 }
 
         void
-LangValue::setSubTags(const QStrList & l)
+LangValue::setSubTags(const Q3StrList & l)
 {
         parse();
         subtags_ = l;
 }
 
diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp
index cdec621..6c0f365 100644
--- a/kabc/vcard/NValue.cpp
+++ b/kabc/vcard/NValue.cpp
@@ -18,13 +18,15 @@
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <VCardRToken.h>
 #include <VCardNValue.h>
 #include <VCardValue.h>
 #include <VCardDefines.h>
 
@@ -43,13 +45,13 @@ NValue::NValue(const NValue & x)
                         middle_(x.middle_),
                         prefix_(x.prefix_),
                         suffix_(x.suffix_)
 {
 }
 
-NValue::NValue(const QCString & s)
+NValue::NValue(const Q3CString & s)
                 :Value(s)
 {
         vDebug("ctor");
 }
 
         NValue &
@@ -65,13 +67,13 @@ NValue::operator = (NValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         NValue &
-NValue::operator = (const QCString & s)
+NValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
@@ -97,13 +99,13 @@ NValue::clone()
         return new NValue( *this );
 }
 
         void
 NValue::_parse()
 {
-        QStrList l;
+        Q3StrList l;
         RTokenise(strRep_, ";", l);
         
         for (unsigned int i = 0; i < l.count(); i++) {
 
                 switch (i) {
                                 case 0: family_         = l.at(0);break;
diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp
index c3134c8..a6a32dd 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/kabc/vcard/OrgValue.cpp
@@ -23,12 +23,14 @@
 
 #include <VCardRToken.h>
 
 #include <VCardOrgValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 OrgValue::OrgValue()
                 :Value()
 {
@@ -36,13 +38,13 @@ OrgValue::OrgValue()
 
 OrgValue::OrgValue(const OrgValue & x)
                 :Value(x)
 {
 }
 
-OrgValue::OrgValue(const QCString & s)
+OrgValue::OrgValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         OrgValue &
 OrgValue::operator = (OrgValue & x)
@@ -51,13 +53,13 @@ OrgValue::operator = (OrgValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         OrgValue &
-OrgValue::operator = (const QCString & s)
+OrgValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
@@ -79,13 +81,13 @@ OrgValue::_parse()
 
         void
 OrgValue::_assemble()
 {
         bool first(true);
         
-        QStrListIterator it(valueList_);
+        Q3StrListIterator it(valueList_);
         
         for (; it.current(); ++it) {
                 if (!first) strRep_ += ';';
                 strRep_ += it.current();
                 first = false;
         }
@@ -95,13 +97,13 @@ OrgValue::_assemble()
 OrgValue::numValues()
 {
         parse();
         return valueList_.count();
 }
 
-        QCString
+        Q3CString
 OrgValue::value(unsigned int i)
 {
         parse();
         return valueList_.at(i);
 }
 
diff --git a/kabc/vcard/Param.cpp b/kabc/vcard/Param.cpp
index c513613..bd6b299 100644
--- a/kabc/vcard/Param.cpp
+++ b/kabc/vcard/Param.cpp
@@ -23,12 +23,14 @@
 
 #include <VCardParam.h>
 
 #include <VCardEntity.h>
 
 #include <VCardRToken.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 Param::Param()
                 :Entity(),
                 name_(""),
@@ -40,13 +42,13 @@ Param::Param(const Param & x)
                 :Entity(x),
                 name_(x.name_),
                 value_(x.value_)
 {
 }
 
-Param::Param(const QCString & s)
+Param::Param(const Q3CString & s)
                 :Entity(s),
                 name_(""),
                 value_("")
 {
 }
 
@@ -60,13 +62,13 @@ Param::operator = (Param & x)
         value_ = x.value_;
         
         return *this;
 }
 
         Param &
-Param::operator = (const QCString & s)
+Param::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
@@ -88,42 +90,42 @@ Param::_parse()
         void
 Param::_assemble()
 {
         strRep_ = name_ + "=" + value_;
 }
 
-Param::Param(const QCString &name, const QCString &value)
+Param::Param(const Q3CString &name, const Q3CString &value)
                 :Entity(),
                 name_(name),
                 value_(value)
 {
         parsed_ = true;
         assembled_ = false;
 }
 
         void
-Param::setName(const QCString & name)
+Param::setName(const Q3CString & name)
 {
         name_ = name;
         
         assembled_ = false;
 }
 
         void
-Param::setValue(const QCString & value)
+Param::setValue(const Q3CString & value)
 {
         value_ = value;
         
         assembled_ = false;
 }
 
-        QCString
+        Q3CString
 Param::name()
 {
         return name_;
 }
 
-        QCString
+        Q3CString
 Param::value()
 {
         return value_;
 }
diff --git a/kabc/vcard/PhoneNumberValue.cpp b/kabc/vcard/PhoneNumberValue.cpp
index 17b1400..57aa336 100644
--- a/kabc/vcard/PhoneNumberValue.cpp
+++ b/kabc/vcard/PhoneNumberValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardPhoneNumberValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 PhoneNumberValue::PhoneNumberValue()
                 :Value()
 {
@@ -34,13 +36,13 @@ PhoneNumberValue::PhoneNumberValue()
 
 PhoneNumberValue::PhoneNumberValue(const PhoneNumberValue & x)
                 :Value(x)
 {
 }
 
-PhoneNumberValue::PhoneNumberValue(const QCString & s)
+PhoneNumberValue::PhoneNumberValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         PhoneNumberValue &
 PhoneNumberValue::operator = (PhoneNumberValue & x)
@@ -49,13 +51,13 @@ PhoneNumberValue::operator = (PhoneNumberValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         PhoneNumberValue &
-PhoneNumberValue::operator = (const QCString & s)
+PhoneNumberValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp
index 2a85820..8fc0558 100644
--- a/kabc/vcard/RToken.cpp
+++ b/kabc/vcard/RToken.cpp
@@ -21,20 +21,20 @@
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <string.h>
 #include <stddef.h>
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 namespace VCARD
 {
 
         Q_UINT32
-RTokenise(const char * str, const char * delim, QStrList & l)
+RTokenise(const char * str, const char * delim, Q3StrList & l)
 {
         // FIXME no stderr !
         l.clear();
         
         if (!delim || !str || strlen(delim) == 0 || strlen(str) == 0) return 0;
         
diff --git a/kabc/vcard/SoundValue.cpp b/kabc/vcard/SoundValue.cpp
index 81040d1..4d098d2 100644
--- a/kabc/vcard/SoundValue.cpp
+++ b/kabc/vcard/SoundValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardSoundValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 SoundValue::SoundValue()
                 :Value()
 {
@@ -34,13 +36,13 @@ SoundValue::SoundValue()
 
 SoundValue::SoundValue(const SoundValue & x)
                 :Value(x)
 {
 }
 
-SoundValue::SoundValue(const QCString & s)
+SoundValue::SoundValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         SoundValue &
 SoundValue::operator = (SoundValue & x)
@@ -49,13 +51,13 @@ SoundValue::operator = (SoundValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         SoundValue &
-SoundValue::operator = (const QCString & s)
+SoundValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp
index cd51cbd..8f02113 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/kabc/vcard/SourceParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardSourceParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 SourceParam::SourceParam()
                 :Param(),
                 type_(SourceParam::TypeUnknown)
@@ -38,13 +40,13 @@ SourceParam::SourceParam(const SourceParam & x)
                         type_(x.type_),
                         par_(x.par_),
                         val_(x.val_)
 {
 }
 
-SourceParam::SourceParam(const QCString & s)
+SourceParam::SourceParam(const Q3CString & s)
                 :Param(s),
                 type_(SourceParam::TypeUnknown)
 {
 }
 
         SourceParam &
@@ -57,13 +59,13 @@ SourceParam::operator = (SourceParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         SourceParam &
-SourceParam::operator = (const QCString & s)
+SourceParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/TelParam.cpp b/kabc/vcard/TelParam.cpp
index 9d9fe4d..4bc8b6a 100644
--- a/kabc/vcard/TelParam.cpp
+++ b/kabc/vcard/TelParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardTelParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TelParam::TelParam()
                 :Param()
 {
@@ -34,13 +36,13 @@ TelParam::TelParam()
 
 TelParam::TelParam(const TelParam & x)
                 :Param(x)
 {
 }
 
-TelParam::TelParam(const QCString & s)
+TelParam::TelParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         TelParam &
 TelParam::operator = (TelParam & x)
@@ -49,13 +51,13 @@ TelParam::operator = (TelParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         TelParam &
-TelParam::operator = (const QCString & s)
+TelParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/TelValue.cpp b/kabc/vcard/TelValue.cpp
index 349f99a..d9cbf3e 100644
--- a/kabc/vcard/TelValue.cpp
+++ b/kabc/vcard/TelValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardTelValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TelValue::TelValue()
                 :Value()
 {
@@ -34,13 +36,13 @@ TelValue::TelValue()
 
 TelValue::TelValue(const TelValue & x)
                 :Value(x)
 {
 }
 
-TelValue::TelValue(const QCString & s)
+TelValue::TelValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         TelValue &
 TelValue::operator = (TelValue & x)
@@ -49,13 +51,13 @@ TelValue::operator = (TelValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         TelValue &
-TelValue::operator = (const QCString & s)
+TelValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/TextBinParam.cpp b/kabc/vcard/TextBinParam.cpp
index 66f2946..2866c12 100644
--- a/kabc/vcard/TextBinParam.cpp
+++ b/kabc/vcard/TextBinParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardTextBinParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextBinParam::TextBinParam()
                 :Param()
 {
@@ -34,13 +36,13 @@ TextBinParam::TextBinParam()
 
 TextBinParam::TextBinParam(const TextBinParam & x)
                 :Param(x)
 {
 }
 
-TextBinParam::TextBinParam(const QCString & s)
+TextBinParam::TextBinParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         TextBinParam &
 TextBinParam::operator = (TextBinParam & x)
@@ -49,13 +51,13 @@ TextBinParam::operator = (TextBinParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         TextBinParam &
-TextBinParam::operator = (const QCString & s)
+TextBinParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/TextBinValue.cpp b/kabc/vcard/TextBinValue.cpp
index c584009..a3a96ae 100644
--- a/kabc/vcard/TextBinValue.cpp
+++ b/kabc/vcard/TextBinValue.cpp
@@ -22,12 +22,14 @@
 */
 
 #include <kmdcodec.h>
 
 #include <VCardTextBinValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextBinValue::TextBinValue()
                 :Value()
 {
@@ -38,13 +40,13 @@ TextBinValue::TextBinValue(const TextBinValue & x)
 {
   mIsBinary_ = x.mIsBinary_;
   mData_ = x.mData_;
   mUrl_ = x.mUrl_;
 }
 
-TextBinValue::TextBinValue(const QCString & s)
+TextBinValue::TextBinValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         TextBinValue &
 TextBinValue::operator = (TextBinValue & x)
@@ -57,13 +59,13 @@ TextBinValue::operator = (TextBinValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         TextBinValue &
-TextBinValue::operator = (const QCString & s)
+TextBinValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp
index c4ac1e3..919f4f7 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/kabc/vcard/TextListValue.cpp
@@ -23,12 +23,14 @@
 
 #include <VCardRToken.h>
 
 #include <VCardTextListValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextListValue::TextListValue()
                 :Value()
 {
@@ -36,13 +38,13 @@ TextListValue::TextListValue()
 
 TextListValue::TextListValue(const TextListValue & x)
                 :Value(x)
 {
 }
 
-TextListValue::TextListValue(const QCString & s)
+TextListValue::TextListValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         TextListValue &
 TextListValue::operator = (TextListValue & x)
@@ -51,13 +53,13 @@ TextListValue::operator = (TextListValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         TextListValue &
-TextListValue::operator = (const QCString & s)
+TextListValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
@@ -79,13 +81,13 @@ TextListValue::_parse()
 
         void
 TextListValue::_assemble()
 {
         bool first(true);
         
-        QStrListIterator it(valueList_);
+        Q3StrListIterator it(valueList_);
         
         for (; it.current(); ++it) {
                 if (!first) strRep_ += ';';
                 strRep_ += it.current();
                 first = false;
         }
@@ -95,13 +97,13 @@ TextListValue::_assemble()
 TextListValue::numValues()
 {
         parse();
         return valueList_.count();
 }
 
-        QCString
+        Q3CString
 TextListValue::value(unsigned int i)
 {
         parse();
         return valueList_.at(i);
 }
 
diff --git a/kabc/vcard/TextParam.cpp b/kabc/vcard/TextParam.cpp
index 7c68700..ce6661f 100644
--- a/kabc/vcard/TextParam.cpp
+++ b/kabc/vcard/TextParam.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardTextParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextParam::TextParam()
                 :Param()
 {
@@ -34,13 +36,13 @@ TextParam::TextParam()
 
 TextParam::TextParam(const TextParam & x)
                 :Param(x)
 {
 }
 
-TextParam::TextParam(const QCString & s)
+TextParam::TextParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         TextParam &
 TextParam::operator = (TextParam & x)
@@ -49,13 +51,13 @@ TextParam::operator = (TextParam & x)
 
         Param::operator = (x);
         return *this;
 }
 
         TextParam &
-TextParam::operator = (const QCString & s)
+TextParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/TextValue.cpp b/kabc/vcard/TextValue.cpp
index 09934fa..d0d2996 100644
--- a/kabc/vcard/TextValue.cpp
+++ b/kabc/vcard/TextValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardTextValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextValue::TextValue()
                 :Value()
 {
@@ -34,13 +36,13 @@ TextValue::TextValue()
 
 TextValue::TextValue(const TextValue & x)
                 :Value(x)
 {
 }
 
-TextValue::TextValue(const QCString & s)
+TextValue::TextValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         TextValue &
 TextValue::operator = (TextValue & x)
@@ -49,22 +51,22 @@ TextValue::operator = (TextValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         TextValue &
-TextValue::operator = (const QCString & s)
+TextValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 TextValue::operator == (TextValue & x)
 {
-        return strRep_ = x.strRep_;
+        return strRep_ == x.strRep_;
 }
 
 TextValue::~TextValue()
 {
 }
 
diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp
index c1d1022..26da7f4 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/kabc/vcard/URIValue.cpp
@@ -21,21 +21,23 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardURIValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 URIValue::URIValue()
                 :Value()
 {
 }
 
-URIValue::URIValue(const QCString & scheme, const QCString & schemeSpecificPart)
+URIValue::URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart)
                 :Value(),
                         scheme_                         (scheme),
                         schemeSpecificPart_(schemeSpecificPart)
 {
         parsed_ = true;
 }
@@ -44,13 +46,13 @@ URIValue::URIValue(const URIValue & x)
                 :       Value                   (x),
                         scheme_                         (x.scheme_),
                         schemeSpecificPart_(x.schemeSpecificPart_)
 {
 }
 
-URIValue::URIValue(const QCString & s)
+URIValue::URIValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         URIValue &
 URIValue::operator = (URIValue & x)
@@ -62,13 +64,13 @@ URIValue::operator = (URIValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         URIValue &
-URIValue::operator = (const QCString & s)
+URIValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
@@ -100,34 +102,34 @@ URIValue::_parse()
         void
 URIValue::_assemble()
 {
         strRep_ = scheme_ + ':' + schemeSpecificPart_;
 }
 
-        QCString
+        Q3CString
 URIValue::scheme()
 {
         parse();
         return scheme_;
 }
 
-        QCString
+        Q3CString
 URIValue::schemeSpecificPart()
 {
         parse();
         return schemeSpecificPart_;
 }
 
         void
-URIValue::setScheme(const QCString & s)
+URIValue::setScheme(const Q3CString & s)
 {
         parse();
         scheme_ = s;
 }
 
         void
-URIValue::setSchemeSpecificPart(const QCString & s)
+URIValue::setSchemeSpecificPart(const Q3CString & s)
 {
         parse();
         schemeSpecificPart_ = s;
 }
 
diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp
index 374306c..f35d986 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/kabc/vcard/UTCValue.cpp
@@ -21,12 +21,14 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardUTCValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 UTCValue::UTCValue()
                 :Value()
 {
@@ -35,13 +37,13 @@ UTCValue::UTCValue()
 UTCValue::UTCValue(const UTCValue & x)
                 :       Value(x),positive_(x.positive_), hour_(x.hour_), minute_(x.minute_)
 
 {
 }
 
-UTCValue::UTCValue(const QCString & s)
+UTCValue::UTCValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         UTCValue &
 UTCValue::operator = (UTCValue & x)
@@ -54,13 +56,13 @@ UTCValue::operator = (UTCValue & x)
 
         Value::operator = (x);
         return *this;
 }
 
         UTCValue &
-UTCValue::operator = (const QCString & s)
+UTCValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index a2ff327..bae5385 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -20,12 +20,14 @@
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <qregexp.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <VCardDefines.h>
 #include <VCardVCardEntity.h>
 
 using namespace VCARD;
 
@@ -38,13 +40,13 @@ VCardEntity::VCardEntity()
 VCardEntity::VCardEntity(const VCardEntity & x)
                 :Entity(x)
 {
   cardList_.setAutoDelete( TRUE );
 }
 
-VCardEntity::VCardEntity(const QCString & s)
+VCardEntity::VCardEntity(const Q3CString & s)
                 :Entity(s)
 {
   cardList_.setAutoDelete( TRUE );
 }
 
         VCardEntity &
@@ -54,13 +56,13 @@ VCardEntity::operator = (VCardEntity & x)
 
         Entity::operator = (x);
         return *this;
 }
 
         VCardEntity &
-VCardEntity::operator = (const QCString & s)
+VCardEntity::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
@@ -80,21 +82,21 @@ VCardEntity::_parse()
 #if 0
     QTime tim;
     tim.start();
     int num  = 0;
     // old code 
         vDebug("parse");
-        QCString s(strRep_);
+        Q3CString s(strRep_);
 
         int i = s.find(QRegExp("BEGIN:VCARD", false));
 
         while (i != -1) {
 
                 i = s.find(QRegExp("BEGIN:VCARD", false), 11);
 
-                QCString cardStr(s.left(i));
+                Q3CString cardStr(s.left(i));
 
                 VCard * v = new VCard(cardStr);
 
                 cardList_.append(v);
 
                 v->parse();
@@ -129,13 +131,13 @@ VCardEntity::_parse()
             }
             ++i;
         }
         if ( i <= len ) {
             ++num;
             char* dat = strRep_.data()+start;
-            VCard * v = new VCard( QCString (  dat,i-start ) );
+            VCard * v = new VCard( Q3CString (  dat,i-start ) );
             start = i;
             cardList_.append(v);
             v->parse();
         }
         i+= 11;
         }
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp
index bad2ef1..5dd675d 100644
--- a/kabc/vcard/VCardv.cpp
+++ b/kabc/vcard/VCardv.cpp
@@ -18,17 +18,17 @@
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 #include <qstringlist.h>
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include <VCardEntity.h>
 #include <VCardVCard.h>
 #include <VCardContentLine.h>
 #include <VCardRToken.h>
 
@@ -45,44 +45,44 @@ VCard::VCard()
 VCard::VCard(const VCard & x)
                 :Entity(x),
                 group_(x.group_)
 {
   contentLineList_.setAutoDelete( TRUE );
 
-  QPtrListIterator<ContentLine> it(x.contentLineList_);
+  Q3PtrListIterator<ContentLine> it(x.contentLineList_);
   for (; it.current(); ++it) {
     ContentLine * c = new ContentLine(*it.current());
     contentLineList_.append(c);
   }
 
 }
 
-VCard::VCard(const QCString & s)
+VCard::VCard(const Q3CString & s)
                 :Entity(s)
 {
   contentLineList_.setAutoDelete( TRUE );
 }
 
         VCard &
 VCard::operator = (VCard & x)
 {
         if (*this == x) return *this;
 
                 group_                  = x.group();
-    QPtrListIterator<ContentLine> it(x.contentLineList_);
+    Q3PtrListIterator<ContentLine> it(x.contentLineList_);
     for (; it.current(); ++it) {
       ContentLine * c = new ContentLine(*it.current());
       contentLineList_.append(c);
     }
 
         Entity::operator = (x);
         return *this;
 }
 
         VCard &
-VCard::operator = (const QCString & s)
+VCard::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
@@ -98,21 +98,22 @@ VCard::~VCard()
 
         void
 VCard::_parse()
 {
         
         QStringList l;
-        QStrList sl;
+        Q3StrList sl;
 
         RTokenise(strRep_, "\r\n", sl);
 
         if (sl.count() < 3) { // Invalid VCARD !
         //qDebug("invalid vcard ");
                 return;
         }
-    l = QStringList::fromStrList( sl );
+    for(Q3StrList::iterator i=sl.begin();i!=sl.end();++i)
+        l.push_back(*i);
         // Get the first line
         QString beginLine = l[0].stripWhiteSpace();
 
         // Remove extra blank lines
         while (l.last().isEmpty())
                 l.remove(l.last());
@@ -177,13 +178,13 @@ VCard::_parse()
                 }
                 --it;
                 refolded.append(cur);
         }
     QStringList::Iterator it2 = refolded.begin();
         for (; it2 != refolded.end(); ++it2) {
-                ContentLine * cl = new ContentLine(QCString((*it2).latin1()));
+                ContentLine * cl = new ContentLine(Q3CString((*it2).latin1()));
                 cl->parse();
                 if (cl->value() == 0)
                 {
                     qDebug("Content line could not be parsed. Discarded: %s", (*it2).latin1());
                     delete cl;
                 }
@@ -225,13 +226,13 @@ VCard::_parse()
 VCard::_assemble()
 {
         vDebug("Assembling vcard");
         strRep_ = "BEGIN:VCARD\r\n";
         strRep_ += "VERSION:3.0\r\n";
 
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 strRep_ += it.current()->asString() + "\r\n";
 
         strRep_ += "END:VCARD\r\n";
 }
@@ -241,13 +242,13 @@ VCard::has(EntityType t)
 {
         parse();
         return contentLine(t) == 0 ? false : true;
 }
 
         bool
-VCard::has(const QCString & s)
+VCard::has(const Q3CString & s)
 {
         parse();
         return contentLine(s) == 0 ? false : true;
 }
 
         void
@@ -256,37 +257,37 @@ VCard::add(const ContentLine & cl)
         parse();
         ContentLine * c = new ContentLine(cl);
         contentLineList_.append(c);
 }
 
         void
-VCard::add(const QCString & s)
+VCard::add(const Q3CString & s)
 {
         parse();
         ContentLine * c = new ContentLine(s);
         contentLineList_.append(c);
 }
 
         ContentLine *
 VCard::contentLine(EntityType t)
 {
         parse();
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 if (it.current()->entityType() == t)
                         return it.current();
 
         return 0;
 }
 
         ContentLine *
-VCard::contentLine(const QCString & s)
+VCard::contentLine(const Q3CString & s)
 {
         parse();
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 if (it.current()->entityType() == EntityNameToEntityType(s))
                         return it.current();
 
         return 0;
diff --git a/kabc/vcard/Value.cpp b/kabc/vcard/Value.cpp
index 1978af2..3a4d406 100644
--- a/kabc/vcard/Value.cpp
+++ b/kabc/vcard/Value.cpp
@@ -20,12 +20,14 @@
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <VCardEntity.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 Value::Value()
                 :Entity()
 {
@@ -33,13 +35,13 @@ Value::Value()
 
 Value::Value(const Value & x)
                 :Entity(x)
 {
 }
 
-Value::Value(const QCString & s)
+Value::Value(const Q3CString & s)
                 :Entity(s)
 {
 }
 
         Value &
 Value::operator = (Value & x)
@@ -48,13 +50,13 @@ Value::operator = (Value & x)
 
         Entity::operator = (x);
         return *this;
 }
 
         Value &
-Value::operator = (const QCString & s)
+Value::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
diff --git a/kabc/vcard/include/VCardAdrParam.h b/kabc/vcard/include/VCardAdrParam.h
index 89dcb64..6456624 100644
--- a/kabc/vcard/include/VCardAdrParam.h
+++ b/kabc/vcard/include/VCardAdrParam.h
@@ -21,44 +21,44 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  ADRPARAM_H
 #define  ADRPARAM_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
         
 class AdrParam : public Param
 {
 
 #include "AdrParam-generated.h"
         
-        QStrList adrTypeList()
+        Q3StrList adrTypeList()
         { parse(); return adrTypeList_; }
         
-        QCString textParam()
+        Q3CString textParam()
         { parse(); return textParam_; }
         
-        void setAdrTypeList(const QStrList & l)
+        void setAdrTypeList(const Q3StrList & l)
         { adrTypeList_ = l; assembled_ = false; }
         
-        void setTextParam(const QCString & s)
+        void setTextParam(const Q3CString & s)
         { textParam_ = s; assembled_ = false; }
         
         enum AdrType {
                 AdrDom, AdrIntl, AdrPostal, AdrParcel, AdrHome, AdrWork, AdrPref,
                 AdrIANA, AdrX
         };
         
         private:
                 
-                        QStrListadrTypeList_;
-                        QCStringtextParam_;
+                        Q3StrListadrTypeList_;
+                        Q3CStringtextParam_;
 };
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardAdrValue.h b/kabc/vcard/include/VCardAdrValue.h
index 0731924..14ddb02 100644
--- a/kabc/vcard/include/VCardAdrValue.h
+++ b/kabc/vcard/include/VCardAdrValue.h
@@ -21,63 +21,65 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  ADRVALUE_H
 #define  ADRVALUE_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class AdrValue : public Value
 {
         
 #include "AdrValue-generated.h"
         
         AdrValue *clone();
         
-        void setPOBox(const QCString & s)
+        void setPOBox(const Q3CString & s)
         { poBox_ = s; assembled_ = false; }
         
-        void setExtAddress(const QCString & s)
+        void setExtAddress(const Q3CString & s)
         { extAddress_ = s; assembled_ = false; }
 
-        void setStreet(const QCString & s)
+        void setStreet(const Q3CString & s)
         { street_ = s; assembled_ = false; }
 
-        void setLocality(const QCString & s)
+        void setLocality(const Q3CString & s)
         { locality_ = s; assembled_ = false; }
 
-        void setRegion(const QCString & s)
+        void setRegion(const Q3CString & s)
         { region_ = s; assembled_ = false; }
 
-        void setPostCode(const QCString & s)
+        void setPostCode(const Q3CString & s)
         { postCode_ = s; assembled_ = false; }
         
-        void setCountryName(const QCString & s)
+        void setCountryName(const Q3CString & s)
         { countryName_ = s; assembled_ = false; }
         
-                QCString poBox()        { parse(); return poBox_;}
-                QCString extAddress()   { parse(); return extAddress_;}
-                QCString street()       { parse(); return street_;}
-                QCString locality()     { parse(); return locality_;}
-                QCString region()       { parse(); return region_;}
-                QCString postCode()     { parse(); return postCode_;}
-                QCString countryName()  { parse(); return countryName_;}
+                Q3CString poBox()       { parse(); return poBox_;}
+                Q3CString extAddress()  { parse(); return extAddress_;}
+                Q3CString street()      { parse(); return street_;}
+                Q3CString locality()    { parse(); return locality_;}
+                Q3CString region()      { parse(); return region_;}
+                Q3CString postCode()    { parse(); return postCode_;}
+                Q3CString countryName()         { parse(); return countryName_;}
         
         private:
                 
-                QCString poBox_;
-                QCString extAddress_;
-                QCString street_;
-                QCString locality_;
-                QCString region_;
-                QCString postCode_;
-                QCString countryName_;
+                Q3CString poBox_;
+                Q3CString extAddress_;
+                Q3CString street_;
+                Q3CString locality_;
+                Q3CString region_;
+                Q3CString postCode_;
+                Q3CString countryName_;
 };
 
 }
 
 #endif
 
diff --git a/kabc/vcard/include/VCardAgentParam.h b/kabc/vcard/include/VCardAgentParam.h
index 72a05db..5733540 100644
--- a/kabc/vcard/include/VCardAgentParam.h
+++ b/kabc/vcard/include/VCardAgentParam.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  AGENTPARAM_H
 #define  AGENTPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 #include <VCardURIValue.h>
 
 namespace VCARD
 {
@@ -43,13 +43,13 @@ class AgentParam : public Param
         URIValue uri()
         { parse(); return uri_; }
         
         void setRefer(bool b)
         { refer_ = b; assembled_ = false; }
 
-        void setURI(const QCString & s)
+        void setURI(const Q3CString & s)
         { uri_ = s; assembled_ = false; }
         
         private:
                 
                         bool    refer_;
                         URIValueuri_;
diff --git a/kabc/vcard/include/VCardAgentValue.h b/kabc/vcard/include/VCardAgentValue.h
index f655836..b0d883b 100644
--- a/kabc/vcard/include/VCardAgentValue.h
+++ b/kabc/vcard/include/VCardAgentValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  AGENTVALUE_H
 #define  AGENTVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardClassValue.h b/kabc/vcard/include/VCardClassValue.h
index ff133c2..c450169 100644
--- a/kabc/vcard/include/VCardClassValue.h
+++ b/kabc/vcard/include/VCardClassValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  CLASSVALUE_H
 #define  CLASSVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 #include <kdebug.h>
 
 namespace VCARD
diff --git a/kabc/vcard/include/VCardContentLine.h b/kabc/vcard/include/VCardContentLine.h
index 1c5f5be..c3c5253 100644
--- a/kabc/vcard/include/VCardContentLine.h
+++ b/kabc/vcard/include/VCardContentLine.h
@@ -21,13 +21,15 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  CONTENTLINE_H
 #define  CONTENTLINE_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "VCardEnum.h"
 #include "VCardEntity.h"
 #include "VCardParam.h"
 #include "VCardValue.h"
 
@@ -36,39 +38,39 @@ namespace VCARD
 
 class ContentLine : public Entity
 {
 
 #include "ContentLine-generated.h"
         
-                QCString        group()                 { parse(); return group_;}
-                QCString        name()          { parse(); return name_;}
+                Q3CString       group()                 { parse(); return group_;}
+                Q3CString       name()          { parse(); return name_;}
                 Value   *       value()                 { parse(); return value_;}
                 ParamList       paramList()     { parse(); return paramList_;}
                 ParamType       paramType()     { parse(); return paramType_;}
                 ValueType       valueType()     { parse(); return valueType_;}
                 EntityType      entityType()    { parse(); return entityType_;}
         
-                void setGroup   (const QCString & s)
+                void setGroup   (const Q3CString & s)
         { group_ = s; assembled_ = false; }
         
-                void setName    (const QCString & s)
+                void setName    (const Q3CString & s)
         { name_ = s; assembled_ = false; }
         
                 void setValue   (Value *s)
         { value_ = s; assembled_ = false; }
         
                 void setParamList(const ParamList & l)
         { paramList_ = l; assembled_ = false; }
 
                 void clear      ();
         
         private:
                 
-                        QCString        group_;
-                        QCString        name_;
-                        QPtrList<Param>         paramList_;
+                        Q3CString       group_;
+                        Q3CString       name_;
+                        Q3PtrList<Param>        paramList_;
                         Value           * value_;
                 
                         ParamType       paramType_;
                         ValueType       valueType_;
                         EntityType      entityType_;
 };
diff --git a/kabc/vcard/include/VCardDateParam.h b/kabc/vcard/include/VCardDateParam.h
index 21ac1f1..959b75b 100644
--- a/kabc/vcard/include/VCardDateParam.h
+++ b/kabc/vcard/include/VCardDateParam.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  DATEPARAM_H
 #define  DATEPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardDateValue.h b/kabc/vcard/include/VCardDateValue.h
index c248966..fc216c0 100644
--- a/kabc/vcard/include/VCardDateValue.h
+++ b/kabc/vcard/include/VCardDateValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  DATEVALUE_H
 #define  DATEVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdatetime.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
diff --git a/kabc/vcard/include/VCardDefines.h b/kabc/vcard/include/VCardDefines.h
index 557410f..5d4f2f4 100644
--- a/kabc/vcard/include/VCardDefines.h
+++ b/kabc/vcard/include/VCardDefines.h
@@ -32,20 +32,20 @@
 #else
 #define vDebug(a)
 #endif
 
 #if 0
 #ifndef NDEBUG
-        #include <qcstring.h>
+        #include <q3cstring.h>
         #include <iostream>
         #ifdef __GNUG__
         #       define vDebug(a) cerr << className() << ":" << __FUNCTION__ << " (" \
-                                                << __LINE__ << "): " << QCString((a)).data() << endl;
+                                                << __LINE__ << "): " << Q3CString((a)).data() << endl;
         #else
         #       define vDebug(a) cerr << className() << ": " \
-                                                << QCString((a)).data() << endl;
+                                                << Q3CString((a)).data() << endl;
         #endif
 #else
         #define vDebug(a)
 #endif
 #endif
 
diff --git a/kabc/vcard/include/VCardEmailParam.h b/kabc/vcard/include/VCardEmailParam.h
index 98d1b30..ff07324 100644
--- a/kabc/vcard/include/VCardEmailParam.h
+++ b/kabc/vcard/include/VCardEmailParam.h
@@ -21,36 +21,36 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  EMAILPARAM_H
 #define  EMAILPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
 class EmailParam : public Param
 {
         
 #include "EmailParam-generated.h"
         
-                QCString        emailType() { parse(); return emailType_;}
+                Q3CString       emailType() { parse(); return emailType_;}
                 bool            pref()          { parse(); return pref_;        }
         
-        void setEmailType(const QCString & s)
+        void setEmailType(const Q3CString & s)
         { emailType_ = s; assembled_ = false; }
         
         void setPref(bool b)
         { pref_ = b; assembled_ = false; }
         
         private:
         
-                        QCStringemailType_;
+                        Q3CStringemailType_;
                         bool    pref_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardEntity.h b/kabc/vcard/include/VCardEntity.h
index 3c945b5..1a3d20f 100644
--- a/kabc/vcard/include/VCardEntity.h
+++ b/kabc/vcard/include/VCardEntity.h
@@ -21,46 +21,46 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  ENTITY_H
 #define  ENTITY_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 namespace VCARD
 {
 
 class Entity
 {
         public:
                 
                 Entity();
                 Entity(const Entity & e);
-                Entity(const QCString & s);
+                Entity(const Q3CString & s);
                 
                 virtual Entity & operator = (const Entity & e);
-                virtual Entity & operator = (const QCString & s);
+                virtual Entity & operator = (const Q3CString & s);
                 
                 virtual bool operator == (Entity & e);
                 virtual bool operator != (Entity & e);
-                virtual bool operator == (const QCString & s);
-                virtual bool operator != (const QCString & s);
+                virtual bool operator == (const Q3CString & s);
+                virtual bool operator != (const Q3CString & s);
                 
                 virtual ~Entity();
                 
-                QCString asString();
+                Q3CString asString();
                 
                 virtual void parse();
                 virtual void assemble();
                 
                 virtual void _parse() = 0;
                 virtual void _assemble() = 0;
         
         protected:
                 
-                QCString strRep_;
+                Q3CString strRep_;
                 bool parsed_;
                 bool assembled_;
 };
 
 }
 
diff --git a/kabc/vcard/include/VCardEnum.h b/kabc/vcard/include/VCardEnum.h
index b4e4094..0c35e5e 100644
--- a/kabc/vcard/include/VCardEnum.h
+++ b/kabc/vcard/include/VCardEnum.h
@@ -21,18 +21,18 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  ENUM_H
 #define  ENUM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 namespace VCARD
 {
 
-extern const QCString paramNames [];
+extern const Q3CString paramNames [];
 
 enum EntityType {
         EntityName,
         EntityProfile,
         EntitySource,
         EntityFullName,
@@ -105,14 +105,14 @@ enum ParamType {
 };
 
 extern const ParamType paramTypesTable[];
 
 ParamType EntityTypeToParamType(EntityType);
 ValueType EntityTypeToValueType(EntityType);
-QCString EntityTypeToParamName(EntityType);
-EntityType EntityNameToEntityType(const QCString &);
+Q3CString EntityTypeToParamName(EntityType);
+EntityType EntityNameToEntityType(const Q3CString &);
 
 char * encodeBase64(const char *, unsigned long, unsigned long &);
 char * decodeBase64(const char *, unsigned long, unsigned long &);
 
 }
 
diff --git a/kabc/vcard/include/VCardFloatValue.h b/kabc/vcard/include/VCardFloatValue.h
index 69fdc22..cac7a91 100644
--- a/kabc/vcard/include/VCardFloatValue.h
+++ b/kabc/vcard/include/VCardFloatValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  FLOATVALUE_H
 #define  FLOATVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardImageParam.h b/kabc/vcard/include/VCardImageParam.h
index ce99ccc..2785331 100644
--- a/kabc/vcard/include/VCardImageParam.h
+++ b/kabc/vcard/include/VCardImageParam.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  IMGPARAM_H
 #define  IMGPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardImageValue.h b/kabc/vcard/include/VCardImageValue.h
index 6ce0371..3b64731 100644
--- a/kabc/vcard/include/VCardImageValue.h
+++ b/kabc/vcard/include/VCardImageValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  IMAGEVALUE_H
 #define  IMAGEVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardLangValue.h b/kabc/vcard/include/VCardLangValue.h
index 991ceed..319de76 100644
--- a/kabc/vcard/include/VCardLangValue.h
+++ b/kabc/vcard/include/VCardLangValue.h
@@ -21,31 +21,31 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  LANGVALUE_H
 #define  LANGVALUE_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class LangValue : public Value
 {
 #include "LangValue-generated.h"
         
-        QCString primary();
-        QStrList subtags();
+        Q3CString primary();
+        Q3StrList subtags();
         
-                void setPrimary(const QCString &);
-        void setSubTags(const QStrList &);
+                void setPrimary(const Q3CString &);
+        void setSubTags(const Q3StrList &);
         
-        QCString primary_;
-        QStrList subtags_;
+        Q3CString primary_;
+        Q3StrList subtags_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardNValue.h b/kabc/vcard/include/VCardNValue.h
index 306821b..ffc5355 100644
--- a/kabc/vcard/include/VCardNValue.h
+++ b/kabc/vcard/include/VCardNValue.h
@@ -22,35 +22,37 @@
 */
 
 #ifndef  NVALUE_H
 #define  NVALUE_H
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace VCARD
 {
 
 class NValue : public Value
 {
 #include "NValue-generated.h"
         NValue *clone();
 
-                QCString family()       { parse(); return family_;}
-                QCString given()        { parse(); return given_;}
-                QCString middle()       { parse(); return middle_;}
-                QCString prefix()       { parse(); return prefix_;}
-                QCString suffix()       { parse(); return suffix_;}
-
-                void setFamily  (const QCString & s) { family_= s; assembled_ = false; }
-                void setGiven   (const QCString & s) { given_= s; assembled_ = false; }
-                void setMiddle  (const QCString & s) { middle_= s; assembled_ = false; }
-                void setPrefix  (const QCString & s) { prefix_= s; assembled_ = false; }
-                void setSuffix  (const QCString & s) { suffix_= s; assembled_ = false; }
+                Q3CString family()      { parse(); return family_;}
+                Q3CString given()       { parse(); return given_;}
+                Q3CString middle()      { parse(); return middle_;}
+                Q3CString prefix()      { parse(); return prefix_;}
+                Q3CString suffix()      { parse(); return suffix_;}
+
+                void setFamily  (const Q3CString & s) { family_= s; assembled_ = false; }
+                void setGiven   (const Q3CString & s) { given_= s; assembled_ = false; }
+                void setMiddle  (const Q3CString & s) { middle_= s; assembled_ = false; }
+                void setPrefix  (const Q3CString & s) { prefix_= s; assembled_ = false; }
+                void setSuffix  (const Q3CString & s) { suffix_= s; assembled_ = false; }
         
         private:
         
-        QCString family_, given_, middle_, prefix_, suffix_;
+        Q3CString family_, given_, middle_, prefix_, suffix_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardOrgValue.h b/kabc/vcard/include/VCardOrgValue.h
index c4f3f25..2e5d32f 100644
--- a/kabc/vcard/include/VCardOrgValue.h
+++ b/kabc/vcard/include/VCardOrgValue.h
@@ -21,30 +21,30 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  ORGVALUE_H
 #define  ORGVALUE_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class OrgValue : public Value
 {
         
 #include "OrgValue-generated.h"
         
         unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
         
         private:
                 
-                QStrList valueList_;
+                Q3StrList valueList_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardParam.h b/kabc/vcard/include/VCardParam.h
index b61ce5c..b83fde1 100644
--- a/kabc/vcard/include/VCardParam.h
+++ b/kabc/vcard/include/VCardParam.h
@@ -21,39 +21,39 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  PARAM_H
 #define  PARAM_H
 
-#include <qcstring.h>
-#include <qptrlist.h>
+#include <q3cstring.h>
+#include <q3ptrlist.h>
 
 #include <VCardEntity.h>
 
 namespace VCARD
 {
 
 class Param : public Entity
 {
 
 #include "Param-generated.h"
 
-        Param(const QCString &name, const QCString &value);
+        Param(const Q3CString &name, const Q3CString &value);
 
-        void setName(const QCString &);
-        void setValue(const QCString &);
+        void setName(const Q3CString &);
+        void setValue(const Q3CString &);
                 
-        QCString name();
-        QCString value();
+        Q3CString name();
+        Q3CString value();
         
         private:
                 
-                QCString name_;
-                QCString value_;
+                Q3CString name_;
+                Q3CString value_;
 };
 
-typedef QPtrList<Param> ParamList;
-typedef QPtrListIterator<Param> ParamListIterator;
+typedef Q3PtrList<Param> ParamList;
+typedef Q3PtrListIterator<Param> ParamListIterator;
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h
index 2f95f1b..4a5adb2 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -22,17 +22,17 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef RTOKEN_H
 #define RTOKEN_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
 
 namespace VCARD
 {
 
-Q_UINT32 RTokenise(const char * str, const char * delim, QStrList & l);
+Q_UINT32 RTokenise(const char * str, const char * delim, Q3StrList & l);
 
 }
 
 #endif
 
diff --git a/kabc/vcard/include/VCardSoundValue.h b/kabc/vcard/include/VCardSoundValue.h
index 994f55e..26f750b 100644
--- a/kabc/vcard/include/VCardSoundValue.h
+++ b/kabc/vcard/include/VCardSoundValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  SOUNDVALUE_H
 #define  SOUNDVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardSourceParam.h b/kabc/vcard/include/VCardSourceParam.h
index 887ea20..5218864 100644
--- a/kabc/vcard/include/VCardSourceParam.h
+++ b/kabc/vcard/include/VCardSourceParam.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  SOURCEPARAM_H
 #define  SOURCEPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
@@ -36,23 +36,23 @@ class SourceParam : public Param
 
 #include "SourceParam-generated.h"
         
         enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
         
                         SourceParamType type(){ parse(); return type_;}
-                        QCString par()          { parse(); return par_; }
-                        QCString val()          { parse(); return val_; }
+                        Q3CString par()                 { parse(); return par_; }
+                        Q3CString val()                 { parse(); return val_; }
                 
                         void setType(SourceParamType t) { type_= t; assembled_ = false; }
-                        void setPar(const QCString & s) { par_= s; assembled_ = false; }
-                        void setVal(const QCString & s) { val_= s; assembled_ = false; }
+                        void setPar(const Q3CString & s) { par_= s; assembled_ = false; }
+                        void setVal(const Q3CString & s) { val_= s; assembled_ = false; }
         
         private:
                 
                 SourceParamType type_;
                 // May be "VALUE = uri" or "CONTEXT = word" or "x-name = *SAFE-CHAR"
-                QCString par_, val_; // Sub-parameter, value
+                Q3CString par_, val_; // Sub-parameter, value
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardTelParam.h b/kabc/vcard/include/VCardTelParam.h
index 27d7dcc..0c45a3a 100644
--- a/kabc/vcard/include/VCardTelParam.h
+++ b/kabc/vcard/include/VCardTelParam.h
@@ -21,13 +21,15 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  TELPARAM_H
 #define  TELPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
@@ -40,12 +42,12 @@ class TelParam : public Param
                 TelPager, TelBBS, TelModem, TelCar, TelISDN, TelVideo, TelPCS,
                 TelIANA, TelX
         };
         
         private:
                 
-                QPtrList<TelType> types_;
+                Q3PtrList<TelType> types_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardTelValue.h b/kabc/vcard/include/VCardTelValue.h
index 9cf5a98..a119e4a 100644
--- a/kabc/vcard/include/VCardTelValue.h
+++ b/kabc/vcard/include/VCardTelValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  TELVALUE_H
 #define  TELVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardTextBinParam.h b/kabc/vcard/include/VCardTextBinParam.h
index 31dec86..d186995 100644
--- a/kabc/vcard/include/VCardTextBinParam.h
+++ b/kabc/vcard/include/VCardTextBinParam.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  TEXTBINPARAM_H
 #define  TEXTBINPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardTextBinValue.h b/kabc/vcard/include/VCardTextBinValue.h
index 8d44fdf..3924f2a 100644
--- a/kabc/vcard/include/VCardTextBinValue.h
+++ b/kabc/vcard/include/VCardTextBinValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  TEXTBINVALUE_H
 #define  TEXTBINVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardTextListValue.h b/kabc/vcard/include/VCardTextListValue.h
index 8e47af5..ac42a29 100644
--- a/kabc/vcard/include/VCardTextListValue.h
+++ b/kabc/vcard/include/VCardTextListValue.h
@@ -21,31 +21,31 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  TEXTLISTVALUE_H
 #define  TEXTLISTVALUE_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class TextListValue : public Value
 {
         
 #include "TextListValue-generated.h"
         
         unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
         
         private:
                 
-                QStrList valueList_;
+                Q3StrList valueList_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardTextParam.h b/kabc/vcard/include/VCardTextParam.h
index 08b5f57..2503337 100644
--- a/kabc/vcard/include/VCardTextParam.h
+++ b/kabc/vcard/include/VCardTextParam.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  TEXTPARAM_H
 #define  TEXTPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardURIValue.h b/kabc/vcard/include/VCardURIValue.h
index 5fd7184..116e4c8 100644
--- a/kabc/vcard/include/VCardURIValue.h
+++ b/kabc/vcard/include/VCardURIValue.h
@@ -22,31 +22,33 @@
 */
 
 #ifndef  URIVALUE_H
 #define  URIVALUE_H
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace VCARD
 {
 
 class URIValue : public Value
 {
 #include "URIValue-generated.h"
 
-        URIValue(const QCString & scheme, const QCString & schemeSpecificPart);
+        URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart);
         
-        QCString scheme();
-        QCString schemeSpecificPart();
+        Q3CString scheme();
+        Q3CString schemeSpecificPart();
         
-                void setScheme                  (const QCString &);
-                void setSchemeSpecificPart(const QCString &);
+                void setScheme                  (const Q3CString &);
+                void setSchemeSpecificPart(const Q3CString &);
         
         private:
         
-                QCString scheme_;
-                QCString schemeSpecificPart_;
+                Q3CString scheme_;
+                Q3CString schemeSpecificPart_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardUTCValue.h b/kabc/vcard/include/VCardUTCValue.h
index ff695e0..eb69829 100644
--- a/kabc/vcard/include/VCardUTCValue.h
+++ b/kabc/vcard/include/VCardUTCValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  UTCVALUE_H
 #define  UTCVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
diff --git a/kabc/vcard/include/VCardVCard.h b/kabc/vcard/include/VCardVCard.h
index 5dec166..5b66074 100644
--- a/kabc/vcard/include/VCardVCard.h
+++ b/kabc/vcard/include/VCardVCard.h
@@ -22,13 +22,15 @@
 */
 
 #ifndef  VCARD_VCARD_H
 #define  VCARD_VCARD_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <VCardEnum.h>
 #include <VCardEntity.h>
 #include <VCardContentLine.h>
 
 namespace VCARD
@@ -37,27 +39,27 @@ namespace VCARD
 class VCard : public Entity
 {
 
 #include "VCard-generated.h"
         
         bool has(EntityType);
-        bool has(const QCString &);
+        bool has(const Q3CString &);
         
         void add(const ContentLine &);
-        void add(const QCString &);
+        void add(const Q3CString &);
         
         ContentLine * contentLine(EntityType);
-        ContentLine * contentLine(const QCString &);
+        ContentLine * contentLine(const Q3CString &);
         
-        QCString group() { parse(); return group_; }
+        Q3CString group() { parse(); return group_; }
         
-                QPtrList<ContentLine>contentLineList() { parse(); return contentLineList_; }
+                Q3PtrList<ContentLine>contentLineList() { parse(); return contentLineList_; }
         
         private:
 
-                QCString        group_;
-                QPtrList<ContentLine>contentLineList_;
+                Q3CString       group_;
+                Q3PtrList<ContentLine>contentLineList_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardVCardEntity.h b/kabc/vcard/include/VCardVCardEntity.h
index 47ba370..8c824e7 100644
--- a/kabc/vcard/include/VCardVCardEntity.h
+++ b/kabc/vcard/include/VCardVCardEntity.h
@@ -22,23 +22,23 @@
 */
 
 #ifndef  VCARD_ENTITY_H
 #define  VCARD_ENTITY_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <VCardEnum.h>
 #include <VCardVCard.h>
 #include <VCardEntity.h>
 
 namespace VCARD
 {
   
-typedef QPtrList<VCard> VCardList;
-typedef QPtrListIterator<VCard> VCardListIterator;
+typedef Q3PtrList<VCard> VCardList;
+typedef Q3PtrListIterator<VCard> VCardListIterator;
 
 class VCardEntity : public Entity
 {
 
 #include "VCardEntity-generated.h"
         
diff --git a/kabc/vcard/include/VCardValue.h b/kabc/vcard/include/VCardValue.h
index 7cfe4a0..024397c 100644
--- a/kabc/vcard/include/VCardValue.h
+++ b/kabc/vcard/include/VCardValue.h
@@ -21,13 +21,13 @@
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef  VALUE_H
 #define  VALUE_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <VCardEntity.h>
 
 namespace VCARD
 {
 
@@ -35,12 +35,12 @@ class Value : public Entity
 {
 #include "Value-generated.h"
 
         virtual Value *clone() { return new Value( *this ); }
 };
 
-typedef QPtrList<Value> ValueList;
-typedef QPtrListIterator<Value> ValueListIterator;
+typedef Q3PtrList<Value> ValueList;
+typedef Q3PtrListIterator<Value> ValueListIterator;
 
 }
 
 #endif
diff --git a/kabc/vcard/include/generated/AdrParam-generated.h b/kabc/vcard/include/generated/AdrParam-generated.h
index 3e265d8..a11d142 100644
--- a/kabc/vcard/include/generated/AdrParam-generated.h
+++ b/kabc/vcard/include/generated/AdrParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 AdrParam();
 AdrParam(const AdrParam&);
-AdrParam(const QCString&);
+AdrParam(const Q3CString&);
 AdrParam & operator = (AdrParam&);
-AdrParam & operator = (const QCString&);
+AdrParam & operator = (const Q3CString&);
 bool operator ==(AdrParam&);
 bool operator !=(AdrParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AdrParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AdrParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~AdrParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/AdrValue-generated.h b/kabc/vcard/include/generated/AdrValue-generated.h
index e1d93e4..c0a33a3 100644
--- a/kabc/vcard/include/generated/AdrValue-generated.h
+++ b/kabc/vcard/include/generated/AdrValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 AdrValue();
 AdrValue(const AdrValue&);
-AdrValue(const QCString&);
+AdrValue(const Q3CString&);
 AdrValue & operator = (AdrValue&);
-AdrValue & operator = (const QCString&);
+AdrValue & operator = (const Q3CString&);
 bool operator ==(AdrValue&);
 bool operator !=(AdrValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AdrValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AdrValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~AdrValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/AgentParam-generated.h b/kabc/vcard/include/generated/AgentParam-generated.h
index 6423867..d5ed988 100644
--- a/kabc/vcard/include/generated/AgentParam-generated.h
+++ b/kabc/vcard/include/generated/AgentParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 AgentParam();
 AgentParam(const AgentParam&);
-AgentParam(const QCString&);
+AgentParam(const Q3CString&);
 AgentParam & operator = (AgentParam&);
-AgentParam & operator = (const QCString&);
+AgentParam & operator = (const Q3CString&);
 bool operator ==(AgentParam&);
 bool operator !=(AgentParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AgentParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AgentParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~AgentParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/AgentValue-generated.h b/kabc/vcard/include/generated/AgentValue-generated.h
index 76bb81c..eef5277 100644
--- a/kabc/vcard/include/generated/AgentValue-generated.h
+++ b/kabc/vcard/include/generated/AgentValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 AgentValue();
 AgentValue(const AgentValue&);
-AgentValue(const QCString&);
+AgentValue(const Q3CString&);
 AgentValue & operator = (AgentValue&);
-AgentValue & operator = (const QCString&);
+AgentValue & operator = (const Q3CString&);
 bool operator ==(AgentValue&);
 bool operator !=(AgentValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AgentValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AgentValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~AgentValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/ClassValue-generated.h b/kabc/vcard/include/generated/ClassValue-generated.h
index df4ed5f..b84c98f 100644
--- a/kabc/vcard/include/generated/ClassValue-generated.h
+++ b/kabc/vcard/include/generated/ClassValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ClassValue();
 ClassValue(const ClassValue&);
-ClassValue(const QCString&);
+ClassValue(const Q3CString&);
 ClassValue & operator = (ClassValue&);
-ClassValue & operator = (const QCString&);
+ClassValue & operator = (const Q3CString&);
 bool operator ==(ClassValue&);
 bool operator !=(ClassValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ClassValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ClassValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ClassValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/ContentLine-generated.h b/kabc/vcard/include/generated/ContentLine-generated.h
index 9efe273..84d0822 100644
--- a/kabc/vcard/include/generated/ContentLine-generated.h
+++ b/kabc/vcard/include/generated/ContentLine-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ContentLine();
 ContentLine(const ContentLine&);
-ContentLine(const QCString&);
+ContentLine(const Q3CString&);
 ContentLine & operator = (ContentLine&);
-ContentLine & operator = (const QCString&);
+ContentLine & operator = (const Q3CString&);
 bool operator ==(ContentLine&);
 bool operator !=(ContentLine& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ContentLine a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ContentLine a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ContentLine();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/DateParam-generated.h b/kabc/vcard/include/generated/DateParam-generated.h
index ff1da58..029c1da 100644
--- a/kabc/vcard/include/generated/DateParam-generated.h
+++ b/kabc/vcard/include/generated/DateParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 DateParam();
 DateParam(const DateParam&);
-DateParam(const QCString&);
+DateParam(const Q3CString&);
 DateParam & operator = (DateParam&);
-DateParam & operator = (const QCString&);
+DateParam & operator = (const Q3CString&);
 bool operator ==(DateParam&);
 bool operator !=(DateParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {DateParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {DateParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~DateParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/DateValue-generated.h b/kabc/vcard/include/generated/DateValue-generated.h
index a382823..70eecce 100644
--- a/kabc/vcard/include/generated/DateValue-generated.h
+++ b/kabc/vcard/include/generated/DateValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 DateValue();
 DateValue(const DateValue&);
-DateValue(const QCString&);
+DateValue(const Q3CString&);
 DateValue & operator = (DateValue&);
-DateValue & operator = (const QCString&);
+DateValue & operator = (const Q3CString&);
 bool operator ==(DateValue&);
 bool operator !=(DateValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {DateValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {DateValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~DateValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/EmailParam-generated.h b/kabc/vcard/include/generated/EmailParam-generated.h
index 428a6fc..f498931 100644
--- a/kabc/vcard/include/generated/EmailParam-generated.h
+++ b/kabc/vcard/include/generated/EmailParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 EmailParam();
 EmailParam(const EmailParam&);
-EmailParam(const QCString&);
+EmailParam(const Q3CString&);
 EmailParam & operator = (EmailParam&);
-EmailParam & operator = (const QCString&);
+EmailParam & operator = (const Q3CString&);
 bool operator ==(EmailParam&);
 bool operator !=(EmailParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {EmailParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {EmailParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~EmailParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/FloatValue-generated.h b/kabc/vcard/include/generated/FloatValue-generated.h
index cac55cf..c04b85f 100644
--- a/kabc/vcard/include/generated/FloatValue-generated.h
+++ b/kabc/vcard/include/generated/FloatValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 FloatValue();
 FloatValue(const FloatValue&);
-FloatValue(const QCString&);
+FloatValue(const Q3CString&);
 FloatValue & operator = (FloatValue&);
-FloatValue & operator = (const QCString&);
+FloatValue & operator = (const Q3CString&);
 bool operator ==(FloatValue&);
 bool operator !=(FloatValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {FloatValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {FloatValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~FloatValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/GeoValue-generated.h b/kabc/vcard/include/generated/GeoValue-generated.h
index 594f3ad..ab659bf 100644
--- a/kabc/vcard/include/generated/GeoValue-generated.h
+++ b/kabc/vcard/include/generated/GeoValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 GeoValue();
 GeoValue(const GeoValue&);
-GeoValue(const QCString&);
+GeoValue(const Q3CString&);
 GeoValue & operator = (GeoValue&);
-GeoValue & operator = (const QCString&);
+GeoValue & operator = (const Q3CString&);
 bool operator ==(GeoValue&);
 bool operator !=(GeoValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {GeoValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {GeoValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~GeoValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/Group-generated.h b/kabc/vcard/include/generated/Group-generated.h
index f39302d..ae16e3d 100644
--- a/kabc/vcard/include/generated/Group-generated.h
+++ b/kabc/vcard/include/generated/Group-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 Group();
 Group(const Group&);
-Group(const QCString&);
+Group(const Q3CString&);
 Group & operator = (Group&);
-Group & operator = (const QCString&);
+Group & operator = (const Q3CString&);
 bool operator ==(Group&);
 bool operator !=(Group& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Group a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Group a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~Group();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/ImageParam-generated.h b/kabc/vcard/include/generated/ImageParam-generated.h
index 81edfd2..91b09a4 100644
--- a/kabc/vcard/include/generated/ImageParam-generated.h
+++ b/kabc/vcard/include/generated/ImageParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ImageParam();
 ImageParam(const ImageParam&);
-ImageParam(const QCString&);
+ImageParam(const Q3CString&);
 ImageParam & operator = (ImageParam&);
-ImageParam & operator = (const QCString&);
+ImageParam & operator = (const Q3CString&);
 bool operator ==(ImageParam&);
 bool operator !=(ImageParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImageParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImageParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ImageParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/ImageValue-generated.h b/kabc/vcard/include/generated/ImageValue-generated.h
index 5a2c493..d71282e 100644
--- a/kabc/vcard/include/generated/ImageValue-generated.h
+++ b/kabc/vcard/include/generated/ImageValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ImageValue();
 ImageValue(const ImageValue&);
-ImageValue(const QCString&);
+ImageValue(const Q3CString&);
 ImageValue & operator = (ImageValue&);
-ImageValue & operator = (const QCString&);
+ImageValue & operator = (const Q3CString&);
 bool operator ==(ImageValue&);
 bool operator !=(ImageValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImageValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImageValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ImageValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/ImgParam-generated.h b/kabc/vcard/include/generated/ImgParam-generated.h
index 46a6ca0..461ca6d 100644
--- a/kabc/vcard/include/generated/ImgParam-generated.h
+++ b/kabc/vcard/include/generated/ImgParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ImgParam();
 ImgParam(const ImgParam&);
-ImgParam(const QCString&);
+ImgParam(const Q3CString&);
 ImgParam & operator = (ImgParam&);
-ImgParam & operator = (const QCString&);
+ImgParam & operator = (const Q3CString&);
 bool operator ==(ImgParam&);
 bool operator !=(ImgParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImgParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImgParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ImgParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/ImgValue-generated.h b/kabc/vcard/include/generated/ImgValue-generated.h
index d75d545..80ee646 100644
--- a/kabc/vcard/include/generated/ImgValue-generated.h
+++ b/kabc/vcard/include/generated/ImgValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ImgValue();
 ImgValue(const ImgValue&);
-ImgValue(const QCString&);
+ImgValue(const Q3CString&);
 ImgValue & operator = (ImgValue&);
-ImgValue & operator = (const QCString&);
+ImgValue & operator = (const Q3CString&);
 bool operator ==(ImgValue&);
 bool operator !=(ImgValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImgValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ImgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/LangValue-generated.h b/kabc/vcard/include/generated/LangValue-generated.h
index 23e138b..434f762 100644
--- a/kabc/vcard/include/generated/LangValue-generated.h
+++ b/kabc/vcard/include/generated/LangValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 LangValue();
 LangValue(const LangValue&);
-LangValue(const QCString&);
+LangValue(const Q3CString&);
 LangValue & operator = (LangValue&);
-LangValue & operator = (const QCString&);
+LangValue & operator = (const Q3CString&);
 bool operator ==(LangValue&);
 bool operator !=(LangValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {LangValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {LangValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~LangValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/NValue-generated.h b/kabc/vcard/include/generated/NValue-generated.h
index 082c253..086810f 100644
--- a/kabc/vcard/include/generated/NValue-generated.h
+++ b/kabc/vcard/include/generated/NValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 NValue();
 NValue(const NValue&);
-NValue(const QCString&);
+NValue(const Q3CString&);
 NValue & operator = (NValue&);
-NValue & operator = (const QCString&);
+NValue & operator = (const Q3CString&);
 bool operator ==(NValue&);
 bool operator !=(NValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {NValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {NValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~NValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/Name-generated.h b/kabc/vcard/include/generated/Name-generated.h
index 0e69abd..a3bcb25 100644
--- a/kabc/vcard/include/generated/Name-generated.h
+++ b/kabc/vcard/include/generated/Name-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 V_Name();
 V_Name(const V_Name&);
-V_Name(const QCString&);
+V_Name(const Q3CString&);
 V_Name & operator = (V_Name&);
-V_Name & operator = (const QCString&);
+V_Name & operator = (const Q3CString&);
 bool operator ==(V_Name&);
 bool operator !=(V_Name& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_Name a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_Name a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~V_Name();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/OrgValue-generated.h b/kabc/vcard/include/generated/OrgValue-generated.h
index 51eb1b7..275f56f 100644
--- a/kabc/vcard/include/generated/OrgValue-generated.h
+++ b/kabc/vcard/include/generated/OrgValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 OrgValue();
 OrgValue(const OrgValue&);
-OrgValue(const QCString&);
+OrgValue(const Q3CString&);
 OrgValue & operator = (OrgValue&);
-OrgValue & operator = (const QCString&);
+OrgValue & operator = (const Q3CString&);
 bool operator ==(OrgValue&);
 bool operator !=(OrgValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {OrgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {OrgValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~OrgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/Param-generated.h b/kabc/vcard/include/generated/Param-generated.h
index cf4666a..1a35166 100644
--- a/kabc/vcard/include/generated/Param-generated.h
+++ b/kabc/vcard/include/generated/Param-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 Param();
 Param(const Param&);
-Param(const QCString&);
+Param(const Q3CString&);
 Param & operator = (Param&);
-Param & operator = (const QCString&);
+Param & operator = (const Q3CString&);
 bool operator ==(Param&);
 bool operator !=(Param& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Param a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Param a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~Param();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/ParamName-generated.h b/kabc/vcard/include/generated/ParamName-generated.h
index ef673c3..b45022e 100644
--- a/kabc/vcard/include/generated/ParamName-generated.h
+++ b/kabc/vcard/include/generated/ParamName-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 V_ParamName();
 V_ParamName(const V_ParamName&);
-V_ParamName(const QCString&);
+V_ParamName(const Q3CString&);
 V_ParamName & operator = (V_ParamName&);
-V_ParamName & operator = (const QCString&);
+V_ParamName & operator = (const Q3CString&);
 bool operator ==(V_ParamName&);
 bool operator !=(V_ParamName& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_ParamName a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_ParamName a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~V_ParamName();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/ParamValue-generated.h b/kabc/vcard/include/generated/ParamValue-generated.h
index e73500f..956c8da 100644
--- a/kabc/vcard/include/generated/ParamValue-generated.h
+++ b/kabc/vcard/include/generated/ParamValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 V_ParamValue();
 V_ParamValue(const V_ParamValue&);
-V_ParamValue(const QCString&);
+V_ParamValue(const Q3CString&);
 V_ParamValue & operator = (V_ParamValue&);
-V_ParamValue & operator = (const QCString&);
+V_ParamValue & operator = (const Q3CString&);
 bool operator ==(V_ParamValue&);
 bool operator !=(V_ParamValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_ParamValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_ParamValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~V_ParamValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/PhoneNumberValue-generated.h b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
index 1320f18..0d206f4 100644
--- a/kabc/vcard/include/generated/PhoneNumberValue-generated.h
+++ b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 PhoneNumberValue();
 PhoneNumberValue(const PhoneNumberValue&);
-PhoneNumberValue(const QCString&);
+PhoneNumberValue(const Q3CString&);
 PhoneNumberValue & operator = (PhoneNumberValue&);
-PhoneNumberValue & operator = (const QCString&);
+PhoneNumberValue & operator = (const Q3CString&);
 bool operator ==(PhoneNumberValue&);
 bool operator !=(PhoneNumberValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {PhoneNumberValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {PhoneNumberValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~PhoneNumberValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/SoundValue-generated.h b/kabc/vcard/include/generated/SoundValue-generated.h
index a9ab2e8..2cc9c0d 100644
--- a/kabc/vcard/include/generated/SoundValue-generated.h
+++ b/kabc/vcard/include/generated/SoundValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 SoundValue();
 SoundValue(const SoundValue&);
-SoundValue(const QCString&);
+SoundValue(const Q3CString&);
 SoundValue & operator = (SoundValue&);
-SoundValue & operator = (const QCString&);
+SoundValue & operator = (const Q3CString&);
 bool operator ==(SoundValue&);
 bool operator !=(SoundValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {SoundValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {SoundValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~SoundValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/SourceParam-generated.h b/kabc/vcard/include/generated/SourceParam-generated.h
index 75fefb8..537e093 100644
--- a/kabc/vcard/include/generated/SourceParam-generated.h
+++ b/kabc/vcard/include/generated/SourceParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 SourceParam();
 SourceParam(const SourceParam&);
-SourceParam(const QCString&);
+SourceParam(const Q3CString&);
 SourceParam & operator = (SourceParam&);
-SourceParam & operator = (const QCString&);
+SourceParam & operator = (const Q3CString&);
 bool operator ==(SourceParam&);
 bool operator !=(SourceParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {SourceParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {SourceParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~SourceParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/TelParam-generated.h b/kabc/vcard/include/generated/TelParam-generated.h
index 3ee77cc..8d9ba0f 100644
--- a/kabc/vcard/include/generated/TelParam-generated.h
+++ b/kabc/vcard/include/generated/TelParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TelParam();
 TelParam(const TelParam&);
-TelParam(const QCString&);
+TelParam(const Q3CString&);
 TelParam & operator = (TelParam&);
-TelParam & operator = (const QCString&);
+TelParam & operator = (const Q3CString&);
 bool operator ==(TelParam&);
 bool operator !=(TelParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TelParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TelParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TelParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/TelValue-generated.h b/kabc/vcard/include/generated/TelValue-generated.h
index 3213e1c..b72fa7d 100644
--- a/kabc/vcard/include/generated/TelValue-generated.h
+++ b/kabc/vcard/include/generated/TelValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TelValue();
 TelValue(const TelValue&);
-TelValue(const QCString&);
+TelValue(const Q3CString&);
 TelValue & operator = (TelValue&);
-TelValue & operator = (const QCString&);
+TelValue & operator = (const Q3CString&);
 bool operator ==(TelValue&);
 bool operator !=(TelValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TelValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TelValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TelValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/TextBinParam-generated.h b/kabc/vcard/include/generated/TextBinParam-generated.h
index d075c10..2e433b0 100644
--- a/kabc/vcard/include/generated/TextBinParam-generated.h
+++ b/kabc/vcard/include/generated/TextBinParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextBinParam();
 TextBinParam(const TextBinParam&);
-TextBinParam(const QCString&);
+TextBinParam(const Q3CString&);
 TextBinParam & operator = (TextBinParam&);
-TextBinParam & operator = (const QCString&);
+TextBinParam & operator = (const Q3CString&);
 bool operator ==(TextBinParam&);
 bool operator !=(TextBinParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextBinParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextBinParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextBinParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/TextBinValue-generated.h b/kabc/vcard/include/generated/TextBinValue-generated.h
index e9553ac..bc3ad61 100644
--- a/kabc/vcard/include/generated/TextBinValue-generated.h
+++ b/kabc/vcard/include/generated/TextBinValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextBinValue();
 TextBinValue(const TextBinValue&);
-TextBinValue(const QCString&);
+TextBinValue(const Q3CString&);
 TextBinValue & operator = (TextBinValue&);
-TextBinValue & operator = (const QCString&);
+TextBinValue & operator = (const Q3CString&);
 bool operator ==(TextBinValue&);
 bool operator !=(TextBinValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextBinValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextBinValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextBinValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/TextListValue-generated.h b/kabc/vcard/include/generated/TextListValue-generated.h
index 9f46124..9df8a46 100644
--- a/kabc/vcard/include/generated/TextListValue-generated.h
+++ b/kabc/vcard/include/generated/TextListValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextListValue();
 TextListValue(const TextListValue&);
-TextListValue(const QCString&);
+TextListValue(const Q3CString&);
 TextListValue & operator = (TextListValue&);
-TextListValue & operator = (const QCString&);
+TextListValue & operator = (const Q3CString&);
 bool operator ==(TextListValue&);
 bool operator !=(TextListValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextListValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextListValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextListValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/TextNSParam-generated.h b/kabc/vcard/include/generated/TextNSParam-generated.h
index d7f58ca..8842bd6 100644
--- a/kabc/vcard/include/generated/TextNSParam-generated.h
+++ b/kabc/vcard/include/generated/TextNSParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextNSParam();
 TextNSParam(const TextNSParam&);
-TextNSParam(const QCString&);
+TextNSParam(const Q3CString&);
 TextNSParam & operator = (TextNSParam&);
-TextNSParam & operator = (const QCString&);
+TextNSParam & operator = (const Q3CString&);
 bool operator ==(TextNSParam&);
 bool operator !=(TextNSParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextNSParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextNSParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextNSParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/TextParam-generated.h b/kabc/vcard/include/generated/TextParam-generated.h
index 154e1bf..e56a8a5 100644
--- a/kabc/vcard/include/generated/TextParam-generated.h
+++ b/kabc/vcard/include/generated/TextParam-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextParam();
 TextParam(const TextParam&);
-TextParam(const QCString&);
+TextParam(const Q3CString&);
 TextParam & operator = (TextParam&);
-TextParam & operator = (const QCString&);
+TextParam & operator = (const Q3CString&);
 bool operator ==(TextParam&);
 bool operator !=(TextParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/TextValue-generated.h b/kabc/vcard/include/generated/TextValue-generated.h
index e1c4dcc..3f205e0 100644
--- a/kabc/vcard/include/generated/TextValue-generated.h
+++ b/kabc/vcard/include/generated/TextValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextValue();
 TextValue(const TextValue&);
-TextValue(const QCString&);
+TextValue(const Q3CString&);
 TextValue & operator = (TextValue&);
-TextValue & operator = (const QCString&);
+TextValue & operator = (const Q3CString&);
 bool operator ==(TextValue&);
 bool operator !=(TextValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/URIValue-generated.h b/kabc/vcard/include/generated/URIValue-generated.h
index dbcb5c1..464178f 100644
--- a/kabc/vcard/include/generated/URIValue-generated.h
+++ b/kabc/vcard/include/generated/URIValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 URIValue();
 URIValue(const URIValue&);
-URIValue(const QCString&);
+URIValue(const Q3CString&);
 URIValue & operator = (URIValue&);
-URIValue & operator = (const QCString&);
+URIValue & operator = (const Q3CString&);
 bool operator ==(URIValue&);
 bool operator !=(URIValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {URIValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {URIValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~URIValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/UTCValue-generated.h b/kabc/vcard/include/generated/UTCValue-generated.h
index 46e447b..1a34b5c 100644
--- a/kabc/vcard/include/generated/UTCValue-generated.h
+++ b/kabc/vcard/include/generated/UTCValue-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 UTCValue();
 UTCValue(const UTCValue&);
-UTCValue(const QCString&);
+UTCValue(const Q3CString&);
 UTCValue & operator = (UTCValue&);
-UTCValue & operator = (const QCString&);
+UTCValue & operator = (const Q3CString&);
 bool operator ==(UTCValue&);
 bool operator !=(UTCValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {UTCValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {UTCValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~UTCValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/VCard-generated.h b/kabc/vcard/include/generated/VCard-generated.h
index 4d7d96d..d09c789 100644
--- a/kabc/vcard/include/generated/VCard-generated.h
+++ b/kabc/vcard/include/generated/VCard-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 VCard();
 VCard(const VCard&);
-VCard(const QCString&);
+VCard(const Q3CString&);
 VCard & operator = (VCard&);
-VCard & operator = (const QCString&);
+VCard & operator = (const Q3CString&);
 bool operator ==(VCard&);
 bool operator !=(VCard& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {VCard a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {VCard a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~VCard();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/VCardEntity-generated.h b/kabc/vcard/include/generated/VCardEntity-generated.h
index 9f2dfbc..cbbe8e1 100644
--- a/kabc/vcard/include/generated/VCardEntity-generated.h
+++ b/kabc/vcard/include/generated/VCardEntity-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 VCardEntity();
 VCardEntity(const VCardEntity&);
-VCardEntity(const QCString&);
+VCardEntity(const Q3CString&);
 VCardEntity & operator = (VCardEntity&);
-VCardEntity & operator = (const QCString&);
+VCardEntity & operator = (const Q3CString&);
 bool operator ==(VCardEntity&);
 bool operator !=(VCardEntity& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {VCardEntity a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {VCardEntity a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~VCardEntity();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/include/generated/Value-generated.h b/kabc/vcard/include/generated/Value-generated.h
index 7afac34..142e720 100644
--- a/kabc/vcard/include/generated/Value-generated.h
+++ b/kabc/vcard/include/generated/Value-generated.h
@@ -1,18 +1,20 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 Value();
 Value(const Value&);
-Value(const QCString&);
+Value(const Q3CString&);
 Value & operator = (Value&);
-Value & operator = (const QCString&);
+Value & operator = (const Q3CString&);
 bool operator ==(Value&);
 bool operator !=(Value& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Value a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Value a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~Value();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
diff --git a/kabc/vcard/testread.cpp b/kabc/vcard/testread.cpp
index 919c661..4d66aaf 100644
--- a/kabc/vcard/testread.cpp
+++ b/kabc/vcard/testread.cpp
@@ -1,12 +1,14 @@
 #include <iostream>
 #include <stdlib.h>
 #include <assert.h>
 
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <VCard.h>
 
 using namespace std;
 
 int main(int argc, char * argv[])
@@ -15,20 +17,20 @@ int main(int argc, char * argv[])
                 cerr << "Usage: " << argv[0] << " <filename>" << endl;
                 exit(1);
         }
         
         QFile f(argv[1]);
         
-        QCString str;
+        Q3CString str;
         
-        if (!f.open(IO_ReadOnly)) {
+        if (!f.open(QIODevice::ReadOnly)) {
                 cerr << "Couldn't open file \"" << argv[1] << endl;
                 exit(1);
         }
         
-        QTextStream t(&f);
+        Q3TextStream t(&f);
         
         while (!t.eof())
                 str += t.readLine().utf8() + '\n';
         
         using namespace VCARD; 
 
@@ -49,13 +51,13 @@ int main(int argc, char * argv[])
                 // Create a vcard using the string representation.
                 VCard & v (*it.current());
 
                 if (v.has(EntityEmail)) {
                         cerr << "Email parameter found" << endl;
                         
-                        QCString s = v.contentLine(EntityEmail)->value()->asString();
+                        Q3CString s = v.contentLine(EntityEmail)->value()->asString();
                         
                         cerr << "Email value == " << s << endl;
                 }
                 
                 if (v.has(EntityNickname)) {
                         cerr << "Nickname parameter found" << endl;
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index e4bbe7b..846e51a 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -2,12 +2,14 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 
 #include <VCard.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
   KCmdLineArgs::init(argc,argv,&aboutData);
 
@@ -30,12 +32,12 @@ int main(int argc,char **argv)
   ParamList p;
   p.append( new TelParam("home") );
   p.append( new TelParam("fax") );
   cl2.setParamList( p );
   v.add(cl2);
 
-  QCString str = v.asString();
+  Q3CString str = v.asString();
 
   kdDebug() << "--- VCard begin ---" << endl
             << str
             << "--- VCard  end  ---" << endl;
 }
diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index 60d02b8..e24a9dc 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -24,12 +24,14 @@ Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qmap.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kmdcodec.h>
 
 #include "vcard21parser.h"
 #include "vcardconverter.h"
 
 using namespace KABC;
@@ -42,13 +44,13 @@ bool VCardLineX::isValid() const
 
   if ( name[0] == 'x' && name[1] == '-' ) // A custom x- line
     return true;
 
   // This is long but it makes it a bit faster (and saves me from using
   // a tree which is probably the ideal situation, but a bit memory heavy)
-  switch( name[0] ) {
+  switch( name[0].unicode() ) {
     case 'a':
       if ( name == VCARD_ADR && qualified &&
                    (qualifiers.contains(VCARD_ADR_DOM)    ||
                     qualifiers.contains(VCARD_ADR_INTL)   ||
                     qualifiers.contains(VCARD_ADR_POSTAL) ||
                     qualifiers.contains(VCARD_ADR_HOME)   ||
@@ -266,13 +268,13 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
 
   //set the addressee's birthday
   tmpStr = mVCard->getValue(VCARD_BDAY);
   addressee.setBirthday(VCardStringToDate(tmpStr));
 
   //set the addressee's phone numbers
-  for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
+  for ( Q3ValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
     if ( (*i).name == VCARD_TEL ) {
       int type = 0;
       if ( (*i).qualified ) {
         if ( (*i).qualifiers.contains( VCARD_TEL_HOME ) )
           type |= PhoneNumber::Home;
         if ( (*i).qualifiers.contains( VCARD_TEL_WORK ) )
@@ -305,13 +307,13 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
       }
       addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) );
     }
   }
   addressee.makePhoneNumbersOLcompatible();
   //set the addressee's addresses
-  for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
+  for ( Q3ValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
     if ( (*i).name == VCARD_ADR ) {
       int type = 0;
       if ( (*i).qualified ) {
         if ( (*i).qualifiers.contains( VCARD_ADR_DOM ) )
           type |= Address::Dom;
         if ( (*i).qualifiers.contains( VCARD_ADR_INTL ) )
@@ -324,13 +326,16 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
           type |= Address::Home;
         if ( (*i).qualifiers.contains( VCARD_ADR_WORK ) )
           type |= Address::Work;
         if ( (*i).qualifiers.contains( VCARD_ADR_PREF ) )
           type |= Address::Pref;
       }
-      addressee.insertAddress( readAddressFromQStringList( (*i).parameters, type ) );
+      QStringList tmp;
+      for(Q3ValueList<QString>::const_iterator ii=(*i).parameters.begin();ii!=(*i).parameters.end();++ii)
+          tmp.push_back(*ii);
+      addressee.insertAddress( readAddressFromQStringList( tmp, type ) );
     }
   }
 
   //set the addressee's delivery label
   tmpStr = mVCard->getValue(VCARD_LABEL);
   if (!tmpStr.isEmpty()) {
@@ -405,16 +410,16 @@ KABC::Address VCard21Parser::readAddressFromQStringList ( const QStringList &dat
 
 VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
 {
   int _err = 0;
   int _state = VC_STATE_BEGIN;
 
-  QValueList<VCardLineX> *_vcdata;
-  QValueList<QString> lines;
+  Q3ValueList<VCardLineX> *_vcdata;
+  QStringList lines;
 
-  _vcdata = new QValueList<VCardLineX>;
+  _vcdata = new Q3ValueList<VCardLineX>;
 
   lines = QStringList::split( QRegExp( "[\x0d\x0a]" ), vc );
 
   // for each line in the vCard
   for ( QStringList::Iterator j = lines.begin(); j != lines.end(); ++j ) {
     VCardLineX _vcl;
@@ -498,14 +503,14 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
             value.remove( value.length() - 1, 1 );
             value.append(*( ++j ));
           }
         }
         _vcl.parameters = QStringList::split( ';', value, true );
         if ( qp ) { // decode the quoted printable
-          for ( QStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
-            *z = KCodecs::quotedPrintableDecode( (*z).latin1() );
+          for ( QLinkedList<QString>::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
+            *z = KCodecs::quotedPrintableDecode( (Q3CString)(*z).latin1() );
         }
       }
     } else {
       _err = VC_ERR_INTERNAL;
       break;
     }
@@ -540,24 +545,24 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
     return 0;
   }
 
   return new VCard21ParserImpl( _vcdata );
 }
 
-VCard21ParserImpl::VCard21ParserImpl(QValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
+VCard21ParserImpl::VCard21ParserImpl(Q3ValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
 {
 }
 
 
 QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifier)
 {
   QString failed;
   const QString lowname = name.lower();
   const QString lowqualifier = qualifier.lower();
 
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
    if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier)) {
     if ((*i).parameters.count() > 0)
      return (*i).parameters[0];
     else return failed;
     }
   }
@@ -567,13 +572,13 @@ QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifie
 
 QString VCard21ParserImpl::getValue(const QString& name)
 {
   QString failed;
   const QString lowname = name.lower();
 
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
     if ((*i).name == lowname && !(*i).qualified) {
       if ((*i).parameters.count() > 0)
         return (*i).parameters[0];
       else return failed;
     }
    }
@@ -581,27 +586,28 @@ QString VCard21ParserImpl::getValue(const QString& name)
 }
 
 
 QStringList VCard21ParserImpl::getValues(const QString& name)
 {
   const QString lowname = name.lower();
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
-    if ((*i).name == lowname && !(*i).qualified)
-      return (*i).parameters;
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+    if ((*i).name == lowname && !(*i).qualified) {
+      return QStringList( (*i).parameters );
+    }
   }
   // failed.
   return QStringList();
 }
 
 QStringList VCard21ParserImpl::getValues(const QString& name, const QString& qualifier)
 {
   const QString lowname = name.lower();
   const QString lowqualifier = qualifier.lower();
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
     if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier))
-       return (*i).parameters;
+       return QStringList( (*i).parameters );
   }
   // failed.
   return QStringList();
 }
 
 
diff --git a/kabc/vcard21parser.h b/kabc/vcard21parser.h
index 77e69b6..80ba6ef 100644
--- a/kabc/vcard21parser.h
+++ b/kabc/vcard21parser.h
@@ -31,13 +31,13 @@ $Id$
 
 #include <qdatetime.h>
 #include <kdebug.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <kurl.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "addressee.h"
 #include "addressbook.h"
 #include "phonenumber.h"
 
 
@@ -193,14 +193,14 @@ public:
  */
 class VCardLineX
 {
 public:
   QString name;
   bool qualified;
-  QValueList<QString> qualifiers;
-  QValueList<QString> parameters;
+  Q3ValueList<QString> qualifiers;
+  Q3ValueList<QString> parameters;
   bool isValid() const;
 };
 
 /**
  * @short Helper class
  */
@@ -214,13 +214,13 @@ public:
   static VCard21ParserImpl *parseVCard(const QString& vc, int *err = NULL);
   QString getValue(const QString& name, const QString& qualifier);
   QString getValue(const QString& name);
   QStringList getValues(const QString& name, const QString& qualifier);
   QStringList getValues(const QString& name);
 
-  QValueList<VCardLineX> *_vcdata;
+  Q3ValueList<VCardLineX> *_vcdata;
 
 private:
-  VCard21ParserImpl (QValueList<VCardLineX> *_vcd);
+  VCard21ParserImpl (Q3ValueList<VCardLineX> *_vcd);
 };
 
 #endif
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index 580c28b..2417874 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -25,12 +25,15 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #include <qfile.h>
 #include <qregexp.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 
@@ -51,13 +54,13 @@ VCardFormatImpl::VCardFormatImpl()
 
 bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
 {
   kdDebug(5700) << "VCardFormat::load()" << endl;
 
   QByteArray fdata = file->readAll();
-  QCString data(fdata.data(), fdata.size()+1);
+  Q3CString data(fdata.data(), fdata.size()+1);
 
   VCardEntity e( data );
 
   VCardListIterator it( e.cardList() );
 
   if ( it.current() ) {
@@ -72,13 +75,13 @@ bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
 
 
 #include <kmessagebox.h>
 bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
 {
   
-    QCString data(file->readAll().data(), file->size()+1); 
+    Q3CString data(file->readAll().data(), file->size()+1); 
   VCardEntity e( data );
 
   VCardListIterator it( e.cardList() );
 
   for (; it.current(); ++it) {
 //US    VCard v(*it.current());
@@ -105,13 +108,13 @@ void VCardFormatImpl::save( const Addressee &addressee, QFile *file )
 
   saveAddressee( addressee, v, false );
 
   vcardlist.append( v );
   vcards.setCardList( vcardlist );
 
-  QCString vcardData = vcards.asString();
+  Q3CString vcardData = vcards.asString();
   file->writeBlock( (const char*)vcardData, vcardData.length() );
 }
 
 void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file )
 {
 
@@ -126,17 +129,17 @@ void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file
   // for memory usage status test only
   // KMessageBox::information ( 0, "Stoppppp", QString("Stop ") );
 }
 
 bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
 {
-  QPtrList<ContentLine> contentLines = v->contentLineList();
+  Q3PtrList<ContentLine> contentLines = v->contentLineList();
   ContentLine *cl;
 
   for( cl = contentLines.first(); cl; cl = contentLines.next() ) {
-    QCString n = cl->name();
+    Q3CString n = cl->name();
     if ( n.left( 2 ) == "X-" ) {
       n = n.mid( 2 );
       int posDash = n.find( "-" );
       addressee.insertCustom( QString::fromUtf8( n.left( posDash ) ),
                         QString::fromUtf8( n.mid( posDash + 1 ) ),
                         QString::fromUtf8( cl->value()->asString() ) );
@@ -216,13 +219,13 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
 
       case EntityCategories:
         addressee.setCategories( QStringList::split( ",", readTextValue( cl ) ) );
         break;
 
       case EntityBirthday:
-        addressee.setBirthday( readDateValue( cl ) );
+        addressee.setBirthday( (QDateTime) readDateValue( cl ) );
         break;
 
       case EntityRevision:
         addressee.setRevision( readDateTimeValue( cl ) );
         break;
 
@@ -527,13 +530,13 @@ Address VCardFormatImpl::readAddressValue( ContentLine *cl )
 
 int VCardFormatImpl::readAddressParam( ContentLine *cl )
 {
   int type = 0;
   ParamList params = cl->paramList();
   ParamListIterator it( params );
-  QCString tmpStr;
+  Q3CString tmpStr;
   for( ; it.current(); ++it ) {
     if ( (*it)->name().upper() == "TYPE" ) {
       tmpStr = (*it)->value().lower();
       if ( tmpStr == "dom" ) type |= Address::Dom;
       else if ( tmpStr == "intl" ) type |= Address::Intl;
       else if ( tmpStr == "parcel" ) type |= Address::Parcel;
@@ -606,13 +609,13 @@ PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
   TelValue *value = (TelValue *)cl->value();
   p.setNumber( QString::fromUtf8( value->asString() ) );
 
   int type = 0;
   ParamList params = cl->paramList();
   ParamListIterator it( params );
-  QCString tmpStr;
+  Q3CString tmpStr;
   for( ; it.current(); ++it ) {
     if ( (*it)->name() == "TYPE" ) {
       tmpStr = (*it)->value().lower();
       if ( tmpStr == "home" ) type |= PhoneNumber::Home;
       else if ( tmpStr == "work" ) type |= PhoneNumber::Work;
       else if ( tmpStr == "msg" ) type |= PhoneNumber::Msg;
@@ -867,13 +870,13 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty
 
   ParamList params;
   if ( pic.isIntern() ) {
     QImage img = pic.data();
     if ( intern ) { // only for vCard export we really write the data inline
       QByteArray data;
-      QDataStream s( data, IO_WriteOnly );
+      QDataStream s( &data, QIODevice::WriteOnly );
       s.setVersion( 4 ); // to produce valid png files
       s << img;
       cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
       params.append( new Param( "ENCODING", "b" ) );
       if ( !pic.type().isEmpty() )
           params.append( new Param( "TYPE", pic.type().utf8() ) );
@@ -956,13 +959,13 @@ void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, co
   if ( sound.isIntern() ) {
     QByteArray data = sound.data();
     if ( intern ) { // only for vCard export we really write the data inline
         cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
     } else { // save sound in cache
       QFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
-      if ( file.open( IO_WriteOnly ) ) {
+      if ( file.open( QIODevice::WriteOnly ) ) {
         file.writeBlock( data );
       }
       cl.setValue( new TextValue( "<dummy>" ) );
     }
     params.append( new Param( "ENCODING", "b" ) );
   } else {
@@ -988,13 +991,13 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
   }
 
   if ( isInline ) {
     QByteArray data;
     if ( v->asString() == "<dummy>" ) { // no sound inline stored => sound is in cache
       QFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
-      if ( file.open( IO_ReadOnly ) ) {
+      if ( file.open( QIODevice::ReadOnly ) ) {
         data = file.readAll();
         file.close();
       }
     } else {
       KCodecs::base64Decode( v->asString(), data );
     }
diff --git a/kabc/vcardformatplugin.cpp b/kabc/vcardformatplugin.cpp
index 8db8c11..0b97a08 100644
--- a/kabc/vcardformatplugin.cpp
+++ b/kabc/vcardformatplugin.cpp
@@ -58,13 +58,13 @@ void VCardFormatPlugin::saveAll( AddressBook *addressBook, Resource *resource, Q
 }
 
 bool VCardFormatPlugin::checkFormat( QFile *file ) const
 {
   QString line;
 
-  file->readLine( line, 1024 );
+  char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp;
   line = line.stripWhiteSpace();
   if ( line == "BEGIN:VCARD" )
     return true;
   else
     return false;
 }
diff --git a/kabc/vcardparser/vcard.h b/kabc/vcardparser/vcard.h
index 0bee441..85b50e4 100644
--- a/kabc/vcardparser/vcard.h
+++ b/kabc/vcardparser/vcard.h
@@ -21,20 +21,20 @@
 #ifndef VCARDPARSER_VCARD_H
 #define VCARDPARSER_VCARD_H
 
 #include "vcardline.h"
 #include <qmap.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 namespace KABC {
 
 class VCard
 {
   public:
-    typedef QValueList<VCard> List;
+    typedef Q3ValueList<VCard> List;
     typedef QMap< QString, VCardLine::List > LineMap;
 
     enum Version { v2_1, v3_0 };
 
     VCard();
     VCard( const VCard& );
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index 8df2d32..c7254a0 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -16,12 +16,14 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include "vcardline.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace KABC;
 
 class VCardLine::VCardLinePrivate
 {
   public:
@@ -40,13 +42,13 @@ VCardLine::VCardLine( const QString &identifier )
 }
 
 VCardLine::VCardLine( const QString &identifier, const QString &value )
   : d( 0 )
 {
   mIdentifier = identifier;
-  mValue.assign( value.data(), value.length() );
+  mValue = value;
 }
 
 VCardLine::VCardLine( const VCardLine& line )
   : d( 0 )
 {
   mParamMap = line.mParamMap;
@@ -83,13 +85,13 @@ QString VCardLine::identifier() const
 }
 
 void VCardLine::setValueString( const QString& value )
 {
     setValueCString( value.utf8() );
 }
-void VCardLine::setValueCString( const QCString& value )
+void VCardLine::setValueCString( const Q3CString& value )
 {
     mValue.duplicate(  value.data(), value.length() );
 }
 
 void VCardLine::setValueBytes( const QByteArray& value )
 {
diff --git a/kabc/vcardparser/vcardline.h b/kabc/vcardparser/vcardline.h
index 8dc9322..dc4bdec 100644
--- a/kabc/vcardparser/vcardline.h
+++ b/kabc/vcardparser/vcardline.h
@@ -19,24 +19,24 @@
 */
 
 #ifndef VCARDLINE_H
 #define VCARDLINE_H
 
 #include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qcstring.h>
+#include <q3valuelist.h>
+#include <q3cstring.h>
 #include <qvariant.h>
 #include <qmap.h>
 #include <qstring.h>
 
 namespace KABC {
 
 class VCardLine
 {
   public:
-    typedef QValueList<VCardLine> List;
+    typedef Q3ValueList<VCardLine> List;
     typedef QMap<QString, QStringList> ParamMap;
 
     VCardLine();
     VCardLine( const QString &identifier );
     VCardLine( const QString &identifier, const QString &value );
     VCardLine( const VCardLine& );
@@ -56,13 +56,13 @@ class VCardLine
     QString identifier() const;
 
     /**
      * Sets the value of of this line.
      */
     void setValueString( const QString& value );
-    void setValueCString( const QCString& value );
+    void setValueCString( const Q3CString& value );
     void setValueBytes( const QByteArray& value );
 
     /**
      * Returns the value of this line.
      */
     QString valueString() const;
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 11622a0..a319531 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -215,13 +215,13 @@ QString VCardParser::createVCards( const VCard::List& list )
           if ( hasEncoding ) { // have to encode the data
             QByteArray input, output;
             input = (*lineIt).valueBytes();
             if ( encodingType == "b" )
               KCodecs::base64Encode( input, output );
             else if ( encodingType == "quoted-printable" )
-              KCodecs::quotedPrintableEncode( input, output );
+              KCodecs::quotedPrintableEncode( input, output, true );
             textLine.append( ":" + QString( output ) );
           } else
             textLine.append( ":" + (*lineIt).valueString().replace( QRegExp("\n"), "\\n" ) );
 
           if ( textLine.length() > FOLD_WIDTH ) { // we have to fold the line
             for ( uint i = 0; i <= ( textLine.length() / FOLD_WIDTH ); ++i )
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp
index 204326e..435c3b0 100644
--- a/kabc/vcardparser/vcardtool.cpp
+++ b/kabc/vcardparser/vcardtool.cpp
@@ -649,13 +649,13 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi
 {
   VCardLine line( identifier );
 
   if ( pic.isIntern() ) {
     if ( !pic.data().isNull() ) {
       QByteArray input;
-      QDataStream s( input, IO_WriteOnly );
+      QDataStream s( &input, QIODevice::WriteOnly );
       s.setVersion( 4 );
       s << pic.data();
       line.setValueBytes( input );
       line.addParameter( "encoding", "b" );
       line.addParameter( "type", "image/png" );
     }
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 3dcd592..83908d0 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -19,30 +19,37 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcheckbox.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
-#include <qlistview.h>
+#include <q3listbox.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
-#include <qsignal.h>
+#include <q3signal.h>
 #include <qstring.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
 
 #ifndef KAB_EMBEDDED    
-#include <qtextedit.h>
+#include <q3textedit.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 #include <kaccelmanager.h>
 #include <kbuttonbox.h>
 #else //KAB_EMBEDDED    
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif //KAB_EMBEDDED    
 
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 
 #include <kapplication.h>
@@ -64,15 +71,15 @@
 
 AddressEditWidget::AddressEditWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
 
     mConfig = AddresseeConfig::instance();
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
   layout->setSpacing( KDialog::spacingHintSmall() );
-  QHBox *b1 = new QHBox( this);
+  Q3HBox *b1 = new Q3HBox( this);
   //QLabel * label = new QLabel( b1 );
   //label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop, 0 ) );
   
  
   //label->setAlignment( AlignCenter);
   layout->addWidget( b1 ); 
@@ -81,17 +88,17 @@ AddressEditWidget::AddressEditWidget( QWidget *parent, const char *name )
                                              b1 );
   connect( mTypeCombo, SIGNAL( activated( int ) ),
            SLOT( updateAddressEdit() ) );
   // layout->addWidget( mTypeCombo );
 
 #ifndef KAB_EMBEDDED    
-  mAddressTextEdit = new QTextEdit( this );
+  mAddressTextEdit = new Q3TextEdit( this );
   mAddressTextEdit->setReadOnly( true );
   mAddressTextEdit->setMinimumHeight( 20 );
 #else //KAB_EMBEDDED    
-  mAddressTextEdit = new QMultiLineEdit( this );
+  mAddressTextEdit = new Q3MultiLineEdit( this );
   mAddressTextEdit->setReadOnly( true );
   mAddressTextEdit->setMinimumHeight( 20 );
 #endif //KAB_EMBEDDED    
   
   layout->addWidget( mAddressTextEdit );
 
@@ -123,19 +130,19 @@ void AddressEditWidget::setAddresses( const KABC::Addressee &addr,
 
   mAddressList.clear();
 
   // Insert types for existing numbers.
   mTypeCombo->insertTypeList( list );
 
-  QValueList<int> defaultTypes;
+  Q3ValueList<int> defaultTypes;
   defaultTypes << KABC::Address::Home;
   defaultTypes << KABC::Address::Work;
 
   mConfig->setUid( mAddressee.uid() );
-  QValueList<int> configList = mConfig->noDefaultAddrTypes();
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int> configList = mConfig->noDefaultAddrTypes();
+  Q3ValueList<int>::ConstIterator it;
   for ( it = configList.begin(); it != configList.end(); ++it )
     defaultTypes.remove( *it );
 
   // Insert default types.
   // Doing this for mPrefCombo is enough because the list is shared by all
   // combos.
@@ -178,13 +185,13 @@ void AddressEditWidget::edit()
           if ( !(*it).isEmpty() )
             hasWork = true;
         }
       }
 
       mConfig->setUid( mAddressee.uid() );
-      QValueList<int> configList;
+      Q3ValueList<int> configList;
       if ( !hasHome ) {
         configList << KABC::Address::Home;
       }
       if ( !hasWork ) {
         configList << KABC::Address::Work;
       }
@@ -252,26 +259,26 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
     mPreviousAddress( 0 )
 {
   mAddressList = list;
 
   QWidget *page = plainPage();
 
-  QGridLayout *topLayout = new QGridLayout( page, 8, 2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 8, 2 );
   topLayout->setSpacing( spacingHintSmall() );
 
   mTypeCombo = new AddressTypeCombo( mAddressList, page );
   topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
 
   QLabel *label = new QLabel( i18n( "Street:" ), page );
   label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
   topLayout->addWidget( label, 1, 0 );
   
 #ifndef KAB_EMBEDDED    
-  mStreetTextEdit = new QTextEdit( page );
+  mStreetTextEdit = new Q3TextEdit( page );
 #else //KAB_EMBEDDED    
-  mStreetTextEdit = new QMultiLineEdit( page );
+  mStreetTextEdit = new Q3MultiLineEdit( page );
 //US qDebug("AddressEditDialog::AddressEditDialog has to be changed");
 #endif //KAB_EMBEDDED    
   
   label->setBuddy( mStreetTextEdit );
   topLayout->addWidget( mStreetTextEdit, 1, 1 );
 
@@ -308,20 +315,20 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
   mCountryCombo->setEditable( true );
   mCountryCombo->setDuplicatesEnabled( false );
   mCountryCombo->setAutoCompletion( true );
   fillCountryCombo();
   label->setBuddy( mCountryCombo );
   topLayout->addWidget( mCountryCombo, 6, 1 );
-  mCountryCombo->setSizeLimit( 8);
+  mCountryCombo->setMaxVisibleItems( 8);
   mPreferredCheckBox = new QCheckBox( i18n( "This is the preferred address" ), page );
   topLayout->addMultiCellWidget( mPreferredCheckBox, 7, 7, 0, 1 );
   /*
   KSeparator *sep = new KSeparator( KSeparator::HLine, page );
   topLayout->addMultiCellWidget( sep, 8, 8, 0, 1 );
   */
-  QHBox *buttonBox = new QHBox( page );
+  Q3HBox *buttonBox = new Q3HBox( page );
   buttonBox->setSpacing( spacingHint() );
   topLayout->addMultiCellWidget( buttonBox, 9, 9, 0, 1 );
 
   QPushButton *addButton = new QPushButton( i18n( "New..." ), buttonBox );
   connect( addButton, SIGNAL( clicked() ), SLOT( addAddress() ) );
 
@@ -580,15 +587,15 @@ void AddressEditDialog::fillCountryCombo()
 
 AddressTypeDialog::AddressTypeDialog( int type, QWidget *parent )
   : KDialogBase( Plain, i18n( "Edit Address Type" ), Ok | Cancel, Ok,
                  parent, "AddressTypeDialog" )
 {
   QWidget *page = plainPage();
-  QVBoxLayout *layout = new QVBoxLayout( page );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( page );
 
-  mGroup = new QButtonGroup( 2, Horizontal, i18n( "Address Types" ), page );
+  mGroup = new Q3ButtonGroup( 2, Qt::Horizontal, i18n( "Address Types" ), page );
   layout->addWidget( mGroup );
 
   mTypeList = KABC::Address::typeList();
   mTypeList.remove( KABC::Address::Pref );
 
   KABC::Address::TypeList::Iterator it;
@@ -614,9 +621,9 @@ int AddressTypeDialog::type() const
       type += mTypeList[ i ];
   }
 
   return type;
 }
 
-#ifndef KAB_EMBEDDED    
-#include "addresseditwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_addresseditwidget.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index bc96d74..1d4e138 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -30,19 +30,19 @@
 #include <kabc/address.h>
 #include <kabc/addressee.h>
 
 #include "addresseeconfig.h"
 #include "typecombo.h"
 
-class QButtonGroup;
+class Q3ButtonGroup;
 class QCheckBox;
-class QListView;
+class Q3ListView;
 #ifndef KAB_EMBEDDED    
-class QTextEdit;
+class Q3TextEdit;
 #else //KAB_EMBEDDED    
-class QMultiLineEdit;
+class Q3MultiLineEdit;
 #endif //KAB_EMBEDDED    
 class QToolButton;
 
 class KComboBox;
 class KLineEdit;
 class KListView;
@@ -78,15 +78,15 @@ class AddressEditWidget : public QWidget
   private:
     AddresseeConfig * mConfig;
     AddressTypeCombo *mTypeCombo;
 
     QPushButton *mEditButton;
 #ifndef KAB_EMBEDDED    
-    QTextEdit *mAddressTextEdit;
+    Q3TextEdit *mAddressTextEdit;
 #else //KAB_EMBEDDED    
-    QMultiLineEdit *mAddressTextEdit;
+    Q3MultiLineEdit *mAddressTextEdit;
 #endif //KAB_EMBEDDED    
 
     KABC::Address::List mAddressList;
     KABC::Addressee mAddressee;
     int mIndex;
 };
@@ -117,15 +117,15 @@ class AddressEditDialog : public KDialogBase
   private:
     void saveAddress( KABC::Address &addr );
     void fillCountryCombo();
 
     AddressTypeCombo *mTypeCombo;
 #ifndef KAB_EMBEDDED    
-    QTextEdit *mStreetTextEdit;
+    Q3TextEdit *mStreetTextEdit;
 #else //KAB_EMBEDDED    
-    QMultiLineEdit *mStreetTextEdit;
+    Q3MultiLineEdit *mStreetTextEdit;
 #endif //KAB_EMBEDDED    
     KComboBox *mCountryCombo;
     KLineEdit *mRegionEdit;
     KLineEdit *mLocalityEdit;
     KLineEdit *mPostalCodeEdit;
     KLineEdit *mPOBoxEdit;
@@ -148,12 +148,12 @@ class AddressTypeDialog : public KDialogBase
     AddressTypeDialog( int type, QWidget *parent );
     ~AddressTypeDialog();
 
     int type() const;
 
   private:
-    QButtonGroup *mGroup;
+    Q3ButtonGroup *mGroup;
 
     KABC::Address::TypeList mTypeList;
 };
 
 #endif
diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp
index ea0436f..81b1bf4 100644
--- a/kaddressbook/addresseeconfig.cpp
+++ b/kaddressbook/addresseeconfig.cpp
@@ -23,12 +23,14 @@
 
 #include "addresseeconfig.h"
 #include "kabprefs.h"
 //US
 #include <kstandarddirs.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace KABC;
 
 static AddresseeConfig* extern_AddresseeConfig = 0; 
 static  KConfig *  extern_Config = 0; 
 
@@ -74,19 +76,19 @@ void AddresseeConfig::setAutomaticNameParsing( bool value )
 {
 
     return AddresseeConfig::config()->readBoolEntry( "AutomaticNameParsing",
                                KABPrefs::instance()->mAutomaticNameParsing );
 }
 
-void AddresseeConfig::setNoDefaultAddrTypes( const QValueList<int> &types )
+void AddresseeConfig::setNoDefaultAddrTypes( const Q3ValueList<int> &types )
 {
     AddresseeConfig::config()->writeEntry( "NoDefaultAddrTypes", types );
     AddresseeConfig::config()->sync();
 }
 
- QValueList<int> AddresseeConfig::noDefaultAddrTypes() const
+ Q3ValueList<int> AddresseeConfig::noDefaultAddrTypes() const
 {
     return AddresseeConfig::config()->readIntListEntry( "NoDefaultAddrTypes" );
 }
 
 void AddresseeConfig::remove( const QString & uid )
 {
diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h
index 47fbdd6..f6bb3e9 100644
--- a/kaddressbook/addresseeconfig.h
+++ b/kaddressbook/addresseeconfig.h
@@ -23,12 +23,14 @@
 
 #ifndef ADDRESSEECONFIG_H
 #define ADDRESSEECONFIG_H
 
 #include <kabc/addressee.h>
 #include <kconfig.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace KABC;
 
 class AddresseeConfig
 {
   public:
@@ -40,14 +42,14 @@ class AddresseeConfig
     Addressee addressee();
 
     void setUid( const QString & uid );
     void setAutomaticNameParsing( bool value );
     bool automaticNameParsing();
 
-    void setNoDefaultAddrTypes( const QValueList<int> &types );
-    QValueList<int> noDefaultAddrTypes() const;
+    void setNoDefaultAddrTypes( const Q3ValueList<int> &types );
+    Q3ValueList<int> noDefaultAddrTypes() const;
 
     void remove( const QString & uid);
 
   private:
     QString mUid;
 };
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index b5a60f2..b925a07 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -20,12 +20,15 @@
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 #include "addresseeeditorwidget.h"
@@ -40,13 +43,13 @@ AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
                  KDialogBase::Ok, parent, name, true )
 {
 
 
   QWidget *page = plainPage();
   
-  QVBoxLayout *layout = new QVBoxLayout( page );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( page );
 
   mEditorWidget = new AddresseeEditorWidget( core, false, page );
   connect( mEditorWidget, SIGNAL( modified( const KABC::Addressee::List& ) ),
            SLOT( widgetModified() ) );
   layout->addWidget( mEditorWidget );
   
@@ -115,9 +118,9 @@ void AddresseeEditorDialog::slotCancel()
 {
   KDialogBase::slotCancel();
   
  
 }
 
-#ifndef KAB_EMBEDDED    
-#include "addresseeeditordialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_addresseeeditordialog.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 4313998..a95db03 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -19,29 +19,33 @@
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qcheckbox.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
 
 #ifndef KAB_EMBEDDED    
-#include <qtextedit.h>
+#include <q3textedit.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
 #include <kaccelmanager.h>
 #include "keywidget.h"
 #include "soundwidget.h"
 
 #else //KAB_EMBEDDED    
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif //KAB_EMBEDDED    
 
 
 #include "keywidget.h"
 #include "geowidget.h"
 #include "imagewidget.h"
@@ -127,13 +131,13 @@ void AddresseeEditorWidget::textChanged( const QString& )
 {
   emitModified();
 }
   
 void AddresseeEditorWidget::initGUI()
 {
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
 
   mTabWidget = new QTabWidget( this );
   layout->addWidget( mTabWidget );
 
   setupTab1();
   setupTab1_1();
@@ -157,13 +161,13 @@ void AddresseeEditorWidget::setupTab1()
   bool horLayout = false;
   int maxCol = 1;
   if ( QApplication::desktop()->width() == 640 || QApplication::desktop()->width() == 320 ) {
       horLayout = true;
       maxCol = 3;
   }
-  QGridLayout *layout = new QGridLayout( tab1, 7-maxCol, maxCol );
+  Q3GridLayout *layout = new Q3GridLayout( tab1, 7-maxCol, maxCol );
 
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
@@ -324,23 +328,23 @@ void AddresseeEditorWidget::setupTab1()
   layout->addColSpacing( 6, 50 );
   
   bar = new KSeparator( KSeparator::HLine, tab1 );
   layout->addMultiCellWidget( bar, 10, 10, 0, 6 );
 */  
   ///////////////////////////////////////
-      QHBox *categoryBox = new QHBox( tab1 ,"cato");
+      Q3HBox *categoryBox = new Q3HBox( tab1 ,"cato");
   categoryBox->setSpacing( KDialogBase::spacingHint() );
   categoryBox->setMargin( KDialogBase::marginHintSmall() );
   
   // Categories
   button = new QPushButton( i18n( "Categories" )+":", categoryBox );
   connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) );
 
   mCategoryEdit = new QPushButton ( categoryBox ); 
   mCategoryEdit->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Fixed  ,FALSE) );
-  mCatPopup = new QPopupMenu ( categoryBox );
+  mCatPopup = new Q3PopupMenu ( categoryBox );
   mCategoryEdit->setPopup( mCatPopup );
   connect(mCatPopup,SIGNAL(aboutToShow ()  ), this ,SLOT(showCatPopup()));
   connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT(selectedCatPopup( int )));
   //connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), 
   //       SLOT( textChanged( const QString& ) ) );
 
@@ -408,13 +412,13 @@ void AddresseeEditorWidget::setCompany2FN()
 void AddresseeEditorWidget::setupTab1_1()
 {
   // This is the Address tab
   QWidget *tab1_1 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 );
-  QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( tab1_1, 7, 2 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   QPushButton *button;
@@ -609,13 +613,13 @@ qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 
 void AddresseeEditorWidget::setupTab2()
 {
   // This is the Details tab
   QWidget *tab2 = new QWidget( mTabWidget );
 
-  QGridLayout *layout = new QGridLayout( tab2, 8, 3 );
+  Q3GridLayout *layout = new Q3GridLayout( tab2, 8, 3 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   
@@ -688,13 +692,13 @@ void AddresseeEditorWidget::setupTab2()
       //layout->addMultiCellWidget( label, 6, 7, 0, 0 );
 
 
       int iii = 6;
 
       if ( QApplication::desktop()->width() == 640 ) {
-          QHBox * nbox = new QHBox ( tab2 );
+          Q3HBox * nbox = new Q3HBox ( tab2 );
           label = new QLabel( i18n( "Nick name:" )+" ", nbox );
           mNicknameEdit = new KLineEdit(  nbox );
           connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
                    SLOT( textChanged( const QString& ) ) );
           label->setBuddy( mNicknameEdit );
 
@@ -732,13 +736,13 @@ void AddresseeEditorWidget::setupTab2()
       connect( mChildEdit, SIGNAL( textChanged( const QString& ) ),
                SLOT( textChanged( const QString& ) ) );
       label->setBuddy( mChildEdit );
       layout->addWidget( mChildEdit, iii, 2 );
       ++iii;
       if ( QApplication::desktop()->width() == 640 ) {
-          QHBox * nbox = new QHBox ( tab2 );
+          Q3HBox * nbox = new Q3HBox ( tab2 );
           label = new QLabel( i18n( "Birthday:" )+" ", nbox );
           mBirthdayPicker = new KDateEdit(  nbox  );
           //mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
           connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                    SLOT( dateChanged( QDate ) ) );
@@ -801,13 +805,13 @@ void AddresseeEditorWidget::setupTab2()
 
 void AddresseeEditorWidget::setupTab2_1()
 {
   // This is the Details tab
   QWidget *tab2_2 = new QWidget( mTabWidget );
 
-  QGridLayout *layout = new QGridLayout( tab2_2, 1, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( tab2_2, 1, 2 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   
@@ -923,18 +927,18 @@ void AddresseeEditorWidget::setupTab2_1()
   // Notes
   label = new QLabel( i18n( "Note:" ), tab2_2 );
   label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
 //US  layout->addWidget( label, 7, 0 );
   layout->addWidget( label, 0, 0 );
 #ifndef KAB_EMBEDDED    
-  mNoteEdit = new QTextEdit( tab2_2 );
-  mNoteEdit->setWordWrap( QTextEdit::WidgetWidth );
+  mNoteEdit = new Q3TextEdit( tab2_2 );
+  mNoteEdit->setWordWrap( Q3TextEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #else //KAB_EMBEDDED    
-  mNoteEdit = new QMultiLineEdit( tab2_2 );
-  mNoteEdit->setWordWrap( QMultiLineEdit::WidgetWidth );
+  mNoteEdit = new Q3MultiLineEdit( tab2_2 );
+  mNoteEdit->setWordWrap( Q3MultiLineEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #endif //KAB_EMBEDDED    
   
   connect( mNoteEdit, SIGNAL( textChanged() ), SLOT( emitModified() ) );
   label->setBuddy( mNoteEdit );
 //US  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
@@ -950,13 +954,13 @@ void AddresseeEditorWidget::setupTab2_1()
 
 void AddresseeEditorWidget::setupTab3()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
-  QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
 //US  layout->setColStretch( 2, 1 );
   
   //////////////////////////////////////
   // Geo
@@ -1002,13 +1006,13 @@ qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be
 void AddresseeEditorWidget::setupTab3_1()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab3, 2, 3 );
-  QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHint() );
   layout->setSpacing( KDialogBase::spacingHint() );
 //US  layout->setColStretch( 2, 1 );
 
 /*US  
   //////////////////////////////////////
@@ -1427,9 +1431,9 @@ QString AddresseeEditorWidget::title() const
 
 QString AddresseeEditorWidget::identifier() const
 {
   return i18n( "contact_editor" );
 }
 
-#ifndef KAB_EMBEDDED    
-#include "addresseeeditorwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_addresseeeditorwidget.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index 816bbb5..aa1207e 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -22,13 +22,13 @@
 */                                                                      
 
 #ifndef ADDRESSEEEDITORWIDGET_H
 #define ADDRESSEEEDITORWIDGET_H
 
 #include <qdatetime.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcombobox.h>
 
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 #include <kjanuswidget.h>
 
@@ -37,15 +37,15 @@
 class AddresseeConfig;
 class QCheckBox;
 class QSpinBox;
 class QTabWidget;
 
 #ifndef KAB_EMBEDDED    
-class QTextEdit;
+class Q3TextEdit;
 #else //KAB_EMBEDDED    
-class QMultiLineEdit;
+class Q3MultiLineEdit;
 #endif //KAB_EMBEDDED    
 
 class KComboBox;
 class KDateEdit;
 class KLineEdit;
 class KSqueezedTextLabel;
@@ -152,13 +152,13 @@ class AddresseeEditorWidget : public ExtensionWidget
     AddressEditWidget *mAddressEditWidget;
     EmailEditWidget *mEmailWidget;
     PhoneEditWidget *mPhoneEditWidget;
     KLineEdit *mURLEdit;
     KLineEdit *mIMAddressEdit;
     QPushButton *mCategoryEdit;
-    QPopupMenu *mCatPopup;
+    Q3PopupMenu *mCatPopup;
     SecrecyWidget *mSecrecyWidget;
     KSqueezedTextLabel *mNameLabel;
 
     // Tab2 and Tab2_2
     KLineEdit *mDepartmentEdit;
     KLineEdit *mOfficeEdit;
@@ -169,15 +169,15 @@ class AddresseeEditorWidget : public ExtensionWidget
     KLineEdit *mSpouseEdit;
     KLineEdit *mChildEdit;
     QComboBox *mGenderBox;
     KDateEdit *mBirthdayPicker;
     KDateEdit *mAnniversaryPicker;
 #ifndef KAB_EMBEDDED    
-    QTextEdit *mNoteEdit;
+    Q3TextEdit *mNoteEdit;
 #else //KAB_EMBEDDED    
-    QMultiLineEdit *mNoteEdit;
+    Q3MultiLineEdit *mNoteEdit;
 #endif //KAB_EMBEDDED    
     
     QSpinBox *mTimeZoneSpin;
     QSpinBox *mGeoLat;
     QSpinBox *mGeoLon;
 
diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp
index 366384a..a860f6d 100644
--- a/kaddressbook/addresseeutil.cpp
+++ b/kaddressbook/addresseeutil.cpp
@@ -43,13 +43,13 @@ QString AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list
 
   return vcard;
 }
 
 KABC::Addressee::List AddresseeUtil::clipboardToAddressees( const QString &data )
 {
-  uint numVCards = data.contains( "BEGIN:VCARD", false );
+  uint numVCards = data.count( "BEGIN:VCARD", Qt::CaseInsensitive );
   QStringList dataList = QStringList::split( "\r\n\r\n", data );
 
   KABC::Addressee::List addrList;
   for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
     KABC::VCardConverter converter;
     KABC::Addressee addr;
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 6def26b..b52a83c 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -22,54 +22,56 @@
 */
 
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include "kaddressbookview.h"
 #include "addviewdialog.h"
 
-AddViewDialog::AddViewDialog( QDict<ViewFactory> *viewFactoryDict,
+AddViewDialog::AddViewDialog( Q3Dict<ViewFactory> *viewFactoryDict,
                               QWidget *parent, const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Add View" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name ),
    mViewFactoryDict( viewFactoryDict )
 {
 //US  setMinimumSize( KMIN(KGlobal::getDesktopWidth(), 300), KMIN(KGlobal::getDesktopHeight(), 300));
   
   mTypeId = 0;
 
   QWidget *page = plainPage();
 
-  QGridLayout *layout = new QGridLayout( page, 2, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 2, 2 );
   layout->setSpacing( spacingHint() );
   layout->setRowStretch( 1, 1 );
   layout->setColStretch( 1, 1 );
 
   QLabel *label = new QLabel( i18n( "View name:" ), page );
   layout->addWidget( label, 0, 0 );
 
   mViewNameEdit = new QLineEdit( page );
   connect( mViewNameEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   layout->addWidget( mViewNameEdit, 0, 1 );
 
-  mTypeGroup = new QButtonGroup( 2, Qt::Horizontal, i18n( "View Type" ), page );
+  mTypeGroup = new Q3ButtonGroup( 2, Qt::Horizontal, i18n( "View Type" ), page );
   connect( mTypeGroup, SIGNAL( clicked( int ) ), this, SLOT( clicked( int ) ) );
   layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
 
   // Now create the radio buttons. This needs some layout work.
-  QDictIterator<ViewFactory> iter( *mViewFactoryDict );
+  Q3DictIterator<ViewFactory> iter( *mViewFactoryDict );
   for ( iter.toFirst(); iter.current(); ++iter ) {
 //US i am not quit sure, why I can nopt use (*iter)-> here 
 //US    new QRadioButton( (*iter)->type(), mTypeGroup );
 //US    label = new QLabel( (*iter)->description(), mTypeGroup );
 #ifdef DESKTOP_VERSION
     new QRadioButton( (*iter)->type(), mTypeGroup );
@@ -110,9 +112,9 @@ void AddViewDialog::clicked( int id )
 
 void AddViewDialog::textChanged( const QString &text )
 {
   enableButton( KDialogBase::Ok, !text.isEmpty() );
 }
 
-#ifndef KAB_EMBEDDED
-#include "addviewdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_addviewdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h
index 8cc12f5..c3e8efd 100644
--- a/kaddressbook/addviewdialog.h
+++ b/kaddressbook/addviewdialog.h
@@ -22,17 +22,17 @@
 */
 
 #ifndef ADDVIEWDIALOG_H
 #define ADDVIEWDIALOG_H
 
 #include <kdialogbase.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 
 class ViewFactory;
-class QButtonGroup;
+class Q3ButtonGroup;
 class QLineEdit;
 
 
 /**
   Modal dialog used for adding a new view. The dialog asks for the name of
   the view as well as the type. Someday it would be nice for this to be a
@@ -40,13 +40,13 @@ class QLineEdit;
  */
 class AddViewDialog : public KDialogBase
 {
   Q_OBJECT
 
   public:
-    AddViewDialog( QDict<ViewFactory> *viewFactoryDict, QWidget *parent,
+    AddViewDialog( Q3Dict<ViewFactory> *viewFactoryDict, QWidget *parent,
                    const char *name = 0 );
     ~AddViewDialog();
 
     QString viewName()const;
 
     QString viewType()const ;
@@ -60,14 +60,14 @@ class AddViewDialog : public KDialogBase
     /**
       Called when the user changes the text in the name of the view.
      */
     void textChanged( const QString &text );
 
   private:
-    QDict<ViewFactory> *mViewFactoryDict;
+    Q3Dict<ViewFactory> *mViewFactoryDict;
     QLineEdit *mViewNameEdit;
-    QButtonGroup *mTypeGroup;
+    Q3ButtonGroup *mTypeGroup;
 
     int mTypeId;
 };
 
 #endif
diff --git a/kaddressbook/details/detailsviewcontainer.cpp b/kaddressbook/details/detailsviewcontainer.cpp
index cee5886..4a86aca 100644
--- a/kaddressbook/details/detailsviewcontainer.cpp
+++ b/kaddressbook/details/detailsviewcontainer.cpp
@@ -19,16 +19,19 @@
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qcombobox.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
 #include "look_basic.h"
@@ -42,32 +45,32 @@
 
 #include "detailsviewcontainer.h"
 
 ViewContainer::ViewContainer( QWidget *parent, const char* name )
   : QWidget( parent, name ), mCurrentLook( 0 )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   //topLayout->setMargin( KDialog::marginHint() );
   //topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( 0 );
   topLayout->setSpacing( 0 );
 
-  QBoxLayout *styleLayout = new QHBoxLayout( topLayout );    
+  Q3BoxLayout *styleLayout = new Q3HBoxLayout( topLayout );    
 
   QLabel *label = new QLabel( i18n("Style:"), this );
   styleLayout->addWidget( label );
 
   mStyleCombo = new QComboBox( this );
   styleLayout->addWidget( mStyleCombo );
 
-  QFrame *frameRuler = new QFrame( this );
+  Q3Frame *frameRuler = new Q3Frame( this );
 //US  frameRuler->setFrameShape( QFrame::HLine );
 //US  frameRuler->setFrameShadow( QFrame::Sunken );
 //US  topLayout->addWidget( frameRuler );
 
-  mDetailsStack = new QWidgetStack( this );
+  mDetailsStack = new Q3WidgetStack( this );
   topLayout->addWidget( mDetailsStack, 1 );
 
   registerLooks();
 
 #if 1
     // Hide detailed view selection combo box, because we currently have
@@ -156,9 +159,9 @@ KABC::Addressee ViewContainer::addressee()
 void ViewContainer::setReadOnly( bool state )
 {
   if ( mCurrentLook )
     mCurrentLook->setReadOnly( state );
 }
 
-#ifndef KAB_EMBEDDED
-#include "detailsviewcontainer.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_detailsviewcontainer.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/detailsviewcontainer.h b/kaddressbook/details/detailsviewcontainer.h
index 9684736..f310a30 100644
--- a/kaddressbook/details/detailsviewcontainer.h
+++ b/kaddressbook/details/detailsviewcontainer.h
@@ -21,18 +21,18 @@
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #ifndef DETAILSVIEWCONTAINER_H
 #define DETAILSVIEWCONTAINER_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "look_basic.h"
 
 class QComboBox;
-class QWidgetStack;
+class Q3WidgetStack;
 
 class ViewContainer : public QWidget
 {
   Q_OBJECT
 
   public:
@@ -91,13 +91,13 @@ class ViewContainer : public QWidget
      */
     void registerLooks();
 
   private:
     KABC::Addressee mCurrentAddressee;
     KABBasicLook *mCurrentLook;
-    QPtrList<KABLookFactory> mLookFactories;
+    Q3PtrList<KABLookFactory> mLookFactories;
 
     QComboBox *mStyleCombo;
-    QWidgetStack *mDetailsStack;
+    Q3WidgetStack *mDetailsStack;
 };
 
 #endif
diff --git a/kaddressbook/details/look_basic.cpp b/kaddressbook/details/look_basic.cpp
index 0245686..48cc42a 100644
--- a/kaddressbook/details/look_basic.cpp
+++ b/kaddressbook/details/look_basic.cpp
@@ -23,13 +23,13 @@
 
 #include <kdebug.h>
 
 #include "look_basic.h"
 
 KABBasicLook::KABBasicLook( QWidget *parent, const char *name )
-  : QVBox( parent, name ), mReadOnly( false )
+  : Q3VBox( parent, name ), mReadOnly( false )
 {
 }
 
 void KABBasicLook::setReadOnly( bool state )
 {
   mReadOnly = state;
@@ -67,9 +67,9 @@ KABLookFactory::KABLookFactory( QWidget *parent, const char *name )
 {
 }
 
 KABLookFactory::~KABLookFactory()
 {
 }
-#ifndef KAB_EMBEDDED
-#include "look_basic.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_look_basic.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/look_basic.h b/kaddressbook/details/look_basic.h
index a65c99c..a70e7f7 100644
--- a/kaddressbook/details/look_basic.h
+++ b/kaddressbook/details/look_basic.h
@@ -22,13 +22,13 @@
 */                                                                      
 
 #ifndef LOOK_KABBASIC_H
 #define LOOK_KABBASIC_H
 
 #include <kabc/addressbook.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 
 class KConfig;
 
 /**
   This is a pure virtual base class that defines the
   interface for how to display and change entries of
@@ -38,13 +38,13 @@ class KConfig;
   Derive it and implement its look and how the user may edit the
   entry.
 
   The paintEvent() has to paint the whole widget, since repaint()
   calls will not delete the widgets background.
  */
-class KABBasicLook : public QVBox
+class KABBasicLook : public Q3VBox
 {
   Q_OBJECT
 
   public:
     /**
       The constructor.
diff --git a/kaddressbook/details/look_details.cpp b/kaddressbook/details/look_details.cpp
index 11d06e9..2c3a79d 100644
--- a/kaddressbook/details/look_details.cpp
+++ b/kaddressbook/details/look_details.cpp
@@ -186,16 +186,16 @@ void KABDetailedView::mouseMoveEvent( QMouseEvent *e )
       setCursor(ArrowCursor);
   }
 }
 
 void KABDetailedView::mousePressEvent( QMouseEvent *e )
 {
-  QPopupMenu menu( this );
-  QPopupMenu *menuBG = new QPopupMenu( &menu );
-  mMenuBorderedBG = new QPopupMenu( &menu );
-  mMenuTiledBG = new QPopupMenu( &menu );
+  Q3PopupMenu menu( this );
+  Q3PopupMenu *menuBG = new Q3PopupMenu( &menu );
+  mMenuBorderedBG = new Q3PopupMenu( &menu );
+  mMenuTiledBG = new Q3PopupMenu( &menu );
 
   menu.insertItem( i18n( "Select Background" ), menuBG );
   menuBG->insertItem( i18n( "Bordered Backgrounds" ), mMenuBorderedBG );
   menuBG->insertItem( i18n( "Tiled Backgrounds" ), mMenuTiledBG );
   menu.insertSeparator();
 
@@ -411,9 +411,9 @@ void KABDetailedView::restoreSettings( KConfig *config )
   mPainter->setHeadLineFont( QFont( gfont, gpointsize + 2, QFont::Bold, true ) );
   mPainter->setBodyFont( QFont( gfont, gpointsize, QFont::Normal, false ) );
   mPainter->setFixedFont( QFont( ffont, fpointsize, QFont::Normal, false ) );
   mPainter->setCommentFont( QFont( gfont, gpointsize, QFont::Normal, false ) );
 }
 
-#ifndef KAB_EMBEDDED
-#include "look_details.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_look_details.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/look_details.h b/kaddressbook/details/look_details.h
index e8d50a9..b59d3a7 100644
--- a/kaddressbook/details/look_details.h
+++ b/kaddressbook/details/look_details.h
@@ -127,14 +127,14 @@ class KABDetailedView : public KABBasicLook
     KToggleAction *mActionShowURLs;
 
     const int mGrid;
     QStringList mBorders;
     QStringList mTiles;
 
-    QPopupMenu *mMenuBorderedBG;
-    QPopupMenu *mMenuTiledBG;
+    Q3PopupMenu *mMenuBorderedBG;
+    Q3PopupMenu *mMenuTiledBG;
 
     static const QString mBorderedBGDir;
     static const QString mTiledBGDir;
 };
 
 class KABDetailedViewFactory : public KABLookFactory
diff --git a/kaddressbook/details/look_html.cpp b/kaddressbook/details/look_html.cpp
index bb30650..4ec1c7d 100644
--- a/kaddressbook/details/look_html.cpp
+++ b/kaddressbook/details/look_html.cpp
@@ -21,13 +21,13 @@
     without including the source code for Qt in the source distribution.
 */
 
 #include <addresseeview.h>
 
 #include "look_html.h"
-#include <qscrollview.h> 
+#include <q3scrollview.h> 
 #include "kabprefs.h"
 #include <kabc/addresseeview.h>
 KABHtmlView::KABHtmlView( QWidget *parent, const char *name )
   : KABBasicLook( parent, name )
 {
     mView = new KABC::AddresseeView( this ); 
@@ -48,9 +48,9 @@ void KABHtmlView::printMe()
 void KABHtmlView::setAddressee( const KABC::Addressee &addr )
 {
   mView->setFont( KABPrefs::instance()->mDetailsFont );
   mView->setAddressee( addr );
 }
 
-#ifndef KAB_EMBEDDED
-#include "look_html.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_look_html.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index e72face..09df47f 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -25,13 +25,15 @@
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qstring.h>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #endif //KAB_EMBEDDED
 #include <kconfig.h>
 #include <kcombobox.h>
@@ -45,20 +47,20 @@
 
 #include "emaileditwidget.h"
 
 EmailEditWidget::EmailEditWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2, 2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2, 2 );
   topLayout->setSpacing( KDialog::spacingHint() );
   QLabel* label = new QLabel( this );
 
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "mail_send", KIcon::Desktop, 0) );
 
   topLayout->addWidget( label, 0, 0 );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
   QPushButton *editButton = new QPushButton( i18n( "Edit Email Addresses..." ), this);
   topLayout->addWidget( editButton,  0, 1 );
   label = new QLabel( i18n( "Email:" ), this );
   topLayout->addWidget( label, 1, 0 );
 
   mEmailEdit = new KLineEdit( this );
@@ -134,13 +136,13 @@ EmailEditDialog::EmailEditDialog( const QStringList &list, QWidget *parent,
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Email Addresses" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, true )
 {
   QWidget *page = plainPage();
 
-  QGridLayout *topLayout = new QGridLayout( page, 4, 3 );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 4, 3 );
 
   QLabel *label = new QLabel( i18n( "Email address:" ), page );
   topLayout->addWidget( label, 0, 0 );
 
   mEmailEdit = new KLineEdit( page );
   label->setBuddy( mEmailEdit );
@@ -151,13 +153,13 @@ EmailEditDialog::EmailEditDialog( const QStringList &list, QWidget *parent,
 
   mAddButton = new QPushButton( i18n( "Add" ), page );
   mAddButton->setEnabled( false );
   connect( mAddButton, SIGNAL( clicked() ), SLOT( add() ) );
   topLayout->addWidget( mAddButton, 0, 2 );
 
-  mEmailListBox = new QListBox( page );
+  mEmailListBox = new Q3ListBox( page );
 
   // Make sure there is room for the scrollbar
   mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 );
   connect( mEmailListBox, SIGNAL( highlighted( int ) ),
            SLOT( selectionChanged( int ) ) );
   topLayout->addMultiCellWidget( mEmailListBox, 1, 3, 0, 1 );
@@ -269,9 +271,9 @@ void EmailEditDialog::selectionChanged( int index )
 
 void EmailEditDialog::emailChanged()
 {
   mAddButton->setEnabled( !mEmailEdit->text().isEmpty() );
 }
 
-#ifndef KAB_EMBEDDED
-#include "emaileditwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_emaileditwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h
index acdecaf..618acee 100644
--- a/kaddressbook/emaileditwidget.h
+++ b/kaddressbook/emaileditwidget.h
@@ -26,17 +26,17 @@
 
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 
 #include "addresseeconfig.h"
 
-class QButtonGroup;
+class Q3ButtonGroup;
 class QCheckBox;
-class QListView;
-class QListBox;
-class QTextEdit;
+class Q3ListView;
+class Q3ListBox;
+class Q3TextEdit;
 class QToolButton;
 
 class KComboBox;
 class KLineEdit;
 class KListView;
 
@@ -86,13 +86,13 @@ class EmailEditDialog : public KDialogBase
     void standard();
     void selectionChanged( int );
     void emailChanged();
 
   private:
     KLineEdit *mEmailEdit;
-    QListBox *mEmailListBox;
+    Q3ListBox *mEmailListBox;
     QPushButton *mAddButton;
     QPushButton *mRemoveButton;
     QPushButton *mEditButton;
     QPushButton *mStandardButton;
 
     bool mChanged;
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 46defa1..5356224 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -19,12 +19,14 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #include <qlayout.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
 #include <kactionclasses.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #ifndef KAB_EMBEDDED
@@ -39,13 +41,13 @@
 #include "kabprefs.h"
 
 #include "extensionmanager.h"
 
 ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent,
                                     const char *name )
-  : QScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 )
+  : Q3ScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 )
 {
 #ifdef KAB_EMBEDDED
 //US  QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu();
   QWidget *settingsmenu = (QWidget*)mCore->getViewMenu();
 #endif //KAB_EMBEDDED
 
@@ -55,13 +57,13 @@ ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent,
 
   mActionExtensions->plug( settingsmenu ,0);
 
   connect( mActionExtensions, SIGNAL( activated( int ) ),
            SLOT( setActiveExtension( int ) ) );
   mWidgetBox = new QWidget( viewport() );
-  new QHBoxLayout (mWidgetBox  );
+  new Q3HBoxLayout (mWidgetBox  );
   addChild( mWidgetBox );
   setResizePolicy(AutoOneFit);
   createExtensionWidgets();
   hide();
 }
 
@@ -145,24 +147,24 @@ void ExtensionManager::setActiveExtension( int id )
 }
 
 void ExtensionManager::createExtensionWidgets()
 {
   // clear extension widget list
   mExtensionWidgetList.setAutoDelete( true );
-  QPtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList );
+  Q3PtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList );
   ExtensionWidget *wdg = 0;
   while ( ( wdg = wdgIt.current() ) != 0 )
     mExtensionWidgetList.remove( wdg );
 
   mExtensionWidgetList.setAutoDelete( false );
 
   QStringList extensionNames( i18n( "None" ) );
 
   // add addressee editor as default
 
-  QHBoxLayout *hbl = (QHBoxLayout *) mWidgetBox->layout();;
+  Q3HBoxLayout *hbl = (Q3HBoxLayout *) mWidgetBox->layout();;
 
   wdg = new AddresseeEditorWidget( mCore, true, mWidgetBox );
   hbl->addWidget( wdg );
   //wdg->hide();
   connect( wdg, SIGNAL( modified( const KABC::Addressee::List& ) ),
            SIGNAL( modified( const KABC::Addressee::List& ) ) );
@@ -241,9 +243,9 @@ void ExtensionManager::createExtensionWidgets()
 
 
   mActionExtensions->setItems( extensionNames );
   mCurrentExtensionWidget = 0;
 }
 
-#ifndef KAB_EMBEDDED
-#include "extensionmanager.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_extensionmanager.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index 611a037..84c948b 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -21,23 +21,23 @@
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef EXTENSIONMANAGER_H
 #define EXTENSIONMANAGER_H
 
-#include <qhbox.h>
-#include <qscrollview.h>
-#include <qptrlist.h>
+#include <q3hbox.h>
+#include <q3scrollview.h>
+#include <q3ptrlist.h>
 
 #include <extensionwidget.h>
 
 class KABCore;
 class KSelectAction;
 
 
-class ExtensionManager : public QScrollView
+class ExtensionManager : public Q3ScrollView
 {
   Q_OBJECT
 
   public:
     ExtensionManager( KABCore *core, QWidget *parent, const char *name = 0 );
     ~ExtensionManager();
@@ -77,13 +77,13 @@ class ExtensionManager : public QScrollView
     void createExtensionWidgets();
 
     KABCore *mCore;
     QWidget *mWidgetBox;
 
     ExtensionWidget *mCurrentExtensionWidget;
-    QPtrList<ExtensionWidget> mExtensionWidgetList;
+    Q3PtrList<ExtensionWidget> mExtensionWidgetList;
 
     KSelectAction *mActionExtensions;
 
 };
 
 #endif
diff --git a/kaddressbook/extensionwidget.cpp b/kaddressbook/extensionwidget.cpp
index 69f4aa8..7c3b415 100644
--- a/kaddressbook/extensionwidget.cpp
+++ b/kaddressbook/extensionwidget.cpp
@@ -75,10 +75,9 @@ QString ExtensionWidget::identifier() const
 
 ConfigureWidget *ExtensionFactory::configureWidget( QWidget*, const char* )
 {
   return 0;
 }
 
-#ifndef KAB_EMBEDDED
-#include "extensionwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_extensionwidget.cpp"
 #endif //KAB_EMBEDDED
-
diff --git a/kaddressbook/extensionwidget.h b/kaddressbook/extensionwidget.h
index fc91f21..9fcfba9 100644
--- a/kaddressbook/extensionwidget.h
+++ b/kaddressbook/extensionwidget.h
@@ -83,15 +83,15 @@ class ExtensionWidget : public QWidget
 
     class ExtensionWidgetPrivate;
     ExtensionWidgetPrivate *d;
 };
 
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class ExtensionFactory : public KLibFactory
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
 class ExtensionFactory
 #endif //KAB_EMBEDDED
 {
   public:
     virtual ExtensionWidget *extension( KABCore *core, QWidget *parent,
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index bfcb121..996177b 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -18,19 +18,26 @@
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
+#include <QDragEnterEvent>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #endif //KAB_EMBEDDED
 
 
@@ -74,18 +81,18 @@ extern "C" {
   {
     return ( new DistributionListFactory );
   }
 }
 #endif //KAB_EMBEDDED
 
-class ContactItem : public QListViewItem
+class ContactItem : public Q3ListViewItem
 {
   public:
     ContactItem( DistributionListView *parent, const KABC::Addressee &addressee,
                const QString &email = QString::null ) :
-      QListViewItem( parent ),
+      Q3ListViewItem( parent ),
       mAddressee( addressee ),
       mEmail( email )
     {
       setText( 0, addressee.realName() );
       if( email.isEmpty() ) {
         setText( 1, addressee.preferredEmail() );
@@ -118,13 +125,13 @@ class ContactItem : public QListViewItem
 };
 
 DistributionListWidget::DistributionListWidget( KABCore *core, QWidget *parent,
                                                 const char *name )
   : ExtensionWidget( core, parent, name ), mManager( 0 )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 3, 4, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 3, 4, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
   if (KGlobal::getOrientation() == KGlobal::Portrait)
   {
     mCreateListButton = new QPushButton( i18n( "New List" ), this );
     mEditListButton = new QPushButton( i18n( "Ren List" ), this );
@@ -163,14 +170,14 @@ DistributionListWidget::DistributionListWidget( KABCore *core, QWidget *parent,
   mContactView->setAllColumnsShowFocus( true );
   mContactView->setMinimumHeight( 30 );
   
   topLayout->addMultiCellWidget( mContactView, 1, 1, 0, 3 );
   connect( mContactView, SIGNAL( selectionChanged() ),
            SLOT( selectionContactViewChanged() ) );
-  connect( mContactView, SIGNAL( dropped( QDropEvent*, QListViewItem* ) ),
-           SLOT( dropped( QDropEvent*, QListViewItem* ) ) );
+  connect( mContactView, SIGNAL( dropped( QDropEvent*, Q3ListViewItem* ) ),
+           SLOT( dropped( QDropEvent*, Q3ListViewItem* ) ) );
 
   mAddContactButton->setEnabled( false );
   topLayout->addWidget( mAddContactButton, 2, 0 );
   connect( mAddContactButton, SIGNAL( clicked() ), SLOT( addContact() ) );
 
   topLayout->addWidget( mChangeEmailButton, 2, 2 );
@@ -407,13 +414,13 @@ QString DistributionListWidget::title() const
 
 QString DistributionListWidget::identifier() const
 {
   return "distribution_list_editor";
 }
 
-void DistributionListWidget::dropped( QDropEvent *e, QListViewItem* )
+void DistributionListWidget::dropped( QDropEvent *e, Q3ListViewItem* )
 {
   dropEvent( e );
 }
 
 void DistributionListWidget::changed()
 {
@@ -429,21 +436,21 @@ DistributionListView::DistributionListView( QWidget *parent, const char* name )
   setAllColumnsShowFocus( true );
 }
 
 void DistributionListView::dragEnterEvent( QDragEnterEvent* e )
 {
 #ifndef KAB_EMBEDDED
-  bool canDecode = QTextDrag::canDecode( e );
+  bool canDecode = Q3TextDrag::canDecode( e );
   e->accept( canDecode );
 #endif //KAB_EMBEDDED
 }
 
 void DistributionListView::viewportDragMoveEvent( QDragMoveEvent *e )
 {
 #ifndef KAB_EMBEDDED
-  bool canDecode = QTextDrag::canDecode( e );
+  bool canDecode = Q3TextDrag::canDecode( e );
   e->accept( canDecode );
 #endif //KAB_EMBEDDED
 }
 
 void DistributionListView::viewportDropEvent( QDropEvent *e )
 {
@@ -458,16 +465,16 @@ void DistributionListView::dropEvent( QDropEvent *e )
 
 EmailSelector::EmailSelector( const QStringList &emails,
                               const QString &current, QWidget *parent )
   : KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
                parent )
 {
-  QFrame *topFrame = plainPage();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = plainPage();
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
-  mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   topLayout->addWidget( mButtonGroup );
 
   QStringList::ConstIterator it;
   for( it = emails.begin(); it != emails.end(); ++it ) {
     QRadioButton *button = new QRadioButton( *it, mButtonGroup );
@@ -476,13 +483,13 @@ EmailSelector::EmailSelector( const QStringList &emails,
     }
   }
 }
 
 QString EmailSelector::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
   if ( button )
     return button->text();
 
   return QString::null;
 }
 
@@ -493,9 +500,9 @@ QString EmailSelector::getEmail( const QStringList &emails,
   dlg.exec();
 
   return dlg.selected();
 }
 
 
-#ifndef KAB_EMBEDDED
-#include "distributionlistwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_distributionlistwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 82bac3d..f619389 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -25,17 +25,22 @@
 #define DISTRIBUTIONLISTWIDGET_H
 
 #include <kdialogbase.h>
 #include <klistview.h>
 
 #include "extensionwidget.h"
+//Added by qt3to4:
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QLabel>
+#include <QDragMoveEvent>
 
-class QButtonGroup;
+class Q3ButtonGroup;
 class QComboBox;
 class QLabel;
-class QListView;
+class Q3ListView;
 
 class DistributionListView;
 class KABCore;
 
 namespace KABC {
 class AddressBook;
@@ -54,13 +59,13 @@ class DistributionListWidget : public ExtensionWidget
 
     QString title() const;
     QString identifier() const;
 
   public slots:
     void save();
-    void dropped( QDropEvent*, QListViewItem* );
+    void dropped( QDropEvent*, Q3ListViewItem* );
 
   private slots:
     void createList();
     void editList();
     void removeList();
     void addContact();
@@ -117,13 +122,13 @@ class EmailSelector : public KDialogBase
     QString selected();
 
     static QString getEmail( const QStringList &emails, const QString &current,
         QWidget *parent );
 
   private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
 
 
 #ifdef KAB_EMBEDDED
 class DistributionListFactory : public ExtensionFactory
 {
diff --git a/kaddressbook/features/mergewidget.cpp b/kaddressbook/features/mergewidget.cpp
index 2476e42..1becc2f 100644
--- a/kaddressbook/features/mergewidget.cpp
+++ b/kaddressbook/features/mergewidget.cpp
@@ -20,12 +20,14 @@
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #endif //KAB_EMBEDDED
 
 #include <kdebug.h>
@@ -60,17 +62,17 @@ extern "C" {
   {
     return ( new MergeFactory );
   }
 }
 #endif //KAB_EMBEDDED
 
-class ContactItem : public QListViewItem
+class ContactItem : public Q3ListViewItem
 {
   public:
     ContactItem( KListView *parent, const KABC::Addressee &addressee )
-      : QListViewItem( parent ), mAddressee( addressee )
+      : Q3ListViewItem( parent ), mAddressee( addressee )
     {
       KABC::Field::List fieldList = KABC::Field::defaultFields();
       KABC::Field::List::ConstIterator it;
 
       int i = 0;
       for ( it = fieldList.begin(); it != fieldList.end(); ++it )
@@ -91,13 +93,13 @@ MergeWidget::MergeWidget( KABCore *core, QWidget *parent, const char *name )
 {
 #ifdef KAB_EMBEDDED
   if (KGlobal::getOrientation() == KGlobal::Portrait)
     parent->setMaximumSize( KGlobal::getDesktopWidth() , 180);
 #endif //KAB_EMBEDDED
   
-  QGridLayout *topLayout = new QGridLayout( this, 3, 2, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 3, 2, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
   mContactView = new KListView( this );
   KABC::Field::List fieldList = KABC::Field::defaultFields();
   KABC::Field::List::ConstIterator it;
 
@@ -211,13 +213,13 @@ void MergeWidget::mergeAndRemove()
 
   KABC::Addressee::List retval;
   retval << mMasterAddressee;
   emit modified( retval );
 
   mBlockUpdate = true;
-  core()->deleteContacts( oldUID );
+  core()->deleteContacts( QStringList(oldUID) );
   core()->setContactSelected( mMasterAddressee.uid() );
   mBlockUpdate = false;
 
   updateView();
 }
 
@@ -366,9 +368,9 @@ void MergeWidget::doMerge( const KABC::Addressee &addr )
   for ( it = customs.begin(); it != customs.end(); ++it )
     if ( !masterCustoms.contains( *it ) )
       newCustoms.append( *it );
   mMasterAddressee.setCustoms( newCustoms );
 }
 
-#ifndef KAB_EMBEDDED
-#include "mergewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_mergewidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/features/mergewidget.h b/kaddressbook/features/mergewidget.h
index 1063c80..bb16282 100644
--- a/kaddressbook/features/mergewidget.h
+++ b/kaddressbook/features/mergewidget.h
@@ -26,13 +26,13 @@
 
 #include <kdialogbase.h>
 #include <klistview.h>
 
 #include "extensionwidget.h"
 
-class QListView;
+class Q3ListView;
 
 class KABCore;
 
 namespace KABC {
 class AddressBook;
 }
diff --git a/kaddressbook/filter.cpp b/kaddressbook/filter.cpp
index 12ab1e3..6462310 100644
--- a/kaddressbook/filter.cpp
+++ b/kaddressbook/filter.cpp
@@ -215,13 +215,13 @@ Filter::List Filter::restore( KConfig *config, QString baseGroup )
       QStringList cats = KABPrefs::instance()->mCustomCategories;
       for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
           Filter filter; 
           filter.noName = false;
           filter.mName = *it;
           filter.mEnabled = true;
-          filter.mCategoryList = *it;
+          filter.mCategoryList = QStringList(*it);
           filter.mMatchRule = Matching;
           filter.mInternal = true;
           list.append( filter );
       }
   }
   return list;
diff --git a/kaddressbook/filter.h b/kaddressbook/filter.h
index f4ae123..508436d 100644
--- a/kaddressbook/filter.h
+++ b/kaddressbook/filter.h
@@ -23,13 +23,13 @@
 
 #ifndef FILTER_H
 #define FILTER_H
 
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include <kabc/addressee.h>
 #include <kconfig.h>
 
 /**
   Filter for AddressBook related objects (Addressees)
@@ -39,13 +39,13 @@
 class Filter
 {
   public: 
     enum { ShowPublic = 1, ShowPrivate = 2, ShowConfidential = 4 };
      void setCriteria(int c) { mCriteria = c ;}
     int criteria() const { return mCriteria;}
-    typedef QValueList<Filter> List;
+    typedef Q3ValueList<Filter> List;
     
     enum MatchRule { Matching = 0, NotMatching = 1 };
 
     Filter();
     Filter( const QString& name );
     ~Filter();
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index ef9b979..40698a7 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -25,24 +25,26 @@
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
-#include <qbuttongroup.h>
-#include <qhbox.h>
+#include <q3buttongroup.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
@@ -61,29 +63,29 @@ FilterEditDialog::FilterEditDialog( QWidget *parent, const char *name )
   initGUI();
 
   QStringList cats = KABPrefs::instance()->mCustomCategories;
 
   QStringList::Iterator iter;
   for ( iter = cats.begin(); iter != cats.end(); ++iter )
-    mCategoriesView->insertItem( new QCheckListItem( mCategoriesView, (*iter), QCheckListItem::CheckBox ) );
+    mCategoriesView->insertItem( new Q3CheckListItem( mCategoriesView, (*iter), Q3CheckListItem::CheckBox ) );
   filterNameTextChanged( mNameEdit->text() );
 }
 
 FilterEditDialog::~FilterEditDialog()
 {
 }
 
 void FilterEditDialog::setFilter( const Filter &filter )
 {
   mNameEdit->setText( filter.name() );
 
   QStringList categories = filter.categories();
-  QListViewItem *item = mCategoriesView->firstChild();
+  Q3ListViewItem *item = mCategoriesView->firstChild();
   while ( item != 0 ) {
     if ( categories.contains( item->text( 0 ) ) ) {
-      QCheckListItem *checkItem = static_cast<QCheckListItem*>( item );
+      Q3CheckListItem *checkItem = static_cast<Q3CheckListItem*>( item );
       checkItem->setOn( true );
     }
 
     item = item->nextSibling();
   }
 
@@ -102,15 +104,15 @@ Filter FilterEditDialog::filter()
 {
   Filter filter;
 
   filter.setName( mNameEdit->text() );
 
   QStringList categories;
-  QListViewItem *item = mCategoriesView->firstChild();
+  Q3ListViewItem *item = mCategoriesView->firstChild();
   while ( item != 0 ) {
-    QCheckListItem *checkItem = static_cast<QCheckListItem*>( item );
+    Q3CheckListItem *checkItem = static_cast<Q3CheckListItem*>( item );
     if ( checkItem->isOn() )
       categories.append( item->text( 0 ) );
 
     item = item->nextSibling();
   }
   filter.setCategories( categories );
@@ -138,13 +140,13 @@ void FilterEditDialog::initGUI()
 #endif //KAB_EMBEDDED  
   
 
   QWidget *page = plainPage();
   QLabel *label;
 
-  QGridLayout *topLayout = new QGridLayout( page, 3, 2, 0, spacingHint() );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 3, 2, 0, spacingHint() );
 
   label = new QLabel( i18n( "Name" ), page );
   mNameEdit = new KLineEdit( page );
   mNameEdit->setFocus();
   topLayout->addWidget( label, 0, 0 );
   topLayout->addWidget( mNameEdit, 0, 1 );
@@ -152,22 +154,22 @@ void FilterEditDialog::initGUI()
            SLOT( filterNameTextChanged( const QString&) ) );
 
   mCategoriesView = new KListView( page );
   mCategoriesView->addColumn( i18n( "Categories" ) );
   topLayout->addMultiCellWidget( mCategoriesView, 1, 1, 0, 1 );
 
-  mMatchRuleGroup = new QHButtonGroup( i18n( "Category rule" ), page );
+  mMatchRuleGroup = new Q3HButtonGroup( i18n( "Category rule" ), page );
   mMatchRuleGroup->setExclusive( true );
   QRadioButton *radio = new QRadioButton( i18n( "Include categories" ), mMatchRuleGroup );
   //mMatchRuleGroup->insert( radio );
   radio = new QRadioButton( i18n( "Exclude categories" ), mMatchRuleGroup );
   radio->setChecked( true );
   //mMatchRuleGroup->insert( radio );
   topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 );
 
-  QHButtonGroup * mMatchPPCGroup = new QHButtonGroup(i18n( "Include contacts, that are:" ), page );
+  Q3HButtonGroup * mMatchPPCGroup = new Q3HButtonGroup(i18n( "Include contacts, that are:" ), page );
   mPublic = new QCheckBox( i18n( "public" ), mMatchPPCGroup );
   mPrivate = new QCheckBox( i18n( "private" ), mMatchPPCGroup );
   mConfidential = new QCheckBox( i18n( "confidential" ), mMatchPPCGroup );
   mPublic->setChecked( true );
   mPrivate->setChecked( true );
   mConfidential->setChecked( true );
@@ -269,13 +271,13 @@ void FilterDialog::refresh()
 
   Filter::List::Iterator iter;
   for ( iter = mFilterList.begin(); iter != mFilterList.end(); ++iter )
     mFilterListBox->insertItem( (*iter).name() );
 }
 
-void FilterDialog::selectionChanged( QListBoxItem *item )
+void FilterDialog::selectionChanged( Q3ListBoxItem *item )
 {
   bool state = ( item != 0 );
 
   mEditButton->setEnabled( state );
   mRemoveButton->setEnabled( state );
 }
@@ -287,29 +289,29 @@ void FilterDialog::initGUI()
 #else //KAB_EMBEDDED  
   resize( KMIN(KGlobal::getDesktopWidth()-10, 330), KMIN(KGlobal::getDesktopHeight()-50, 200));
 #endif //KAB_EMBEDDED  
 
   QWidget *page = plainPage();
 
-  QGridLayout *topLayout = new QGridLayout( page, 1, 2, 0, spacingHint() );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 1, 2, 0, spacingHint() );
 
   mFilterListBox = new KListBox( page );
   topLayout->addWidget( mFilterListBox, 0, 0 );
-  connect( mFilterListBox, SIGNAL( selectionChanged( QListBoxItem * ) ),
-           SLOT( selectionChanged( QListBoxItem * ) ) );
-  connect( mFilterListBox, SIGNAL( doubleClicked ( QListBoxItem * ) ),
+  connect( mFilterListBox, SIGNAL( selectionChanged( Q3ListBoxItem * ) ),
+           SLOT( selectionChanged( Q3ListBoxItem * ) ) );
+  connect( mFilterListBox, SIGNAL( doubleClicked ( Q3ListBoxItem * ) ),
            SLOT( edit() ) );
 
-  KButtonBox *buttonBox = new KButtonBox( page, Vertical );
+  KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
   buttonBox->addButton( i18n( "&Add..." ), this, SLOT( add() ) );
   mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, SLOT( edit() ) );
   mEditButton->setEnabled( false );
   mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
 
   buttonBox->layout();
   topLayout->addWidget( buttonBox, 0, 1 );
 }
 
-#ifndef KAB_EMBEDDED
-#include "filtereditdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_filtereditdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h
index 5a8bad1..64d2976 100644
--- a/kaddressbook/filtereditdialog.h
+++ b/kaddressbook/filtereditdialog.h
@@ -28,25 +28,24 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef FILTEREDITDIALOG_H
 #define FILTEREDITDIALOG_H
 
-class QButtonGroup;
+#include <Q3HButtonGroup>
 class QString;
 class QToolButton;
 class QWidget;
-class QListBoxItem;
+class Q3ListBoxItem;
 class QCheckBox;
 
 class KLineEdit;
 class KListBox;
 class KListView;
 
 #include <kdialogbase.h>
-#include <qhbuttongroup.h>
 
 #include "filter.h"
 
 class FilterDialog : public KDialogBase
 {
   Q_OBJECT
@@ -59,13 +58,13 @@ class FilterDialog : public KDialogBase
     Filter::List filters() const;
 
   protected slots:
     void add();
     void edit();
     void remove();
-    void selectionChanged( QListBoxItem* );
+    void selectionChanged( Q3ListBoxItem* );
 
   private:
     void initGUI();
     void refresh();
 
     Filter::List mFilterList;
@@ -95,13 +94,13 @@ class FilterEditDialog : public KDialogBase
     void initGUI();
 
     Filter mFilter;
 
     KLineEdit *mNameEdit;
     KListView *mCategoriesView;
-    QHButtonGroup *mMatchRuleGroup;
+    Q3HButtonGroup *mMatchRuleGroup;
     QCheckBox *mPrivate;
     QCheckBox *mPublic;
     QCheckBox *mConfidential;
     QPushButton *mEditButton;
     QPushButton *mRemoveButton;
 };
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 13cd084..caff3b2 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -24,30 +24,37 @@
 #include <kabc/geo.h>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #else //KAB_EMBEDDED
 
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <QPaintEvent>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <QMouseEvent>
 #include <kglobal.h>
 #endif //KAB_EMBEDDED
 
+#include <QDesktopWidget>
+
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
 #include <qcheckbox.h>
 #include <qfile.h>
 #include <qapplication.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <stdlib.h>
@@ -56,23 +63,23 @@
 
 GeoWidget::GeoWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QLabel *label = 0;
 
-  QGridLayout *topLayout = new QGridLayout( this, 4, 3 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 4, 3 );
   topLayout->setMargin( KDialog::marginHint() );
   topLayout->setSpacing( KDialog::spacingHint() );
 
   label = new QLabel( this );
 //US ambiguous call to loadIcon. Add an additional parameter  
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, 0 ) );
   label->setAlignment( Qt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 3, 0, 0 );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
   mGeoIsValid = new QCheckBox( i18n( "Use geo data" ), this );
   topLayout->addMultiCellWidget( mGeoIsValid, 0, 0, 1, 2 );
 
   label = new QLabel( i18n( "Latitude:" ), this );
   topLayout->addWidget( label, 1, 1 );
 
@@ -164,22 +171,22 @@ void GeoWidget::editGeoData()
 
 GeoDialog::GeoDialog( QWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Geo Data Input" ), Ok | Cancel, Ok,
                  parent, name, true, true ),
     mUpdateSexagesimalInput( true )
 {
-  QFrame *page = plainPage();
+  Q3Frame *page = plainPage();
 
-  QGridLayout *topLayout = new QGridLayout( page, 1, 1, marginHintSmall(),
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 1, 1, marginHintSmall(),
                                             spacingHint() );
   //topLayout->setRowStretch( 1, 1 );
 
   mMapWidget = new GeoMapWidget( page );
   mCityCombo = new KComboBox( page );
-  QGroupBox *sexagesimalGroup = new QGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page );
-  QGridLayout *sexagesimalLayout = new QGridLayout( sexagesimalGroup->layout(),
+  Q3GroupBox *sexagesimalGroup = new Q3GroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
+  Q3GridLayout *sexagesimalLayout = new Q3GridLayout( sexagesimalGroup->layout(),
                                                     2, 5, spacingHint() );
   QLabel *label;
   if ( QApplication::desktop()->width() < 320 ) {
       label = new QLabel( i18n( "La." ), sexagesimalGroup );
       sexagesimalLayout->setSpacing ( spacingHintSmall() );
       sexagesimalLayout->setMargin ( marginHintSmall() );
@@ -426,14 +433,14 @@ void GeoDialog::loadCityList()
     fileName = getenv("QPEDIR");
     fileName += "/pics/kdepim/kaddressbook/zone.tab";
 #endif
 
     QFile file( fileName);
     
-  if ( file.open( IO_ReadOnly ) ) {
-    QTextStream s( &file );
+  if ( file.open( QIODevice::ReadOnly ) ) {
+    Q3TextStream s( &file );
 
     QString line, country;
     QRegExp coord( "[+-]\\d+[+-]\\d+" );
     QRegExp name( "[^\\s]+/[^\\s]+" );
     int posc, posn, pos;
 
@@ -549,13 +556,13 @@ int GeoDialog::nearestCity( double x, double y )
 }
 
 
 GeoMapWidget::GeoMapWidget( QWidget *parent, const char *name )
   : QWidget( parent, name ), mLatitude( 0 ), mLongitude( 0 )
 {
-  setBackgroundMode( NoBackground );
+  setBackgroundMode( Qt::NoBackground );
 
   setFixedSize( 240, 120 );
 
   update();
 }
 
@@ -621,9 +628,9 @@ void GeoMapWidget::paintEvent( QPaintEvent* )
   p.drawEllipse( x, y, 4, 4 );
 
   p.end();
   bitBlt( this, 0, 0, &world );
 }
 
-#ifndef KAB_EMBEDDED
-#include "geowidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_geowidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index 3d39691..5b64370 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -24,12 +24,16 @@
 #ifndef GEOWIDGET_H
 #define GEOWIDGET_H
 
 #include <qmap.h>
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPaintEvent>
 #include <kdialogbase.h>
 
 namespace KABC {
 class Geo;
 }
 
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index eec5e08..6ecf66d 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -34,80 +34,84 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <kurl.h>
 
 #include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 
 #include "imagewidget.h"
 
 ImageWidget::ImageWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2, 1, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2, 1, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
-  QGroupBox *photoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
-  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 3, 2,
+  Q3GroupBox *photoBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
+  Q3GridLayout *boxLayout = new Q3GridLayout( photoBox->layout(), 3, 2,
                                             KDialog::spacingHint() );
   boxLayout->setRowStretch( 2, 1 );
 
   mPhotoLabel = new QLabel( photoBox );
   int fac = 9;
   if ( QApplication::desktop()->width() > 320 )
       fac = 6;
   mPhotoLabel->setFixedSize( 50*9/fac, 70*9/fac );
   mPhotoLabel->setScaledContents( true );
-  mPhotoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+  mPhotoLabel->setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken );
   boxLayout->addMultiCellWidget( mPhotoLabel, 0, 3, 0, 0 );
 
   mPhotoUrl = new KURLRequester( photoBox );
 #ifndef KAB_EMBEDDED  
   mPhotoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined. Does this harm ???");
 #endif //KAB_EMBEDDED  
   
   
   boxLayout->addWidget( mPhotoUrl, 0, 1 );
-  QHBox *hb1 = new QHBox ( photoBox );
+  Q3HBox *hb1 = new Q3HBox ( photoBox );
   mUsePhotoUrl = new QCheckBox( i18n( "Store as URL" ), hb1 );
   mUsePhotoUrl->setEnabled( false );
   boxLayout->addWidget( hb1, 1, 1 );
 
   QPushButton * pb = new QPushButton( i18n( "Remove" ), hb1 );
   connect( pb, SIGNAL( clicked() ),this, SLOT( removePhoto() ) );
   boxLayout->addWidget( new QLabel(  photoBox ), 2, 1 );
 
   topLayout->addWidget( photoBox, 0, 0 );
 
-  QGroupBox *logoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
-  boxLayout = new QGridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
+  Q3GroupBox *logoBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
+  boxLayout = new Q3GridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
   boxLayout->setRowStretch( 2, 1 );
 
   mLogoLabel = new QLabel( logoBox );
   mLogoLabel->setFixedSize( 50*9/fac, 70*9/fac );
   mLogoLabel->setScaledContents( true );
-  mLogoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+  mLogoLabel->setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken );
   boxLayout->addMultiCellWidget( mLogoLabel, 0, 3, 0, 0 );
 
   mLogoUrl = new KURLRequester( logoBox );
 #ifndef KAB_EMBEDDED  
   mLogoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined 2");
 #endif //KAB_EMBEDDED  
   boxLayout->addWidget( mLogoUrl, 0, 1 );
   
-  QHBox *hb2 = new QHBox ( logoBox );
+  Q3HBox *hb2 = new Q3HBox ( logoBox );
   mUseLogoUrl = new QCheckBox( i18n( "Store as URL" ), hb2 );
   mUseLogoUrl->setEnabled( false );
   boxLayout->addWidget( hb2, 1, 1 );
 
    pb = new QPushButton( i18n( "Remove" ), hb2 );
   connect( pb, SIGNAL( clicked() ),this, SLOT( removeLogo() ) );
@@ -177,13 +181,13 @@ KABC::Picture ImageWidget::photo() const
 {
   KABC::Picture photo;
 
   if ( mUsePhotoUrl->isChecked() )
     photo.setUrl( mPhotoUrl->url() );
   else {
-    QPixmap *px = mPhotoLabel->pixmap();
+    const QPixmap *px = mPhotoLabel->pixmap();
     if ( px ) {
 #ifndef KAB_EMBEDDED  
       if ( px->height() > px->width() )
         photo.setData( px->convertToImage().scaleHeight( 140 ) );
       else
         photo.setData( px->convertToImage().scaleWidth( 100 ) );
@@ -229,13 +233,13 @@ KABC::Picture ImageWidget::logo() const
 {
   KABC::Picture logo;
 
   if ( mUseLogoUrl->isChecked() )
     logo.setUrl( mLogoUrl->url() );
   else {
-    QPixmap *px = mLogoLabel->pixmap();
+    const QPixmap *px = mLogoLabel->pixmap();
     if ( px ) {
 #ifndef KAB_EMBEDDED  
       if ( px->height() > px->width() )
         logo.setData( px->convertToImage().scaleHeight( 140 ) );
       else
         logo.setData( px->convertToImage().scaleWidth( 100 ) );
@@ -289,9 +293,9 @@ QPixmap ImageWidget::loadPixmap( const QString &url )
   if ( url.isEmpty() )
     return pixmap;
   pixmap.load( url );
   return pixmap;
 }
 
-#ifndef KAB_EMBEDDED
-#include "imagewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_imagewidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index bbfba58..9320a6b 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -22,12 +22,15 @@
 */                                                                      
 
 #ifndef IMAGEWIDGET_H
 #define IMAGEWIDGET_H
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QLabel>
 
 #include <kabc/picture.h>
 #include <kdialogbase.h>
 
 class KURL;
 class KURLRequester;
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 5f8b83d..a54d1cd 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -22,35 +22,39 @@
 */
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qcombobox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
 
 #include <kdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kglobal.h>
 #include "kabprefs.h"
 
 #include "incsearchwidget.h"
 
 IncSearchWidget::IncSearchWidget( QWidget *parent, const char *name )
-    : QWidget( parent, name )
 {
+    setObjectName(name);
+    setParent(parent);
 #ifndef KAB_EMBEDDED
 //US  setCaption( i18n( "Incremental Search" ) );
 #endif //KAB_EMBEDDED
 
-  QHBoxLayout *layout = new QHBoxLayout( this, 2, KDialog::spacingHint() );
+  Q3HBoxLayout *layout = new Q3HBoxLayout( this, 2, KDialog::spacingHint() );
 
 #ifdef DESKTOP_VERSION
   QLabel *label = new QLabel( i18n( "Search:" ), this );
-  label->setAlignment( QLabel::AlignVCenter | QLabel::AlignRight );
+  label->setAlignment( Qt::AlignVCenter | Qt::AlignRight );
   layout->addWidget( label );
 #endif //KAB_EMBEDDED
 
   mSearchText = new KLineEdit( this );
   layout->addWidget( mSearchText );
 // #ifdef KAB_EMBEDDED
@@ -173,9 +177,9 @@ void IncSearchWidget::setCurrentItem( int pos )
 
 int IncSearchWidget::currentItem() const
 {
   
   return mFieldCombo->currentItem();
 }
-#ifndef KAB_EMBEDDED
-#include "incsearchwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_incsearchwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index aebf8a6..740b7db 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -22,14 +22,17 @@
 */                                                                      
 
 #include <qevent.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qstring.h>
-#include <qtl.h>
+#include <q3tl.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kabc/addressbook.h>
 #include <kabc/field.h>
 #include <kdebug.h>
 #include <klocale.h>
 
@@ -70,15 +73,15 @@ QString JumpButton::character() const
 
 JumpButtonBar::JumpButtonBar( KABCore *core, QWidget *parent, const char *name )
   : QWidget( parent, name ), mCore( core )
 {
     if ( QApplication::desktop()->width() < 480 )
         
-        mButtonLayout = new QGridLayout( this,  1, 18 );
+        mButtonLayout = new Q3GridLayout( this,  1, 18 );
     else
-        mButtonLayout = new QGridLayout( this,  1, 20 );
+        mButtonLayout = new Q3GridLayout( this,  1, 20 );
   mButtonLayout->setAlignment( Qt::AlignTop );
 
   recreateButtons();
 }
 
 JumpButtonBar::~JumpButtonBar()
@@ -249,9 +252,9 @@ void JumpButtonBar::sortListLocaleAware( QStringList &list )
     }
     ++beginIt;
     --walkBackIt;
   }
 }
 
-#ifndef KAB_EMBEDDED
-#include "jumpbuttonbar.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_jumpbuttonbar.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h
index d534f2b..0589812 100644
--- a/kaddressbook/jumpbuttonbar.h
+++ b/kaddressbook/jumpbuttonbar.h
@@ -23,17 +23,20 @@
 
 #ifndef JUMPBUTTONBAR_H
 #define JUMPBUTTONBAR_H
 
 #include <qsizepolicy.h>
 #include <qwidget.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3GridLayout>
 
 class QChar;
-class QGridLayout;
+class Q3GridLayout;
 class QResizeEvent;
 class QPushButton;
 class JumpButton;
 
 namespace KABC {
 class Field;
@@ -73,12 +76,12 @@ class JumpButtonBar : public QWidget
 
   private:
     void sortListLocaleAware( QStringList &list );
 
     KABCore *mCore;
 
-    QGridLayout *mButtonLayout;
+    Q3GridLayout *mButtonLayout;
     QStringList mCharacters;
-    QPtrList<JumpButton> mButtons;
+    Q3PtrList<JumpButton> mButtons;
 };
 
 #endif
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index ab2824c..03b44d1 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -36,24 +36,34 @@ $Id$
 #include <qtimer.h>
 #include <qlabel.h>
 #include <qregexp.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QPixmap>
+#include <Q3ValueList>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <Q3CString>
+#include <Q3PopupMenu>
+#include <Q3PtrList>
 #include <libkdepim/phoneaccess.h>
 
 #ifndef KAB_EMBEDDED
 #include <qclipboard.h>
 #include <qdir.h> 
 #include <qfile.h>
 #include <qapplicaton.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qlayout.h>
 #include <qregexp.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <kabc/addresseelist.h>
 #include <kabc/errorhandler.h>
 #include <kabc/resource.h>
 #include <kabc/vcardconverter.h>
 #include <kapplication.h>
 #include <kactionclasses.h>
@@ -85,13 +95,13 @@ $Id$
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #include "addresseedialog.h"
 //US
 #include <addresseeview.h>
 
-#include <qapp.h>
+#include <qapplication.h>
 #include <qmenubar.h>
 //#include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h> // needed for SmallIcon
 #include <kresources/kcmkresources.h>
@@ -126,18 +136,18 @@ $Id$
 #include <resource.h>
 
 //US#include <qsplitter.h>
 #include <qmap.h>
 #include <qdir.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qlayout.h>
 #include <qclipboard.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/categoryeditdialog.h>
 #include <kabc/vcardconverter.h>
 
 
@@ -172,18 +182,18 @@ class KABCatPrefs : public QDialog
 {
   public:
     KABCatPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Manage new Categories") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n "), this );
         lay->addWidget( lab ); 
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("New categories not in list:"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         addCatBut = new QRadioButton(i18n("Add to category list"), format );
         new QRadioButton(i18n("Remove from addressees"), format );
         addCatBut->setChecked( true );
         QPushButton * ok = new QPushButton( i18n("OK"), this );
@@ -204,18 +214,18 @@ class KABFormatPrefs : public QDialog
 {
   public:
     KABFormatPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Set formatted name") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("You can set the formatted name\nfor a list of contacts in one go."), this );
         lay->addWidget( lab ); 
-        QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Set formatted name to:"), this );
+        Q3ButtonGroup* format = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Set formatted name to:"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         simple = new QRadioButton(i18n("Simple: James Bond"), format );
         full = new QRadioButton(i18n("Full: Mr. James 007 Bond I"), format );
         reverse = new QRadioButton(i18n("Reverse: Bond, James"), format );
         company = new QRadioButton(i18n("Organization: MI6"), format );
@@ -242,35 +252,35 @@ class KAex2phonePrefs : public QDialog
 {
   public:
     KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
-        lab->setAlignment (AlignHCenter  ); 
-        QHBox* temphb;
-        temphb = new QHBox( this );
+        lab->setAlignment (Qt::AlignHCenter  ); 
+        Q3HBox* temphb;
+        temphb = new Q3HBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
         new QLabel( i18n("Connection: "), temphb ); 
         mPhoneConnection = new QLineEdit( temphb);
         lay->addWidget( temphb );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
         new QLabel( i18n("Model(opt.): "), temphb ); 
         mPhoneModel = new QLineEdit( temphb);
         lay->addWidget( temphb );
         // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this );
         // lay->addWidget( mWriteToSim );
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) );  
-        lab->setAlignment (AlignHCenter); 
+        lab->setAlignment (Qt::AlignHCenter); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
@@ -404,13 +414,13 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   //toggleBeamReceive( );
   mMainWindow->toolBar()->show();
   // we have a toolbar repainting error on the Zaurus when starting KA/Pi
   //QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
     QTimer::singleShot( 100, this, SLOT ( loadDataAfterStart() ));
 }
-void KABCore::receiveStart( const QCString& cmsg, const QByteArray& data )
+void KABCore::receiveStart( const Q3CString& cmsg, const QByteArray& data )
 {
     //qDebug("KO: QCOP start message received: %s ", cmsg.data()  );
     mCStringMess = cmsg;
     mByteData = data;
 }
 
@@ -418,15 +428,15 @@ void  KABCore::loadDataAfterStart()
 {
     //qDebug("KABCore::loadDataAfterStart() ");
     ((StdAddressBook*)mAddressBook)->init( true );
         mViewManager->refreshView();
 
 #ifndef DESKTOP_VERSION  
-        disconnect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT (receiveStart ( const QCString &, const QByteArray & )));
+        disconnect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT (receiveStart ( const Q3CString &, const QByteArray & )));
         
-      QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
+      QObject::connect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const Q3CString &, const QByteArray & )));
       if ( !mCStringMess.isEmpty() ) 
           ExternalAppHandler::instance()->appMessage( mCStringMess, mByteData );
 #endif
       // QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
     setCaptionBack();
 }
@@ -450,17 +460,17 @@ KABCore::~KABCore()
     delete syncManager;
 #ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
 #endif
 }
-void KABCore::receive( const QCString& cmsg, const QByteArray& data )
+void KABCore::receive( const Q3CString& cmsg, const QByteArray& data )
 {
     //qDebug("KA: QCOP message received: %s ", cmsg.data()  );
     if ( cmsg == "setDocument(QString)" ) {
-        QDataStream stream( data, IO_ReadOnly );
+        QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
         QString fileName;
         stream >> fileName;
         recieve( fileName );
         return;
     }
 }
@@ -477,13 +487,13 @@ void KABCore::toggleBeamReceive( )
         return;
     } 
     qDebug("KA: AB enable BeamReceive ");
     mActionBR->setChecked(true);
 
     infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ;   
-    QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive(  const QCString&, const QByteArray& )));
+    QObject::connect( infrared, SIGNAL (received ( const Q3CString &, const QByteArray & )),this, SLOT(receive(  const Q3CString&, const QByteArray& )));
 #endif
 }
 
 
 void KABCore::disableBR(bool b)
 {
@@ -557,13 +567,13 @@ void KABCore::restoreSettings()
       wid = 400;
 #else
   int wid = QApplication::desktop()->width();
   if ( wid < 640 )
       wid = QApplication::desktop()->height();
 #endif
-  QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
+  Q3ValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
   if ( true /*splitterSize.count() == 0*/ ) {
       splitterSize.append( wid / 2 );
       splitterSize.append( wid / 2 );
   }
   mMiniSplitter->setSizes( splitterSize );
   if (  mExtensionBarSplitter ) {
@@ -647,16 +657,16 @@ QStringList KABCore::selectedUIDs() const
 {
   return mViewManager->selectedUids();
 }
 
 KABC::Resource *KABCore::requestResource( QWidget *parent )
 {
-  QPtrList<KABC::Resource> kabcResources = addressBook()->resources();
+  Q3PtrList<KABC::Resource> kabcResources = addressBook()->resources();
 
-  QPtrList<KRES::Resource> kresResources;
-  QPtrListIterator<KABC::Resource> resIt( kabcResources );
+  Q3PtrList<KRES::Resource> kresResources;
+  Q3PtrListIterator<KABC::Resource> resIt( kabcResources );
   KABC::Resource *resource;
   while ( ( resource = resIt.current() ) != 0 ) {
     ++resIt;
     if ( !resource->readOnly() ) {
       KRES::Resource *res = static_cast<KRES::Resource*>( resource );
       if ( res )
@@ -792,20 +802,20 @@ void KABCore::mailVCard( const QStringList& uids )
     QString name = a.givenName() + "_" + a.familyName() + ".vcf";
 
     QString fileName = dirName + "/" + name;
 
     QFile outFile(fileName);
 
-    if ( outFile.open(IO_WriteOnly) ) {  // file opened successfully
+    if ( outFile.open(QIODevice::WriteOnly) ) {  // file opened successfully
       KABC::VCardConverter converter;
       QString vcard;
 
       converter.addresseeToVCard( a, vcard );
 
-      QTextStream t( &outFile );  // use a text stream
-      t.setEncoding( QTextStream::UnicodeUTF8 );
+      Q3TextStream t( &outFile );  // use a text stream
+      t.setEncoding( Q3TextStream::UnicodeUTF8 );
       t << vcard;
 
       outFile.close();
 
       urls.append( fileName );
     }
@@ -1013,17 +1023,17 @@ void KABCore::beamVCard(const QStringList& uids)
           start = sep;
       }
       datastream += vcard.mid( start,vcard.length() );
   }
 #ifndef DESKTOP_VERSION
   QFile outFile(fileName);
-  if ( outFile.open(IO_WriteOnly) ) { 
+  if ( outFile.open(QIODevice::WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
-      QTextStream t( &outFile );  // use a text stream
+      Q3TextStream t( &outFile );  // use a text stream
       //t.setEncoding( QTextStream::UnicodeUTF8 );
-      t.setEncoding( QTextStream::Latin1 );
+      t.setEncoding( Q3TextStream::Latin1 );
       t <<datastream.latin1();
       outFile.close();
       Ir *ir = new Ir( this );
       connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
       ir->send( fileName, description, "text/x-vCard" );
   } else {
@@ -1294,16 +1304,16 @@ void KABCore::addrModified( const KABC::Addressee &addr ,bool updateDetails )
 }
 
 void KABCore::newContact()
 {
 
 
-  QPtrList<KABC::Resource> kabcResources = mAddressBook->resources();
+  Q3PtrList<KABC::Resource> kabcResources = mAddressBook->resources();
 
-  QPtrList<KRES::Resource> kresResources;
-  QPtrListIterator<KABC::Resource> it( kabcResources );
+  Q3PtrList<KRES::Resource> kresResources;
+  Q3PtrListIterator<KABC::Resource> it( kabcResources );
   KABC::Resource *resource;
   while ( ( resource = it.current() ) != 0 ) {
     ++it;
     if ( !resource->readOnly() ) {
       KRES::Resource *res = static_cast<KRES::Resource*>( resource );
       if ( res )
@@ -1853,21 +1863,21 @@ void KABCore::slotEditorDestroyed( const QString &uid )
     //mEditorDict.remove( uid );
 }
 
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
-  QHBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3HBoxLayout *topLayout = new Q3HBoxLayout( this );
   topLayout->setSpacing( KDialogBase::spacingHint() );
 
   mExtensionBarSplitter = new QSplitter( this );
   mExtensionBarSplitter->setOrientation( Qt::Vertical );
 
   mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
 
-  QVBox *viewSpace = new QVBox( mDetailsSplitter );
+  Q3VBox *viewSpace = new Q3VBox( mDetailsSplitter );
   mIncSearchWidget = new IncSearchWidget( viewSpace );
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
@@ -1885,34 +1895,34 @@ void KABCore::initGUI()
 
   mXXPortManager = new XXPortManager( this, this );
 
 #else //KAB_EMBEDDED
   //US initialize viewMenu before settingup viewmanager.
   //  Viewmanager needs this menu to plugin submenues.
-  viewMenu = new QPopupMenu( this );
-  settingsMenu = new QPopupMenu( this );
+  viewMenu = new Q3PopupMenu( this );
+  settingsMenu = new Q3PopupMenu( this );
   //filterMenu = new QPopupMenu( this );
-  ImportMenu = new QPopupMenu( this );
-  ExportMenu = new QPopupMenu( this );
-  syncMenu = new QPopupMenu( this );
-  changeMenu= new QPopupMenu( this );
-  beamMenu= new QPopupMenu( this );
+  ImportMenu = new Q3PopupMenu( this );
+  ExportMenu = new Q3PopupMenu( this );
+  syncMenu = new Q3PopupMenu( this );
+  changeMenu= new Q3PopupMenu( this );
+  beamMenu= new Q3PopupMenu( this );
 
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
 
-  QBoxLayout *topLayout;
+  Q3BoxLayout *topLayout;
 
   // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
 
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 
 #ifdef DESKTOP_VERSION
-  topLayout = new QHBoxLayout( this );
+  topLayout = new Q3HBoxLayout( this );
 
 
   mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
   topLayout->addWidget(mMiniSplitter );
@@ -1921,18 +1931,18 @@ void KABCore::initGUI()
   mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   mViewManager = new ViewManager( this, mExtensionBarSplitter  );
   mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
   if ( QApplication::desktop()->width() > 480 ) {
-      topLayout = new QHBoxLayout( this );
+      topLayout = new Q3HBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   } else {
 
-      topLayout = new QHBoxLayout( this );
+      topLayout = new Q3HBoxLayout( this );
       mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
       mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
   }
 
   topLayout->addWidget(mMiniSplitter );
   mViewManager = new ViewManager( this,  mMiniSplitter );
@@ -2031,23 +2041,23 @@ void KABCore::initActions()
 #endif //KAB_EMBEDDED
 
   // file menu
  
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
     //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
-    mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager,
+    mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", Qt::CTRL + Qt::Key_P, mViewManager,
                  SLOT( printView() ), actionCollection(), "kaddressbook_print" );
   
 
     mActionPrintDetails = new KAction( i18n( "&Print Details" ), "fileprint", 0, mDetails,
                  SLOT( printView() ), actionCollection(), "kaddressbook_print2" );
 
-  mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
+  mActionSave = new KAction( i18n( "&Save" ), "filesave", Qt::CTRL+Qt::Key_S, this,
                              SLOT( save() ), actionCollection(), "file_sync" );
 
-  mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
+  mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", Qt::CTRL+Qt::Key_N, this,
                              SLOT( newContact() ), actionCollection(), "file_new_contact" );
 
   mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                  this, SLOT( mailVCard() ),
                                  actionCollection(), "file_mail_vcard");
 
@@ -2080,41 +2090,41 @@ void KABCore::initActions()
                                       mMainWindow, SLOT( exit() ),
                                       actionCollection(), "quit" );
 #endif //KAB_EMBEDDED
 
   // edit menu
   if ( mIsPart ) {
-    mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
+    mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", Qt::CTRL + Qt::Key_C, this,
                                SLOT( copyContacts() ), actionCollection(),
                                "kaddressbook_copy" );
-    mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this,
+    mActionCut = new KAction( i18n( "Cu&t" ), "editcut", Qt::CTRL + Qt::Key_X, this,
                               SLOT( cutContacts() ), actionCollection(),
                               "kaddressbook_cut" );
-    mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this,
+    mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", Qt::CTRL + Qt::Key_V, this,
                                 SLOT( pasteContacts() ), actionCollection(),
                                 "kaddressbook_paste" );
-    mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this,
+    mActionSelectAll = new KAction( i18n( "Select &All" ), Qt::CTRL + Qt::Key_A, this,
                   SLOT( selectAllContacts() ), actionCollection(),
                  "kaddressbook_select_all" );
-    mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this,
+    mActionUndo = new KAction( i18n( "&Undo" ), "undo", Qt::CTRL + Qt::Key_Z, this,
                                SLOT( undo() ), actionCollection(),
                                "kaddressbook_undo" );
-    mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z,
+    mActionRedo = new KAction( i18n( "Re&do" ), "redo", Qt::CTRL + Qt::SHIFT + Qt::Key_Z,
                                this, SLOT( redo() ), actionCollection(),
                                "kaddressbook_redo" );
   } else {
     mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
     mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
     mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
     mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
     mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
     mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
   }
 
   mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
-                               Key_Delete, this, SLOT( deleteContacts() ),
+                               Qt::Key_Delete, this, SLOT( deleteContacts() ),
                                actionCollection(), "edit_delete" );
 
   mActionUndo->setEnabled( false );
   mActionRedo->setEnabled( false );
 
   // settings menu
@@ -2243,15 +2253,15 @@ void KABCore::initActions()
 // KDE uses a XML format to plug the actions, but we work her without this overhead.
 void KABCore::addActionsManually()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifdef KAB_EMBEDDED
-  QPopupMenu *fileMenu = new QPopupMenu( this );
-  QPopupMenu *editMenu = new QPopupMenu( this );
-  QPopupMenu *helpMenu = new QPopupMenu( this );
+  Q3PopupMenu *fileMenu = new Q3PopupMenu( this );
+  Q3PopupMenu *editMenu = new Q3PopupMenu( this );
+  Q3PopupMenu *helpMenu = new Q3PopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
   mMainWindow->setToolBarsMovable (false ); 
 #ifndef DESKTOP_VERSION
   if ( KABPrefs::instance()->mFullMenuBarVisible ) {
 #endif
@@ -2273,13 +2283,13 @@ void KABCore::addActionsManually()
       mIncSearchWidget = new IncSearchWidget( tb );
       // tb->insertWidget(-1, 0, mIncSearchWidget);
 #ifndef DESKTOP_VERSION
   } else  {
       //US setup toolbar
       QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
-      QPopupMenu *popupBarTB = new QPopupMenu( this );
+      Q3PopupMenu *popupBarTB = new Q3PopupMenu( this );
       menuBarTB->insertItem( SmallIcon( "z_menu" ) , popupBarTB);
       tb->insertWidget(-1, 0, menuBarTB);
       mIncSearchWidget = new IncSearchWidget( tb );
       tb->enableMoving(false);
       popupBarTB->insertItem( i18n("&File"), fileMenu );
       popupBarTB->insertItem( i18n("&Edit"), editMenu );
@@ -2628,13 +2638,13 @@ void KABCore::configureKeyBindings()
 #endif //KAB_EMBEDDED
 }
 
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
-  KRES::KCMKResources dlg( this, "" , 0 );
+  KRES::KCMKResources dlg( this, "" , QStringList() );
 
   if ( !dlg.exec() )
     return;
   KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
@@ -2724,13 +2734,13 @@ void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString
   KABC::AddressBook::Iterator it;
 
     int count = 0;
     for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
         ++count;
     }
-    QProgressBar bar(count,0 );
+    Q3ProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
@@ -2905,13 +2915,13 @@ KABC::Addressee KABCore::getLastSyncAddressee()
         lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 
         QString sum = "";
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
             sum = "E: ";
         lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse.setRevision( mLastAddressbookSync );
-        lse.setCategories( i18n("SyncEvent") );
+        lse.setCategories( QStringList(i18n("SyncEvent")) );
         mAddressBook->insertAddressee( lse );
     }
     return lse;
 }
 int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full )
 {
@@ -3096,13 +3106,13 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             fullDateRange = true;
             Addressee newAdd;
             addresseeRSync = newAdd;
             addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee"));
             addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); 
             addresseeRSync.setRevision( mLastAddressbookSync );
-            addresseeRSync.setCategories( i18n("SyncAddressee") );
+            addresseeRSync.setCategories( QStringList(i18n("SyncAddressee")) );
         }
     }
     if ( addresseeLSync.revision() == mLastAddressbookSync ) {
         // qDebug("FULLDATE 2");
         fullDateRange = true;
     }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ec6a9ec..4351720 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -25,17 +25,21 @@
 #define KABCORE_H
 
 #include <kabc/field.h>
 
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
-#include <qdict.h>
+#include <q3dict.h>
 #include <qtimer.h>
 
 #include <qwidget.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QPixmap>
+#include <QResizeEvent>
 #include <ksyncmanager.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
 
 namespace KABC {
@@ -82,15 +86,15 @@ class KABCore : public QWidget, public KSyncInterface
 
     ~KABCore();
 
 
 #ifdef KAB_EMBEDDED
   //US added functionality
-    QPopupMenu* getViewMenu() {return viewMenu;}
-    QPopupMenu* getFilterMenu() {return filterMenu;}
-    QPopupMenu* getSettingsMenu() {return settingsMenu;}
+    Q3PopupMenu* getViewMenu() {return viewMenu;}
+    Q3PopupMenu* getFilterMenu() {return filterMenu;}
+    Q3PopupMenu* getSettingsMenu() {return settingsMenu;}
     void addActionsManually();
 #endif //KAB_EMBEDDED
     /**
       Restores the global settings.
      */
     void restoreSettings();
@@ -132,14 +136,14 @@ class KABCore : public QWidget, public KSyncInterface
 
 #ifndef KAB_EMBEDDED
     static KAboutData *createAboutData();
 #endif //KAB_EMBEDDED
 
 #ifdef KAB_EMBEDDED
-    inline QPopupMenu* getImportMenu() { return ImportMenu;}
-    inline QPopupMenu* getExportMenu() { return ExportMenu;}
+    inline Q3PopupMenu* getImportMenu() { return ImportMenu;}
+    inline Q3PopupMenu* getExportMenu() { return ExportMenu;}
 #endif //KAB_EMBEDDED
 
   public slots:
 #ifdef KAB_EMBEDDED
     void createAboutData();
 #endif //KAB_EMBEDDED
@@ -363,14 +367,14 @@ class KABCore : public QWidget, public KSyncInterface
    
     void saveSettings();
 
   private slots:
     void updateToolBar();
     void updateMainWindow();
-    void receive( const QCString& cmsg, const QByteArray& data );
-    void receiveStart( const QCString& cmsg, const QByteArray& data );
+    void receive( const Q3CString& cmsg, const QByteArray& data );
+    void receiveStart( const Q3CString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setJumpButtonBar( bool visible );
     void setCaptionBack();
     void resizeAndCallContactdialog();
@@ -391,13 +395,13 @@ class KABCore : public QWidget, public KSyncInterface
 
     void slotEditorDestroyed( const QString &uid );
     void configurationChanged();
     void addressBookChanged();
 
   private:
-    QCString mCStringMess;
+    Q3CString mCStringMess;
     QByteArray mByteData;
     QString mEmailSourceChannel;
     QString mEmailSourceUID;
     void resizeEvent(QResizeEvent* e );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
@@ -483,20 +487,20 @@ class KABCore : public QWidget, public KSyncInterface
     KAction *mActionStorageHowto;
     KAction *mActionKdeSyncHowto;
     KAction *mActionMultiSyncHowto;
 
     KAction *mActionDeleteView;
 
-    QPopupMenu *viewMenu;
-    QPopupMenu *filterMenu;
-    QPopupMenu *settingsMenu;
-    QPopupMenu *changeMenu;
-    QPopupMenu *beamMenu;
+    Q3PopupMenu *viewMenu;
+    Q3PopupMenu *filterMenu;
+    Q3PopupMenu *settingsMenu;
+    Q3PopupMenu *changeMenu;
+    Q3PopupMenu *beamMenu;
 //US    QAction *mActionSave;
-    QPopupMenu *ImportMenu;
-    QPopupMenu *ExportMenu;
+    Q3PopupMenu *ImportMenu;
+    Q3PopupMenu *ExportMenu;
     //LR additional methods
     KAction *mActionRemoveVoice;
     KAction *mActionSetFormattedName;
     KAction * mActionImportOL;
 
 #ifndef KAB_EMBEDDED
@@ -521,13 +525,13 @@ class KABCore : public QWidget, public KSyncInterface
     bool syncPhone();
     void message( QString m , bool startTimer = true);
 
     // LR *******************************
     // sync stuff!
     QString sentSyncFile();
-    QPopupMenu *syncMenu;
+    Q3PopupMenu *syncMenu;
     KSyncManager* syncManager;
     int mGlobalSyncMode; 
     bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
     KABC::Addressee getLastSyncAddressee();
     QDateTime mLastAddressbookSync;
     int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 42d541b..6f9c995 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -22,13 +22,13 @@
 */
 
 //US#ifdef KAB_EMBEDDED
 //#include <qstring.h>
 //#endif //KAB_EMBEDDED
 
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <stdlib.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include <kconfig.h>
@@ -88,13 +88,13 @@ KABPrefs::KABPrefs()
   addItemInt( "CurrentExtension", &mCurrentExtension, 0 );
   addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions );
 
   KPrefs::setCurrentGroup( "Views" );
   QString defaultView = i18n( "Default Table View" );
   addItemString( "CurrentView", &mCurrentView, defaultView );
-  addItemStringList( "ViewNames", &mViewNames, defaultView );
+  addItemStringList( "ViewNames", &mViewNames, QStringList(defaultView) );
 
   KPrefs::setCurrentGroup( "Filters" );
   addItemInt( "CurrentFilter", &mCurrentFilter, 0 );
 
 }
 
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index ddbc0c0..aff725e 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -22,13 +22,15 @@
 */
 
 #ifndef KABPREFS_H
 #define KABPREFS_H
 
 #include <qstringlist.h>
-#include <qdict.h>
+#include <q3dict.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <libkdepim/kpimprefs.h>
 
 class KConfig;
 
 class KABPrefs : public KPimPrefs
@@ -70,14 +72,14 @@ class KABPrefs : public KPimPrefs
     bool mDetailsPageVisible;
     bool mMultipleViewsAtOnce;
     bool mSearchWithReturn;
     bool mAutoSearchWithWildcard;
     bool mHideSearchOnSwitch;
     bool mAskForDelete;
-    QValueList<int> mExtensionsSplitter;
-    QValueList<int> mDetailsSplitter;
+    Q3ValueList<int> mExtensionsSplitter;
+    Q3ValueList<int> mDetailsSplitter;
 
     // Extensions stuff
     int mCurrentExtension;
     QStringList mActiveExtensions;
 
     // Views stuff
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index cd38e5f..4eb1f7f 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -10,46 +10,46 @@ INCLUDEPATH += . ./details  ./features  ./xxport ../libkdepim ../microkde ../mic
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
 
 unix : {
 
 staticlib: {
         TARGET  = kapi_linux
-LIBS += ../bin/libmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
-LIBS += ../bin/libmicrokde.a
-LIBS += ../bin/libmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
-LIBS += ../bin/libmicrokde.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_dir.a
+LIBS += ../bin/libxmicrokdepim.a
+LIBS += ../bin/libxmicrokcal.a
+LIBS += ../bin/libxmicrokabc.a
+LIBS += ../bin/libxmicrokde.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_dir.a
+LIBS += ../bin/libxmicrokdepim.a
+LIBS += ../bin/libxmicrokcal.a
+LIBS += ../bin/libxmicrokabc.a
+LIBS += ../bin/libxmicrokde.a
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 
 } else {
-LIBS += ../bin/libmicrokdepim.so
-LIBS += ../bin/libmicrokde.so
-LIBS += ../bin/libmicrokabc.so
-LIBS += ../bin/libmicrokcal.so
+LIBS += ../bin/libxmicrokdepim.so
+LIBS += ../bin/libxmicrokde.so
+LIBS += ../bin/libxmicrokabc.so
+LIBS += ../bin/libxmicrokcal.so
 #LIBS += -lldap
 }
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_
-LIBS += ../bin/microkdepim.lib
-LIBS += ../bin/microkcal.lib
-LIBS += ../bin/microkde.lib
-LIBS += ../bin/microkabc.lib
+LIBS += ../bin/xmicrokdepim.lib
+LIBS += ../bin/xmicrokcal.lib
+LIBS += ../bin/xmicrokde.lib
+LIBS += ../bin/xmicrokabc.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 importol {
 debug: {
@@ -201,6 +201,8 @@ xxport/qtopia_xxport.cpp \
 xxport/sharpdtm_xxport.cpp \
 #details/look_details.cpp \
 #mainwindow.cpp \
 # calendarview.cpp \
 # timespanview.cpp
 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 64e3a4a..c4b2499 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -9,16 +9,16 @@ DESTDIR=$(QPEDIR)/bin
 
 INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
 #DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
 #DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #DEFINES += KORG_NOLVALTERNATION
-LIBS += -lmicrokdepim
-LIBS += -lmicrokde
+LIBS += -lxmicrokdepim
+LIBS += -lxmicrokde
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokabc
+LIBS += -lxmicrokabc
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
 LIBS += -Wl,-export-dynamic
 LIBS += $(GCC3EXTRALIB1)
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index c417226..b317974 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -22,14 +22,17 @@
 */
 
 #ifdef KAB_EMBEDDED
 #include "kabprefs.h"
 #include <kglobal.h>
 #include <qmessagebox.h>
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QCloseEvent>
 #else //KAB_EMBEDDED
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #endif //KAB_EMBEDDED
@@ -39,24 +42,24 @@
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 
 #ifdef KAB_EMBEDDED
 KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "abmain" )
 #else //KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) 
-//MOC_SKIP_END
+#endif
 #endif //KAB_EMBEDDED
 {
     setIcon(SmallIcon( "ka24" )  );
 #if 0
   //US for embedded systems, create the toolbar before we initiate KABCore.
   // KABCore will fill the toolbar with menues and icons
-  QMainWindow::ToolBarDock tbd;
-  tbd = Top;
-  iconToolBar = new QToolBar( this );
+  Qt::ToolBarDock tbd;
+  tbd = Qt::DockTop;
+  iconToolBar = new Q3ToolBar( this );
   addToolBar (iconToolBar , tbd );
   iconToolBar->setHorizontalStretchable(true);  
 //US  iconToolBar->setWidth(300);
 #endif // 0
 
   mCore = new KABCore( this, true, this );
@@ -82,13 +85,13 @@ KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainW
 
 
 #endif //KAB_EMBEDDED
   setAutoSaveSettings();
   mCore->restoreSettings();
 #ifndef DESKTOP_VERSION
-      QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), mCore, SLOT (receiveStart ( const QCString &, const QByteArray & )));
+      QObject::connect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), mCore, SLOT (receiveStart ( const Q3CString &, const QByteArray & )));
 #endif
 }
 
 KAddressBookMain::~KAddressBookMain()
 {
     // mCore->saveSettings();
@@ -232,10 +235,9 @@ void KAddressBookMain::closeEvent( QCloseEvent* ce )
     //KABPrefs::instance()->writeConfig();
   }
 
   ce->accept();
 }
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbookmain.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kaddressbookmain.cpp"
 #endif //KAB_EMBEDDED
-
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index b6d9b4b..d3f5cc7 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -21,16 +21,18 @@
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKMAIN_H
 #define KADDRESSBOOKMAIN_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QCloseEvent>
 
 #ifdef KAB_EMBEDDED
-class QToolBar;
+class Q3ToolBar;
 #include <qaction.h>
 //#include <qmainwindow.h>
 #include <kmainwindow.h>
 #else //KAB_EMBEDDED
 #include <kaction.h>
 #include <kapplication.h>
@@ -49,15 +51,15 @@ class KConfig;
   @author Don Sanders <dsanders@kde.org>
   @version 0.1
  */
 #ifdef KAB_EMBEDDED
 class KAddressBookMain : public KMainWindow
 #else //KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
-//MOC_SKIP_END
+#endif
 #endif //KAB_EMBEDDED
 {
   Q_OBJECT
 
   public:
     KAddressBookMain();
@@ -70,15 +72,15 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
 
     
   public slots:
     void showMinimized () ;
     virtual void addEmail( QString addr );
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
     virtual ASYNC showContactEditor( QString uid );
-//MOC_SKIP_END
+#endif
 #endif //KAB_EMBEDDED
     virtual void newContact();
     virtual QString getNameByPhone( QString phone );
     virtual void save();
     virtual void exit();
   protected:
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 86898e2..4823b37 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -29,12 +29,14 @@
 #include <klocale.h>
 
 #include "viewmanager.h"
 
 #endif //KAB_EMBEDDED
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kabc/distributionlistdialog.h>
 #include <kabc/addressbook.h>
 #include <kdebug.h>
 
 #include "kaddressbookview.h"
@@ -130,13 +132,13 @@ KABC::Addressee::List KAddressBookView::addressees()
   return addresseeList;
 }
 
 void KAddressBookView::initGUI()
 {
   // Create the layout
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
 
   // Add the view widget
   mViewWidget = new QWidget( this );
   layout->addWidget( mViewWidget );
 }
 
@@ -180,9 +182,9 @@ ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab,
 {
   return new ViewConfigureWidget( ab, parent, name );
 }
 
  
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbookview.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kaddressbookview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 3a3f71a..e423cd7 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -1,6 +1,8 @@
+//Added by qt3to4:
+#include <QDropEvent>
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -37,13 +39,13 @@ class QDropEvent;
 #include <qregexp.h>
 
 #include "viewconfigurewidget.h"
 #include "filter.h"
 
 #ifdef DESKTOP_VERSION 
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #include <qprinter.h>
 #include <qpainter.h>
 #endif
 
 namespace KABC { class AddressBook; }
 
@@ -172,15 +174,15 @@ class KAddressBookView : public QWidget
     /**
       This method must be overloaded in subclasses. Select (highlight)
       the addressee matching <i>uid</i>. If uid
       is equal to QString::null, then all addressees should be selected.
      */
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
     virtual void setSelected( QString uid = QString::null, bool selected = true ) = 0;
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
     //US my moc can not handle the default parameters. Is this a problem ???
     virtual void setSelected( QString uid, bool selected) = 0;
 #endif //KAB_EMBEDDED
 
   signals:
@@ -259,15 +261,15 @@ class KAddressBookView : public QWidget
     KABC::Field::List mFieldList;
     
     QWidget *mViewWidget;
 };
 
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class ViewFactory : public KLibFactory
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
 class ViewFactory
 #endif //KAB_EMBEDDED
 {
   
   public:
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 168d39e..8055085 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -18,18 +18,22 @@
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
 
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <kconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
@@ -42,19 +46,19 @@
 NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
                                 const char *name )
   : QWidget( parent, name )
 {
   if (KGlobal::getOrientation() == KGlobal::Portrait)
   {
-    QGridLayout* layout = new QGridLayout( this, 1, 1, KDialog::marginHintSmall(),
+    Q3GridLayout* layout = new Q3GridLayout( this, 1, 1, KDialog::marginHintSmall(),
                                          KDialog::spacingHintSmall() );
     
     QLabel *label = new QLabel( i18n( title ), this );
     layout->addWidget( label, 0, 1 );
     
-    mBox = new QListBox( this );
+    mBox = new Q3ListBox( this );
     mBox->setMaximumSize(70, 70);
     layout->addMultiCellWidget( mBox, 0, 1, 0, 0 );
 
     KButtonBox *bbox = new KButtonBox( this, Qt::Vertical );
     mAddButton = bbox->addButton( i18n( "Add" ), this,  SLOT( add() ) );
     mRemoveButton = bbox->addButton( i18n( "Rem" ), this,  SLOT( remove() ) );
@@ -67,19 +71,19 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
 
 //    layout->addWidget( group );
       
   }
   else
   {
-    QHBoxLayout *layout = new QHBoxLayout( this );
+    Q3HBoxLayout *layout = new Q3HBoxLayout( this );
 
-    QGroupBox *group = new QGroupBox( 0, Qt::Vertical, title, this );
-    QGridLayout *groupLayout = new QGridLayout( group->layout(), 2, 2,
+    Q3GroupBox *group = new Q3GroupBox( 0, Qt::Vertical, title, this );
+    Q3GridLayout *groupLayout = new Q3GridLayout( group->layout(), 2, 2,
                                               KDialog::spacingHint() );
 
-    mBox = new QListBox( group );
+    mBox = new Q3ListBox( group );
     
     groupLayout->addWidget( mBox, 0, 0 );
 
     KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
     mAddButton = bbox->addButton( i18n( "Add" ), this,  SLOT( add() ) );
     mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  SLOT( remove() ) );
@@ -94,14 +98,14 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
   }  
 
   mAddButton->setEnabled( false );
   mRemoveButton->setEnabled( false );
     
 
-  connect( mBox, SIGNAL( selectionChanged( QListBoxItem* ) ),
-           SLOT( selectionChanged( QListBoxItem* ) ) );
+  connect( mBox, SIGNAL( selectionChanged( Q3ListBoxItem* ) ),
+           SLOT( selectionChanged( Q3ListBoxItem* ) ) );
   connect( mEdit, SIGNAL( textChanged( const QString& ) ),
              SLOT( textChanged( const QString& ) ) );
   connect( mEdit, SIGNAL( returnPressed() ), SLOT( add() ) );
                
 }
 
@@ -140,13 +144,13 @@ void NamePartWidget::remove()
   if ( mBox->count() == 0 )
     selectionChanged( 0 );
 
   emit modified();
 }
 
-void NamePartWidget::selectionChanged( QListBoxItem *item )
+void NamePartWidget::selectionChanged( Q3ListBoxItem *item )
 {
   mRemoveButton->setEnabled( item != 0 );
 }
 
 void NamePartWidget::textChanged( const QString& text )
 {
@@ -154,13 +158,13 @@ void NamePartWidget::textChanged( const QString& text )
 }
 
 
 AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QGridLayout *layout;
+  Q3GridLayout *layout;
 
   mPrefix = new NamePartWidget( i18n( "Prefixes" ), this );
   mInclusion = new NamePartWidget( i18n( "Inclusions" ), this );
   mSuffix = new NamePartWidget( i18n( "Suffixes" ), this );
   QString dfn;
   if (QApplication::desktop()->width() > 320 )
@@ -175,25 +179,25 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   mFormattedNameCombo->insertItem( i18n( "Simple Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
   mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
     
   if (KGlobal::getOrientation() == KGlobal::Portrait)
   {
-    layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(),
+    layout = new Q3GridLayout( this, 4, 2, KDialog::marginHintSmall(),
                                          KDialog::spacingHintSmall() );
 
     layout->addMultiCellWidget( mPrefix, 0, 0, 0, 1 );
     layout->addMultiCellWidget( mInclusion, 1, 1, 0, 1 );
     layout->addMultiCellWidget( mSuffix, 2, 2, 0, 1 );
     layout->addWidget( label, 3, 0 );
     layout->addWidget( mFormattedNameCombo, 3, 1 );
     
   }
   else
   {
-    layout = new QGridLayout( this, 2, 3, KDialog::marginHint(),
+    layout = new Q3GridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
     layout->addWidget( mPrefix, 0, 0 );
     layout->addWidget( mInclusion, 0, 1 );
     layout->addWidget( mSuffix, 0, 2 );
     layout->addWidget( label, 1, 0 );
@@ -230,9 +234,9 @@ void AddresseeWidget::saveSettings()
   config.writeEntry( "Prefixes", mPrefix->nameParts() );
   config.writeEntry( "Inclusions", mInclusion->nameParts() );
   config.writeEntry( "Suffixes", mSuffix->nameParts() );
   config.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
 }
 
-#ifndef KAB_EMBEDDED
-#include "addresseewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_addresseewidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index 09330c8..f2a95a8 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -26,14 +26,14 @@
 
 #include <qwidget.h>
 
 class KComboBox;
 class KLineEdit;
 
-class QListBox;
-class QListBoxItem;
+class Q3ListBox;
+class Q3ListBoxItem;
 class QPushButton;
 
 class NamePartWidget : public QWidget
 {
   Q_OBJECT
 
@@ -49,19 +49,19 @@ class NamePartWidget : public QWidget
     void modified();
 
   private slots:
     void add();
     void remove();
 
-    void selectionChanged( QListBoxItem* );
+    void selectionChanged( Q3ListBoxItem* );
     void textChanged( const QString& );
 
   private:
     KLineEdit *mEdit;
 
-    QListBox *mBox;
+    Q3ListBox *mBox;
     QPushButton *mAddButton;
     QPushButton *mRemoveButton;
 };
 
 class AddresseeWidget : public QWidget
 {
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index e87b000..33b66ad 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -19,26 +19,29 @@
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 
 #include <klocale.h>
 
 #include "configurewidget.h"
 
 #include "extensionconfigdialog.h"
 
 ExtensionConfigDialog::ExtensionConfigDialog( ExtensionFactory *factory, KConfig *config,
                                               QWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
                  name, true, true ), mWidget( 0 ), mConfig( config )
 {
-  QFrame *page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 1, 1, marginHint(), spacingHint() );
+  Q3Frame *page = plainPage();
+  Q3GridLayout *layout = new Q3GridLayout( page, 1, 1, marginHint(), spacingHint() );
 
   mWidget = factory->configureWidget( page, "ExtensionConfigWidget" );
   layout->addWidget( mWidget, 0, 0 );
 
   mWidget->restoreSettings( mConfig );
 }
@@ -51,9 +54,9 @@ void ExtensionConfigDialog::slotOk()
 {
   mWidget->saveSettings( mConfig );
 
   KDialogBase::slotOk();
 }
 
-#ifndef KAB_EMBEDDED
-#include "extensionconfigdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_extensionconfigdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 9e4db74..d2b7ef1 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -19,22 +19,26 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qcheckbox.h>
-#include <qframe.h>
-#include <qgroupbox.h>
+#include <q3frame.h>
+#include <q3groupbox.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
@@ -54,21 +58,21 @@
 #include "extensionwidget.h"
 #include "kabprefs.h"
 
 #include "kabconfigwidget.h"
 #include <kglobalsettings.h>
 
-class ExtensionItem : public QCheckListItem
+class ExtensionItem : public Q3CheckListItem
 {
   public:
 
 #ifndef KAB_EMBEDDED
-    ExtensionItem( QListView *parent, const QString &text );
+    ExtensionItem( Q3ListView *parent, const QString &text );
     void setService( const KService::Ptr &ptr );
 #else //KAB_EMBEDDED
-    ExtensionItem( QListView *parent, const QString &text, const QString &name, const QString &comment );
+    ExtensionItem( Q3ListView *parent, const QString &text, const QString &name, const QString &comment );
     void setFactory( ExtensionFactory* fac );
 #endif //KAB_EMBEDDED
 
     bool configWidgetAvailable() const;
     ExtensionFactory *factory() const;
 
@@ -87,26 +91,26 @@ class ExtensionItem : public QCheckListItem
 };
 
 KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *name )
   : KPrefsWidget( prefs, parent, name )
 {
   
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0,
                                             KDialog::spacingHintSmall() );
 
   QTabWidget *tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
   // General page
   QWidget *generalPage = new QWidget( this );
-  QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
+  Q3VBoxLayout *layout = new Q3VBoxLayout( generalPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
 
   QWidget *hBox = new QWidget( generalPage, "qhbox" );
-  QHBoxLayout *hboxLayout = new QHBoxLayout( hBox);
+  Q3HBoxLayout *hboxLayout = new Q3HBoxLayout( hBox);
   KPrefsWidFont *detailsFont =
       addWidFont(i18n("phone:123"),i18n("Details view font"),
                  &(KABPrefs::instance()->mDetailsFont),hBox);
   hboxLayout->addWidget(detailsFont->label());
   hboxLayout->addWidget(detailsFont->preview());
   hboxLayout->addWidget(detailsFont->button());
@@ -114,13 +118,13 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   hboxLayout->setSpacing(KDialog::spacingHintSmall());
   //hBox->setBackgroundColor( black);
   layout->addWidget( hBox );
 
   //general groupbox
    QWidget *vBox = new QWidget( generalPage, "qvbox" );
-  QVBoxLayout *boxLayout = new QVBoxLayout( vBox );
+  Q3VBoxLayout *boxLayout = new Q3VBoxLayout( vBox );
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall() );
   boxLayout->setSpacing( KDialog::spacingHintSmall() );
   mMenuBarBox = new QCheckBox( i18n( "Full Menu bar (restart)" ), vBox, "mremenuturn" );
   boxLayout->addWidget( mMenuBarBox );
   mSearchReturnBox = new QCheckBox( i18n( "Search only after <return> key pressed" ), vBox, "mreturn" );
@@ -151,19 +155,19 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   layout->addWidget( vBox );
 
   tabWidget->addTab( generalPage, i18n( "General" ) );
 
   // Extension page
   QWidget *extensionPage = new QWidget( this );
-  QVBoxLayout *extensionLayout = new QVBoxLayout( extensionPage, KDialog::marginHintSmall(),
+  Q3VBoxLayout *extensionLayout = new Q3VBoxLayout( extensionPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
   //extensions groupbox
 
-  QGroupBox* groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage );
-  boxLayout = new QVBoxLayout( groupBox->layout() );
+  Q3GroupBox* groupBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage );
+  boxLayout = new Q3VBoxLayout( groupBox->layout() );
   boxLayout->setAlignment( Qt::AlignTop );
   boxLayout->setMargin(KDialog::marginHintSmall());
   boxLayout->setSpacing(KDialog::spacingHintSmall());
   groupBox->layout()->setMargin(1) ;
   groupBox->layout()->setSpacing(0);
   mExtensionView = new KListView( groupBox );
@@ -186,16 +190,16 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   connect( mSearchReturnBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mAutoSearchWithWildcardBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mHideSearchOnSwitchBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mAskForQuit, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
   connect( mAskForDelete, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
-  connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ),
-           SLOT( selectionChanged( QListViewItem* ) ) );
-  connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ),
-           SLOT( itemClicked( QListViewItem* ) ) );
+  connect( mExtensionView, SIGNAL( selectionChanged( Q3ListViewItem* ) ),
+           SLOT( selectionChanged( Q3ListViewItem* ) ) );
+  connect( mExtensionView, SIGNAL( clicked( Q3ListViewItem* ) ),
+           SLOT( itemClicked( Q3ListViewItem* ) ) );
   connect( mConfigureButton, SIGNAL( clicked() ),
            SLOT( configureExtension() ) );
 
   tabWidget->addTab( extensionPage, i18n( "Extensions" ) );
 
   // Addressee page
@@ -292,14 +296,14 @@ void KABConfigWidget::restoreExtensionSettings()
 }
 
 void KABConfigWidget::saveExtensionSettings()
 {
   QStringList activeExtensions;
 
-  QPtrList<QListViewItem> list;
-  QListViewItemIterator it( mExtensionView );
+  Q3PtrList<Q3ListViewItem> list;
+  Q3ListViewItemIterator it( mExtensionView );
   while ( it.current() ) {
     ExtensionItem *item = static_cast<ExtensionItem*>( it.current() );
     if ( item ) {
       if ( item->isOn() )
         activeExtensions.append( item->factory()->identifier() );
     }
@@ -325,40 +329,40 @@ void KABConfigWidget::configureExtension()
   ExtensionConfigDialog dlg( item->factory(), &config, this );
   dlg.exec();
 
   config.sync();
 }
 
-void KABConfigWidget::selectionChanged( QListViewItem *i )
+void KABConfigWidget::selectionChanged( Q3ListViewItem *i )
 {
   ExtensionItem *item = static_cast<ExtensionItem*>( i );
   if ( !item )
     return;
 
   mConfigureButton->setEnabled( item->configWidgetAvailable() );
 }
 
-void KABConfigWidget::itemClicked( QListViewItem *item )
+void KABConfigWidget::itemClicked( Q3ListViewItem *item )
 {
   if ( item != 0 )
     modified();
 }
 
 #ifndef KAB_EMBEDDED
-ExtensionItem::ExtensionItem( QListView *parent, const QString &text )
-  : QCheckListItem( parent, text, CheckBox )
+ExtensionItem::ExtensionItem( Q3ListView *parent, const QString &text )
+  : Q3CheckListItem( parent, text, CheckBox )
 {
 }
 
 void ExtensionItem::setService( const KService::Ptr &ptr )
 {
   mPtr = ptr;
 }
 #else //KAB_EMBEDDED
-ExtensionItem::ExtensionItem( QListView *parent, const QString &text, const QString &name, const QString &comment )
-  : QCheckListItem( parent, text, CheckBox )
+ExtensionItem::ExtensionItem( Q3ListView *parent, const QString &text, const QString &name, const QString &comment )
+  : Q3CheckListItem( parent, text, CheckBox )
 {
   mName = name;
   mComment = comment;
 }
 
 
@@ -415,10 +419,9 @@ QString ExtensionItem::text( int column ) const
     return mComment;
   else
     return QString::null;
 #endif //KAB_EMBEDDED
 }
 
-#ifndef KAB_EMBEDDED
-#include "kabconfigwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kabconfigwidget.cpp"
 #endif //KAB_EMBEDDED
-
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index f2a6b1b..4b6e58c 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -24,13 +24,13 @@
 #ifndef KABCONFIGWIDGET_H
 #define KABCONFIGWIDGET_H
 
 #include <kprefswidget.h>
 
 class QCheckBox;
-class QListViewItem;
+class Q3ListViewItem;
 class QPushButton;
 class QComboBox;
 class QLineEdit;
 class KListView;
 class KABPrefs;
 
@@ -50,14 +50,14 @@ class KABConfigWidget : public KPrefsWidget
   virtual void usrWriteConfig();
 
 
 
   private slots:
     void configureExtension();
-    void selectionChanged( QListViewItem* );
-    void itemClicked( QListViewItem* );
+    void selectionChanged( Q3ListViewItem* );
+    void itemClicked( Q3ListViewItem* );
 
   private:
     void restoreExtensionSettings();
     void saveExtensionSettings();
 
     KListView *mExtensionView;
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index cbfedbd..55ffcd8 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -19,12 +19,14 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #ifndef KAB_EMBEDDED
 #include <kaboutdata.h>
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 //#include <klocale.h>
@@ -45,13 +47,13 @@ extern "C"
 }
 
 KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
   : KCModule( KABPrefs::instance(), parent, name )
 {
     //abort();
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
   mConfigWidget = new KABConfigWidget( (KABPrefs*)getPreferences(), this, "KABConfigWidget" );
   layout->addWidget( mConfigWidget );
   layout->setSpacing( 0 );
   layout->setMargin( 0 );
 
   connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
@@ -84,9 +86,9 @@ const KAboutData* KCMKabConfig::aboutData() const
 
   return about;
 
 }
 #endif //KAB_EMBEDDED
 
-#ifndef KAB_EMBEDDED
-#include "kcmkabconfig.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kcmkabconfig.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index c117d34..8ebee19 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -25,21 +25,23 @@
 
 #include <qinputdialog.h>
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #include <kio/netaccess.h>
 #include <kmessagebox.h>
 #else //KAB_EMBEDDED
 #include <qmap.h>
 #include <qmessagebox.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <kurl.h>
 #endif //KAB_EMBEDDED
 
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdialog.h>
@@ -49,13 +51,13 @@
 
 #include "keywidget.h"
 
 KeyWidget::KeyWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QGridLayout *layout = new QGridLayout( this, 2, 2, KDialog::marginHint(),
+  Q3GridLayout *layout = new Q3GridLayout( this, 2, 2, KDialog::marginHint(),
                                          KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18n( "Keys:" ), this );
   layout->addWidget( label, 0, 0 );
 
   mKeyCombo = new KComboBox( this );
@@ -133,13 +135,13 @@ void KeyWidget::addKey()
   if ( url.isEmpty() )
     return;
 
   QString tmpFile;
   if ( KIO::NetAccess::download( url, tmpFile ) ) {
     QFile file( tmpFile );
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
       QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
       KMessageBox::error( this, text.arg( url.url() ) );
       return;
     }
 
 
@@ -149,27 +151,27 @@ void KeyWidget::addKey()
   
   if ( keyfile.isEmpty() )
     return;
 
   {
     QFile file( keyfile );
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
       QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
       QString caption( i18n( "Error" ) );
       QMessageBox::critical( this, caption, text.arg( keyfile ) );
       return;
     }
   
 #endif //KAB_EMBEDDED    
 
   
 
-    QTextStream s( &file );
+    Q3TextStream s( &file );
     QString data;
 
-    s.setEncoding( QTextStream::UnicodeUTF8 );
+    s.setEncoding( Q3TextStream::UnicodeUTF8 );
     s >> data;
     file.close();
 
     KABC::Key key( data, type );
     if ( type == KABC::Key::Custom )
       key.setCustomTypeString( name );
@@ -218,35 +220,35 @@ void KeyWidget::exportKey()
   KABC::Key key = (*mKeyList.at( mKeyCombo->currentItem() ) );
 
 #ifndef KAB_EMBEDDED    
   KURL url = KFileDialog::getSaveURL();
   
   KTempFile tempFile;
-  QTextStream *s = tempFile.textStream();
-  s->setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream *s = tempFile.textStream();
+  s->setEncoding( Q3TextStream::UnicodeUTF8 );
   (*s) << key.textData();
   tempFile.close();
 
   KIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
 #else //KAB_EMBEDDED    
   QString keyfile = KFileDialog::getSaveFileName( "huhu",
                                     "Save Key", this );
   
   if ( keyfile.isEmpty() )
     return;
 
   QFile file( keyfile );
-    if ( !file.open( IO_ReadWrite ) ) {
+    if ( !file.open( QIODevice::ReadWrite ) ) {
       QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
       QString caption( i18n( "Error" ) );
       QMessageBox::critical( this, caption, text.arg( keyfile ) );
       return;
     }
 
-  QTextStream s( &file );
-  s.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream s( &file );
+  s.setEncoding( Q3TextStream::UnicodeUTF8 );
   s << key.textData();
   file.close();
     
     
 #endif //KAB_EMBEDDED    
 
@@ -269,9 +271,9 @@ void KeyWidget::updateKeyCombo()
 
   bool state = ( mKeyList.count() != 0 );
   mRemoveButton->setEnabled( state );
   mExportButton->setEnabled( state );
 }
 
-#ifndef KAB_EMBEDDED
-#include "keywidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_keywidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 2f3531d..e373105 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -2,14 +2,13 @@
 #include <qpe/qpeapplication.h>
 #include <qcopchannel_qws.h> 
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qwindowsstyle.h>
-#include <qplatinumstyle.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 #include <qmessagebox.h> 
 #include <stdlib.h>
 #endif
 
 #include <qtextcodec.h> 
 #include <kstandarddirs.h>
@@ -21,18 +20,18 @@
 #include "kaddressbookmain.h"
 #include "externalapphandler.h"
 #include <libkdepim/kpimglobalprefs.h>
 void dumpMissing();
 int main( int argc, char **argv )
 {
+    if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
 #ifndef DESKTOP_VERSION
   QPEApplication a( argc, argv );
   a.setKeepRunning ();
 #else
   QApplication a( argc, argv );
-  QApplication::setStyle( new QPlatinumStyle ());
 #ifdef _WIN32_
   QString hdir ( getenv( "HOME") );
   if ( hdir.isEmpty() ) {
     QString hd ("C:/" );
     //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd );
     if ( QDir::homeDirPath().lower() == hd.lower() ) {
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 199f3d6..96822d8 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -20,18 +20,20 @@
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qlistbox.h>
-#include <qlistview.h>
+#include <q3listbox.h>
+#include <q3listview.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #else //KAB_EMBEDDED
 #include <kstandarddirs.h>
 #endif //KAB_EMBEDDED
@@ -54,13 +56,13 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
                                 QWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel,
                  Ok, parent, name, true )
 {
 
   QWidget *page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 5, 3 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 5, 3 );
   layout->setSpacing( spacingHint() );
   layout->addColSpacing( 2, 100 );
   QLabel *label;
   
   label = new QLabel( i18n( "Honorific prefixes:" ), page );
   layout->addWidget( label, 0, 0 );
@@ -292,9 +294,9 @@ void NameEditDialog::slotHelp()
   kapp->invokeHelp( "managing-contacts-automatic-nameparsing" );
 #else //KAB_EMBEDDED
 qDebug("NameEditDialog::slotHelp Help is not supported yet");
 #endif //KAB_EMBEDDED
 }
 
-#ifndef KAB_EMBEDDED
-#include "nameeditdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_nameeditdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/old_mainwindow.cpp b/kaddressbook/old_mainwindow.cpp
index 0e886d9..7a445c7 100644
--- a/kaddressbook/old_mainwindow.cpp
+++ b/kaddressbook/old_mainwindow.cpp
@@ -313,19 +313,19 @@ QPixmap MainWindow::loadPixmap( QString name )
 
 void MainWindow::initActions()
 {
     iconToolBar->clear();
     KABPrefs *p = KABPrefs::instance();
     QPEMenuBar *menuBar1 = new QPEMenuBar( iconToolBar );
-    QPopupMenu *menuBar = new QPopupMenu( this );
+    Q3PopupMenu *menuBar = new Q3PopupMenu( this );
     menuBar1->insertItem( "ME", menuBar);
-    QPopupMenu *fileMenu = new QPopupMenu( this );
-    QPopupMenu *editMenu = new QPopupMenu( this );
-    QPopupMenu *viewMenu = new QPopupMenu( this );
-    QPopupMenu *settingsMenu = new QPopupMenu( this );
-    QPopupMenu *importMenu = new QPopupMenu( this );
+    Q3PopupMenu *fileMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *editMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *viewMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *settingsMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *importMenu = new Q3PopupMenu( this );
 
     menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
 
     QIconSet icon;
 
 
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index df3b551..3661677 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -24,19 +24,25 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qstring.h>
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qbuttongroup.h>
-#include <qhbox.h>
+#include <q3listbox.h>
+#include <q3listview.h>
+#include <q3buttongroup.h>
+#include <q3hbox.h>
 #include <qcursor.h>
 #include <qtimer.h>
 #include <qapplication.h> 
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
 #include <kbuttonbox.h>
 #include <klistview.h>
 #include <kapplication.h>
 #include <qapplication.h>
 #include <kconfig.h>
@@ -54,30 +60,30 @@
 
 #include "phoneeditwidget.h"
 
 PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
   : QWidget(parent,name)
 {
-    QGridLayout* gridLayout = new QGridLayout ( this, 2,2 );
+    Q3GridLayout* gridLayout = new Q3GridLayout ( this, 2,2 );
 
     QLabel *temp = new QLabel( "", this );
     temp->setAlignment( Qt::AlignCenter );
     temp->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
     QPushButton *addBut = new QPushButton ( "add", this );
     addBut->setPixmap ( SmallIcon("plus"));
     addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() );
     connect(addBut,SIGNAL(clicked ()),SLOT(addNumber()));
 
-    sv = new QScrollView( this );
-    sv->setFrameStyle ( QFrame::Plain );
+    sv = new Q3ScrollView( this );
+    sv->setFrameStyle ( Q3Frame::Plain );
     sv->setLineWidth ( 0 ); 
     sv->setMidLineWidth ( 0 ); 
     mw = new QWidget ( sv->viewport() );
     sv->addChild(mw);
-    sv->setResizePolicy( QScrollView::AutoOneFit );
-    mainLayout = new QVBoxLayout ( mw );
+    sv->setResizePolicy( Q3ScrollView::AutoOneFit );
+    mainLayout = new Q3VBoxLayout ( mw );
     mainLayout->setMargin( 0 );
     mainLayout->setSpacing( 0 );
     gridLayout->setMargin( 2 );
     gridLayout->setSpacing( 4 );
     if ( QApplication::desktop()->width() == 240 || QApplication::desktop()->width() == 480 ) {
         gridLayout->addWidget( addBut, 0, 0 );
@@ -87,13 +93,13 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
         gridLayout->addWidget( temp, 1, 0 );
         gridLayout->addWidget( addBut, 0, 0 );
         gridLayout->addMultiCellWidget( sv, 0, 1, 1,1 );
     }
     setDefaults();
     mTypeNumberEditList.setAutoDelete( true );
-    mPopup = new QPopupMenu( this );
+    mPopup = new Q3PopupMenu( this );
     QStringList list = PhoneNumber::supportedTypeListNames();
     mPopupCount = list.count();
     int i = 0;
     while ( i < mPopupCount ) {
         mPopup->insertItem( list[ i ], i );
         ++i;
@@ -223,23 +229,23 @@ KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers()
 }
 
 #if 0
 PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QGridLayout *layout = new QGridLayout( this, 4, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( this, 4, 1 );
 //US  layout->setSpacing( KDialog::spacingHint() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
 
 
 
  QLabel* label = new QLabel( this );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
 //US  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
   layout->addWidget( label, 0, 0 ); 
 
   QPushButton *editButton = new QPushButton( i18n( "Edit Phone Numbers..." ),
                                              this ); 
   if ( QApplication::desktop()->width() < 640 ) 
@@ -324,23 +330,23 @@ void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &list )
 {
   mPhoneList.clear();
 
   // Insert types for existing numbers.
   mPrefCombo->insertTypeList( list );
 
-  QValueList<int> defaultTypes;
+  Q3ValueList<int> defaultTypes;
   defaultTypes << KABC::PhoneNumber::Home;
   defaultTypes << KABC::PhoneNumber::Work;
   defaultTypes << KABC::PhoneNumber::Cell;
   defaultTypes << ( KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
   defaultTypes << ( KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax );
 
   // Insert default types.
   // Doing this for mPrefCombo is enough because the list is shared by all
   // combos.
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
   for( it = defaultTypes.begin(); it != defaultTypes.end(); ++it ) {
     if ( !mPrefCombo->hasType( *it ) )
       mPrefCombo->insertType( list, *it, PhoneNumber( "", *it ) );
   }
 
   updateCombos();
@@ -484,16 +490,16 @@ void PhoneEditWidget::updateOtherEdit( PhoneTypeCombo *combo, PhoneTypeCombo *ot
   }
 }
 
 ///////////////////////////////////////////
 // PhoneEditDialog
 
-class PhoneViewItem : public QListViewItem
+class PhoneViewItem : public Q3ListViewItem
 {
 public:
-  PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number );
+  PhoneViewItem( Q3ListView *parent, const KABC::PhoneNumber &number );
 
   void setPhoneNumber( const KABC::PhoneNumber &number )
   {
     mPhoneNumber = number;
     makeText();
   }
@@ -508,14 +514,14 @@ public:
 private:
   void makeText();
 
   KABC::PhoneNumber mPhoneNumber;
 };
 
-PhoneViewItem::PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number )
-  : QListViewItem( parent ), mPhoneNumber( number )
+PhoneViewItem::PhoneViewItem( Q3ListView *parent, const KABC::PhoneNumber &number )
+  : Q3ListViewItem( parent ), mPhoneNumber( number )
 { 
 #ifdef DESKTOP_VERSION
     setRenameEnabled ( 0, true );
 #endif
   makeText();
 }
@@ -541,34 +547,34 @@ PhoneEditDialog::PhoneEditDialog( const KABC::PhoneNumber::List &list, QWidget *
                  parent, name, true)
 {
   mPhoneNumberList = list;
 
   QWidget *page = plainPage();
 
-  QGridLayout *layout = new QGridLayout( page, 1, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 1, 2 );
   layout->setSpacing( spacingHint() );
 
   mListView = new KListView( page );
   mListView->setAllColumnsShowFocus( true );
   mListView->addColumn( i18n( "Number" ) );
   mListView->addColumn( i18n( "Type" ) );
 
-  KButtonBox *buttonBox = new KButtonBox( page, Vertical );
+  KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
 
   buttonBox->addButton( i18n( "&Add..." ), this, SLOT( slotAddPhoneNumber() ) );
   mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, SLOT( slotEditPhoneNumber() ) );
   mEditButton->setEnabled( false );
   mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, SLOT( slotRemovePhoneNumber() ) );
   mRemoveButton->setEnabled( false );
   buttonBox->layout();
 
   layout->addWidget( mListView, 0, 0 );
   layout->addWidget( buttonBox, 0, 1 );
 
   connect( mListView, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged()) );
-  connect( mListView, SIGNAL(doubleClicked( QListViewItem *, const QPoint &, int  )), this, SLOT( slotEditPhoneNumber()));
+  connect( mListView, SIGNAL(doubleClicked( Q3ListViewItem *, const QPoint &, int  )), this, SLOT( slotEditPhoneNumber()));
 
   KABC::PhoneNumber::List::Iterator it;
   for ( it = mPhoneNumberList.begin(); it != mPhoneNumberList.end(); ++it )
     new PhoneViewItem( mListView, *it );
   if (QApplication::desktop()->width() < 480 )    
       showMaximized();
@@ -585,13 +591,13 @@ PhoneEditDialog::~PhoneEditDialog()
 void PhoneEditDialog::slotAddPhoneNumber()
 {
   KABC::PhoneNumber tmp( "", 0 );
   PhoneTypeDialog dlg( tmp, this );
 
   if ( dlg.exec() ) {
-      QListViewItem* i = mListView->firstChild();
+      Q3ListViewItem* i = mListView->firstChild();
       KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
       bool insert = true;
       while ( i ) {
           PhoneViewItem* p = ( PhoneViewItem* ) i;
           KABC::PhoneNumber pn = p->phoneNumber();
           if ( (pn.type() | KABC::PhoneNumber::Pref)  == (phoneNumber.type() | KABC::PhoneNumber::Pref)  ) {
@@ -617,13 +623,13 @@ void PhoneEditDialog::slotRemovePhoneNumber()
 {
   PhoneViewItem *item = static_cast<PhoneViewItem*>( mListView->currentItem() );
   if ( !item )
     return;
 
   mPhoneNumberList.remove( item->phoneNumber() );
-  QListViewItem *currItem = mListView->currentItem();
+  Q3ListViewItem *currItem = mListView->currentItem();
   mListView->takeItem( currItem );
   delete currItem;
 
   mChanged = true;
 }
 
@@ -670,23 +676,23 @@ PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Phone Number" ),
                 KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                 parent, name, true), mPhoneNumber( phoneNumber )
 {
   QWidget *page = plainPage();
   QLabel *label = 0;
-  QGridLayout *layout = new QGridLayout( page, 3, 2, marginHint(), spacingHint() );
+  Q3GridLayout *layout = new Q3GridLayout( page, 3, 2, marginHint(), spacingHint() );
 
   label = new QLabel( i18n( "Number:" ), page );
   layout->addWidget( label, 0, 0 );
   mNumber = new KLineEdit( page );
   layout->addWidget( mNumber, 0, 1 );
 
   mPreferredBox = new QCheckBox( i18n( "This is the preferred phone number" ), page );
   layout->addMultiCellWidget( mPreferredBox, 1, 1, 0, 1 );
 
-  mGroup = new QButtonGroup( 2, Horizontal, i18n( "Types" ), page );
+  mGroup = new Q3ButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
   layout->addMultiCellWidget( mGroup, 2, 2, 0, 1 );
 
   // fill widgets
   mNumber->setText( mPhoneNumber.number() );
 
   mTypeList = KABC::PhoneNumber::typeList();
@@ -723,9 +729,9 @@ KABC::PhoneNumber PhoneTypeDialog::phoneNumber()
   else
     mPhoneNumber.setType( type & ~KABC::PhoneNumber::Pref );
 
   return mPhoneNumber;
 }
 #endif
-#ifndef KAB_EMBEDDED
-#include "phoneeditwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_phoneeditwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 5bb4226..2be3e2b 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -24,22 +24,26 @@
 */                                                                      
 
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qapplication.h> 
+#include <QDesktopWidget>
 
-#include <qptrlist.h>
-#include <qscrollview.h>
+#include <q3ptrlist.h>
+#include <q3scrollview.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 #include "addresseeconfig.h"
 #include "typecombo.h"
 
-class QButtonGroup;
+class Q3ButtonGroup;
 class QCheckBox;
 class PhoneTypeNumberEdit;
 
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kabc/phonenumber.h>
@@ -73,39 +77,39 @@ class PhoneEditWidget : public QWidget
     void deleteEdit(  PhoneTypeNumberEdit* ew );
     void addNumber();
     void pendingDelete();
   protected:
 
   private:
-    QScrollView* sv;
-    QPopupMenu *mPopup;
+    Q3ScrollView* sv;
+    Q3PopupMenu *mPopup;
     int mPopupCount;
     PhoneTypeNumberEdit* mPendingDelete;
     void setDefaults();
     PhoneTypeNumberEdit* appendEditCombo();
     QWidget* mw;
-    QVBoxLayout* mainLayout;
-    QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList;
+    Q3VBoxLayout* mainLayout;
+    Q3PtrList <PhoneTypeNumberEdit> mTypeNumberEditList;
     
 };
   
 
 class PhoneTypeNumberEdit : public QWidget
 {
   Q_OBJECT
 public:
     PhoneTypeNumberEdit( QWidget *parent, const char *name = 0 ) :QWidget( parent )
       {
-          QHBoxLayout * lay = new QHBoxLayout( this );
+          Q3HBoxLayout * lay = new Q3HBoxLayout( this );
           lay->setSpacing( 2 );
           lay->setMargin( 0 );
           mMinusButton = new QPushButton ( this );
           mMinusButton->setPixmap ( SmallIcon("minus"));
           mCombo = new KComboBox( this );
           if ( QApplication::desktop()->width() <= 640 )
-              mCombo->setSizeLimit ( 6 );
+              mCombo->setMaxVisibleItems ( 6 );
           mNumber = new KLineEdit( this );
           mMinusButton->setMaximumHeight( mNumber->sizeHint().height() + 6);
           lay->addWidget( mMinusButton  );
           lay->addWidget( mCombo );
           lay->addWidget( mNumber  );
           connect( mMinusButton , SIGNAL ( clicked() ), this, SLOT ( deleteNumber() ) );
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 4a2acc8..1c237c0 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -19,23 +19,25 @@
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kabc/secrecy.h>
 #include <kcombobox.h>
 #include <kdialog.h>
 
 #include "secrecywidget.h"
 
 SecrecyWidget::SecrecyWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QVBoxLayout *layout = new QVBoxLayout( this, KDialog::marginHint(),
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this, KDialog::marginHint(),
                                          KDialog::spacingHint() );
   mSecrecyCombo = new KComboBox( this );
   layout->addWidget( mSecrecyCombo );
 
   KABC::Secrecy::TypeList list = KABC::Secrecy::typeList();
   KABC::Secrecy::TypeList::Iterator it;
@@ -62,9 +64,9 @@ KABC::Secrecy SecrecyWidget::secrecy() const
   KABC::Secrecy secrecy;
   secrecy.setType( mSecrecyCombo->currentItem() );
 
   return secrecy;
 }
 
-#ifndef KAB_EMBEDDED
-#include "secrecywidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_secrecywidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/undo.cpp b/kaddressbook/undo.cpp
index 4442087..a6c1580 100644
--- a/kaddressbook/undo.cpp
+++ b/kaddressbook/undo.cpp
@@ -111,9 +111,9 @@ void RedoStack::redo()
     
   command = pop();
   command->redo();
   UndoStack::instance()->push( command );
 }
 
-#ifndef KAB_EMBEDDED
-#include "undo.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_undo.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/undo.h b/kaddressbook/undo.h
index 843bc26..a8ba2ee 100644
--- a/kaddressbook/undo.h
+++ b/kaddressbook/undo.h
@@ -22,13 +22,13 @@
 */
 
 #ifndef UNDO_H
 #define UNDO_H
 
 #include <qobject.h>
-#include <qptrstack.h>
+#include <q3ptrstack.h>
 #include <qstring.h>
 
 class Command
 {
 public:
   Command() {}
@@ -64,13 +64,13 @@ class StackBase : public QObject
   protected:
     /** Protect the pop method so users must call undo/redo to properly
     * use the stack, however the subclasses need it to modify the stack.
     */
     Command *pop();
     
-    QPtrStack<Command> mCommandStack;
+    Q3PtrStack<Command> mCommandStack;
 };
 
 class UndoStack : public StackBase
 {
 public:
   static UndoStack *instance();
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index 5807dc0..e900b00 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -18,13 +18,13 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qtextstream.h>
+#include <q3textstream.h>
 
 #include <qapplication.h>
 #include <qclipboard.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index 5daae1a..7366a0b 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -33,26 +33,30 @@
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <klocale.h>
 
 #include <qtoolbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3BoxLayout>
 
 #include "viewconfigurefieldspage.h"
 
-class FieldItem : public QListBoxText
+class FieldItem : public Q3ListBoxText
 {
   public:
-    FieldItem( QListBox *parent, KABC::Field *field )
-      : QListBoxText( parent, field->label() ), mField( field ) {}
+    FieldItem( Q3ListBox *parent, KABC::Field *field )
+      : Q3ListBoxText( parent, field->label() ), mField( field ) {}
     
-    FieldItem( QListBox *parent, KABC::Field *field, int index )
-      : QListBoxText( parent, field->label(), parent->item( index ) ),
+    FieldItem( Q3ListBox *parent, KABC::Field *field, int index )
+      : Q3ListBoxText( parent, field->label(), parent->item( index ) ),
         mField( field ) {}
     
     KABC::Field *field() { return mField; }
     
   private:
     KABC::Field *mField;
@@ -103,13 +107,13 @@ void ViewConfigureFieldsPage::slotShowFields( int index )
   else category = 1 << ( index - 1 );
 
   KABC::Field::List allFields = mAddressBook->fields( category );
 
   KABC::Field::List::ConstIterator it;
   for ( it = allFields.begin(); it != allFields.end(); ++it ) {
-    QListBoxItem *item = mSelectedBox->firstItem();
+    Q3ListBoxItem *item = mSelectedBox->firstItem();
     while( item ) {
       FieldItem *fieldItem = static_cast<FieldItem *>( item );
       if ( (*it)->equals( fieldItem->field() ) )
         break;
       item = item->next();
     }
@@ -186,25 +190,25 @@ void ViewConfigureFieldsPage::slotButtonsEnabled()
 }
 
 void ViewConfigureFieldsPage::slotMoveUp()
 {
   int i = mSelectedBox->currentItem();
   if ( i > 0 ) {
-    QListBoxItem *item = mSelectedBox->item( i );
+    Q3ListBoxItem *item = mSelectedBox->item( i );
     mSelectedBox->takeItem( item );
     mSelectedBox->insertItem( item, i - 1 );
     mSelectedBox->setCurrentItem( item );
     mSelectedBox->setSelected( i - 1, true );
   }
 }
 
 void ViewConfigureFieldsPage::slotMoveDown()
 {
   int i = mSelectedBox->currentItem();
   if ( i > -1 && i < (int)mSelectedBox->count() - 1 ) {
-    QListBoxItem *item = mSelectedBox->item( i );
+    Q3ListBoxItem *item = mSelectedBox->item( i );
     mSelectedBox->takeItem( item );
     mSelectedBox->insertItem( item, i + 1 );
     mSelectedBox->setCurrentItem( item );
     mSelectedBox->setSelected( i + 1, true );
   }
 }
@@ -216,17 +220,17 @@ void ViewConfigureFieldsPage::initGUI()
   // 0 = 640x480 ; 1 = 240x320
   bool orientation = 1;
   
 
   setCaption( i18n("Select Fields to Display") );
 
-  QGridLayout *gl = 0;
+  Q3GridLayout *gl = 0;
   if (orientation == 0) 
-    gl = new QGridLayout( this , 6, 4, 0, KDialog::spacingHint() );
+    gl = new Q3GridLayout( this , 6, 4, 0, KDialog::spacingHint() );
   else
-    gl = new QGridLayout( this , 4, 6, 0, KDialog::spacingHint() );
+    gl = new Q3GridLayout( this , 4, 6, 0, KDialog::spacingHint() );
 
   #ifndef KAB_EMBEDDED
   mCategoryCombo = new KComboBox( false, this );
   #else //KAB_EMBEDDED
   mCategoryCombo = new QComboBox( false, this );
   #endif //KAB_EMBEDDED
@@ -246,38 +250,38 @@ void ViewConfigureFieldsPage::initGUI()
   if (orientation == 0) 
     gl->addWidget( label, 0, 2 );
   else
     gl->addWidget( label, 2, 0 );
     
 
-  mUnSelectedBox = new QListBox( this );
-  mUnSelectedBox->setSelectionMode( QListBox::Extended );
+  mUnSelectedBox = new Q3ListBox( this );
+  mUnSelectedBox->setSelectionMode( Q3ListBox::Extended );
   mUnSelectedBox->setMinimumHeight( 80 );
   if (orientation == 0) 
     gl->addWidget( mUnSelectedBox, 1, 0 );
   else
     gl->addWidget( mUnSelectedBox, 0, 1 );
 
-  mSelectedBox = new QListBox( this );
+  mSelectedBox = new Q3ListBox( this );
   //if ( QApplication::desktop()->width() < 320 ) {
   //  mUnSelectedBox->setMaximumWidth( 134 );
   //  mSelectedBox->setMaximumWidth( 134 );
   //}
-  mSelectedBox->setSelectionMode( QListBox::Extended );
+  mSelectedBox->setSelectionMode( Q3ListBox::Extended );
   mSelectedBox->setMinimumHeight( 80 );
   label->setBuddy( mSelectedBox );
   if (orientation == 0) 
     gl->addWidget( mSelectedBox, 1, 2 );
   else
     gl->addWidget( mSelectedBox, 2, 1 );
     
-  QBoxLayout *vb1 = 0;
+  Q3BoxLayout *vb1 = 0;
   if (orientation == 0) 
-    vb1 = new QBoxLayout( QBoxLayout::TopToBottom, KDialog::spacingHint() );
+    vb1 = new Q3BoxLayout( Q3BoxLayout::TopToBottom, KDialog::spacingHint() );
   else
-    vb1 = new QBoxLayout( QBoxLayout::LeftToRight, KDialog::spacingHint() );
+    vb1 = new Q3BoxLayout( Q3BoxLayout::LeftToRight, KDialog::spacingHint() );
   
   vb1->addStretch();
 
   mAddButton = new QToolButton( this );
   if (orientation == 0) 
     mAddButton->setIconSet( SmallIconSet( "1rightarrow" ) );
@@ -298,17 +302,17 @@ void ViewConfigureFieldsPage::initGUI()
   vb1->addStretch();
   if (orientation == 0) 
     gl->addLayout( vb1, 1, 1 );
   else
     gl->addLayout( vb1, 1, 1 );
 
-  QBoxLayout *vb2 = 0;
+  Q3BoxLayout *vb2 = 0;
   if (orientation == 0) 
-    vb2 = new QBoxLayout( QBoxLayout::TopToBottom, KDialog::spacingHint() );
+    vb2 = new Q3BoxLayout( Q3BoxLayout::TopToBottom, KDialog::spacingHint() );
   else
-    vb2 = new QBoxLayout( QBoxLayout::LeftToRight, KDialog::spacingHint() );
+    vb2 = new Q3BoxLayout( Q3BoxLayout::LeftToRight, KDialog::spacingHint() );
   
   vb2->addStretch();
 
   mUpButton = new QToolButton( this );
     mUpButton->setIconSet( SmallIconSet( "1uparrow" ) );
   connect( mUpButton, SIGNAL( clicked() ), SLOT( slotMoveUp() ) );
@@ -337,15 +341,15 @@ void ViewConfigureFieldsPage::initGUI()
   //mSelectedBox->setMinimumSize( sizeHint );
 
   gl->activate();
 
   connect( mUnSelectedBox, SIGNAL( selectionChanged() ), SLOT( slotButtonsEnabled() ) );
   connect( mSelectedBox, SIGNAL( selectionChanged() ), SLOT( slotButtonsEnabled() ) );
-  connect( mSelectedBox, SIGNAL( currentChanged( QListBoxItem * ) ), SLOT( slotButtonsEnabled() ) );
+  connect( mSelectedBox, SIGNAL( currentChanged( Q3ListBoxItem * ) ), SLOT( slotButtonsEnabled() ) );
 
   slotButtonsEnabled();
 }
 
 
-#ifndef KAB_EMBEDDED
-#include "viewconfigurefieldspage.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_viewconfigurefieldspage.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index b27668c..42d132f 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -32,14 +32,14 @@
 #ifndef KAB_EMBEDDED
 class KComboBox;
 #else //KAB_EMBEDDED
 class QComboBox;
 #endif //KAB_EMBEDDED
 
-class QListBox;
-class QListBoxItem;
+class Q3ListBox;
+class Q3ListBoxItem;
 class QPushButton;
 class QToolButton;
 
 class ViewConfigureFieldsPage : public QWidget
 {
   Q_OBJECT
@@ -65,14 +65,14 @@ class ViewConfigureFieldsPage : public QWidget
     
 #ifndef KAB_EMBEDDED
     KComboBox *mCategoryCombo;
 #else //KAB_EMBEDDED
     QComboBox *mCategoryCombo;
 #endif //KAB_EMBEDDED
-    QListBox *mSelectedBox;
-    QListBox *mUnSelectedBox;
+    Q3ListBox *mSelectedBox;
+    Q3ListBox *mUnSelectedBox;
     QToolButton *mAddButton;
     QToolButton *mRemoveButton;
     QToolButton *mUpButton;
     QToolButton *mDownButton;
 
     KABC::AddressBook *mAddressBook;
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index b085a5e..cdb778b 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -24,16 +24,19 @@
 #ifndef KAB_EMBEDDED
 #include <kcombobox.h>
 #else //KAB_EMBEDDED
 #include <qcombobox.h>
 #endif //KAB_EMBEDDED
 
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 #include <kconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 
 #include "filter.h"
@@ -41,15 +44,15 @@
 #include "viewconfigurefilterpage.h"
 
 ViewConfigureFilterPage::ViewConfigureFilterPage( QWidget *parent,
                                                   const char *name )
   : QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this, 0, KDialog::spacingHint() );
   
-  mFilterGroup = new QButtonGroup();
+  mFilterGroup = new Q3ButtonGroup();
   connect( mFilterGroup, SIGNAL( clicked( int ) ), SLOT( buttonClicked( int ) ) );
   
   QLabel *label = new QLabel( i18n( "The default filter will be activated whenever"
   " this view is displayed. This feature allows you to configure views that only"
   " interact with certain types of information based on the filter. Once the view"
   " is activated, the filter can be changed at anytime." ), this );
@@ -65,13 +68,13 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( QWidget *parent,
   topLayout->addWidget( button );
   
   button = new QRadioButton( i18n( "Use last active filter" ), this );
   mFilterGroup->insert( button );
   topLayout->addWidget( button );
   
-  QBoxLayout *comboLayout = new QHBoxLayout();
+  Q3BoxLayout *comboLayout = new Q3HBoxLayout();
   topLayout->addLayout( comboLayout );
   button = new QRadioButton( i18n( "Use filter:" ), this );
   mFilterGroup->insert( button );
   comboLayout->addWidget( button );
   
 #ifndef KAB_EMBEDDED
@@ -129,9 +132,9 @@ void ViewConfigureFilterPage::saveSettings( KConfig *config )
     
 void ViewConfigureFilterPage::buttonClicked( int id )
 {
   mFilterCombo->setEnabled( id == 2 );
 }
 
-#ifndef KAB_EMBEDDED
-#include "viewconfigurefilterpage.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_viewconfigurefilterpage.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index 3be9564..fb39a61 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -23,13 +23,13 @@
 
 #ifndef VIEWCONFIGUREFILTERPAGE
 #define VIEWCONFIGUREFILTERPAGE
 
 #include <qwidget.h>
 
-class QButtonGroup;
+class Q3ButtonGroup;
 
 #ifndef KAB_EMBEDDED
 class KComboBox;
 #else //KAB_EMBEDDED
 class QComboBox;
 #endif //KAB_EMBEDDED
@@ -54,10 +54,10 @@ class ViewConfigureFilterPage : public QWidget
 #ifndef KAB_EMBEDDED
     KComboBox *mFilterCombo;
 #else //KAB_EMBEDDED
     QComboBox *mFilterCombo;
 #endif //KAB_EMBEDDED
   
-    QButtonGroup *mFilterGroup;
+    Q3ButtonGroup *mFilterGroup;
 };
 
 #endif
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 666e188..047df8c 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -21,25 +21,28 @@
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 
 #ifndef KAB_EMBEDDED
 
-#include <qvbox.h>
+#include <q3vbox.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
 #include "viewmanager.h"
 
 #endif //KAB_EMBEDDED
 
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QPixmap>
 
 #include <kjanuswidget.h>
 #include <kglobal.h>
 #include <klocale.h>
 
 #include "viewconfigurewidget.h"
@@ -47,20 +50,20 @@
 #include "viewconfigurefilterpage.h"
 
 ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, QWidget *parent,
                                           const char *name )
   : ConfigureWidget( ab, parent, name )
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this );
   
   mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed );
   
   topLayout->addWidget( mMainWidget );
 
   // Add the first page, the attributes
-  QVBox *page = addPage( i18n( "Fields" ), QString::null,
+  Q3VBox *page = addPage( i18n( "Fields" ), QString::null,
                          KGlobal::iconLoader()->loadIcon( "view_detailed",
                          KIcon::Panel, 16 ) );
 
  
   // Add the select fields page 
   mFieldsPage = new ViewConfigureFieldsPage( addressBook(), (QWidget*)page );
@@ -90,19 +93,19 @@ void ViewConfigureWidget::restoreSettings( KConfig *config )
 void ViewConfigureWidget::saveSettings( KConfig *config )
 {
   mFieldsPage->saveSettings( config );
   mFilterPage->saveSettings( config );
 }
     
-QVBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
+Q3VBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
                                    const QPixmap &pixmap )
 {
   return mMainWidget->addVBoxPage( item, header, pixmap );
 }
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <stdlib.h>
 
 ViewConfigureDialog::ViewConfigureDialog( ViewConfigureWidget *wdg, const QString &viewName,
                                           QWidget *parent, const char *name )
@@ -149,11 +152,9 @@ void ViewConfigureDialog::slotHelp()
   kapp->invokeHelp( "using-views" );
 #else //KAB_EMBEDDED
   qDebug("ViewConfigureDialog::slotHelp not yet implemented");
 #endif //KAB_EMBEDDED
 }
 
-#ifndef KAB_EMBEDDED
-#include "viewconfigurewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_viewconfigurewidget.cpp"
 #endif //KAB_EMBEDDED
-
-
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index 0c2b77c..e3b9b12 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -25,13 +25,13 @@
 #define VIEWCONFIGUREWIDGET_H
 
 
 
 #include "configurewidget.h"
 
-class QVBox;
+class Q3VBox;
 
 #include <kdialogbase.h>
 #include <qpixmap.h>
 
 class KJanusWidget;
 class QString;
@@ -71,13 +71,13 @@ class ViewConfigureWidget : public ConfigureWidget
     virtual void saveSettings( KConfig *config );
  
 
     /**
       Use this method to add new pages to the widget.
      */
-    QVBox *addPage( const QString &item, const QString &header = QString::null,
+    Q3VBox *addPage( const QString &item, const QString &header = QString::null,
                     const QPixmap &pixmap = QPixmap() );
                                                             
   private:
     KJanusWidget *mMainWidget;    
 
     ViewConfigureFieldsPage *mFieldsPage;
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index b5d9419..5cfe3ad 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -47,24 +47,28 @@ $Id$
 #include "views/kaddressbooktableview.h"
 #include "views/kaddressbookcardview.h"
 #include "kaddressbookview.h"
 
 #include <qaction.h>
 #include <qmessagebox.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QDropEvent>
 #include <kconfigbase.h>
 
 #endif //KAB_EMBEDDED
 
 
 #include <kdebug.h>
 #include <kactionclasses.h>
 
 #include <qlayout.h>
 #include <qapplication.h>
-#include <qwidgetstack.h>
+#include <QDesktopWidget>
+#include <q3widgetstack.h>
 
 #include <kabc/addressbook.h>
 #include "filtereditdialog.h"
 #include "addviewdialog.h"
 #include "kabcore.h"
 #include "kabprefs.h"
@@ -114,13 +118,13 @@ void ViewManager::restoreSettings()
       cw = 0; 
   mActionSelectFilter->setComboWidth( cw );
   // Tell the views to reread their config, since they may have
   // been modified by global settings
   QString _oldgroup = mCore->config()->group();
 
-  QDictIterator<KAddressBookView> it( mViewDict );
+  Q3DictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
     KConfigGroupSaver saver( mCore->config(), it.currentKey() );
     it.current()->readConfig( mCore->config() );
   }
   setActiveView( activeViewName );
 
@@ -128,13 +132,13 @@ void ViewManager::restoreSettings()
 }
 
 void ViewManager::saveSettings()
 {
   QString _oldgroup = mCore->config()->group();
 
-  QDictIterator<KAddressBookView> it( mViewDict );
+  Q3DictIterator<KAddressBookView> it( mViewDict );
   for ( it.toFirst(); it.current(); ++it ) {
     KConfigGroupSaver saver( mCore->config(), it.currentKey() );
 #ifdef DESKTOP_VERSION
     (*it)->writeConfig( mCore->config() );
 #else
     (*it).writeConfig( mCore->config() );
@@ -158,13 +162,13 @@ QStringList ViewManager::selectedUids() const
     return QStringList();
 }
 
 QStringList ViewManager::selectedEmails() const
 {
   if ( mActiveView )
-    return mActiveView->selectedEmails();
+    return QStringList(mActiveView->selectedEmails());
   else
     return QStringList();
 }
 
 KABC::Addressee::List ViewManager::selectedAddressees() const
 {
@@ -553,13 +557,13 @@ void ViewManager::startDrag()
   QStringList uidList = selectedUids();
   QStringList::Iterator iter;
   for ( iter = uidList.begin(); iter != uidList.end(); ++iter )
     addrList.append( mCore->addressBook()->findByUid( *iter ) );
 
   KMultipleDrag *drag = new KMultipleDrag( this );
-  drag->addDragObject( new QTextDrag( AddresseeUtil::addresseesToClipboard(addrList), this ) );
+  drag->addDragObject( new Q3TextDrag( AddresseeUtil::addresseesToClipboard(addrList), this ) );
   KABC::Addressee::List::Iterator it;
   QStringList vcards;
   for ( it = addrList.begin(); it != addrList.end(); ++it ) {
     QString vcard = QString::null;
     KABC::VCardConverter converter;
     if ( converter.addresseeToVCard( *it, vcard ) )
@@ -656,15 +660,15 @@ int ViewManager::filterPosition( const QString &name ) const
 void ViewManager::initActions()
 {
 //US      <ActionList name="view_loadedviews"/>
 //US      <Separator/>
 
 #ifdef KAB_EMBEDDED
-  QPopupMenu *viewmenu = (QPopupMenu*)mCore->getViewMenu();
-  QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu();
-  QPopupMenu *filtermenu = (QPopupMenu*)mCore->getFilterMenu();
+  Q3PopupMenu *viewmenu = (Q3PopupMenu*)mCore->getViewMenu();
+  Q3PopupMenu *settingsmenu = (Q3PopupMenu*)mCore->getSettingsMenu();
+  Q3PopupMenu *filtermenu = (Q3PopupMenu*)mCore->getFilterMenu();
 #endif //KAB_EMBEDDED
 
   mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" );
 #if KDE_VERSION >= 309
   mActionSelectView->setMenuAccelsEnabled( false );
 #endif
@@ -735,14 +739,14 @@ void ViewManager::initActions()
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::initGUI()
 {
-    QHBoxLayout *layout = new QHBoxLayout( this, 0, 0 );
-  mViewWidgetStack = new QWidgetStack( this );
+    Q3HBoxLayout *layout = new Q3HBoxLayout( this, 0, 0 );
+  mViewWidgetStack = new Q3WidgetStack( this );
   layout->addWidget( mViewWidgetStack );
 }
 
-#ifndef KAB_EMBEDDED
-#include "viewmanager.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_viewmanager.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index ab5d372..4bbdbc7 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -23,21 +23,23 @@
 
 #ifndef VIEWMANAGER_H
 #define VIEWMANAGER_H
 
 #include <qwidget.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <QDropEvent>
 #include <kaddressbookview.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include "filter.h"
 
 class KAction;
 class KSelectAction;
 
 class KABCore;
-class QWidgetStack;
+class Q3WidgetStack;
 class QDropEvent;
 
 namespace KABC { class AddressBook; }
 
 /**
   The view manager manages the views and everything related to them. The
@@ -142,17 +144,17 @@ class ViewManager : public QWidget
 
     KABCore *mCore;
 
     Filter mCurrentFilter;
     Filter::List mFilterList;
 
-    QDict<KAddressBookView> mViewDict;
-    QDict<ViewFactory> mViewFactoryDict;
+    Q3Dict<KAddressBookView> mViewDict;
+    Q3Dict<ViewFactory> mViewFactoryDict;
     QStringList mViewNameList;
 
-    QWidgetStack *mViewWidgetStack;
+    Q3WidgetStack *mViewWidgetStack;
     KAddressBookView *mActiveView;
     
     KAction *mActionDeleteView;
     KSelectAction *mActionSelectFilter;
     KSelectAction *mActionSelectView;
 
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index b6e053f..1a29f41 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -31,12 +31,20 @@
 #include <qdatetime.h>
 #include <qlabel.h>
 #include <qstyle.h>
 #include <qcursor.h>
 #include <qtooltip.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3PtrList>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QEvent>
+#include <QWheelEvent>
 
 #include "kabprefs.h"
 #include <kdebug.h>
 #include <kglobalsettings.h>
 //END includes
 
@@ -68,17 +76,17 @@ class CardViewTip : public QLabel {
 
 
 //
 // Warning: make sure you use findRef() instead of find() to find an
 //          item! Only the pointer value is unique in the list.
 //
-class CardViewItemList : public QPtrList<CardViewItem>
+class CardViewItemList : public Q3PtrList<CardViewItem>
 {
   protected:
-    virtual int compareItems(QPtrCollection::Item item1,
-                             QPtrCollection::Item item2)
+    virtual int compareItems(Q3PtrCollection::Item item1,
+                             Q3PtrCollection::Item item2)
     {
       CardViewItem *cItem1 = (CardViewItem*)item1;
       CardViewItem *cItem2 = (CardViewItem*)item2;
 
       if ( cItem1 == cItem2 )
           return 0;
@@ -158,13 +166,13 @@ class CardViewPrivate
        mResizeAnchor(0),
        mRubberBandAnchor( 0 ),
        mCompText( QString::null )
     {};
 
     CardViewItemList mItemList;
-    QPtrList<CardViewSeparator> mSeparatorList;
+    Q3PtrList<CardViewSeparator> mSeparatorList;
     QFontMetrics *mFm;
     QFontMetrics *mBFm;         // bold font
     QFont mHeaderFont;           // custom header font
     CardView::SelectionMode mSelectionMode;
     bool mDrawCardBorder;
     bool mDrawFieldLabels;
@@ -205,13 +213,13 @@ class CardViewItemPrivate
         mSelected( false ),
         x( 0 ),
         y( 0 ){};
         
 
     QString mCaption;
-    QPtrList< CardViewItem::Field > mFieldList;
+    Q3PtrList< CardViewItem::Field > mFieldList;
     bool mSelected;
     int x;                      // horizontal position, set by the view
     int y;                      // vertical position, set by the view
     int maxLabelWidth;          // the width of the widest label, according to the view font.
     int hcache;                 // height cache
 };
@@ -310,13 +318,13 @@ void CardViewItem::paintCard(QPainter *p, QColorGroup &cg)
   else
     p->setPen(cg.buttonText());
   p->drawText(2+mg, 2+mg + bFm.ascent()/*bFm.height()*//*-bFm.descent()*//*-bFm.leading()*/, trimString(d->mCaption, w-4, bFm));
   p->restore();
 
   // Go through the fields and draw them
-  QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
+  Q3PtrListIterator< CardViewItem::Field > iter(d->mFieldList);
   QString label, value;
   int yPos = mg + 4 + bFm.height()/* + 1*/ + fm.height(); // why the + 1 ??? (anders)
   p->setPen(cg.text());
 
   int fh = fm.height();
   int cln( 0 );
@@ -405,18 +413,18 @@ int CardViewItem::height( bool allowCache ) const
   bool sef = mView->showEmptyFields();
   int fh = mView->d->mFm->height();//lineSpacing(); // font height
   //int sp = QMAX( 0, 2- mView->d->mFm->leading() ); // field spacing NOTE make a property
   int fieldHeight = 0;
   int lines;
   int maxLines( mView->maxFieldLines() );
-  QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
+  Q3PtrListIterator< CardViewItem::Field > iter(d->mFieldList);
   for (iter.toFirst(); iter.current(); ++iter)
   {
     if ( !sef && (*iter)->second.isEmpty() )
       continue;
-    lines = QMIN( (*iter)->second.contains('\n') + 1, maxLines );
+    lines = QMIN( (*iter)->second.count('\n') + 1, maxLines );
     fieldHeight += ( lines * fh ) + 2;//sp;
   }
 
   // height of caption font (bold)
   fieldHeight += mView->d->mBFm->height();
   d->hcache = baseHeight + fieldHeight;
@@ -447,13 +455,13 @@ void CardViewItem::insertField(const QString &label, const QString &value)
 }
 
 void CardViewItem::removeField(const QString &label)
 {
   CardViewItem::Field *f;
 
-  QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
+  Q3PtrListIterator< CardViewItem::Field > iter(d->mFieldList);
   for (iter.toFirst(); iter.current(); ++iter)
   {
     f = *iter;
     if (f->first == label)
       break;
   }
@@ -520,13 +528,13 @@ void CardViewItem::setCaption(const QString &caption)
   d->mCaption = caption;
   repaintCard();
 }
 
 QString CardViewItem::fieldValue(const QString &label)
 {
-  QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
+  Q3PtrListIterator< CardViewItem::Field > iter(d->mFieldList);
   for (iter.toFirst(); iter.current(); ++iter)
     if ((*iter)->first == label)
         return (*iter)->second;
 
   return QString();
 }
@@ -566,13 +574,13 @@ void CardViewItem::showFullString( const QPoint &itempos, CardViewTip *tip )
     bool se = mView->showEmptyFields();
     int fh = mView->d->mFm->height();
 //    {
     Field *_f;
     for (_f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next())
       if ( se || ! _f->second.isEmpty() )
-        y += ( QMIN(_f->second.contains('\n')+1, maxLines) * fh ) + 2;
+        y += ( QMIN(_f->second.count('\n')+1, maxLines) * fh ) + 2;
 //    }
     if ( isLabel && itempos.y() > y + fh )
       return;
     // label or data?
     s = isLabel ? f->first : f->second;
     // trimmed?
@@ -583,13 +591,13 @@ void CardViewItem::showFullString( const QPoint &itempos, CardViewTip *tip )
     int mw = isLabel ? lw - colonWidth : w - lw - (mrg*2); // max width for string
     if ( isLabel )
     {
       trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
     } else {
       QRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) );
-      trimmed = r.width() > mw || r.height()/fh >  QMIN(s.contains('\n') + 1, maxLines);
+      trimmed = r.width() > mw || r.height()/fh >  QMIN(s.count('\n') + 1, maxLines);
     }
   }
   if ( trimmed )
   {
     tip->setFont( (isLabel && !lw) ? mView->headerFont() : mView->font() ); // if condition is true, a header
     tip->setText( s );
@@ -623,24 +631,24 @@ CardViewItem::Field *CardViewItem::fieldAt( const QPoint & itempos ) const
   int fh = mView->d->mFm->height();
   int maxLines = mView->maxFieldLines();
   Field *f;
   for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() )
   {
     if ( showEmpty || !f->second.isEmpty() )
-      ypos += ( QMIN( f->second.contains('\n')+1, maxLines ) *fh)+2;
+      ypos += ( QMIN( f->second.count('\n')+1, maxLines ) *fh)+2;
     if ( iy <= ypos )
       break;
   }
   return f ? f : 0;
 }
 //END CardViewItem
 
 //BEGIN CardView
 
 CardView::CardView(QWidget *parent, const char *name)
-  : QScrollView(parent, name),
+  : Q3ScrollView(parent, name),
     d(new CardViewPrivate())
 {
     mFlagKeyPressed = false;
     mFlagBlockKeyPressed = false;
   d->mItemList.setAutoDelete(true);
   d->mSeparatorList.setAutoDelete(true);
@@ -653,19 +661,19 @@ CardView::CardView(QWidget *parent, const char *name)
   d->mTip = ( new CardViewTip( viewport() ) ),
   d->mTip->hide();
   d->mTimer = ( new QTimer(this, "mouseTimer") ),
 
   viewport()->setMouseTracking( true );
   viewport()->setFocusProxy(this);
-  viewport()->setFocusPolicy(WheelFocus);
-  viewport()->setBackgroundMode(PaletteBase);
+  viewport()->setFocusPolicy(Qt::WheelFocus);
+  viewport()->setBackgroundMode(Qt::PaletteBase);
 
   connect( d->mTimer, SIGNAL(timeout()), this, SLOT(tryShowFullText()) );
 
 //US  setBackgroundMode(PaletteBackground, PaletteBase);
-  setBackgroundMode(PaletteBackground);
+  setBackgroundMode(Qt::PaletteBackground);
 
   // no reason for a vertical scrollbar
   setVScrollBarMode(AlwaysOff);
 }
 
 CardView::~CardView()
@@ -736,13 +744,13 @@ void CardView::setCurrentItem( CardViewItem *item )
   emit currentChanged( item );
 }
 
 CardViewItem *CardView::itemAt(const QPoint &viewPos)
 {
   CardViewItem *item = 0;
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
   bool found = false;
   for (iter.toFirst(); iter.current() && !found; ++iter)
   {
     item = *iter;
     //if (item->d->mRect.contains(viewPos))
     if (QRect(item->d->x, item->d->y, d->mItemWidth, item->height()).contains(viewPos))
@@ -784,13 +792,13 @@ CardView::SelectionMode CardView::selectionMode() const
 {
   return d->mSelectionMode;
 }
 
 void CardView::selectAll(bool state)
 {
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
   if (!state)
   {
     for (iter.toFirst(); iter.current(); ++iter)
     {
       if ((*iter)->isSelected())
       {
@@ -875,13 +883,13 @@ bool CardView::isSelected(CardViewItem *item) const
   return (item && item->isSelected());
 }
 
 CardViewItem *CardView::selectedItem() const
 {
   // find the first selected item
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
   for (iter.toFirst(); iter.current(); ++iter)
   {
     if ((*iter)->isSelected())
       return *iter;
   }
 
@@ -952,13 +960,13 @@ void CardView::drawContents(QPainter *p, int clipx, int clipy,
   CardViewItem *item;
   CardViewSeparator *sep;
   // make sure the viewport is a pure background
   viewport()->erase( QRect ( cX, cY , clipw, cliph ) );
 
   // Now tell the cards to draw, if they are in the clip region
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
   for (iter.toFirst(); iter.current(); ++iter)
   {
     item = *iter;
     cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
 
     if (clipRect.intersects(cardRect) || clipRect.contains(cardRect))
@@ -972,13 +980,13 @@ void CardView::drawContents(QPainter *p, int clipx, int clipy,
       item->paintCard(p, cg);
       p->restore();
     }
   }
 
   // Followed by the separators if they are in the clip region
-  QPtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
+  Q3PtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
   for (sepIter.toFirst(); sepIter.current(); ++sepIter)
   {
     sep = *sepIter;
     sepRect = sep->mRect;
 
     if (clipRect.intersects(sepRect) || clipRect.contains(sepRect))
@@ -990,13 +998,13 @@ void CardView::drawContents(QPainter *p, int clipx, int clipy,
     }
   }
 }
 
 void CardView::resizeEvent(QResizeEvent *e)
 {
-  QScrollView::resizeEvent(e);
+  Q3ScrollView::resizeEvent(e);
 
   setLayoutDirty(true);
 }
 
 void CardView::calcLayout()
 {
@@ -1010,13 +1018,13 @@ void CardView::calcLayout()
   int yPos = 0;
   int cardSpacing = d->mItemSpacing;
 
   // delete the old separators
   d->mSeparatorList.clear();
 
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
   CardViewItem *item = 0;
   CardViewSeparator *sep = 0;
   xPos += cardSpacing;
 
   for (iter.toFirst(); iter.current(); ++iter)
   {
@@ -1053,13 +1061,13 @@ void CardView::calcLayout()
 
   xPos += maxWidth;
   resizeContents( xPos + cardSpacing, maxHeight );
 
   // Update the height of all the separators now that we know the
   // max height of a column
-  QPtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
+  Q3PtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
   for (sepIter.toFirst(); sepIter.current(); ++sepIter)
   {
     (*sepIter)->mRect.setHeight(maxHeight - 2*cardSpacing - 2*d->mItemMargin);
   }
 
   d->mLayoutDirty = false;
@@ -1098,13 +1106,13 @@ void CardView::setItemSpacing( uint spacing )
   d->mItemSpacing = spacing;
   setLayoutDirty( true );
 }
 
 void CardView::contentsMousePressEvent(QMouseEvent *e)
 {
-  QScrollView::contentsMousePressEvent(e);
+  Q3ScrollView::contentsMousePressEvent(e);
 
   QPoint pos = e->pos();
   d->mLastClickPos = pos;
 
   CardViewItem *item = itemAt(pos);
 
@@ -1168,13 +1176,13 @@ void CardView::contentsMousePressEvent(QMouseEvent *e)
              (e->state() & Qt::ShiftButton))
     {
       if ( item == other ) return;
 
       bool s = ! item->isSelected();
 
-      if ( s && ! (e->state() & ControlButton) )
+      if ( s && ! (e->state() & Qt::ControlButton) )
       {
         bool b = signalsBlocked();
         blockSignals(true);
         selectAll(false);
         blockSignals(b);
       }
@@ -1216,13 +1224,13 @@ void CardView::contentsMousePressEvent(QMouseEvent *e)
   }
 
 }
 
 void CardView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
-  QScrollView::contentsMouseReleaseEvent(e);
+  Q3ScrollView::contentsMouseReleaseEvent(e);
 
   if ( d->mResizeAnchor )
   {
     // finish the resizing:
         unsetCursor();
     // hide rubber bands
@@ -1254,13 +1262,13 @@ void CardView::contentsMouseReleaseEvent(QMouseEvent *e)
     emit executed(item);
   }
 }
 
 void CardView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
-  QScrollView::contentsMouseDoubleClickEvent(e);
+  Q3ScrollView::contentsMouseDoubleClickEvent(e);
 
   CardViewItem *item = itemAt(e->pos());
 
   if (item)
   {
     d->mCurrentItem = item;
@@ -1299,18 +1307,18 @@ void CardView::contentsMouseMoveEvent( QMouseEvent *e )
   {
     int colcontentw = d->mItemWidth + (2*d->mItemSpacing);
     int colw = colcontentw + d->mSepWidth;
     int m = e->x()%colw;
     if ( m >= colcontentw && m > 0 )
     {
-      setCursor( SplitVCursor ); // Why does this fail sometimes?
+      setCursor( Qt::SplitVCursor ); // Why does this fail sometimes?
       d->mOnSeparator = true;
     }
     else
     {
-      setCursor( ArrowCursor );
+      setCursor( Qt::ArrowCursor );
       d->mOnSeparator = false;
     }
   }
 }
 
 void CardView::enterEvent( QEvent * )
@@ -1321,13 +1329,13 @@ void CardView::enterEvent( QEvent * )
 void CardView::leaveEvent( QEvent * )
 {
   d->mTimer->stop();
   if (d->mOnSeparator)
   {
     d->mOnSeparator = false;
-    setCursor( ArrowCursor );
+    setCursor( Qt::ArrowCursor );
    }
 }
 
 void CardView::focusInEvent( QFocusEvent * )
 {
   if (!d->mCurrentItem && d->mItemList.count() )
@@ -1365,27 +1373,27 @@ void CardView::keyPressEvent( QKeyEvent *e )
   uint pos = d->mItemList.findRef( d->mCurrentItem );
   CardViewItem *aItem = 0L; // item that gets the focus
   CardViewItem *old = d->mCurrentItem;
 
   switch ( e->key() )
   {
-    case Key_Up:
+      case Qt::Key_Up:
     if ( pos > 0 )
     {
       aItem = d->mItemList.at( pos - 1 );
       setCurrentItem( aItem );
     }
     break;
-    case Key_Down:
+      case Qt::Key_Down:
     if ( pos < d->mItemList.count() - 1 )
     {
       aItem = d->mItemList.at( pos + 1 );
       setCurrentItem( aItem );
     }
     break;
-    case Key_Left:
+      case Qt::Key_Left:
     {
       // look for an item in the previous/next column, starting from
       // the vertical middle of the current item.
       // FIXME use nice calculatd measures!!!
       QPoint aPoint( d->mCurrentItem->d->x, d->mCurrentItem->d->y );
       aPoint -= QPoint( 30,-(d->mCurrentItem->height()/2) );
@@ -1397,13 +1405,13 @@ void CardView::keyPressEvent( QKeyEvent *e )
         aItem = itemAt( aPoint );
       }
       if ( aItem )
         setCurrentItem( aItem );
     }
     break;
-    case Key_Right:
+      case Qt::Key_Right:
     {
       // FIXME use nice calculated measures!!!
       QPoint aPoint( d->mCurrentItem->d->x + d->mItemWidth, d->mCurrentItem->d->y );
       aPoint += QPoint( 30,(d->mCurrentItem->height()/2) );
       aItem = itemAt( aPoint );
       while ( !aItem && aPoint.y() > 27 )
@@ -1412,34 +1420,34 @@ void CardView::keyPressEvent( QKeyEvent *e )
         aItem = itemAt( aPoint );
       }
       if ( aItem )
         setCurrentItem( aItem );
     }
     break;
-    case Key_Home:
+      case Qt::Key_Home:
     aItem = d->mItemList.first();
     setCurrentItem( aItem );
     break;
-    case Key_End:
+      case Qt::Key_End:
     aItem = d->mItemList.last();
     setCurrentItem( aItem );
     break;
-    case Key_Prior: // PageUp
+      case Qt::Key_Prior: // PageUp
     {
       // QListView: "Make the item above the top visible and current"
       // TODO if contentsY(), pick the top item of the leftmost visible column
       if ( contentsX() <= 0 )
         return;
       int cw = columnWidth();
       int theCol = ( QMAX( 0, ( contentsX()/cw) * cw ) ) + d->mItemSpacing;
       aItem = itemAt( QPoint( theCol + 1, d->mItemSpacing + 1 ) );
       if ( aItem )
         setCurrentItem( aItem );
     }
     break;
-    case Key_Next:  // PageDown
+      case Qt::Key_Next:  // PageDown
     {
       // QListView: "Make the item below the bottom visible and current"
       // find the first not fully visible column.
       // TODO: consider if a partly visible (or even hidden) item at the
       //       bottom of the rightmost column exists
       int cw = columnWidth();
@@ -1455,25 +1463,25 @@ void CardView::keyPressEvent( QKeyEvent *e )
       aItem = itemAt( QPoint( theCol, d->mItemSpacing + 1 ) );
 
       if ( aItem )
         setCurrentItem( aItem );
     }
     break;
-    case Key_Space:
+      case Qt::Key_Space:
     setSelected( d->mCurrentItem, !d->mCurrentItem->isSelected() );
     emit selectionChanged();
     break;
-    case Key_Return:
-    case Key_Enter: 
+      case Qt::Key_Return:
+      case Qt::Key_Enter: 
         {
             emit returnPressed( d->mCurrentItem );
             emit executed( d->mCurrentItem );
         }
     break;
     default:
-    if ( (e->state() & ControlButton) && e->key() == Key_A )
+    if ( (e->state() & Qt::ControlButton) && e->key() == Qt::Key_A )
     {
       // select all
       selectAll( true );
       break;
     }
     // if we have a string, do autosearch
@@ -1485,13 +1493,13 @@ void CardView::keyPressEvent( QKeyEvent *e )
   }
   // handle selection
   if ( aItem )
   {
     if ( d->mSelectionMode == CardView::Extended )
     {
-      if ( (e->state() & ShiftButton) )
+      if ( (e->state() & Qt::ShiftButton) )
       {
         // shift button: toggle range
         // if control button is pressed, leave all items
         // and toggle selection current->old current
         // otherwise, ??????
         bool s = ! aItem->isSelected();
@@ -1516,13 +1524,13 @@ void CardView::keyPressEvent( QKeyEvent *e )
           item = d->mItemList.at( from );
           item->setSelected( s );
           repaintItem( item );
         }
         emit selectionChanged();
       }
-      else if ( (e->state() & ControlButton) )
+      else if ( (e->state() & Qt::ControlButton) )
       {
         // control button: do nothing
       }
       else
       {
         // no button: move selection to this item
@@ -1635,15 +1643,15 @@ void CardView::drawRubberBands( int pos )
 
   int tmpcw = (d->mRubberBandAnchor-d->firstX)/d->span;
   int x = d->firstX + tmpcw - d->mSepWidth - contentsX();
   int h = visibleHeight();
 
   QPainter p( viewport() );
-  p.setRasterOp( XorROP );
-  p.setPen( gray );
-  p.setBrush( gray );
+  p.setCompositionMode( QPainter::CompositionMode_Xor );
+  p.setPen( Qt::gray );
+  p.setBrush( Qt::gray );
   uint n = d->first;
   // erase
   if ( d->mRubberBandAnchor )
     do {
       p.drawRect( x, 0, 2, h );
       x += tmpcw;
@@ -1696,13 +1704,13 @@ QFont CardView::headerFont() const
 {
   return d->mHeaderFont;
 }
 
 void CardView::setFont( const QFont &fnt )
 {
-  QScrollView::setFont( fnt );
+  Q3ScrollView::setFont( fnt );
   delete d->mFm;
   d->mFm = new QFontMetrics( fnt );
 }
 
 int CardView::separatorWidth()
 {
@@ -1733,18 +1741,18 @@ void CardView::keyReleaseEvent ( QKeyEvent * e )
    if ( !e->isAutoRepeat() ) {
         mFlagBlockKeyPressed = true;
         qApp->processEvents();
         mFlagBlockKeyPressed = false;
         mFlagKeyPressed = false;
    }
-   QScrollView::keyReleaseEvent ( e );
+   Q3ScrollView::keyReleaseEvent ( e );
 }
 
 
 
 
 
 //END Cardview
 
-#ifndef KAB_EMBEDDED
-#include "cardview.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_cardview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 2ea3771..9c245ea 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -1,15 +1,23 @@
 #ifndef CARDVIEW_H
 #define CARDVIEW_H
 
-#include <qscrollview.h>
-#include <qptrlist.h>
+#include <q3scrollview.h>
+#include <q3ptrlist.h>
 #include <qstring.h>
 #include <qrect.h>
 #include <qpair.h>
 #include <qpoint.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
 
 class QLabel;
 class QPainter;
 class QResizeEvent;
 class QMouseEvent;
 class CardView;
@@ -145,13 +153,13 @@ class CardViewItem
 *
 * The CardView class is designed to mirror the API of the QListView or
 * QIconView. The CardView is also completely independant of KAddressBook and
 * can be used elsewhere. With the exception of a few simple config checks,
 * the CardView is also 100% independant of KDE.
 */
-class CardView : public QScrollView
+class CardView : public Q3ScrollView
 {
   friend class CardViewItem;
 
   Q_OBJECT
 
   public:
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index 2bddca6..46a59a1 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -16,41 +16,46 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
 
 #include <qpainter.h>
+//Added by qt3to4:
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QDragMoveEvent>
+#include <QDragLeaveEvent>
 
 #include <kcolordialog.h>
 
 #ifndef KAB_EMBEDDED
 #include <kcolordrag.h>
 #endif //KAB_EMBEDDED
 
 #include "colorlistbox.h"
 #ifdef DESKTOP_VERSION
 #include <qcolordialog.h>
 #endif
 
-ColorListBox::ColorListBox( QWidget *parent, const char *name, WFlags f )
+ColorListBox::ColorListBox( QWidget *parent, const char *name, Qt::WFlags f )
   :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
 {
   connect( this, SIGNAL(selected(int)), this, SLOT(newColor(int)) );
-  connect( this, SIGNAL(clicked(QListBoxItem *)), this, SLOT(slotNewColor(QListBoxItem *)) );
+  connect( this, SIGNAL(clicked(Q3ListBoxItem *)), this, SLOT(slotNewColor(Q3ListBoxItem *)) );
   setAcceptDrops( true);
 }
 
 
 void ColorListBox::setEnabled( bool state )
 {
   if( state == isEnabled() )
   {
     return;
   }
 
-  QListBox::setEnabled( state );
+  Q3ListBox::setEnabled( state );
   for( uint i=0; i<count(); i++ )
   {
     updateItem( i );
   }
 }
 
@@ -72,16 +77,16 @@ QColor ColorListBox::color( uint index ) const
   {
     ColorListItem *colorItem = (ColorListItem*)item(index);
     return( colorItem->color() );
   }
   else
   {
-    return( black );
+    return( Qt::black );
   }
 }
-void ColorListBox::slotNewColor(QListBoxItem * i)
+void ColorListBox::slotNewColor(Q3ListBoxItem * i)
 {
     if ( i )
         newColor( index( i ) );
 }
 
 void ColorListBox::newColor( int index )
@@ -195,13 +200,13 @@ qDebug("ColorListBox::dropEvent drag&drop currently not supported");
   
 }
 
 
 
 ColorListItem::ColorListItem( const QString &text, const QColor &color )
-  : QListBoxItem(), mColor( color ), mBoxWidth( 30 )
+  : Q3ListBoxItem(), mColor( color ), mBoxWidth( 30 )
 {
   setText( text );
 }
 
 
 const QColor &ColorListItem::color( void )
@@ -226,20 +231,20 @@ void ColorListItem::paint( QPainter *p )
   p->setPen( Qt::black );
   p->drawRect( 3, 1, mBoxWidth, h-1 );
   p->fillRect( 4, 2, mBoxWidth-2, h-3, mColor );
 }
 
 
-int ColorListItem::height(const QListBox *lb ) const
+int ColorListItem::height(const Q3ListBox *lb ) const
 {
   return( lb->fontMetrics().lineSpacing()+1 );
 }
 
 
-int ColorListItem::width(const QListBox *lb ) const
+int ColorListItem::width(const Q3ListBox *lb ) const
 {
   return( mBoxWidth + lb->fontMetrics().width( text() ) + 6 );
 }
 
-#ifndef KAB_EMBEDDED
-#include "colorlistbox.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_colorlistbox.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index bb91484..31a8085 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -19,24 +19,29 @@
  */
 
 #ifndef _COLOR_LISTBOX_H_
 #define _COLOR_LISTBOX_H_
 
 #include <klistbox.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDragLeaveEvent>
+#include <QDropEvent>
+#include <QDragEnterEvent>
 
 class QDragEnterEvent;
 class QDragLeaveEvent;
 class QDragMoveEvent;
 class QDropEvent;
 
 class ColorListBox : public KListBox
 {
   Q_OBJECT
 
   public:
-    ColorListBox( QWidget *parent=0, const char * name=0, WFlags f=0 );
+    ColorListBox( QWidget *parent=0, const char * name=0, Qt::WFlags f=0 );
     void setColor( uint index, const QColor &color );
     QColor color( uint index ) const;
 
   public slots:
     virtual void setEnabled( bool state );
 
@@ -45,31 +50,31 @@ class ColorListBox : public KListBox
     void dragLeaveEvent( QDragLeaveEvent *e );
     void dragMoveEvent( QDragMoveEvent *e );
     void dropEvent( QDropEvent *e );
 
   private slots:
     void newColor( int index );
-    void slotNewColor(QListBoxItem * i);
+    void slotNewColor(Q3ListBoxItem * i);
 
   private:
     int mCurrentOnDragEnter;
 
 };
 
 
-class ColorListItem : public QListBoxItem
+class ColorListItem : public Q3ListBoxItem
 {
   public:
     ColorListItem( const QString &text, const QColor &color=Qt::black );
     const QColor &color( void );
     void  setColor( const QColor &color );
 
   protected:
     virtual void paint( QPainter * );
-    virtual int height( const QListBox * ) const;
-    virtual int width( const QListBox * ) const;
+    virtual int height( const Q3ListBox * ) const;
+    virtual int width( const Q3ListBox * ) const;
 
   private:
     QColor mColor;
     int mBoxWidth;
 };
 
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index e0fbd21..b6327fe 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -22,17 +22,20 @@
 */                                                                      
 
 #include <qstring.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
-#include <qvbox.h>
-#include <qgroupbox.h>
+#include <q3vbox.h>
+#include <q3groupbox.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -86,13 +89,13 @@ void ConfigureCardViewWidget::saveSettings( KConfig *config )
   mAdvancedPage->saveSettings( config );
 }
     
 ////////////////////////
 // CardViewLookNFeelPage
 CardViewLookNFeelPage::CardViewLookNFeelPage( QWidget *parent, const char *name )
-  : QVBox( parent, name )
+  : Q3VBox( parent, name )
 {
   initGUI();
 }
 
 CardViewLookNFeelPage::~CardViewLookNFeelPage()
 {
@@ -231,124 +234,124 @@ void CardViewLookNFeelPage::initGUI()
   int spacing = KDialog::spacingHint();
   int margin = KDialog::marginHint();
   
   QTabWidget *tabs = new QTabWidget( this );
 
   // Layout
-  QVBox *loTab = new QVBox( this, "layouttab" );
+  Q3VBox *loTab = new Q3VBox( this, "layouttab" );
   
   loTab->setSpacing( spacing );
   loTab->setMargin( margin );
   
-  QGroupBox *gbGeneral = new QGroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
+  Q3GroupBox *gbGeneral = new Q3GroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
   
   cbDrawSeps = new QCheckBox( i18n("Draw &separators"), gbGeneral );
 
-  QHBox *hbSW = new QHBox( gbGeneral );
+  Q3HBox *hbSW = new Q3HBox( gbGeneral );
   QLabel *lSW = new QLabel( i18n("Separator &width:"), hbSW );
   sbSepWidth = new QSpinBox( 1, 50, 1, hbSW );
   lSW->setBuddy( sbSepWidth);
 
-  QHBox *hbPadding = new QHBox( gbGeneral );
+  Q3HBox *hbPadding = new Q3HBox( gbGeneral );
   QLabel *lSpacing = new QLabel( i18n("&Padding:"), hbPadding );
   sbSpacing = new QSpinBox( 0, 100, 1, hbPadding );
   lSpacing->setBuddy( sbSpacing );
 
-  QGroupBox *gbCards = new QGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
+  Q3GroupBox *gbCards = new Q3GroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
 
-  QHBox *hbMargin = new QHBox( gbCards );
+  Q3HBox *hbMargin = new Q3HBox( gbCards );
   QLabel *lMargin = new QLabel( i18n("&Margin:"), hbMargin );
   sbMargin = new QSpinBox( 0, 100, 1, hbMargin );
   lMargin->setBuddy( sbMargin );
 
   cbDrawBorders = new QCheckBox( i18n("Draw &borders"), gbCards );
 
   loTab->setStretchFactor( new QWidget( loTab ), 1 );
   
-  QWhatsThis::add( sbMargin, i18n(
+  Q3WhatsThis::add( sbMargin, i18n(
         "The item margin is the distance (in pixels) between the item edge and the item data. Most noticeably, "
         "incrementing the item margin will add space between the focus rectangle and the item data."
         ) );
-  QWhatsThis::add( lMargin, QWhatsThis::textFor( sbMargin ) );
-  QWhatsThis::add( sbSpacing, i18n(
+  /* TODO:hacker: Q3WhatsThis::add( lMargin, Q3WhatsThis::textFor( sbMargin ) ); */
+  Q3WhatsThis::add( sbSpacing, i18n(
         "The Item Spacing decides the distance (in pixels) between the items and anything else: the view "
         "borders, other items or column separators."
         ) );
-  QWhatsThis::add( lSpacing, QWhatsThis::textFor( sbSpacing ) );
-  QWhatsThis::add( sbSepWidth, i18n("Sets the width of column separators") );
-  QWhatsThis::add( lSW, QWhatsThis::textFor( sbSepWidth ) );
+  /* TODO:hacker: Q3WhatsThis::add( lSpacing, Q3WhatsThis::textFor( sbSpacing ) ); */
+  Q3WhatsThis::add( sbSepWidth, i18n("Sets the width of column separators") );
+  /* TODO:hacker: Q3WhatsThis::add( lSW, Q3WhatsThis::textFor( sbSepWidth ) ); */
   
   tabs->addTab( loTab, i18n("&Layout") );
     
   // Colors
-  QVBox *colorTab = new QVBox( this, "colortab" );
+  Q3VBox *colorTab = new Q3VBox( this, "colortab" );
   colorTab->setSpacing( spacing );
   colorTab->setMargin( spacing );
   cbEnableCustomColors = new QCheckBox( i18n("&Enable custom Colors"), colorTab );
   connect( cbEnableCustomColors, SIGNAL(clicked()), this, SLOT(enableColors()) );
   lbColors = new ColorListBox( colorTab );
   tabs->addTab( colorTab, i18n("&Colors") );
   
-  QWhatsThis::add( cbEnableCustomColors, i18n(
+  Q3WhatsThis::add( cbEnableCustomColors, i18n(
         "If custom colors are enabled, you may choose the colors for the view below. "
         "Otherwise colors from your current KDE color scheme are used."
         ) );
-  QWhatsThis::add( lbColors, i18n(
+  Q3WhatsThis::add( lbColors, i18n(
         "Double click or press RETURN on a item to select a color for the related strings in the view."
         ) );
   
   // Fonts
-  QVBox *fntTab = new QVBox( this, "fonttab" );
+  Q3VBox *fntTab = new Q3VBox( this, "fonttab" );
   
   fntTab->setSpacing( spacing );
   fntTab->setMargin( spacing );
   
   cbEnableCustomFonts = new QCheckBox( i18n("&Enable custom fonts"), fntTab );
   connect( cbEnableCustomFonts, SIGNAL(clicked()), this, SLOT(enableFonts()) );
   
   vbFonts = new QWidget( fntTab );
-  QGridLayout *gFnts = new QGridLayout( vbFonts, 2, 3 );
+  Q3GridLayout *gFnts = new Q3GridLayout( vbFonts, 2, 3 );
   gFnts->setSpacing( spacing );
   gFnts->setAutoAdd( true );
   gFnts->setColStretch( 1, 1 );  
   QLabel *lTFnt = new QLabel( i18n("&Text font:"), vbFonts );
   lTextFont = new QLabel( vbFonts );
-  lTextFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
+  lTextFont->setFrameStyle( Q3Frame::Panel|Q3Frame::Sunken );
 #ifndef KAB_EMBEDDED    
   btnFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
   btnFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
   
   lTFnt->setBuddy( btnFont );
   
   connect( btnFont, SIGNAL(clicked()), this, SLOT(setTextFont()) );
   
   QLabel *lHFnt = new QLabel( i18n("&Header font:"), vbFonts );
   lHeaderFont = new QLabel( vbFonts );
-  lHeaderFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
+  lHeaderFont->setFrameStyle( Q3Frame::Panel|Q3Frame::Sunken );
 #ifndef KAB_EMBEDDED    
   btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
   btnHeaderFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
   lHFnt->setBuddy( btnHeaderFont );
   connect( btnHeaderFont, SIGNAL(clicked()), this, SLOT(setHeaderFont()) );
   
   fntTab->setStretchFactor( new QWidget( fntTab ), 1 );
 
-  QWhatsThis::add( cbEnableCustomFonts, i18n(
+  Q3WhatsThis::add( cbEnableCustomFonts, i18n(
         "If custom fonts are enabled, you may choose which fonts to use for this view below. "
         "Otherwise the default KDE font will be used, in bold style for the header and "
         "normal style for the data."
         ) );
           
   tabs->addTab( fntTab, i18n("&Fonts") );
   
   // Behaviour
-  QVBox *behaviourTab = new QVBox( this );
+  Q3VBox *behaviourTab = new Q3VBox( this );
   behaviourTab->setMargin( margin );
   behaviourTab->setSpacing( spacing );
   
   cbShowEmptyFields = new QCheckBox( i18n("Show &empty fields"), behaviourTab );
   cbShowFieldLabels = new QCheckBox( i18n("Show field &labels"), behaviourTab );
 
@@ -361,9 +364,9 @@ void CardViewLookNFeelPage::initGUI()
 void CardViewLookNFeelPage::updateFontLabel( QFont fnt, QLabel *l )
 {
   l->setFont( fnt );
   l->setText(  QString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
 }
 
-#ifndef KAB_EMBEDDED
-#include "configurecardviewdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_configurecardviewdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 7a62226..4af475d 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -23,15 +23,17 @@
 
 #ifndef CONFIGURECARDVIEWDIALOG_H
 #define CONFIGURECARDVIEWDIALOG_H
 
 #include "viewconfigurewidget.h"
 
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qwidget.h>
 #include <qfont.h>
+//Added by qt3to4:
+#include <QLabel>
 
 class QString;
 class QWidget;
 class QCheckBox;
 class QLabel;
 class KConfig;
@@ -74,13 +76,13 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
     
     Layout
     * item margin
     * item spacing
 */
 
-class CardViewLookNFeelPage : public QVBox {
+class CardViewLookNFeelPage : public Q3VBox {
 
   Q_OBJECT
   
   public:
     CardViewLookNFeelPage( QWidget *parent=0, const char *name=0 );
     ~CardViewLookNFeelPage();
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index c329cd9..7ed897a 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -24,17 +24,20 @@
 #include <qstring.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
-#include <qvbox.h>
-#include <qbuttongroup.h>
+#include <q3vbox.h>
+#include <q3buttongroup.h>
 #include <qtabwidget.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kiconloader.h>
@@ -81,13 +84,13 @@ void ConfigureTableViewWidget::saveSettings( KConfig *config )
   mPage->saveSettings( config );
 }
 
 
 
 LookAndFeelPage::LookAndFeelPage(QWidget *parent, const char *name)
-  : QVBox(parent, name)
+  : Q3VBox(parent, name)
 {
   initGUI();
   
   // Set initial state
   enableBackgroundToggled(mBackgroundBox->isChecked());
 }
@@ -226,18 +229,18 @@ void LookAndFeelPage::initGUI()
   int spacing = KDialog::spacingHint();
   int margin = KDialog::marginHint();
   
   QTabWidget *tabs = new QTabWidget( this );
 
   // General
-  QVBox *generalTab = new QVBox( this, "generaltab" );
+  Q3VBox *generalTab = new Q3VBox( this, "generaltab" );
   
   generalTab->setSpacing( spacing );
   generalTab->setMargin( margin );
 
-  QButtonGroup *group = new QButtonGroup(1, Qt::Horizontal, 
+  Q3ButtonGroup *group = new Q3ButtonGroup(1, Qt::Horizontal, 
                                          i18n("Row Separator"), generalTab);
       
   mAlternateButton = new QRadioButton(i18n("Alternating backgrounds"),
                                       group, "mAlternateButton");
   mLineButton = new QRadioButton(i18n("Single line"), group, "mLineButton");
   mNoneButton = new QRadioButton(i18n("None"), group, "mNoneButton");
@@ -259,69 +262,69 @@ void LookAndFeelPage::initGUI()
   mToolTipBox = new QCheckBox(i18n("Enable contact tooltips"), generalTab,
                               "mToolTipBox");
 
   tabs->addTab( generalTab, i18n("&General") );
     
   // Colors
-  QVBox *colorTab = new QVBox( this, "colortab" );
+  Q3VBox *colorTab = new Q3VBox( this, "colortab" );
   colorTab->setSpacing( spacing );
   colorTab->setMargin( spacing );
   cbEnableCustomColors = new QCheckBox( i18n("&Enable custom Colors"), colorTab );
   connect( cbEnableCustomColors, SIGNAL(clicked()), this, SLOT(enableColors()) );
   lbColors = new ColorListBox( colorTab );
   tabs->addTab( colorTab, i18n("&Colors") );
   
-  QWhatsThis::add( cbEnableCustomColors, i18n(
+  Q3WhatsThis::add( cbEnableCustomColors, i18n(
         "If custom colors are enabled, you may choose the colors for the view below. "
         "Otherwise colors from your current KDE color scheme are used."
         ) );
-  QWhatsThis::add( lbColors, i18n(
+  Q3WhatsThis::add( lbColors, i18n(
         "Double click or press RETURN on a item to select a color for the related strings in the view."
         ) );
   
   // Fonts
-  QVBox *fntTab = new QVBox( this, "fonttab" );
+  Q3VBox *fntTab = new Q3VBox( this, "fonttab" );
   
   fntTab->setSpacing( spacing );
   fntTab->setMargin( spacing );
   
   cbEnableCustomFonts = new QCheckBox( i18n("&Enable custom fonts"), fntTab );
   connect( cbEnableCustomFonts, SIGNAL(clicked()), this, SLOT(enableFonts()) );
   
   vbFonts = new QWidget( fntTab );
-  QGridLayout *gFnts = new QGridLayout( vbFonts, 2, 3 );
+  Q3GridLayout *gFnts = new Q3GridLayout( vbFonts, 2, 3 );
   gFnts->setSpacing( spacing );
   gFnts->setAutoAdd( true );
   gFnts->setColStretch( 1, 1 );  
   QLabel *lTFnt = new QLabel( i18n("&Text font:"), vbFonts );
   lTextFont = new QLabel( vbFonts );
-  lTextFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
+  lTextFont->setFrameStyle( Q3Frame::Panel|Q3Frame::Sunken );
 #ifndef KAB_EMBEDDED    
   btnFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
   btnFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
   
   lTFnt->setBuddy( btnFont );
   
   connect( btnFont, SIGNAL(clicked()), this, SLOT(setTextFont()) );
   
   QLabel *lHFnt = new QLabel( i18n("&Header font:"), vbFonts );
   lHeaderFont = new QLabel( vbFonts );
-  lHeaderFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
+  lHeaderFont->setFrameStyle( Q3Frame::Panel|Q3Frame::Sunken );
 #ifndef KAB_EMBEDDED    
   btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
   btnHeaderFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
   lHFnt->setBuddy( btnHeaderFont );
   connect( btnHeaderFont, SIGNAL(clicked()), this, SLOT(setHeaderFont()) );
   
   fntTab->setStretchFactor( new QWidget( fntTab ), 1 );
 
-  QWhatsThis::add( cbEnableCustomFonts, i18n(
+  Q3WhatsThis::add( cbEnableCustomFonts, i18n(
         "If custom fonts are enabled, you may choose which fonts to use for this view below. "
         "Otherwise the default KDE font will be used, in bold style for the header and "
         "normal style for the data."
         ) );
           
   tabs->addTab( fntTab, i18n("&Fonts") );
@@ -337,9 +340,9 @@ void LookAndFeelPage::enableBackgroundToggled(bool enabled)
 void LookAndFeelPage::updateFontLabel( QFont fnt, QLabel *l )
 {
   l->setFont( fnt );
   l->setText(  QString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
 }
 
-#ifndef KAB_EMBEDDED    
-#include "configuretableviewdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_configuretableviewdialog.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 003ccf8..8125fc9 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -23,13 +23,15 @@
 
 #ifndef CONFIGURETABLEVIEWDIALOG_H
 #define CONFIGURETABLEVIEWDIALOG_H
 
 #include "viewconfigurewidget.h"
 
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <QLabel>
 
 class QString;
 class QWidget;
 class QRadioButton;
 class QCheckBox;
 class KURLRequester;
@@ -60,13 +62,13 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
     LookAndFeelPage *mPage;
 };
 
 /**
   Internal class. It is only defined here for moc
 */
-class LookAndFeelPage : public QVBox
+class LookAndFeelPage : public Q3VBox
 {
   Q_OBJECT
   
   public:
     LookAndFeelPage( QWidget *parent, const char *name = 0 );
     ~LookAndFeelPage() {}
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 9accf78..227645d 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -18,21 +18,26 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qheader.h>
-#include <qiconset.h>
+#include <q3header.h>
+#include <qicon.h>
 #include <qimage.h>
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qcombobox.h>
 #include <qpainter.h>
 #include <qbrush.h>
 #include <qevent.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kconfig.h>
@@ -44,29 +49,30 @@
 #include "contactlistview.h"
 
 /////////////////////////////////
 // DynamicTip Methods
 
 DynamicTip::DynamicTip( ContactListView *parent)
-  : QToolTip( parent )
+  /* TODO:hacker:: QToolTip( parent ) */
 {
 }
 
 void DynamicTip::maybeTip( const QPoint &pos )
 {
+    /* TODO:hacker: 
  static bool ishidden = true;
   if (!parentWidget()->inherits( "ContactListView" ))
     return;
 
   ContactListView *plv = (ContactListView*)parentWidget();
   if (!plv->tooltips())
     return;
 
   QPoint posVp = plv->viewport()->pos();
 
-  QListViewItem *lvi = plv->itemAt( pos - posVp );
+  Q3ListViewItem *lvi = plv->itemAt( pos - posVp );
   if (!lvi)
     return;
 
 #ifndef KAB_EMBEDDED    
   ContactListViewItem *plvi = dynamic_cast< ContactListViewItem* >(lvi);
 #else //KAB_EMBEDDED    
@@ -148,13 +154,13 @@ void DynamicTip::maybeTip( const QPoint &pos )
 
   tip( r, s );
     }
         else
         hide();
         ishidden = !ishidden;
-      
+      */
 }
 
 ///////////////////////////
 // ContactListViewItem Methods
 
 ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
@@ -170,13 +176,13 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
 QString ContactListViewItem::key(int column, bool ascending) const
 {
 #ifndef DESKTOP_VERSION
     int lan = KGlobal::locale()->language();
     //qDebug("language %d ", lan);
     if ( lan == 1 ) { //GERMAN
-        QString ret = QListViewItem::key(column, ascending).lower().utf8();
+        QString ret = Q3ListViewItem::key(column, ascending).lower().utf8();
         int start = -1;
         while ( (start = ret.find( 'ä', start+1)) > 0 ) {
             ret.at(start-1) = 'a';
         }
         start = -1;
         while ( (start = ret.find( 'ö', start+1)) > 0 ) {
@@ -194,13 +200,13 @@ QString ContactListViewItem::key(int column, bool ascending) const
 
         return ret;
         
     }
     else
 #endif
-        return QListViewItem::key(column, ascending).lower();
+        return Q3ListViewItem::key(column, ascending).lower();
 }
 
 void ContactListViewItem::paintCell(QPainter * p,
                                                     const QColorGroup & cg,
                                     int column,
                                     int width,
@@ -285,13 +291,13 @@ void ContactListView::printMe()
 #ifdef DESKTOP_VERSION 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
@@ -340,23 +346,23 @@ void ContactListView::contentsMousePressEvent(QMouseEvent* e)
 }
 
 
 // To initiate a drag operation
 void ContactListView::contentsMouseMoveEvent( QMouseEvent *e )
 {
-  if ((e->state() & LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
+  if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
     emit startAddresseeDrag();
   }
   else
     KListView::contentsMouseMoveEvent( e );
 }
 
 bool ContactListView::acceptDrag(QDropEvent *e) const
 {
 #ifndef KAB_EMBEDDED  
-  return QTextDrag::canDecode(e);
+  return Q3TextDrag::canDecode(e);
 #else //KAB_EMBEDDED  
 qDebug("ContactListView::acceptDrag has to be fixed");
   return false;
 #endif //KAB_EMBEDDED  
 }
 
@@ -421,9 +427,9 @@ void ContactListView::keyReleaseEvent ( QKeyEvent * e )
         qApp->processEvents();
         mFlagBlockKeyPressed = false;
         mFlagKeyPressed = false;
    }
    KListView::keyReleaseEvent ( e );
 }
-#ifndef KAB_EMBEDDED    
-#include "contactlistview.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_contactlistview.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 46477e1..c92b002 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -2,12 +2,16 @@
 #define CONTACTLISTVIEW_H
 
 #include <qcolor.h>
 #include <qpixmap.h>
 #include <qtooltip.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 #include <klistview.h>
 
 #include <kabc/field.h>
 #include <kabc/addressee.h>
 #include <kabc/addressbook.h>
@@ -17,13 +21,13 @@ class QDropEvent;
 class KAddressBookTableView;
 class ContactListView;
 
 /** The whole tooltip design needs a lot of work. Currently it is
 * hacked together to function.
 */
-class DynamicTip : public QToolTip
+class DynamicTip /* TODO:hacker: : public QToolTip */
 {
   public:
     DynamicTip( ContactListView * parent );
 
   protected:
     void maybeTip( const QPoint & );
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index b503652..1e5a556 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -18,19 +18,24 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qevent.h>
-#include <qiconview.h>
+#include <q3iconview.h>
 #include <qlayout.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
+#include <QDragEnterEvent>
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
@@ -122,13 +127,13 @@ void AddresseeCardView::printMe()
 #ifdef DESKTOP_VERSION 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
@@ -145,13 +150,13 @@ void AddresseeCardView::printMe()
 }
 
 
 void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KAB_EMBEDDED
-  if (QTextDrag::canDecode(e))
+  if (Q3TextDrag::canDecode(e))
     e->accept();
 #else //KAB_EMBEDDED
 qDebug("AddresseeCardView::dragEnterEvent drag&drop is not implemented");
 #endif //KAB_EMBEDDED
 }
 
@@ -173,13 +178,13 @@ KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab,
                                             QWidget *parent, const char *name )
     : KAddressBookView( ab, parent, name )
 {
     mShowEmptyFields = false;
 
     // Init the GUI
-    QVBoxLayout *layout = new QVBoxLayout(viewWidget());
+    Q3VBoxLayout *layout = new Q3VBoxLayout(viewWidget());
 
     mCardView = new AddresseeCardView(viewWidget(), "mCardView");
     mCardView->setSelectionMode(CardView::Extended);
     layout->addWidget(mCardView);
 
     // Connect up the signals
@@ -517,9 +522,9 @@ void KAddressBookCardView::addresseeSelected()
     }
 
     if (!found)
         emit selected(QString::null);
 
 }
-#ifndef KAB_EMBEDDED
-#include "kaddressbookcardview.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kaddressbookcardview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 2a71f7e..8f8e48b 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -22,12 +22,15 @@
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <QDragEnterEvent>
+#include <QDropEvent>
 #ifndef KAB_EMBEDDED
 #include <kiconview.h>
 #else //KAB_EMBEDDED
 #include <klocale.h>
 #endif //KAB_EMBEDDED
 
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index d6ddec3..3a41a4b 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -19,25 +19,33 @@
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #ifndef KAB_EMBEDDED
-#include <qiconview.h>
+#include <q3iconview.h>
 #include <qstringlist.h>
 
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
 #else //KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 
+//Added by qt3to4:
+#include <QDropEvent>
+#include <Q3ValueList>
+#include <QPixmap>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+
 #include <kabc/addressbook.h>
 #include "kabprefs.h"
 #include "viewmanager.h"
 #include "kaddressbookiconview.h"
 #include <qlayout.h>
 #include <qregexp.h>
@@ -70,70 +78,70 @@ extern "C" {
 // AddresseeIconView (internal class)
 #ifndef KAB_EMBEDDED
 AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
   : KIconView(parent, name)
 #else //KAB_EMBEDDED
 AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
-  : QIconView(parent, name)
+  : Q3IconView(parent, name)
 #endif //KAB_EMBEDDED
 
 {
-  setSelectionMode( QIconView::Extended );
-  setResizeMode( QIconView::Adjust );
+  setSelectionMode( Q3IconView::Extended );
+  setResizeMode( Q3IconView::Adjust );
   setWordWrapIconText( true );
   setGridX( 100 );
   setItemsMovable(false);
   setSorting(true, true);
 
   
 //US ???  setMode( KIconView::Select );
   
 #ifndef KAB_EMBEDDED
 
-  connect(this, SIGNAL(dropped(QDropEvent*, const QValueList<QIconDragItem>&)),
-          this, SLOT(itemDropped(QDropEvent*, const QValueList<QIconDragItem>&)));
+  connect(this, SIGNAL(dropped(QDropEvent*, const Q3ValueList<Q3IconDragItem>&)),
+          this, SLOT(itemDropped(QDropEvent*, const Q3ValueList<Q3IconDragItem>&)));
 #endif //KAB_EMBEDDED
 }
 
 AddresseeIconView::~AddresseeIconView()
 {
 }
 
 
 void AddresseeIconView::itemDropped(QDropEvent *e, 
-                                    const QValueList<QIconDragItem> &)
+                                    const Q3ValueList<Q3IconDragItem> &)
 {
   emit addresseeDropped(e);
 }
 
-QDragObject *AddresseeIconView::dragObject()
+Q3DragObject *AddresseeIconView::dragObject()
 {
   emit startAddresseeDrag();
   
   // We never want IconView to start the drag
   return 0;
 }
 ////////////////////////////////
 // AddresseeIconViewItem  (internal class)
 #ifndef KAB_EMBEDDED
 class AddresseeIconViewItem : public KIconViewItem
 #else //KAB_EMBEDDED
-class AddresseeIconViewItem : public QIconViewItem
+class AddresseeIconViewItem : public Q3IconViewItem
 #endif //KAB_EMBEDDED
 {
   public:
 #ifndef KAB_EMBEDDED
     AddresseeIconViewItem(const KABC::Field::List &fields,
                           KABC::AddressBook *doc, const KABC::Addressee &a, 
-                          QIconView *parent)
+                          Q3IconView *parent)
       : KIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #else //KAB_EMBEDDED
     AddresseeIconViewItem(const KABC::Field::List &fields,
                           KABC::AddressBook *doc, const KABC::Addressee &a,
-                          QIconView *parent)
-      : QIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
+                          Q3IconView *parent)
+      : Q3IconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #endif //KAB_EMBEDDED
       {
           if ( mFields.isEmpty() ) {
             mFields = KABC::Field::defaultFields();
           }
           refresh();
@@ -197,24 +205,24 @@ class AddresseeIconViewItem : public QIconViewItem
 
 KAddressBookIconView::KAddressBookIconView( KABC::AddressBook *ab,
                                             QWidget *parent, const char *name)
     : KAddressBookView( ab, parent, name )
 {
     // Init the GUI
-    QVBoxLayout *layout = new QVBoxLayout(viewWidget());
+    Q3VBoxLayout *layout = new Q3VBoxLayout(viewWidget());
     
     mIconView = new AddresseeIconView(viewWidget(), "mIconView");
     layout->addWidget(mIconView);
     
     // Connect up the signals
     
 //US method executed is part of KIconView
 //US    connect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US            this, SLOT(addresseeExecuted(QIconViewItem *)));
-    connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
-            this, SLOT(addresseeExecuted(QIconViewItem *)));
+    connect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
+            this, SLOT(addresseeExecuted(Q3IconViewItem *)));
     
     connect(mIconView, SIGNAL(selectionChanged()),
             this, SLOT(addresseeSelected()));
     connect(mIconView, SIGNAL(addresseeDropped(QDropEvent*)),
             this, SIGNAL(dropped(QDropEvent*)));
     connect(mIconView, SIGNAL(startAddresseeDrag()),
@@ -245,26 +253,26 @@ void KAddressBookIconView::readConfig(KConfig *config)
 {
   KAddressBookView::readConfig(config);
     
 //US method executed is part of KIconView
 //US  disconnect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US             this, SLOT(addresseeExecuted(QIconViewItem *)));
-  disconnect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
-             this, SLOT(addresseeExecuted(QIconViewItem *)));
+  disconnect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
+             this, SLOT(addresseeExecuted(Q3IconViewItem *)));
 
 //US method executed is part of KIconView. Use selectionChanged instead
 /*US
   if (KABPrefs::instance()->mHonorSingleClick)
     connect(mIconView, SIGNAL(executed(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
   else
     connect(mIconView, SIGNAL(doubleClicked(QIconViewItem *)),
             this, SLOT(addresseeExecuted(QIconViewItem *)));
 */
-    connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
-            this, SLOT(addresseeExecuted(QIconViewItem *)));
+    connect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
+            this, SLOT(addresseeExecuted(Q3IconViewItem *)));
             
 }
 void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
 {
     mIconView->clear();
     mIconList.clear();
@@ -333,13 +341,13 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
     else
         emit selected(QString::null);
 }
 QStringList KAddressBookIconView::selectedUids()
 {
     QStringList uidList;
-    QIconViewItem *item;
+    Q3IconViewItem *item;
     AddresseeIconViewItem *aItem;
     
     for (item = mIconView->firstItem(); item; item = item->nextItem())
     {
         if (item->isSelected())
         {
@@ -355,13 +363,13 @@ QStringList KAddressBookIconView::selectedUids()
     
     return uidList;
 }
     
 void KAddressBookIconView::refresh(QString uid)
 {
-  QIconViewItem *item;
+  Q3IconViewItem *item;
   AddresseeIconViewItem *aItem;
     
   if ( uid.isNull() ) {
     // Rebuild the view
     mIconView->clear();
     mIconList.clear();
@@ -403,13 +411,13 @@ void KAddressBookIconView::refresh(QString uid)
     refresh( QString::null );
   }
 }
 
 void KAddressBookIconView::setSelected(QString uid, bool selected)
 {
-    QIconViewItem *item;
+    Q3IconViewItem *item;
     AddresseeIconViewItem *aItem;
     
     if (uid.isNull())
     {
         mIconView->selectAll(selected);
     }
@@ -432,13 +440,13 @@ void KAddressBookIconView::setSelected(QString uid, bool selected)
                  found = true;
              }
          }
     }
 }
    
-void KAddressBookIconView::addresseeExecuted(QIconViewItem *item)
+void KAddressBookIconView::addresseeExecuted(Q3IconViewItem *item)
 {
 #ifndef KAB_EMBEDDED
     AddresseeIconViewItem *aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
     AddresseeIconViewItem *aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
@@ -447,13 +455,13 @@ void KAddressBookIconView::addresseeExecuted(QIconViewItem *item)
         emit executed(aItem->addressee().uid());
     }
 }
 
 void KAddressBookIconView::addresseeSelected()
 {
-    QIconViewItem *item;
+    Q3IconViewItem *item;
     AddresseeIconViewItem *aItem;
     
     bool found = false;
     for (item = mIconView->firstItem(); item && !found; 
          item = item->nextItem())
     {
@@ -473,9 +481,9 @@ void KAddressBookIconView::addresseeSelected()
     }
     
     if (!found)
         emit selected(QString::null);
 }
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbookiconview.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kaddressbookiconview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index b0b9fea..6fad4c6 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -22,26 +22,29 @@
 */                                                                      
 
 #ifndef KADDRESSBOOKICONVIEW_H
 #define KADDRESSBOOKICONVIEW_H
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <QDropEvent>
 #ifndef KAB_EMBEDDED
 #include <kiconview.h>
 #else //KAB_EMBEDDED
-#include <qiconview.h>
-#include <qptrlist.h>
+#include <q3iconview.h>
+#include <q3ptrlist.h>
 #include <klocale.h>
 #endif //KAB_EMBEDDED
 #include "kaddressbookview.h"
 
-class QIconViewItem;
+class Q3IconViewItem;
 class KConfig;
 class AddresseeIconView;
 class AddresseeIconViewItem;
-class QIconDragItem;
+class Q3IconDragItem;
 class KAddressBookIconView;
 
 namespace KABC { class AddressBook; }
 
 /** This is an example kaddressbook view that is implemented using
 * KIconView. This view is not the most useful view, but it displays
@@ -65,36 +68,36 @@ class KAddressBookIconView : public KAddressBookView
     virtual void scrollDOWN();
     virtual void setFocusAV();
     
   public slots:
     void refresh(QString uid = QString::null);
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
     void setSelected(QString uid = QString::null, bool selected = true);
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
 //US my MOC do not like default parameters ???
     void setSelected(QString uid, bool selected);
 #endif //KAB_EMBEDDED
   
   protected slots:
-    void addresseeExecuted(QIconViewItem *item);
+    void addresseeExecuted(Q3IconViewItem *item);
     void addresseeSelected();
   
   private:
     AddresseeIconView *mIconView;
-    QPtrList<AddresseeIconViewItem> mIconList;
+    Q3PtrList<AddresseeIconViewItem> mIconList;
 };
 
 
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class AddresseeIconView : public KIconView
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
-class AddresseeIconView : public QIconView
+class AddresseeIconView : public Q3IconView
 #endif //KAB_EMBEDDED
 {
   Q_OBJECT
   
   public:
     AddresseeIconView(QWidget *parent, const char *name);
@@ -102,16 +105,16 @@ class AddresseeIconView : public QIconView
     
   signals:
     void addresseeDropped(QDropEvent *);
     void startAddresseeDrag();
   
   protected:
-    virtual QDragObject *dragObject();
+    virtual Q3DragObject *dragObject();
     
   protected slots:
-    void itemDropped(QDropEvent *, const QValueList<QIconDragItem> &);
+    void itemDropped(QDropEvent *, const Q3ValueList<Q3IconDragItem> &);
 };
 
 class IconViewFactory : public ViewFactory
 {
   public:
     KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 272f2eb..7efaaa9 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -1,19 +1,23 @@
 // $Id$
 
-#include <qvbox.h>
-#include <qlistbox.h>
+#include <q3vbox.h>
+#include <q3listbox.h>
 #include <qwidget.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qcombobox.h>
 #include <qapplication.h>
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qevent.h>
-#include <qurl.h>
+#include <q3url.h>
 #include <qpixmap.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 
 #include <kabc/addressbook.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
@@ -29,23 +33,23 @@
 #include "contactlistview.h"
 #include "kabprefs.h"
 #include "undocmds.h"
 #include "viewmanager.h"
 
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qregexp.h>
 
 #include "kaddressbooktableview.h"
 
 
 KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
                                               QWidget *parent, const char *name )
   : KAddressBookView( ab, parent, name )
 {
-  mainLayout = new QVBoxLayout( viewWidget(), 2 );
+  mainLayout = new Q3VBoxLayout( viewWidget(), 2 );
 
   // The list view will be created when the config is read.
   mListView = 0;
 }
 
 KAddressBookTableView::~KAddressBookTableView()
@@ -74,20 +78,20 @@ void KAddressBookTableView::scrollDOWN()
 void KAddressBookTableView::reconstructListView()
 {
     if (mListView)
     {
         disconnect(mListView, SIGNAL(selectionChanged()),
                    this, SLOT(addresseeSelected()));
-        disconnect(mListView, SIGNAL(executed(QListViewItem*)),
-                   this, SLOT(addresseeExecuted(QListViewItem*)));
-        disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
-                   this, SLOT(addresseeExecuted(QListViewItem*)));
+        disconnect(mListView, SIGNAL(executed(Q3ListViewItem*)),
+                   this, SLOT(addresseeExecuted(Q3ListViewItem*)));
+        disconnect(mListView, SIGNAL(doubleClicked(Q3ListViewItem*)),
+                   this, SLOT(addresseeExecuted(Q3ListViewItem*)));
         disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
                    SIGNAL(startDrag()));
-        disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+        disconnect(mListView, SIGNAL(returnPressed(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
 
         disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
                    SIGNAL(dropped(QDropEvent*)));
         delete mListView;
     }
 
@@ -102,13 +106,13 @@ void KAddressBookTableView::reconstructListView()
   KABC::Field::List fieldList = fields();
   KABC::Field::List::ConstIterator it;
 
   int c = 0;
   for( it = fieldList.begin(); it != fieldList.end(); ++it ) {
       mListView->addColumn( (*it)->label() );
-      mListView->setColumnWidthMode(c++, QListView::Manual);
+      mListView->setColumnWidthMode(c++, Q3ListView::Manual);
 //US
       //  qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1());
   }
 
   connect(mListView, SIGNAL(selectionChanged()),
           this, SLOT(addresseeSelected()));
@@ -116,21 +120,21 @@ void KAddressBookTableView::reconstructListView()
           SIGNAL(startDrag()));
   connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
           SIGNAL(dropped(QDropEvent*)));
 
   if (KABPrefs::instance()->mHonorSingleClick) {
     //    qDebug("KAddressBookTableView::reconstructListView single");
-    connect(mListView, SIGNAL(executed(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(executed(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
   } else {
     //    qDebug("KAddressBookTableView::reconstructListView double");
-    connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(doubleClicked(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
   }
-    connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(returnPressed(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
     connect(mListView, SIGNAL(signalDelete()),
           this, SLOT(addresseeDeleted()));
 
 //US performceimprovement. Refresh is done from the outside
 //US refresh();
 
@@ -341,13 +345,13 @@ void KAddressBookTableView::refresh(QString uid)
       mListView->ensureItemVisible( currentItem );
       mListView->setSelected( currentItem, true );
     }
   } else {
     // Only need to update on entry. Iterate through and try to find it
     ContactListViewItem *ceItem;
-    QListViewItemIterator it( mListView );
+    Q3ListViewItemIterator it( mListView );
     while ( it.current() ) {
 #ifndef KAB_EMBEDDED
       ceItem = dynamic_cast<ContactListViewItem*>( it.current() );
 #else //KAB_EMBEDDED
       ceItem = (ContactListViewItem*)( it.current() );
 #endif //KAB_EMBEDDED
@@ -363,13 +367,13 @@ void KAddressBookTableView::refresh(QString uid)
   }
 }
 
 QStringList KAddressBookTableView::selectedUids()
 {
     QStringList uidList;
-    QListViewItem *item;
+    Q3ListViewItem *item;
     ContactListViewItem *ceItem;
 
     for(item = mListView->firstChild(); item; item = item->itemBelow())
     {
         if (mListView->isSelected( item ))
         {
@@ -391,13 +395,13 @@ QStringList KAddressBookTableView::selectedUids()
 
     return uidList;
 }
 
 void KAddressBookTableView::setSelected(QString uid, bool selected)
 {
-    QListViewItem *item;
+    Q3ListViewItem *item;
     ContactListViewItem *ceItem;
 
     if (uid.isNull())
     {
         mListView->selectAll(selected);
     }
@@ -426,13 +430,13 @@ void KAddressBookTableView::setSelected(QString uid, bool selected)
 void KAddressBookTableView::addresseeSelected()
 {
     // We need to try to find the first selected item. This might not be the
     // last selected item, but when QListView is in multiselection mode,
     // there is no way to figure out which one was
     // selected last.
-    QListViewItem *item;
+    Q3ListViewItem *item;
     bool found =false;
     for (item = mListView->firstChild(); item && !found;
          item = item->nextSibling())
     {
         if (item->isSelected())
         {
@@ -450,13 +454,13 @@ void KAddressBookTableView::addresseeSelected()
     }
 
     if (!found)
         emit selected(QString::null);
 }
 
-void KAddressBookTableView::addresseeExecuted(QListViewItem *item)
+void KAddressBookTableView::addresseeExecuted(Q3ListViewItem *item)
 {
     if (item)
     {
 #ifndef KAB_EMBEDDED
         ContactListViewItem *ceItem
                = dynamic_cast<ContactListViewItem*>(item);
@@ -484,9 +488,9 @@ void KAddressBookTableView::addresseeDeleted()
 }
 
 
 
 
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbooktableview.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kaddressbooktableview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 38db7b4..c3cb038 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -7,31 +7,33 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
 #include <qwidget.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qstring.h>
 #include <qdialog.h>
-#include <qtabdialog.h>
+#include <q3tabdialog.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "undo.h"
 
 #else //KAB_EMBEDDED
 #include "views/configuretableviewdialog.h"
 #endif //KAB_EMBEDDED
 
 #include "klocale.h"
 #include "kaddressbookview.h"
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
-class QListViewItem;
-class QListBox;
-class QVBoxLayout;
+class Q3ListViewItem;
+class Q3ListBox;
+class Q3VBoxLayout;
 class KConfig;
 
 class ContactListViewItem;
 class ContactListView;
 
 
@@ -76,16 +78,16 @@ friend class ContactListView;
     void addresseeSelected();
     void addresseeDeleted();
 
     /** Called whenever the user executes an addressee. In terms of the
     * list view, this is probably a double click
     */
-    void addresseeExecuted(QListViewItem*);
+    void addresseeExecuted(Q3ListViewItem*);
 
   private:
-    QVBoxLayout *mainLayout;
+    Q3VBoxLayout *mainLayout;
     ContactListView *mListView;
 };
 
 
 class TableViewFactory : public ViewFactory
 {
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 7281003..ed5807f 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -27,13 +27,13 @@ Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 #include <qregexp.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
@@ -101,13 +101,13 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
     doExport( tmpFile.file(), list );
     tmpFile.close();
 
     return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
   } else {
     QFile file( url.path() );
-    if ( !file.open( IO_WriteOnly ) ) {
+    if ( !file.open( QIODevice::WriteOnly ) ) {
       QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
       KMessageBox::error( parentWidget(), txt.arg( url.path() ) );
       return false;
     }
 
     doExport( &file, list );
@@ -121,13 +121,13 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
   QString fileName = KFileDialog::getSaveFileName( "addressbook.csv", i18n("Save file"), parentWidget() );
 
   if ( fileName.isEmpty() )
       return false;
 
   QFile file( fileName );
-  if ( !file.open( IO_WriteOnly ) ) {
+  if ( !file.open( QIODevice::WriteOnly ) ) {
     QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
     KMessageBox::error( parentWidget(), txt.arg( fileName ) );
     return false;
   }
 
   doExport( &file, list );
@@ -148,13 +148,13 @@ KABC::AddresseeList CSVXXPort::importContacts( const QString& ) const
   else
     return KABC::AddresseeList();
 }
 
 void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
 {
-  QTextStream t( fp );
+  Q3TextStream t( fp );
   t.setCodec( QTextCodec::codecForName("utf8") );
 
   KABC::AddresseeList::ConstIterator iter;
   KABC::Field::List fields = addressBook()->fields();
   KABC::Field::List::Iterator fieldIter;
   bool first = true;
@@ -184,11 +184,9 @@ void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
     }
 
     t << "\n";
   }
 }
 
-#ifndef KAB_EMBEDDED
-#include "csv_xxport.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_csv_xxport.cpp"
 #endif //KAB_EMBEDDED
-
-
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 862241e..7959cac 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -24,28 +24,32 @@ Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #ifdef DESKTOP_VERSION
 #include <qinputdialog.h>
 #else
 #include <qtcompat/qinputdialog.h>
 #endif
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
-#include <qtable.h>
+#include <q3table.h>
 #include <qlayout.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3ValueList>
+#include <Q3GridLayout>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kfiledialog.h>
 #include <klineedit.h>
@@ -53,13 +57,13 @@ $Id$
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 
 #ifdef DESKTOP_VERSION
-#include "qtable.h"
+#include "q3table.h"
 #else
 #include "qcombotableitem.h"
 #endif
 #include "csvimportdialog.h"
 
 CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent,
@@ -158,13 +162,13 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent,
            this, SLOT( applyTemplate() ) );
  
   connect( this, SIGNAL( user2Clicked() ),
            this, SLOT( saveTemplate() ) );
 
   // if ( QApplication::desktop()->width() < 321 ) 
-      QIconSet  icon = SmallIcon("filesave");
+      QIcon  icon = SmallIcon("filesave");
      
     findButton( User2 )->setIconSet (icon ) ;
     icon = SmallIcon("fileopen");
     findButton( User1 )->setIconSet (icon ) ;
     int wid = findButton( User2 )->sizeHint().height();
     findButton( User2 )->setMaximumWidth( wid+4  );
@@ -183,13 +187,13 @@ KABC::AddresseeList CSVImportDialog::contacts() const
     KABC::Addressee a;
     bool emptyRow = true;
     KABC::Address addrHome( KABC::Address::Home );
     KABC::Address addrWork( KABC::Address::Work );
     for ( int col = 0; col < mTable->numCols(); ++col ) {
       
-      QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, col ) );
+      Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0, col ) );
 
       if ( !item ) {
         qDebug( "ERROR: item cast failed" );
         continue;
       }
 
@@ -226,13 +230,13 @@ KABC::AddresseeList CSVImportDialog::contacts() const
         case Birthday:
 //US
 //the generated code had the following format: a.setBirthday( QDate::fromString( value, Qt::ISODate ) );
 // But Qt::IsoDate and QDate::fromString was not specified. Do I have the wrong QT version ?
           {
             QDate dt = KGlobal::locale()->readDate( value, "%Y-%m-%d");  // = Qt::ISODate
-            a.setBirthday(dt);
+            a.setBirthday(QDateTime(dt));
           }
           break;
         case Email:
           if ( !value.isEmpty() )
             a.insertEmail( value, true );
           break;
@@ -379,32 +383,32 @@ KABC::AddresseeList CSVImportDialog::contacts() const
 }
 
 void CSVImportDialog::initGUI()
 {
   QWidget* page = plainPage();
 
-  QGridLayout *layout = new QGridLayout( page, 1, 1, marginHintSmall(), 
+  Q3GridLayout *layout = new Q3GridLayout( page, 1, 1, marginHintSmall(), 
                                          spacingHintSmall() );
-  QHBoxLayout *hbox = new QHBoxLayout();
+  Q3HBoxLayout *hbox = new Q3HBoxLayout();
   hbox->setSpacing( spacingHint() );
   
   QLabel *label = new QLabel( i18n( "File to import:" ), page );
   hbox->addWidget( label );
 
   mUrlRequester = new KURLRequester( page );
   mUrlRequester->setFilter( "*.csv" );
   hbox->addWidget( mUrlRequester );
 
   layout->addMultiCellLayout( hbox, 0, 0, 0, 2 );
 
   // Delimiter: comma, semicolon, tab, space, other
-  mDelimiterBox = new QButtonGroup( i18n( "Delimiter" ), page );
+  mDelimiterBox = new Q3ButtonGroup( i18n( "Delimiter" ), page );
   mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
   mDelimiterBox->layout()->setSpacing( spacingHint() );
   mDelimiterBox->layout()->setMargin( marginHint() );
-  QGridLayout *delimiterLayout = new QGridLayout( mDelimiterBox->layout() );
+  Q3GridLayout *delimiterLayout = new Q3GridLayout( mDelimiterBox->layout() );
   delimiterLayout->setAlignment( Qt::AlignTop );
   layout->addMultiCellWidget( mDelimiterBox, 1, 1, 0, 2 );
 
   mRadioComma = new QRadioButton( i18n( "Comma" ), mDelimiterBox );
   mRadioComma->setChecked( true );
   delimiterLayout->addWidget( mRadioComma, 0, 0 );
@@ -447,14 +451,14 @@ void CSVImportDialog::initGUI()
   layout->addWidget( label, 2, 2 );
 
   mIgnoreDuplicates = new QCheckBox( page );
   mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) );
   layout->addMultiCellWidget( mIgnoreDuplicates, 4, 4, 0, 2 );
 
-  mTable = new QTable( 0, 0, page );
-  mTable->setSelectionMode( QTable::NoSelection );
+  mTable = new Q3Table( 0, 0, page );
+  mTable->setSelectionMode( Q3Table::NoSelection );
   //mTable->horizontalHeader()->hide();
   layout->addMultiCellWidget( mTable, 5, 5, 0, 2 );
 /*US
   setButtonText( User1, i18n( "Apply Template" ) );
   setButtonText( User2, i18n( "Save Template" ) );
 */  
@@ -480,17 +484,17 @@ void CSVImportDialog::fillTable()
          S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
 
   QChar x;
   QString field = "";
 
   // store previous assignment
-  QValueList<int> mTypeOld = mTypeStore;
+  Q3ValueList<int> mTypeOld = mTypeStore;
   
   mTypeStore.clear();
   for ( column = 0; column < mTable->numCols(); ++column ) {
-    QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, column ) );
+    Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0, column ) );
 
     if ( !item || mClearTypeStore )
       mTypeStore.append( typeToPos( Undefined ) );
     else if ( item )
       mTypeStore.append( item->currentItem() );
   }
@@ -503,33 +507,33 @@ void CSVImportDialog::fillTable()
   } else  if ( mComboCodec->currentItem () == 1 ) {
       mData = QString::fromLatin1( mFileArray.data() );
   } else  {
       mData = QString::fromLocal8Bit( mFileArray.data() );
   } 
 
-  QTextStream inputStream( mData, IO_ReadOnly );
+  Q3TextStream inputStream( mData, QIODevice::ReadOnly );
 
   if ( mComboCodec->currentItem () == 0 ) {
-      inputStream.setEncoding( QTextStream::UnicodeUTF8 );
+      inputStream.setEncoding( Q3TextStream::UnicodeUTF8 );
   } else  if ( mComboCodec->currentItem () == 1 ) {
-      inputStream.setEncoding( QTextStream::Latin1 );
+      inputStream.setEncoding( Q3TextStream::Latin1 );
   } else  {
-      inputStream.setEncoding( QTextStream::Locale );
+      inputStream.setEncoding( Q3TextStream::Locale );
   } 
 
   int maxColumn = 0;
   while ( !inputStream.atEnd() ) {
     inputStream >> x; // read one char
 
     if ( x == '\r' ) inputStream >> x; // eat '\r', to handle DOS/LOSEDOWS files correctly
 
     switch ( state ) {
      case S_START :
       if ( x == mTextQuote ) {
         state = S_QUOTED_FIELD;
-      } else if ( x == mDelimiter ) {
+      } else if ( QString(x) == mDelimiter ) {
         if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) )
           ++column;
         lastCharDelimiter = true;
       } else if ( x == '\n' ) {
         ++row;
         column = 1;
@@ -558,13 +562,13 @@ void CSVImportDialog::fillTable()
       }
       break;
      case S_MAYBE_END_OF_QUOTED_FIELD :
       if ( x == mTextQuote ) {
         field += x;
         state = S_QUOTED_FIELD;
-      } else if ( x == mDelimiter || x == '\n' ) {
+      } else if ( QString(x) == mDelimiter || x == '\n' ) {
         setText( row - mStartLine + 1, column, field );
         field = "";
         if ( x == '\n' ) {
           ++row;
           column = 1;
         } else {
@@ -575,13 +579,13 @@ void CSVImportDialog::fillTable()
         state = S_START;
       } else {
         state = S_END_OF_QUOTED_FIELD;
       }
       break;
      case S_END_OF_QUOTED_FIELD :
-      if ( x == mDelimiter || x == '\n' ) {
+      if ( QString(x) == mDelimiter || x == '\n' ) {
         setText( row - mStartLine + 1, column, field );
         field = "";
         if ( x == '\n' ) {
           ++row;
           column = 1;
         } else {
@@ -598,13 +602,13 @@ void CSVImportDialog::fillTable()
       if ( x == mTextQuote ) {
         field = "";
         state = S_QUOTED_FIELD;
         break;
       }
      case S_NORMAL_FIELD :
-      if ( x == mDelimiter || x == '\n' ) {
+      if ( QString(x) == mDelimiter || x == '\n' ) {
         setText( row - mStartLine + 1, column, field );
         field = "";
         if ( x == '\n' ) {
           ++row;
           column = 1;
         } else {
@@ -614,13 +618,13 @@ void CSVImportDialog::fillTable()
         }
         state = S_START;
       } else {
         field += x;
       }
     }
-    if ( x != mDelimiter )
+    if ( QString(x) != mDelimiter )
       lastCharDelimiter = false;
 
     if ( column > maxColumn )
       maxColumn = column;
   }
 
@@ -646,13 +650,13 @@ void CSVImportDialog::fillTable()
       keys[( it.data() )] =  it.key();
 //US end
   
   for ( column = 0; column < mTable->numCols(); ++column ) {
    
 //US    QComboTableItem *item = new QComboTableItem( mTable, mTypeMap.keys() );
-    QComboTableItem *item = new QComboTableItem( mTable, keys );
+    Q3ComboTableItem *item = new Q3ComboTableItem( mTable, keys );
     mTable->setItem( 0, column, item );
     if ( column < mTypeStore.count() )
       item->setCurrentItem( mTypeStore[ column ] );
     else
       item->setCurrentItem( typeToPos( Undefined ) );
     
@@ -761,13 +765,13 @@ void CSVImportDialog::lineSelected( const QString& line )
 
 void CSVImportDialog::slotOk()
 {
   bool assigned = false;
 
   for ( int column = 0; column < mTable->numCols(); ++column ) {
-    QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, 
+    Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0, 
                                                            column ) );
     if ( item && posToType( item->currentItem() ) != Undefined )
       assigned = true;
   }
     
   if ( assigned )
@@ -833,13 +837,13 @@ void CSVImportDialog::applyTemplate()
     columnMap.insert( i, col );
   }
   
   // apply the column map
   for ( uint column = 0; column < columnMap.count(); ++column ) {
     int type = columnMap[ column ];
-    QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0,
+    Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0,
                                                            column ) );
     if ( item )
       item->setCurrentItem( typeToPos( type ) );
   }
 }
 
@@ -875,13 +879,13 @@ void CSVImportDialog::saveTemplate()
   config.setGroup( "Misc" );
   config.writeEntry( "Name", name );
 
   config.setGroup( "csv column map" );
 
   for ( uint column = 0; column < mTable->numCols(); ++column ) {
-    QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, 
+    Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0, 
                                                            column ) );
     if ( item )
       config.writeEntry( QString::number( column ), posToType( 
                          item->currentItem() ) );
     else
       config.writeEntry( QString::number( column ), 0 );
@@ -931,13 +935,13 @@ void CSVImportDialog::ignoreDuplicatesChanged( int )
 void CSVImportDialog::setFile( const QString &fileName )
 {
   if ( fileName.isEmpty() )
     return;
 
   QFile file( fileName );
-  if ( !file.open( IO_ReadOnly ) ) {
+  if ( !file.open( QIODevice::ReadOnly ) ) {
     KMessageBox::sorry( this, i18n( "Cannot open input file!" ) );
     file.close();
     return;
   }
 
   mFileArray = file.readAll();
@@ -961,9 +965,9 @@ void CSVImportDialog::urlChanged( const QString &file )
  
   findButton( User1 )->setEnabled( state );
   findButton( User2 )->setEnabled( state );
  
 }
 
-#ifndef KAB_EMBEDDED
-#include <csvimportdialog.moc>
+#ifndef KAB_EMBEDDED_
+#include <moc_csvimportdialog.cpp>
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index 2661420..520f3fa 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -30,23 +30,23 @@ $Id$
 #define CSV_IMPORT_DLG_H
 
 #include <kabc/addressbook.h>
 #include <kabc/addresseelist.h>
 #include <kdialogbase.h>
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 class KURLRequester;
 
-class QButtonGroup;
+class Q3ButtonGroup;
 class QComboBox;
 class QCheckBox;
 class QLineEdit;
 class QPushButton;
 class QRadioButton;
-class QTable;
+class Q3Table;
 
 class CSVImportDialog : public KDialogBase
 {
   Q_OBJECT
 
   public:
@@ -82,14 +82,14 @@ class CSVImportDialog : public KDialogBase
            BusinessAddressPostalCode, BusinessAddressCountry, 
            BusinessAddressLabel,
            HomePhone, BusinessPhone, MobilePhone, HomeFax, BusinessFax, MobileWorkPhone,
            Isdn, Pager, Email, Mailer, Title, Role, Organization, Note, URL, Categories
          };
 
-    QTable* mTable;
-    QButtonGroup* mDelimiterBox;
+    Q3Table* mTable;
+    Q3ButtonGroup* mDelimiterBox;
     QRadioButton* mRadioComma;
     QRadioButton* mRadioSemicolon;
     QRadioButton* mRadioTab;
     QRadioButton* mRadioSpace;
     QRadioButton* mRadioOther;
     QLineEdit* mDelimiterEdit;
@@ -116,11 +116,11 @@ class CSVImportDialog : public KDialogBase
     QString mData;
     QByteArray mFileArray;
     QMap<QString, uint> mTypeMap;
     KABC::AddressBook *mAddressBook;
     int mCustomCounter;
     bool mClearTypeStore;
-    QValueList<int> mTypeStore;
+    Q3ValueList<int> mTypeStore;
 
 };
 
 #endif
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 03efc1b..72d3fc2 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -113,9 +113,9 @@ KABC::AddresseeList KDE2XXPort::importContacts( const QString& ) const
 
   addressBook()->load();
 
   return KABC::AddresseeList();
 }
 
-#ifndef KAB_EMBEDDED
-#include "kde2_xxport.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kde2_xxport.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 9a8fa68..64b9071 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -26,14 +26,16 @@
   Copyright (c) 2004 Ulf Schenk
 
   $Id$
 */
 
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kabc/vcardconverter.h>
 #include <kabc/vcardparser/vcardtool.h>
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
@@ -99,20 +101,20 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString
 #endif //KAB_EMBEDDED
 
     if ( fileName.isEmpty() )
         return false;
 
     QFile outFile( fileName );
-    if ( !outFile.open( IO_WriteOnly ) ) {
+    if ( !outFile.open( QIODevice::WriteOnly ) ) {
         QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
         KMessageBox::error( parentWidget(), text.arg( fileName ) );
         return false;
     }
 
-    QTextStream t( &outFile );
-    t.setEncoding( QTextStream::UnicodeUTF8 );
+    Q3TextStream t( &outFile );
+    t.setEncoding( Q3TextStream::UnicodeUTF8 );
 
     KABC::Addressee::List::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         KABC::VCardConverter converter;
         QString vcard;
 
@@ -150,13 +152,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
         if ( url.isEmpty() )
             return addrList;
         QString caption( i18n( "vCard Import Failed" ) );
         if ( KIO::NetAccess::download( url, fileName ) ) {
             QFile file( fileName );
 
-            file.open( IO_ReadOnly );
+            file.open( QIODevice::ReadOnly );
             QByteArray rawData = file.readAll();
             file.close();
 
             QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
             addrList = parseVCard( data );
 
@@ -193,14 +195,14 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
                 qDebug("VCardXXPort::importContacts  Urls at the moment not supported");
                 if ( url.isEmpty() )
                     return addrList;
 
             }
         QFile file( fileName );
-        if ( file.open( IO_ReadOnly ) ) {
-            QCString rawData ( file.readAll().data(),file.size()+1);
+        if ( file.open( QIODevice::ReadOnly ) ) {
+            Q3CString rawData ( file.readAll().data(),file.size()+1);
             file.close();
             int start = 0;
 #ifndef DESKTOP_VERSION            
             while ( start < rawData.size()-2 ) {
                 if ( rawData.at( start ) == '\r' ) 
                     if ( rawData.at( start+1 ) == '\n' )
@@ -264,9 +266,9 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
         KMessageBox::sorry( parentWidget(), text );
     }
     return addrList;
 }
 
 
-#ifndef KAB_EMBEDDED
-#include "vcard_xxport.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_vcard_xxport.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 405f7ec..95b240d 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -27,12 +27,14 @@ Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlayout.h>
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
@@ -214,24 +216,22 @@ void XXPortManager::loadPlugins()
     if ( !xxportFactory ) {
       kdDebug(5720) << "XXPortManager::loadExtensions(): Cast failed" << endl;
       continue;
     }
 
 #else //KAB_EMBEDDED
-  QList<XXPortFactory> factorylist;
+  QList<XXPortFactory*> factorylist;
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_csv_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_kde2_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_vcard_xxport()));
   //US  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_opie_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_qtopia_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_sharpdtm_xxport()));
 
-  QListIterator<XXPortFactory> it(factorylist);
-  for ( ; it.current(); ++it )
-  {
-    XXPortFactory *xxportFactory = it.current();
+  for(QList<XXPortFactory*>::iterator it=factorylist.begin();it!=factorylist.end();++it) {
+    XXPortFactory *xxportFactory = *it;
 #endif //KAB_EMBEDDED
 
     XXPortObject *obj = xxportFactory->xxportObject( mCore->addressBook(), mCore );
     if ( obj ) {
       mCore->addGUIClient( obj );
       mXXPortObjects.insert( obj->identifier(), obj );
@@ -247,13 +247,13 @@ void XXPortManager::loadPlugins()
 PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent,
                               const char *name )
   : KDialogBase( Plain, i18n( "Import this contact?" ), Ok | User1| User2, Ok, parent,
                  name, true, true ,i18n( "Import all!" ),i18n( "No" ) )
 {
   QWidget *page = plainPage();
-  QVBoxLayout *layout = new QVBoxLayout( page, marginHint(), spacingHint() );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( page, marginHint(), spacingHint() );
   connect( this, SIGNAL( user1Clicked() ), this, SLOT ( slotClose() ) );
   connect( this, SIGNAL( user2Clicked() ), this, SLOT ( slotCancel() ) );
 
   KABC::AddresseeView *view = new KABC::AddresseeView( page );
   view->setAddressee( addr );
   layout->addWidget( view );
@@ -261,10 +261,9 @@ PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent,
   resize( 640, 480 );
 #else
   showMaximized();
 #endif
 }
 
-#ifndef KAB_EMBEDDED
-#include "xxportmanager.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_xxportmanager.cpp"
 #endif //KAB_EMBEDDED
-
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index e801d9b..0528922 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -29,13 +29,13 @@ $Id$
 */
 
 
 #ifndef XXPORTMANAGER_H
 #define XXPORTMANAGER_H
 
-#include <qdict.h>
+#include <q3dict.h>
 #include <qobject.h>
 
 #include <kurl.h>
 
 #include "xxportobject.h"
 
@@ -68,13 +68,13 @@ class XXPortManager : public QObject
     void slotImport( const QString&, const QString& );
     void slotExport( const QString&, const QString& );
 
   private:
     void loadPlugins();
 
-    QDict<XXPortObject> mXXPortObjects;
+    Q3Dict<XXPortObject> mXXPortObjects;
 
     KABCore *mCore;
     bool mShowPreview;
 };
 
 #endif
diff --git a/kaddressbook/xxportobject.cpp b/kaddressbook/xxportobject.cpp
index bd9d986..2d8d0ff 100644
--- a/kaddressbook/xxportobject.cpp
+++ b/kaddressbook/xxportobject.cpp
@@ -268,9 +268,9 @@ KABC::AddresseeList XXPortResourceObject::_importContacts( const QString& identi
 
   return adrlst;
 }
 
 
 
-#ifndef KAB_EMBEDDED
-#include "xxportobject.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_xxportobject.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 278cab0..088bffa 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -33,22 +33,27 @@ $Id$
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 #include <qapplication.h>
-#include <qbuttongroup.h>
+#include <QDesktopWidget>
+#include <q3buttongroup.h>
 #include <qcombobox.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qstringlist.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 
 #include "kabcore.h"
 #include "kabprefs.h"
 
 #include "xxportselectdialog.h"
 
@@ -59,14 +64,14 @@ XXPortSelectDialog::XXPortSelectDialog( KABCore *core, bool sort,
       mUseSorting( sort )
 {
   initGUI();
 
   connect( mFiltersCombo, SIGNAL( activated( int ) ),
            SLOT( filterChanged( int ) ) );
-  connect( mCategoriesView, SIGNAL( clicked( QListViewItem* ) ),
-           SLOT( categoryClicked( QListViewItem* ) ) );
+  connect( mCategoriesView, SIGNAL( clicked( Q3ListViewItem* ) ),
+           SLOT( categoryClicked( Q3ListViewItem* ) ) );
 
   // setup filters
 #ifndef KAB_EMBEDDED
   mFilters = Filter::restore( kapp->config(), "Filter" );
   Filter::List::iterator filterIt;
 #else //KAB_EMBEDDED
@@ -81,13 +86,13 @@ XXPortSelectDialog::XXPortSelectDialog( KABCore *core, bool sort,
   mUseFilters->setEnabled( filters.count() > 0 );
 
   // setup categories
   QStringList categories =  KABPrefs::instance()->mCustomCategories;
   QStringList::Iterator it;
   for ( it = categories.begin(); it != categories.end(); ++it )
-    new QCheckListItem( mCategoriesView, *it, QCheckListItem::CheckBox );
+    new Q3CheckListItem( mCategoriesView, *it, Q3CheckListItem::CheckBox );
   mUseCategories->setEnabled( categories.count() > 0 );
 
   int count = mCore->selectedUIDs().count();
   mUseSelection->setEnabled( count != 0 );
   mUseSelection->setChecked( count  > 1 );
 
@@ -207,30 +212,30 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
 }
 
 QStringList XXPortSelectDialog::categories() const
 {
   QStringList list;
 
-  QListViewItemIterator it( mCategoriesView );
+  Q3ListViewItemIterator it( mCategoriesView );
   for ( ; it.current(); ++it ) {
-    QCheckListItem* qcli = static_cast<QCheckListItem*>(it.current());
+    Q3CheckListItem* qcli = static_cast<Q3CheckListItem*>(it.current());
     if ( qcli->isOn() )
       list.append( it.current()->text( 0 ) );
   }
 
   return list;
 }
 
 void XXPortSelectDialog::filterChanged( int )
 {
   mUseFilters->setChecked( true );
 }
 
-void XXPortSelectDialog::categoryClicked( QListViewItem *i )
+void XXPortSelectDialog::categoryClicked( Q3ListViewItem *i )
 {
-  QCheckListItem *qcli = static_cast<QCheckListItem*>( i );
+  Q3CheckListItem *qcli = static_cast<Q3CheckListItem*>( i );
   if ( qcli->isOn() )
     mUseCategories->setChecked( true );
 }
 
 void XXPortSelectDialog::slotHelp()
 {
@@ -241,66 +246,66 @@ void XXPortSelectDialog::slotHelp()
 #endif //KAB_EMBEDDED
 
 }
 
 void XXPortSelectDialog::initGUI()
 {
-  QFrame *page = plainPage();
+  Q3Frame *page = plainPage();
 
-  QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHintSmall(),
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( page, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
   QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page );
   topLayout->addWidget( label );
 
-  mButtonGroup = new QButtonGroup( i18n( "Contact Selection" ), page );
+  mButtonGroup = new Q3ButtonGroup( i18n( "Contact Selection" ), page );
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
   mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
   mButtonGroup->layout()->setMargin( KDialog::marginHint() );
 
-  QGridLayout *groupLayout = new QGridLayout( mButtonGroup->layout() );
+  Q3GridLayout *groupLayout = new Q3GridLayout( mButtonGroup->layout() );
   groupLayout->setAlignment( Qt::AlignTop );
 
   mUseWholeBook = new QRadioButton( i18n( "&All" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
-  QWhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) );
+  Q3WhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) );
   groupLayout->addWidget( mUseWholeBook, 0, 0 );
 
   mUseSelection = new QRadioButton( i18n( "&Selected" ), mButtonGroup );
-  QWhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n"
+  Q3WhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n"
                                         "This option is disabled if no contacts are selected." ) );
   groupLayout->addWidget( mUseSelection, 1, 0 );
 
   mUseFilters = new QRadioButton( i18n( "By matching &filter" ), mButtonGroup );
-  QWhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n"
+  Q3WhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n"
                                      "This option is disabled if you haven't defined any filters" ) );
   groupLayout->addWidget( mUseFilters, 2, 0 );
 
   mUseCategories = new QRadioButton( i18n( "By Cate&gories" ), mButtonGroup );
-  QWhatsThis::add( mUseCategories, i18n( "Only contacts who are members of a category that is checked on the list to the left.\n"
+  Q3WhatsThis::add( mUseCategories, i18n( "Only contacts who are members of a category that is checked on the list to the left.\n"
                                        "This option is disabled if you have no categories." ) );
   groupLayout->addWidget( mUseCategories, 3, 0 );
 
   mFiltersCombo = new QComboBox( false, mButtonGroup );
   mFiltersCombo->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) );
+  Q3WhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) );
   groupLayout->addWidget( mFiltersCombo, 2, 1 );
 
-  mCategoriesView = new QListView( mButtonGroup );
+  mCategoriesView = new Q3ListView( mButtonGroup );
   mCategoriesView->addColumn( "" );
   mCategoriesView->header()->hide();
-  QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) );
+  Q3WhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) );
   groupLayout->addWidget( mCategoriesView, 3, 1 );
   mCategoriesView->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
   //if (QApplication::desktop()->height() == 480 )
   // mCategoriesView->setMaximumHeight( 240 );
   topLayout->addWidget( mButtonGroup );
 
-  QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page );
+  Q3ButtonGroup *sortingGroup = new Q3ButtonGroup( i18n( "Sorting" ), page );
   sortingGroup->setColumnLayout( 0, Qt::Vertical );
-  QGridLayout *sortLayout = new QGridLayout( sortingGroup->layout(), 2, 2,
+  Q3GridLayout *sortLayout = new Q3GridLayout( sortingGroup->layout(), 2, 2,
                                              KDialog::spacingHint() );
   sortLayout->setAlignment( Qt::AlignTop );
 
   label = new QLabel( i18n( "Criterion:" ), sortingGroup );
   sortLayout->addWidget( label, 0, 0 );
 
@@ -332,11 +337,9 @@ void XXPortSelectDialog::initGUI()
 #ifndef DESKTOP_VERSION
   hideButtons();
 #endif
   }
 }
 
-#ifndef KAB_EMBEDDED
-#include "xxportselectdialog.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_xxportselectdialog.cpp"
 #endif //KAB_EMBEDDED
-
-
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index 28b1fef..208f4f9 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -27,16 +27,16 @@
 #include <kabc/addresseelist.h>
 #include <kabc/field.h>
 #include <kdialogbase.h>
 
 #include "filter.h"
 
-class QButtonGroup;
+class Q3ButtonGroup;
 class QComboBox;
-class QListView;
-class QListViewItem;
+class Q3ListView;
+class Q3ListViewItem;
 class QRadioButton;
 
 class KABCore;
 class KComboBox;
 
 class XXPortSelectDialog : public KDialogBase
@@ -50,28 +50,28 @@ class XXPortSelectDialog : public KDialogBase
     KABC::AddresseeList contacts();
     void tagSelected();
     QStringList uids();
 
   private slots:
     void filterChanged( int );
-    void categoryClicked( QListViewItem * i );
+    void categoryClicked( Q3ListViewItem * i );
 
   protected slots:
     void slotHelp();
 
   private:
     void initGUI();
     QStringList categories() const;
 
-    QButtonGroup* mButtonGroup;
+    Q3ButtonGroup* mButtonGroup;
     QRadioButton* mUseCategories;
     QRadioButton* mUseFilters;
     QRadioButton* mUseWholeBook;
     QRadioButton* mUseSelection;
     QComboBox* mFiltersCombo;
-    QListView* mCategoriesView;
+    Q3ListView* mCategoriesView;
 
     KComboBox *mFieldCombo;
     KComboBox *mSortTypeCombo;
 
     KABCore *mCore;
     KABC::AddresseeList mAddresseeList;
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 18ce9da..467fef7 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -20,15 +20,16 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 // $Id$
 
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qapp.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
+#include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qsound.h>
 #include <qpushbutton.h>
@@ -36,12 +37,15 @@
 #ifndef DESKTOP_VERSION
 #define protected public
 #include <qspinbox.h>
 #undef protected 
 #else
 #include <qspinbox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 #endif
 #include <stdlib.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #include <sys/ioctl.h>
 #endif
@@ -59,16 +63,16 @@
 
 
 AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
     : QDialog (parent, name ,false, Qt::WStyle_StaysOnTop )
 {
     setCaption( "KO/Pi Alarm!" );
-    QVBoxLayout* layout = new QVBoxLayout( this);
+    Q3VBoxLayout* layout = new Q3VBoxLayout( this);
   QLabel* l = new QLabel("The following event triggered alarm:",this);
   layout->addWidget ( l );
-  l->setAlignment( AlignCenter);
+  l->setAlignment( Qt::AlignCenter);
   mMessage = new QLabel ( " ", this );
   int fs = 18;
   int fs2 = 12;
   int baseSize = 6;
   if ( QApplication::desktop()->width() < 480 ) {
       fs2 = 10;
@@ -80,16 +84,16 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   QFont fo = QApplication::font();
   fo.setBold( true );
   fo.setPointSize( fs2 );
   l->setFont( fo );
   fo.setPointSize( fs );
   mMessage->setFont(fo );
-  mMessage->setAlignment( AlignCenter);
+  mMessage->setAlignment( Qt::AlignCenter);
   layout->addWidget ( mMessage );
   mMissedAlarms= new QLabel ( "(No missed Alarms)", this );
-  mMissedAlarms->setAlignment( AlignCenter);
+  mMissedAlarms->setAlignment( Qt::AlignCenter);
 
   playSoundTimer = new QTimer( this );
   connect ( playSoundTimer, SIGNAL( timeout()  ), this, SLOT (playSound() ) );
 
   playSoundTimer->stop();
   
@@ -100,13 +104,13 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   QLabel* labb = new QLabel("Suspend\nduration\n(minutes):",this);
 #ifdef DESKTOP_VERSION
   fo = font();
   fo.setPointSize( 12 );
   labb->setFont ( fo );
 #endif
-  labb->setAlignment(AlignCenter);
+  labb->setAlignment(Qt::AlignCenter);
   //layout->addWidget ( labb );
   fo = font();
   int pointSize = 36;
   if ( QApplication::desktop()->width() <= 320 )
       pointSize = 18;
   fo.setPointSize( pointSize );
@@ -119,23 +123,23 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
 #if QT_VERSION < 0x030000
   mSuspendSpin->upButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize ));
   mSuspendSpin->downButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize ));
 #endif
   mSuspendSpin->setFixedSize( 18*baseSize, 10*baseSize+2 );
   mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus ); 
-  QHBoxLayout* layoutSpin = new QHBoxLayout( layout );
+  Q3HBoxLayout* layoutSpin = new Q3HBoxLayout( layout );
   layoutSpin->addStretch ();
   layoutSpin->addWidget ( labb );
   layoutSpin->addWidget ( mSuspendSpin );
   layoutSpin->addStretch ();
 
-  QVBox * bbox  = new QVBox ( this );
+  Q3VBox * bbox  = new Q3VBox ( this );
   layout->addWidget ( bbox );
   bbox->layout()->setSpacing( 2 );
   labb = new QLabel("Press \"Cancel\" or \"Esc\" to suspend!",bbox);
-  labb->setAlignment(AlignCenter);
+  labb->setAlignment(Qt::AlignCenter);
   mSuspendButton = new QPushButton( "Suspend", bbox);
   QPushButton* silen = new QPushButton( " Stop sound ", bbox);
   okbut = new QPushButton( "Ok", bbox); 
   mSuspendButton->setFont( fo );
   silen->setFont( fo );
   okbut->setFont( fo );
diff --git a/kalarmd/alarmdialog.h b/kalarmd/alarmdialog.h
index 52e681a..c3e0966 100644
--- a/kalarmd/alarmdialog.h
+++ b/kalarmd/alarmdialog.h
@@ -27,12 +27,14 @@
 
 #include <qdialog.h>
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include "sharp_char.h"
 
 
 class QSpinBox;
 class QLabel;
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 15eff28..74a53cb 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -49,13 +49,13 @@
 
 
 SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     : QLabel( parent )
 {
     mAlarmDialog = new AlarmDialog( 0 );
-    mPopUp = new QPopupMenu( this );
+    mPopUp = new Q3PopupMenu( this );
     mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) );
     mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Todo List", this, SLOT ( showTodo() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) );
@@ -63,18 +63,18 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) );
     mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) );
     mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) );
     mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
-    mTimerPopUp = new QPopupMenu( this );
+    mTimerPopUp = new Q3PopupMenu( this );
     
-    mBeepPopUp = new QPopupMenu( this );   
-    mSoundPopUp = new QPopupMenu( this );   
-    mPausePopUp = new QPopupMenu( this ); 
-    mFontsizePopup = new QPopupMenu( this ); 
+    mBeepPopUp = new Q3PopupMenu( this );   
+    mSoundPopUp = new Q3PopupMenu( this );   
+    mPausePopUp = new Q3PopupMenu( this ); 
+    mFontsizePopup = new Q3PopupMenu( this ); 
     mFontsizePopup->insertItem( "10", 10 ); 
     mFontsizePopup->insertItem( "12", 12 ); 
     mFontsizePopup->insertItem( "14", 14 ); 
     mFontsizePopup->insertItem( "16", 16 ); 
     mFontsizePopup->insertItem( "18", 18 ); 
     mFontsizePopup->insertItem( "20", 20 ); 
@@ -82,13 +82,13 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     mFontsizePopup->insertItem( "24", 24 ); 
     mFontsizePopup->insertItem( "26", 26 ); 
     mFontsizePopup->insertItem( "28", 28 ); 
     mFontsizePopup->insertItem( "30", 30 ); 
     mFontsizePopup->insertItem( "32", 32 ); 
     mFontsizePopup->insertItem( "36", 36 ); 
-    QPopupMenu* savePopUp = new QPopupMenu( this ); 
+    QPopupMenu* savePopUp = new Q3PopupMenu( this ); 
     savePopUp->insertItem( "Save", 0 );   
     savePopUp->insertItem( "Load", 1 );   
     mSoundPopUp->insertItem( "Buzzer", 0 );   
     mSoundPopUp->insertItem( "Wav file", 1 ); 
     mPausePopUp->insertItem( " 1 sec", 1 );
     mPausePopUp->insertItem( " 2 sec", 2 );
@@ -96,13 +96,13 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     mPausePopUp->insertItem( " 5 sec", 5 );
     mPausePopUp->insertItem( "10 sec", 10 );
     mPausePopUp->insertItem( "15 sec", 15 );
     mPausePopUp->insertItem( "30 sec", 30 );
     mPausePopUp->insertItem( " 1 min", 60 );
     mPausePopUp->insertItem( " 5 min", 300 );
-    mSuspendPopUp = new QPopupMenu( this );
+    mSuspendPopUp = new Q3PopupMenu( this );
     mSuspendPopUp->insertItem( "Off", 0 ); 
     mSuspendPopUp->insertItem( " 1x", 1 );   
     mSuspendPopUp->insertItem( " 2x", 2 );   
     mSuspendPopUp->insertItem( " 3x", 3 );  
     mSuspendPopUp->insertItem( " 5x", 5 );  
     mSuspendPopUp->insertItem( "10x", 10 );  
diff --git a/kalarmd/simplealarmdaemonimpl.h b/kalarmd/simplealarmdaemonimpl.h
index 06ef91b..ac65797 100644
--- a/kalarmd/simplealarmdaemonimpl.h
+++ b/kalarmd/simplealarmdaemonimpl.h
@@ -27,13 +27,12 @@
 #include <qdatetime.h>
 #include <qlabel.h>
 #include <qtimer.h>
 
 class QLabel;
 class QTimer;
-class QPopupMenu;
 class AlarmDialog;
 class SimpleAlarmDaemonImpl : public QLabel
 {
     Q_OBJECT
   public:
     SimpleAlarmDaemonImpl( QWidget *parent = 0 );
@@ -73,13 +72,13 @@ class SimpleAlarmDaemonImpl : public QLabel
     int mPlayBeeps;
     int mPausePlay;
     int mSuspend;
     QString mAlarmMessage;
     int mTimerTime;
     int getFileNameLen( QString );
-    QPopupMenu* mPopUp, *mBeepPopUp, *mTimerPopUp, *mSoundPopUp,*mPausePopUp,*mSuspendPopUp, *mFontsizePopup;
+    Q3PopupMenu* mPopUp, *mBeepPopUp, *mTimerPopUp, *mSoundPopUp,*mPausePopUp,*mSuspendPopUp, *mFontsizePopup;
     QDateTime mRunningTimer;
     void fillTimerPopUp();
     QString timerMesssage;
     QString mCustomText;
     QString mRunningTimerText;
     int mCustomMinutes;
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index 4a5ceef..05d8357 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -16,10 +16,12 @@ win32:{
 #SUBDIRS += kabc/plugins/olaccess
 
 }
 }
 unix:{ 
 !staticlib: {
-SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher  pwmanager/libcrypt/error  pwmanager/libcrypt/mpi  pwmanager/libcrypt/zlib pwmanager/pwmanager
+SUBDIRS += libetpan
+# kmicromail/libmailwrapper kmicromail
+SUBDIRS += pwmanager/libcrypt/cipher  pwmanager/libcrypt/error  pwmanager/libcrypt/mpi  pwmanager/libcrypt/zlib pwmanager/pwmanager
 }
 }
 
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 985a762..9b1ea2f 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -9,14 +9,16 @@
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailwrapper.h>
 /* OPIE */
 //#include <qpe/qpeapplication.h>
 
 /* QT */
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kiconloader.h>
 #include <klocale.h>
 
 #define GET_NEW_MAILS 101
 
 using namespace Opie::Core;
@@ -51,30 +53,30 @@ POP3viewItem::~POP3viewItem()
 
 AbstractMail *POP3viewItem::getWrapper()
 {
     return wrapper;
 }
 
-void POP3viewItem::refresh(QValueList<Opie::Core::OSmartPointer<RecMail> > & )
+void POP3viewItem::refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > & )
 {
     refresh();
 }
 
 void POP3viewItem::refresh()
 {
     if (account->getOffline()) return;
-    QValueList<FolderP> *folders = wrapper->listFolders();
-    QListViewItem *child = firstChild();
+    Q3ValueList<FolderP> *folders = wrapper->listFolders();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
-    QValueList<FolderP>::ConstIterator it;
-    QListViewItem*item = 0;
+    Q3ValueList<FolderP>::ConstIterator it;
+    Q3ListViewItem*item = 0;
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
         item = new POP3folderItem( (*it), this , item );
         item->setSelectable( (*it)->may_select());
     }
     delete folders;
@@ -83,15 +85,15 @@ void POP3viewItem::refresh()
 RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
 {
   
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * POP3viewItem::getContextMenu()
+Q3PopupMenu * POP3viewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
             m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
             m->insertItem(i18n("Disconnect"),0);
@@ -105,16 +107,16 @@ QPopupMenu * POP3viewItem::getContextMenu()
     }
     return m;
 }
 
 void POP3viewItem::disconnect()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
     wrapper->logout();
 }
 
@@ -154,13 +156,13 @@ void POP3viewItem::contextMenuSelected(int which)
     }
 }
 
 POP3folderItem::~POP3folderItem()
 {}
 
-POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after  )
+POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem(folderInit,parent,after )
 {
     pop3 = parent;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_POP3FOLDER );
@@ -169,26 +171,26 @@ POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent ,
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
-void POP3folderItem::refresh(QValueList<RecMailP>&target)
+void POP3folderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
         pop3->getWrapper()->listMessages( folder->getName(),target );
 }
 
 RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail)
 {
     return pop3->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * POP3folderItem::getContextMenu()
+Q3PopupMenu * POP3folderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
         m->insertItem(i18n("Refresh header list"),0);
         m->insertItem(i18n("Delete all mails"),1);
         m->insertItem(i18n("Move/Copie all mails"),2);
@@ -258,31 +260,31 @@ NNTPviewItem::~NNTPviewItem()
 
 AbstractMail *NNTPviewItem::getWrapper()
 {
     return wrapper;
 }
 
-void NNTPviewItem::refresh( QValueList<RecMailP> & )
+void NNTPviewItem::refresh( Q3ValueList<RecMailP> & )
 {
     refresh();
 }
 
 void NNTPviewItem::refresh()
 {
     if (account->getOffline()) return;
-    QValueList<FolderP> *folders = wrapper->listFolders();
+    Q3ValueList<FolderP> *folders = wrapper->listFolders();
 
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
-    QValueList<FolderP>::ConstIterator it;
-    QListViewItem*item = 0;
+    Q3ValueList<FolderP>::ConstIterator it;
+    Q3ListViewItem*item = 0;
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
         item = new NNTPfolderItem( (*it), this , item );
         item->setSelectable( (*it)->may_select());
     }
     delete folders;
@@ -291,15 +293,15 @@ void NNTPviewItem::refresh()
 RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
 {
  
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * NNTPviewItem::getContextMenu()
+Q3PopupMenu * NNTPviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
             m->insertItem(i18n("Disconnect"),0);
             m->insertItem(i18n("Set offline"),1);
@@ -323,16 +325,16 @@ void NNTPviewItem::subscribeGroups()
         refresh();
     }
 }
 
 void NNTPviewItem::disconnect()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
     wrapper->logout();
 }
 
@@ -365,13 +367,13 @@ void NNTPviewItem::contextMenuSelected(int which)
     }
 }
 
 NNTPfolderItem::~NNTPfolderItem()
 {}
 
-NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after  )
+NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem( folderInit, parent,after )
 {
     nntp = parent;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_POP3FOLDER );
@@ -380,26 +382,26 @@ NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
-void NNTPfolderItem::refresh(QValueList<RecMailP>&target)
+void NNTPfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
         nntp->getWrapper()->listMessages( folder->getName(),target );
 }
 
 RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return nntp->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * NNTPfolderItem::getContextMenu()
+Q3PopupMenu * NNTPfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         m->insertItem(i18n("Refresh header list"),0);
         m->insertItem(i18n("Copy all postings"),1);
     }
     return m;
@@ -450,13 +452,13 @@ IMAPviewItem::~IMAPviewItem()
 
 AbstractMail *IMAPviewItem::getWrapper()
 {
     return wrapper;
 }
 
-void IMAPviewItem::refresh(QValueList<RecMailP>&)
+void IMAPviewItem::refresh(Q3ValueList<RecMailP>&)
 {
     refreshFolders(false);
 }
 
 const QStringList&IMAPviewItem::subFolders()
 {
@@ -467,17 +469,17 @@ void IMAPviewItem::refreshFolders(bool force)
 {
     if (childCount()>0 && force==false) return;
     if (account->getOffline()) return;
 
     removeChilds();
     currentFolders.clear();
-    QValueList<FolderP> * folders = wrapper->listFolders();
+    Q3ValueList<FolderP> * folders = wrapper->listFolders();
 
-    QValueList<FolderP>::Iterator it;
-    QListViewItem*item = 0;
-    QListViewItem*titem = 0;
+    Q3ValueList<FolderP>::Iterator it;
+    Q3ListViewItem*item = 0;
+    Q3ListViewItem*titem = 0;
     QString fname,del,search;
     int pos;
 
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
         if ((*it)->getDisplayName().lower()=="inbox")
@@ -510,15 +512,15 @@ void IMAPviewItem::refreshFolders(bool force)
             item = new IMAPfolderItem( (*it), this , item );
         }
     }
     delete folders;
 }
 
-QPopupMenu * IMAPviewItem::getContextMenu()
+Q3PopupMenu * IMAPviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
             m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
             m->insertItem(i18n("Refresh folder list"),0);
@@ -612,13 +614,13 @@ RECBODYP IMAPviewItem::fetchBody(const RecMailP&)
 
 bool IMAPviewItem::offline()
 {
     return account->getOffline();
 }
 
-IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , QListViewItem*after )
+IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent , Q3ListViewItem*after )
         : AccountViewItem( folderInit, parent , after )
 {
     imap = parent;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_IMAPFOLDER );
@@ -627,13 +629,13 @@ IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
-IMAPfolderItem::IMAPfolderItem(const FolderP &folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  )
+IMAPfolderItem::IMAPfolderItem(const FolderP &folderInit, IMAPfolderItem *parent , Q3ListViewItem*after, IMAPviewItem *master  )
         : AccountViewItem(folderInit, parent,after )
 {
     imap = master;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_IMAPFOLDER );
@@ -650,13 +652,13 @@ IMAPfolderItem::~IMAPfolderItem()
 
 const QString& IMAPfolderItem::Delemiter()const
 {
     return folder->Separator();
 }
 
-void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
+void IMAPfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
     {
         imap->getWrapper()->listMessages( folder->getName(),target );
     }
     else
@@ -667,15 +669,15 @@ void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
 
 RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return imap->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * IMAPfolderItem::getContextMenu()
+Q3PopupMenu * IMAPfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (folder->may_select())
         {
             m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
             m->insertItem(i18n("Refresh header list"),0);
@@ -718,13 +720,13 @@ void IMAPfolderItem::deleteFolder()
                                      i18n("No"),QString::null,1,1);
    
     if (yesno == 0)
     {
         if (imap->getWrapper()->deleteMbox(folder))
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             IMAPviewItem * box = imap;
             /* be carefull - after that this object is destroyd so don't use
              * any member of it after that call!!*/
             imap->refreshFolders(true);
             if (v)
             {
@@ -797,25 +799,25 @@ MHviewItem::~MHviewItem()
 
 AbstractMail *MHviewItem::getWrapper()
 {
     return wrapper;
 }
 
-void MHviewItem::refresh( QValueList<RecMailP> & target)
+void MHviewItem::refresh( Q3ValueList<RecMailP> & target)
 {
     refresh(false);
     getWrapper()->listMessages( "",target );
 }
 
 void MHviewItem::refresh(bool force)
 {
     if (childCount()>0 && force==false) return;
     removeChilds();
     currentFolders.clear();
-    QValueList<FolderP> *folders = wrapper->listFolders();
-    QValueList<FolderP>::ConstIterator it;
+    Q3ValueList<FolderP> *folders = wrapper->listFolders();
+    Q3ValueList<FolderP>::ConstIterator it;
     MHfolderItem*item = 0;
     MHfolderItem*pmaster = 0;
     QString fname = "";
     int pos;
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
@@ -854,15 +856,15 @@ void MHviewItem::refresh(bool force)
 RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
 {
  
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * MHviewItem::getContextMenu()
+Q3PopupMenu * MHviewItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         m->insertItem(i18n("Refresh folder list"),0);
         m->insertItem(i18n("Create new folder"),1);
         m->insertItem(i18n("Delete all mails"),2);
         m->insertItem(i18n("Move/Copie all mails"),3);
@@ -917,20 +919,20 @@ void MHviewItem::contextMenuSelected(int which)
     }
 }
 
 MHfolderItem::~MHfolderItem()
 {}
 
-MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after  )
+MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , Q3ListViewItem*after  )
         : AccountViewItem(folderInit, parent,after )
 {
     mbox = parent;
     initName();
 }
 
-MHfolderItem::MHfolderItem(const FolderP& folderInit, MHfolderItem *parent, QListViewItem*after, MHviewItem*master)
+MHfolderItem::MHfolderItem(const FolderP& folderInit, MHfolderItem *parent, Q3ListViewItem*after, MHviewItem*master)
         : AccountViewItem(folderInit, parent,after )
 {
     folder = folderInit;
     mbox = master;
     initName();
 }
@@ -964,13 +966,13 @@ void MHfolderItem::initName()
 
 const FolderP&MHfolderItem::getFolder()const
 {
     return folder;
 }
 
-void MHfolderItem::refresh(QValueList<RecMailP>&target)
+void MHfolderItem::refresh(Q3ValueList<RecMailP>&target)
 {
     if (folder->may_select())
         mbox->getWrapper()->listMessages( folder->getName(),target );
 }
 
 RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail)
@@ -986,28 +988,28 @@ void MHfolderItem::deleteFolder()
                                      i18n("No"),QString::null,1,1);
   
     if (yesno == 0)
     {
         if (mbox->getWrapper()->deleteMbox(folder))
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             MHviewItem * box = mbox;
             /* be carefull - after that this object is destroyd so don't use
              * any member of it after that call!!*/
             mbox->refresh(true);
             if (v)
             {
                 v->setSelected(box,true);
             }
         }
     }
 }
 
-QPopupMenu * MHfolderItem::getContextMenu()
+Q3PopupMenu * MHfolderItem::getContextMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         m->insertItem(i18n("Move/Copie all mails"),2);
         m->insertItem(i18n("Delete all mails"),0);
         m->insertItem(i18n("Create new subfolder"),3);
         m->insertItem(i18n("Delete folder"),1);
@@ -1028,13 +1030,13 @@ void MHfolderItem::createFolder()
     //ndirdlg.showMaximized();
     if (ndirdlg.exec()  )
     {
         QString ndir = ndirdlg.Newdir();
         if (mbox->getWrapper()->createMbox(ndir,folder))
         {
-            QListView*v=listView();
+            Q3ListView*v=listView();
             MHviewItem * box = mbox;
             /* be carefull - after that this object is destroyd so don't use
              * any member of it after that call!!*/
             mbox->refresh(true);
             if (v)
             {
@@ -1075,32 +1077,32 @@ bool MHfolderItem::isDraftfolder()
  * Generic stuff
  */
 
 const QString AccountViewItem::contextName="AccountViewItem";
 
 AccountViewItem::AccountViewItem( AccountView *parent )
-        : QListViewItem( parent )
+        : Q3ListViewItem( parent )
 {
     init();
     m_Backlink = parent;
 }
 
-AccountViewItem::AccountViewItem( QListViewItem *parent)
-        : QListViewItem( parent),folder(0)
+AccountViewItem::AccountViewItem( Q3ListViewItem *parent)
+        : Q3ListViewItem( parent),folder(0)
 {
     init();
 }
 
-AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after  )
-        :QListViewItem( parent,after ),folder(0)
+AccountViewItem::AccountViewItem( Q3ListViewItem *parent , Q3ListViewItem*after  )
+        :Q3ListViewItem( parent,after ),folder(0)
 {
     init();
 }
 
-AccountViewItem::AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  )
-       :QListViewItem( parent,after ),folder(folderInit)
+AccountViewItem::AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,Q3ListViewItem *parent , Q3ListViewItem*after  )
+       :Q3ListViewItem( parent,after ),folder(folderInit)
 {
     init();
 }
 
 void AccountViewItem::init()
 {
@@ -1137,16 +1139,16 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder)
         }
     }
 }
 
 void AccountViewItem::removeChilds()
 {
-    QListViewItem *child = firstChild();
+    Q3ListViewItem *child = firstChild();
     while ( child )
     {
-        QListViewItem *tmp = child;
+        Q3ListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
 }
 
 bool AccountViewItem::matchName(const QString&name)const
diff --git a/kmicromail/accountitem.h b/kmicromail/accountitem.h
index 4c92bfc..bbfd05f 100644
--- a/kmicromail/accountitem.h
+++ b/kmicromail/accountitem.h
@@ -1,42 +1,45 @@
 #ifndef __ACCOUNT_ITEM
 #define __ACCOUNT_ITEM
 
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PopupMenu>
 #include <opie2/osmartpointer.h>
 #include <libmailwrapper/mailwrapper.h>
 
 class POP3wrapper;
 class RecMail;
 class RecBody;
-class QPopupMenu;
+class Q3PopupMenu;
 class Selectstore;
 class AccountView;
 class POP3account;
 class NNTPaccount;
 class IMAPaccount;
 class AbstractMail;
 class Folder;
 
 #define RECBODYP Opie::Core::OSmartPointer<RecBody>
 
-class AccountViewItem : public QListViewItem
+class AccountViewItem : public Q3ListViewItem
 {
 
 public:
     AccountViewItem( AccountView *parent );
-    AccountViewItem( QListViewItem *parent);
-    AccountViewItem( QListViewItem *parent , QListViewItem*after  );
-    AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after  );
+    AccountViewItem( Q3ListViewItem *parent);
+    AccountViewItem( Q3ListViewItem *parent , Q3ListViewItem*after  );
+    AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,Q3ListViewItem *parent , Q3ListViewItem*after  );
 
     virtual ~AccountViewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0;
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&)=0;
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0;
-    virtual QPopupMenu * getContextMenu(){return 0;};
+    virtual Q3PopupMenu * getContextMenu(){return 0;};
     virtual void contextMenuSelected(int){}
     virtual AccountView*accountView();
     virtual bool matchName(const QString&name)const;
     virtual bool isDraftfolder();
     Opie::Core::OSmartPointer<Folder> getFolder() { return folder; };
 
@@ -53,16 +56,16 @@ protected:
 class POP3viewItem : public AccountViewItem
 {
 
 public:
     POP3viewItem( POP3account *a, AccountView *parent );
     virtual ~POP3viewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target );
     virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
     POP3account *account;
     virtual void refresh();
     AbstractMail *wrapper;
@@ -71,17 +74,17 @@ protected:
 };
 
 class POP3folderItem : public AccountViewItem
 {
 
 public:
-    POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after  );
+    POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , Q3ListViewItem*after  );
     virtual ~POP3folderItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
     void downloadMails();
     POP3viewItem *pop3;
 };
@@ -90,16 +93,16 @@ protected:
 class NNTPviewItem : public AccountViewItem
 {
 
 public:
     NNTPviewItem( NNTPaccount *a, AccountView *parent );
     virtual ~NNTPviewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target );
     virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
     NNTPaccount *account;
     virtual void refresh();
     AbstractMail *wrapper;
@@ -109,17 +112,17 @@ protected:
 };
 
 class NNTPfolderItem : public AccountViewItem
 {
 
 public:
-    NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after  );
+    NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , Q3ListViewItem*after  );
     virtual ~NNTPfolderItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
     void downloadMails();
     NNTPviewItem *nntp;
 };
@@ -129,16 +132,16 @@ protected:
 class IMAPviewItem : public AccountViewItem
 {
     friend class IMAPfolderItem;
 public:
     IMAPviewItem( IMAPaccount *a, AccountView *parent );
     virtual ~IMAPviewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
     AbstractMail *getWrapper();
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     const QStringList&subFolders();
     virtual void refreshFolders(bool force=false);
     bool offline();
 
 protected:
@@ -149,18 +152,18 @@ protected:
 };
 
 class IMAPfolderItem : public AccountViewItem
 {
 
 public:
-    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPviewItem *parent , QListViewItem*after  );
-    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  );
+    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPviewItem *parent , Q3ListViewItem*after  );
+    IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , Q3ListViewItem*after, IMAPviewItem *master  );
     virtual ~IMAPfolderItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     virtual const QString& Delemiter()const;
 protected:
     virtual void createNewFolder();
     virtual void deleteFolder();
     virtual void downloadMails();
@@ -171,16 +174,16 @@ class MHviewItem : public AccountViewItem
 {
     friend class MHfolderItem;
 
 public:
     MHviewItem( const QString&aMboxPath, AccountView *parent );
     virtual ~MHviewItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target );
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target );
     virtual RECBODYP fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail );
     AbstractMail *getWrapper();
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     QStringList subFolders();
     virtual void refresh(bool force=false);
 
 protected:
     void downloadMails();
@@ -191,18 +194,18 @@ protected:
 };
 
 class MHfolderItem : public AccountViewItem
 {
 
 public:
-    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHviewItem *parent , QListViewItem*after  );
-    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master);
+    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHviewItem *parent , Q3ListViewItem*after  );
+    MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, Q3ListViewItem*after, MHviewItem*master);
     virtual ~MHfolderItem();
-    virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&);
+    virtual void refresh(Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&);
     virtual RECBODYP fetchBody(const Opie::Core::OSmartPointer<RecMail>&);
-    virtual QPopupMenu * getContextMenu();
+    virtual Q3PopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const;
     virtual bool isDraftfolder();
 
 protected:
     void downloadMails();
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index d1d4f7e..eea1f65 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -10,31 +10,33 @@
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qmessagebox.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcheckbox.h>
 #include <qtimer.h>
 #include <qspinbox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 using namespace Opie::Core;
-AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
-        : QListView( parent, name, flags )
+AccountView::AccountView( QWidget *parent, const char *name, Qt::WFlags flags )
+        : Q3ListView( parent, name, flags )
 {
     //connect( this, SIGNAL( selectionChanged(QListViewItem*) ),
     //       SLOT( refresh(QListViewItem*) ) );
-    connect( this, SIGNAL( clicked(QListViewItem*) ),
-           SLOT( refresh(QListViewItem*) ) );
-    connect( this, SIGNAL( returnPressed(QListViewItem*) ),
-           SLOT( refresh(QListViewItem*) ) );
-     connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
-          SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) );
+    connect( this, SIGNAL( clicked(Q3ListViewItem*) ),
+           SLOT( refresh(Q3ListViewItem*) ) );
+    connect( this, SIGNAL( returnPressed(Q3ListViewItem*) ),
+           SLOT( refresh(Q3ListViewItem*) ) );
+     connect( this, SIGNAL( mouseButtonPressed(int,Q3ListViewItem*,const QPoint&,int) ),this,
+          SLOT( slotHold(int,Q3ListViewItem*,const QPoint&,int) ) );
     setSorting(0);
 }
 
 AccountView::~AccountView()
 {
     imapAccounts.clear();
@@ -45,18 +47,18 @@ void AccountView::slotContextMenu(int id)
 {
     AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
     if (!view) return;
     view->contextMenuSelected(id);
 }
 
-void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int)
+void AccountView::slotHold(int button, Q3ListViewItem * item,const QPoint&,int)
 {
     if (button==1) {return;}
     if (!item) return;
     AccountViewItem *view = static_cast<AccountViewItem *>(item);
-    QPopupMenu*m = view->getContextMenu();
+    Q3PopupMenu*m = view->getContextMenu();
     if (!m) return;
     connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int)));
     m->setFocus();
     m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
     delete m;
 }
@@ -90,13 +92,13 @@ void AccountView::populate( QList<Account> list )
             /* must not be hold 'cause it isn't required */
             (void) new NNTPviewItem( nntp, this );
        }
      }
 }
 
-void AccountView::refresh(QListViewItem *item)
+void AccountView::refresh(Q3ListViewItem *item)
 {
     if ( item )
     {
         bool ask = true;
         //qDebug("text -%s- ",item->text( 0 ).latin1() );
         if ( item->text( 0 ) == i18n (" Local Mailfolders") )
@@ -142,13 +144,13 @@ void AccountView::refreshOutgoing()
         // qDebug("refresh ");
     }
 }
 void AccountView::refreshCurrentSelected()
 {
     if ( !m_currentItem ) return;
-    QValueList<RecMailP> headerlist;
+    Q3ValueList<RecMailP> headerlist;
     AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
     view->refresh(headerlist);
     emit refreshMailview(headerlist);
     topLevelWidget()->setCaption( i18n ( "KOpieMail/Pi" ) ) ;
 }
 
@@ -163,13 +165,13 @@ void AccountView::refreshCurrent()
 void AccountView::refreshAll()
 {
 }
 
 RecBodyP AccountView::fetchBody(const RecMailP&aMail)
 {
-    QListViewItem*item = selectedItem ();
+    Q3ListViewItem*item = selectedItem ();
     if (!item) return new RecBody();
     AccountViewItem *view = static_cast<AccountViewItem *>(item);
     return view->fetchBody(aMail);
 }
 
 void AccountView::setupFolderselect(Selectstore*sels)
diff --git a/kmicromail/accountview.h b/kmicromail/accountview.h
index 33f3479..14b0ff9 100644
--- a/kmicromail/accountview.h
+++ b/kmicromail/accountview.h
@@ -1,48 +1,50 @@
 #ifndef ACCOUNTVIEW_H
 #define ACCOUNTVIEW_H
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <opie2/osmartpointer.h>
 #include <libmailwrapper/mailtypes.h>
 
 class Selectstore;
 class Folder;
 class AbstractMail;
 class Account;
 class IMAPviewItem;
 class MHviewItem;
 
-class AccountView : public QListView
+class AccountView : public Q3ListView
 {
     Q_OBJECT
 
 public:
-    AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
+    AccountView( QWidget *parent = 0, const char *name = 0, Qt::WFlags flags = 0 );
     virtual ~AccountView();
     virtual void populate( QList<Account> list );
     virtual RecBodyP fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail);
     virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
     virtual void downloadMailsInbox(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
     virtual bool currentisDraft();
-    QValueList<MHviewItem*> allAccounts() { return mhAccounts;}
+    Q3ValueList<MHviewItem*> allAccounts() { return mhAccounts;}
 public slots:
     virtual void refreshAll();
-    virtual void refresh(QListViewItem *item);
+    virtual void refresh(Q3ListViewItem *item);
     virtual void refreshCurrent();
     virtual void refreshCurrentSelected();
     virtual void refreshOutgoing();
-    virtual void slotHold(int, QListViewItem *,const QPoint&,int);
+    virtual void slotHold(int, Q3ListViewItem *,const QPoint&,int);
     virtual void slotContextMenu(int id);
     void setupFolderselect(Selectstore*sels);
 
 signals:
-    void refreshMailview(const QValueList<RecMailP>& );
+    void refreshMailview(const Q3ValueList<RecMailP>& );
 
 protected:
-    QListViewItem* m_currentItem;
-    QValueList<IMAPviewItem*> imapAccounts;
-    QValueList<MHviewItem*> mhAccounts;
+    Q3ListViewItem* m_currentItem;
+    Q3ValueList<IMAPviewItem*> imapAccounts;
+    Q3ValueList<MHviewItem*> mhAccounts;
 };
 
 #endif
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 4bc4441..81d7b52 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -35,20 +35,20 @@
 #include <qpe/global.h>
 //#include <qpe/contact.h>
 
 
 #include <qcombobox.h>
 #include <qcheckbox.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
-#include <qlistview.h>
+#include <q3listview.h>
 
 //using namespace Opie::Core;
 //using namespace Opie::Ui;
 ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, bool modal )
     : ComposeMailUI( parent, name, modal )
 {
@@ -122,13 +122,13 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo
     connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
     connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
     connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
     connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) );
     mMail = 0;
     warnAttach = true; 
-    QIconSet icon;
+    QIcon icon;
     //icon = SmallIcon("fileexport");
     icon = SmallIcon("filesave");
     SaveButton->setIconSet (icon ) ;
     if ( QApplication::desktop()->width() < 320 ) {
         SaveButton->setText ("") ;
         SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ;
@@ -138,13 +138,13 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
     QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold );
     QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold );
 #endif
     message->setFont ( KOPrefs::instance()->mComposeFont );
-    message->setWordWrap (QMultiLineEdit::WidgetWidth);
+    message->setWordWrap (Q3MultiLineEdit::WidgetWidth);
     if ( smtpAccounts.count() > 0 ) {
         fillValues( smtpAccountBox->currentItem() );
     } else {
         QMessageBox::information( 0, i18n( "Problem" ),
                                   i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ),
                                   i18n( "Ok" ) );
@@ -531,14 +531,14 @@ void ComposeMail::reEditMail(const RecMailP&current)
     ccLine->setText(data->CC().join(","));
     bccLine->setText(data->Bcc().join(","));
     replyLine->setText(data->Replyto());
     setCharset(body->getCharset());
 }
 
-AttachViewItem::AttachViewItem( QListView *parent, Attachment *att )
-    : QListViewItem( parent )
+AttachViewItem::AttachViewItem( Q3ListView *parent, Attachment *att )
+    : Q3ListViewItem( parent )
 {
     attachment = att;
     if ( !attachment->getPixmap().isNull() )
         setPixmap( 0,attachment->getPixmap() );
     setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() );
     setText( 1, QString::number( att->getSize() ) );
diff --git a/kmicromail/composemail.h b/kmicromail/composemail.h
index 966ac3e..9aef4e1 100644
--- a/kmicromail/composemail.h
+++ b/kmicromail/composemail.h
@@ -1,11 +1,11 @@
 #ifndef COMPOSEMAIL_H
 #define COMPOSEMAIL_H
 
 #include <qlineedit.h>
-#include <qlistview.h>
+#include <q3listview.h>
 
 #include "composemailui.h"
 //#include "addresspickerui.h"
 #include <libmailwrapper/settings.h>
 #include <libmailwrapper/mailwrapper.h>
 
@@ -77,16 +77,16 @@ protected:
     QList<SMTPaccount> smtpAccounts;
     QString m_replyid;
     QString mEncoding;
     bool warnAttach;
 };
 
-class AttachViewItem : public QListViewItem
+class AttachViewItem : public Q3ListViewItem
 {
 public:
-    AttachViewItem( QListView *parent, Attachment *att );
+    AttachViewItem( Q3ListView *parent, Attachment *att );
     Attachment *getAttachment() { return attachment; }
 
 private:
     Attachment *attachment;
 
 };
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index 2c0f2d8..f274dc3 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -13,23 +13,23 @@
 #include <qcheckbox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qspinbox.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 
 #include <libmailwrapper/nntpwrapper.h>
 
 using namespace Opie::Core;
 
-AccountListItem::AccountListItem( QListView *parent, Account *a)
-        : QListViewItem( parent )
+AccountListItem::AccountListItem( Q3ListView *parent, Account *a)
+        : Q3ListViewItem( parent )
 {
     account = a;
     setText( 0, account->getAccountName() );
     QString ttext = "";
     switch (account->getType()) {
         case MAILLIB::A_NNTP:
@@ -48,13 +48,13 @@ AccountListItem::AccountListItem( QListView *parent, Account *a)
             ttext = "UNKNOWN";
             break;
     }
     setText( 1, ttext);
 }
 
-EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
+EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool modal, Qt::WFlags flags )
         : EditAccountsUI( parent, name, modal, flags )
 {
     settings = s;
 
     mailList->addColumn( i18n( "Account" ) );
     mailList->addColumn( i18n( "Type" ) );
@@ -305,13 +305,13 @@ void EditAccounts::accept()
 }
 
 /**
  * SelectMailType
  */
 
-SelectMailType::SelectMailType( QString *selection, QWidget *parent, const char *name, bool modal, WFlags flags )
+SelectMailType::SelectMailType( QString *selection, QWidget *parent, const char *name, bool modal, Qt::WFlags flags )
         : SelectMailTypeUI( parent, name, modal, flags )
 {
     selected = selection;
     selected->replace( 0, selected->length(), typeBox->currentText() );
     connect( typeBox, SIGNAL( activated(const QString&) ), SLOT( slotSelection(const QString&) ) );
 }
@@ -322,13 +322,13 @@ void SelectMailType::slotSelection( const QString &sel )
 }
 
 /**
  * IMAPconfig
  */
 
-IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
+IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, bool modal, Qt::WFlags flags )
         : IMAPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     //fillValues();
 
@@ -405,13 +405,13 @@ void IMAPconfig::accept()
 }
 
 /**
  * POP3config
  */
 
-POP3config::POP3config( POP3account *account, QWidget *parent, const char *name, bool modal, WFlags flags )
+POP3config::POP3config( POP3account *account, QWidget *parent, const char *name, bool modal, Qt::WFlags flags )
         : POP3configUI( parent, name, modal, flags )
 {
     data = account;
     //fillValues();
 
     connect( ComboBox1, SIGNAL( activated(int) ), SLOT( slotConnectionToggle(int) ) );
@@ -486,22 +486,22 @@ void POP3config::accept()
 }
 
 /**
  * SMTPconfig
  */
 
-SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
+SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name, bool modal, Qt::WFlags flags )
         : SMTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     connect( loginBox, SIGNAL( toggled(bool) ), userLine, SLOT( setEnabled(bool) ) );
     connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) );
 
     // fillValues();
-    QIconSet icon;
+    QIcon icon;
     //icon = SmallIcon("fileexport");
     icon = SmallIcon("fileopen");
     SignaturButton->setText("");
     SignaturButton->setIconSet (icon ) ;
     SignaturButton->setMaximumSize ( SignaturButton->sizeHint().height()+4,SignaturButton->sizeHint().height()) ;
     connect( SignaturButton, SIGNAL( clicked() ), this, SLOT( chooseSig() ) );
@@ -569,13 +569,13 @@ void SMTPconfig::accept()
 }
 
 /**
  * NNTPconfig
  */
 
-NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
+NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name, bool modal, Qt::WFlags flags )
         : NNTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     connect( loginBox, SIGNAL( toggled(bool) ), userLine, SLOT( setEnabled(bool) ) );
     connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) );
@@ -590,28 +590,28 @@ NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name,
 void NNTPconfig::slotShowSub()
 {
     save();
     data->save();
     ListViewGroups->clear();
     for ( QStringList::Iterator it = subscribedGroups.begin(); it != subscribedGroups.end(); ++it ) {
-         QCheckListItem *item;
-         item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+         Q3CheckListItem *item;
+         item = new Q3CheckListItem( ListViewGroups, (*it), Q3CheckListItem::CheckBox );
          item->setOn( true );
     }
     topLevelWidget()->setCaption( i18n("%1 groups subscribed").arg( subscribedGroups.count()));
 }
 void NNTPconfig::slotShowFilter()
 {
     save();
     data->save();
     ListViewGroups->clear();
     int count = 0;
     for ( QStringList::Iterator it = allGroups.begin(); it != allGroups.end(); ++it ) {
-        QCheckListItem *item;
+        Q3CheckListItem *item;
         if ( GroupFilter->text().isEmpty() || (*it).find( GroupFilter->text() ) >= 0 ) {
-            item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+            item = new Q3CheckListItem( ListViewGroups, (*it), Q3CheckListItem::CheckBox );
             ++count;
             if ( subscribedGroups.contains( (*it) ) >= 1 ) {
                 item->setOn( true );
             }
         }
     }
@@ -626,14 +626,14 @@ void NNTPconfig::slotGetNG() {
     allGroups =  tmp->listAllNewsgroups();
     topLevelWidget()->setCaption( i18n("Downloaded %1 group names").arg( allGroups.count()));
     
     ListViewGroups->clear();
 
     for ( QStringList::Iterator it = allGroups.begin(); it != allGroups.end(); ++it ) {
-        QCheckListItem *item;
-        item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+        Q3CheckListItem *item;
+        item = new Q3CheckListItem( ListViewGroups, (*it), Q3CheckListItem::CheckBox );
         if ( subscribedGroups.contains( (*it) ) >= 1 ) {
             item->setOn( true );
             
         }
     }
     delete tmp;
@@ -660,14 +660,14 @@ void NNTPconfig::fillValues()
     loginBox->setChecked( data->getLogin() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
     subscribedGroups = data->getGroups();
     /* don't forget that - you will overwrite values if user clicks cancel! */
     for ( QStringList::Iterator it = subscribedGroups.begin(); it != subscribedGroups.end(); ++it ) {
-         QCheckListItem *item;
-         item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+         Q3CheckListItem *item;
+         item = new Q3CheckListItem( ListViewGroups, (*it), Q3CheckListItem::CheckBox );
          item->setOn( true );
     }
 }
 
 void NNTPconfig::save()
 {
@@ -676,17 +676,17 @@ void NNTPconfig::save()
     data->setPort( portLine->text() );
     data->setSSL( sslBox->isChecked() );
     data->setLogin( loginBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
 
-    QListViewItemIterator list_it( ListViewGroups );
+    Q3ListViewItemIterator list_it( ListViewGroups );
 
     for ( ; list_it.current(); ++list_it ) {
 
-        if ( ( (QCheckListItem*)list_it.current() )->isOn() ) {
+        if ( ( (Q3CheckListItem*)list_it.current() )->isOn() ) {
              if ( subscribedGroups.contains( list_it.current()->text(0) ) < 1 ) 
                  subscribedGroups.append(  list_it.current()->text(0) );
         } else {
              if ( subscribedGroups.contains( list_it.current()->text(0) ) >= 1 ) 
                  subscribedGroups.remove(  list_it.current()->text(0) );
         }
diff --git a/kmicromail/editaccounts.h b/kmicromail/editaccounts.h
index 465780c..3d01d23 100644
--- a/kmicromail/editaccounts.h
+++ b/kmicromail/editaccounts.h
@@ -1,41 +1,41 @@
 #ifndef EDITACCOUNTS_H
 #define EDITACCOUNTS_H
 
 #include <qstring.h>
-#include <qlistview.h>
+#include <q3listview.h>
 
 #include "editaccountsui.h"
 #include "selectmailtypeui.h"
 #include "imapconfigui.h"
 #include "pop3configui.h"
 #include "smtpconfigui.h"
 #include "nntpconfigui.h"
 
 #include <libetpan/clist.h>
 #include <libmailwrapper/settings.h>
 
 
-class AccountListItem : public QListViewItem
+class AccountListItem : public Q3ListViewItem
 {
 
 public:
-    AccountListItem( QListView *parent, Account *a);
+    AccountListItem( Q3ListView *parent, Account *a);
     Account *getAccount() { return account; }
 
 private:
     Account *account;
 
 };
 
 class EditAccounts : public EditAccountsUI
 {
     Q_OBJECT
 
 public: 
-    EditAccounts( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
+    EditAccounts( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = 0, Qt::WFlags flags = 0 );
     
 public slots:
     void slotNewAccount( const QString &type );
     void slotEditAccount( Account *account );
     void slotDeleteAccount( Account * account );
     void slotAdjustColumns();
@@ -57,13 +57,13 @@ private:
 
 class SelectMailType : public SelectMailTypeUI
 {
     Q_OBJECT
 
 public:
-    SelectMailType( QString *selection = 0, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
+    SelectMailType( QString *selection = 0, QWidget *parent = 0, const char *name = 0, bool modal = 0, Qt::WFlags flags = 0 );
 
 private slots:
     void slotSelection( const QString &sel );
 
 private:
     QString *selected;
@@ -72,13 +72,13 @@ private:
 
 class IMAPconfig : public IMAPconfigUI
 {
     Q_OBJECT
 
 public:
-    IMAPconfig( IMAPaccount *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
+    IMAPconfig( IMAPaccount *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, Qt::WFlags flags = 0 );
 
 public slots:
     void fillValues();
 
 protected slots:
     void slotConnectionToggle( int index );
@@ -91,13 +91,13 @@ private:
 
 class POP3config : public POP3configUI
 {
     Q_OBJECT
 
 public:
-    POP3config( POP3account *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
+    POP3config( POP3account *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, Qt::WFlags flags = 0 );
     
 public slots:
     void fillValues();
 
 protected slots:
     void slotConnectionToggle( int index );
@@ -110,13 +110,13 @@ private:
 
 class SMTPconfig : public SMTPconfigUI
 {
     Q_OBJECT
 
 public:
-    SMTPconfig( SMTPaccount *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
+    SMTPconfig( SMTPaccount *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, Qt::WFlags flags = 0 );
 
 public slots:
     void fillValues();
 
 protected slots:
     void slotConnectionToggle( int index );
@@ -130,13 +130,13 @@ private:
 
 class NNTPconfig : public NNTPconfigUI
 {
     Q_OBJECT
 
 public:
-    NNTPconfig( NNTPaccount *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
+    NNTPconfig( NNTPaccount *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, Qt::WFlags flags = 0 );
 
 public slots:
     void fillValues();
 
 protected slots:
     void slotSSL( bool enabled );
diff --git a/kmicromail/kmicromail.pro b/kmicromail/kmicromail.pro
index 9f4d4bd..ce30bbf 100644
--- a/kmicromail/kmicromail.pro
+++ b/kmicromail/kmicromail.pro
@@ -38,13 +38,14 @@ SOURCES         = main.cpp  \
                selectsmtp.cpp \
                nntpgroups.cpp \
                koprefs.cpp\
                koprefsdialog.cpp\
                nntpgroupsdlg.cpp
 
-INTERFACES     = editaccountsui.ui \
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3     = editaccountsui.ui \
                selectmailtypeui.ui \
                imapconfigui.ui \
                pop3configui.ui \
                nntpconfigui.ui \
                smtpconfigui.ui \
                composemailui.ui \
@@ -53,13 +54,13 @@ INTERFACES     = editaccountsui.ui \
                newmaildirui.ui \
                selectstoreui.ui \
                nntpgroupsui.ui
 
 
 INCLUDEPATH += ./qpe . .. ../libkdepim   ../microkde ../microkde/kdecore ../libetpan/include ../microkde/kdeui
-LIBS        +=  -L../bin -lmicromailwrapper  -lmicrolibetpan  -lmicrokde  -lssl -lcrypto  -lmicrokdepim -lmicrokabc -lpthread
+LIBS        +=  -L../bin -lmicromailwrapper  -lxmicrolibetpan  -lxmicrokde  -lssl -lcrypto  -lxmicrokdepim -lxmicrokabc -lpthread
 
 DESTDIR= ../bin
 TARGET       = ompi
 
 DEFINES +=  DESKTOP_VERSION
 unix : {
@@ -73,6 +74,11 @@ QMAKE_LINK += /NODEFAULTLIB:LIBC
 #QMAKE_LINK += /NODEFAULTLIB:MSVCRT
 #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+CONFIG += uic3
+
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index a5a51f7..19fa398 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -52,13 +52,13 @@ INTERFACES     = editaccountsui.ui \
                newmaildirui.ui \
                selectstoreui.ui \
                nntpgroupsui.ui
 
 
 INCLUDEPATH += $(QPEDIR)/include . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim  $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/libetpan/include $(KDEPIMDIR)/microkde/kdeui 
-LIBS        += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan  -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim -lpthread
+LIBS        += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lxmicrolibetpan  -lxmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lxmicrokdepim -lpthread
 LIBS += $(QTOPIALIB)
 #LIBS += -lqtopia 
 #next line for Zaurus only
 #LIBS +=  -luuid
 
 LIBS += $(GCC3EXTRALIB1)
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index e4b61dc..e2eed9a 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -23,13 +23,13 @@
 
 #include <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 017f1f7..e3102a4 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -20,30 +20,35 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #include <kdialog.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
+#include <q3groupbox.h>
+#include <q3buttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qcombobox.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <QPixmap>
+#include <Q3Frame>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
@@ -108,15 +113,15 @@ void KOPrefsDialog::setupGlobalTab()
    
 
 
 } 
 void KOPrefsDialog::setupMainTab() 
 {
-    QFrame *topFrame = addPage(i18n("General"),0,0);
+    Q3Frame *topFrame = addPage(i18n("General"),0,0);
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
 
   mNameEdit = new QLineEdit(topFrame);
   mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
@@ -133,15 +138,15 @@ void KOPrefsDialog::setupMainTab()
                                     &(KOPrefs::instance()->mUseKapi),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1);
 }
 
 void KOPrefsDialog::setupMailTab()
 {
- QFrame *topFrame = addPage(i18n("Mail"),0,0);
+ Q3Frame *topFrame = addPage(i18n("Mail"),0,0);
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
   KPrefsDialogWidBool*  ttt =  addWidBool(i18n("View mail as html"),
                  &(KOPrefs::instance()->mViewAsHtml),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1);
@@ -179,16 +184,16 @@ void KOPrefsDialog::setupMailTab()
   topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1);
   */
 }
 void KOPrefsDialog::setupFontsTab()
 {
 
-    QFrame *topFrame = addPage(i18n("Fonts"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Fonts"),0,0);
     //  DesktopIcon("fonts",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
   KPrefsDialogWidFont * tVFont;
   int i = 0;
   KPrefsDialogWidFont *timeLabelsFont =
       addWidFont(i18n("OK"),i18n("Application(nr)"),
@@ -235,14 +240,14 @@ void KOPrefsDialog::usrWriteConfig()
     
 }
 
 #if 0
 void KOPrefsDialog::setupLocaleDateTab()
 {
-QFrame *topFrame = addPage(i18n("Date Format"),0,0);
-   QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
+Q3Frame *topFrame = addPage(i18n("Date Format"),0,0);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,3,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
 
    
    KPrefsWidRadios *syncPrefsGroup =
@@ -289,14 +294,14 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    ++iii;
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
- QFrame *topFrame = addPage(i18n("Locale"),0,0);
-   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+ Q3Frame *topFrame = addPage(i18n("Locale"),0,0);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;
  KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
@@ -328,13 +333,13 @@ void  KOPrefsDialog::setupLocaleTab()
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
    }
    else {
        QWidget * hb = new QWidget( topFrame );
-       QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
+       Q3HBoxLayout  *hbLayout = new Q3HBoxLayout(hb);
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
        hbLayout->addWidget(sb->checkBox()  );
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
@@ -358,15 +363,15 @@ void KOPrefsDialog::showSyncPage()
 
 }
 void KOPrefsDialog::setupSyncAlgTab()
 {
 #if 0
   QLabel * lab;
-   QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
+   Q3Frame *topFrame = addPage(i18n("Sync Prefs"),0,0);
    mSetupSyncAlgTab = topFrame;
-   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
    int iii = 0;  
    
    KPrefsDialogWidBool *sb =
        addWidBool(i18n("Ask for preferences before syncing"),
@@ -400,14 +405,14 @@ void KOPrefsDialog::setupSyncAlgTab()
 
 
 void KOPrefsDialog::setupSyncTab()
 {
 #if 0
     QLabel * lab;
-   QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
-   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+   Q3Frame *topFrame = addPage(i18n("Sync Network"),0,0);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());
    lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
    int iii = 0;
    topLayout->addMultiCellWidget(lab , iii,iii,0,1);
    ++iii;
@@ -448,16 +453,16 @@ void KOPrefsDialog::setupSyncTab()
  
 #endif
 }
 
 void KOPrefsDialog::setupMainTab()
 {
-    QFrame *topFrame = addPage(i18n("General"),0,0);
+    Q3Frame *topFrame = addPage(i18n("General"),0,0);
     // DesktopIcon("identity",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
  //  KPrefsDialogWidBool *emailControlCenter =
 //       addWidBool(i18n("&Use email settings from Control Center"),
 //                  &(KOPrefs::instance()->mEmailControlCenter),topFrame);
@@ -472,43 +477,43 @@ void KOPrefsDialog::setupMainTab()
 
   mEmailEdit = new QLineEdit(topFrame);
   mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
   topLayout->addWidget(mEmailLabel,1,0);
   topLayout->addWidget(mEmailEdit,1,1);
   KPrefsDialogWidBool *wb;
-  QHBox *dummy;
+  Q3HBox *dummy;
   if ( QApplication::desktop()->width() >  480 ) {
-      dummy = new QHBox(topFrame);
+      dummy = new Q3HBox(topFrame);
   } else {
-      dummy = new QVBox(topFrame);
+      dummy = new Q3VBox(topFrame);
   }
 
   topLayout->addMultiCellWidget(dummy, 2,2,0,1); 
   addWidBool(i18n("Full menu bar(nr)"),
              &(KOPrefs::instance()->mShowFullMenu),dummy);
   
   
   addWidBool(i18n("Mini icons in toolbar(nr)"),
              &(KOPrefs::instance()->mToolBarMiniIcons),dummy);
 
 
-  dummy = new QHBox(topFrame);
+  dummy = new Q3HBox(topFrame);
   new QLabel(i18n("Days in What's Next:"),dummy);
   mWhatsNextSpin = new QSpinBox(1,14,1,dummy);
  
   topLayout->addMultiCellWidget(dummy,3,3,0,1);
 
 
 
-  dummy = new QHBox(topFrame);
+  dummy = new Q3HBox(topFrame);
   new QLabel(i18n("Days in Next-X-Days:"),dummy);
   mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
  
   topLayout->addMultiCellWidget(dummy,4,4,0,1);
 
-  QHBox *prioBox = new QHBox(topFrame);
+  Q3HBox *prioBox = new Q3HBox(topFrame);
   // intervalBox->setSpacing(spacingHint());
   topLayout->addMultiCellWidget(prioBox,5,5,0,1);
   QString messa = i18n("Show topmost todo prios in What's Next:");
 
   if ( QApplication::desktop()->width() <  300 )
       messa = i18n("Show topmost todo prios in What's N.:");
@@ -526,13 +531,13 @@ void KOPrefsDialog::setupMainTab()
   // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"),  topFrame);
   //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
 
   // addWidBool(i18n("Enable automatic saving of calendar"),
   //         &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
 
-  QHBox *intervalBox = new QHBox(topFrame);
+  Q3HBox *intervalBox = new Q3HBox(topFrame);
   // intervalBox->setSpacing(spacingHint());
   topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
   QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
   mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
   autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 
   /*
@@ -617,20 +622,20 @@ void KOPrefsDialog::setupMainTab()
   */
 }
 
 
 void KOPrefsDialog::setupTimeTab()
 {
-    QFrame *topFrame = addPage(i18n("Time"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Time"),0,0);
     // DesktopIcon("clock",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
  
-  QHBox *dummy = new QHBox(topFrame);
+  Q3HBox *dummy = new Q3HBox(topFrame);
   KPrefsWidTime *dayBegins =
       addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
                dummy);
   //topLayout->addWidget(dayBegins->label(),2,0);
   
   //topLayout->addWidget(dayBegins->spinBox(),2,1);
@@ -655,28 +660,28 @@ void KOPrefsDialog::setupTimeTab()
                        3,0);
   mAlarmTimeCombo = new QComboBox(topFrame);
   mAlarmTimeCombo->insertStringList(alarmList);
   topLayout->addWidget(mAlarmTimeCombo,3,1);
 
 
-  QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
+  Q3GroupBox *workingHoursGroup = new Q3GroupBox(1,Qt::Horizontal,
                                                i18n("Working Hours"),
                                                topFrame);
   topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
   workingHoursGroup->layout()->setSpacing( 0 );
   workingHoursGroup->layout()->setMargin( 4 );
-  QHBox *workStartBox = new QHBox(workingHoursGroup);
+  Q3HBox *workStartBox = new Q3HBox(workingHoursGroup);
   // workStartBox->setMargin( 0 );
   addWidTime(i18n("Daily starting hour:"),
              &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
 
-  QHBox *workEndBox = new QHBox(workingHoursGroup);
+  Q3HBox *workEndBox = new Q3HBox(workingHoursGroup);
   //workEndBox->setMargin( 0 );
   addWidTime(i18n("Daily ending hour:"),
              &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
-  QVBox *excludeBox  = new QVBox(workingHoursGroup);
+  Q3VBox *excludeBox  = new Q3VBox(workingHoursGroup);
   //excludeBox->setMargin( 0 );
   addWidBool(i18n("Exclude holidays"),
              &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
 
   addWidBool(i18n("Exclude Saturdays"),
              &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
@@ -690,16 +695,16 @@ void KOPrefsDialog::setupTimeTab()
 }
 
 
 void KOPrefsDialog::setupViewsTab()
 {
 
-    QFrame *topFrame = addPage(i18n("Views"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Views"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
 //   QBoxLayout *dayBeginsLayout = new QHBoxLayout;
 //   topLayout->addLayout(dayBeginsLayout,0,0);
 
@@ -782,13 +787,13 @@ void KOPrefsDialog::setupViewsTab()
 
 
 
    topFrame = addPage(i18n("ViewChange"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,6,1);
+  topLayout = new Q3GridLayout(topFrame,6,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   ii = 0;
  
 
   dummy =
@@ -835,18 +840,18 @@ void KOPrefsDialog::setupViewsTab()
 
 
 
    topFrame = addPage(i18n("Month View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,5,1);
+  topLayout = new Q3GridLayout(topFrame,5,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   ii = 0;
   QLabel *lab;
-  QHBox *habo = new QHBox( topFrame );
+  Q3HBox *habo = new Q3HBox( topFrame );
   if ( QApplication::desktop()->width() < 320 ) {
       lab = new QLabel ( i18n("Show events that recur "), topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
       
   } else {
@@ -862,13 +867,13 @@ void KOPrefsDialog::setupViewsTab()
     addWidBool(i18n("weekly"),
                &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 
 
-  habo = new QHBox( topFrame ); 
+  habo = new Q3HBox( topFrame ); 
   if ( QApplication::desktop()->width() < 320 ) {
       lab = new QLabel (i18n("Show in every cell ") , topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
       
   } else {
@@ -930,13 +935,13 @@ void KOPrefsDialog::setupViewsTab()
 
   // *********************** Todo View
 
    topFrame = addPage(i18n("Todo View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout = new Q3GridLayout(topFrame,4,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   ii = 0;
 
  KPrefsDialogWidBool *showCompletedTodo =
       addWidBool(i18n("To-do view shows completed Todos"),
@@ -962,21 +967,21 @@ void KOPrefsDialog::setupViewsTab()
 
   QWidget* wid = new QWidget( topFrame );
   // Todo due today color
   KPrefsWidColor *todoDueTodayColor =
       addWidColor(i18n("Todo due today color:"),
                   &(KOPrefs::instance()->mTodoDueTodayColor),wid);
-  QHBoxLayout *widLayout = new QHBoxLayout(wid);
+  Q3HBoxLayout *widLayout = new Q3HBoxLayout(wid);
   widLayout->addWidget( todoDueTodayColor->label() );
   widLayout->addWidget( todoDueTodayColor->button() );
   topLayout->addWidget(wid,ii++,0);
   //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
 
   // Todo overdue color
   wid = new QWidget( topFrame );
-  widLayout = new QHBoxLayout(wid);
+  widLayout = new Q3HBoxLayout(wid);
   KPrefsWidColor *todoOverdueColor =
       addWidColor(i18n("Todo overdue color:"),
                   &(KOPrefs::instance()->mTodoOverdueColor),wid);
   widLayout->addWidget(todoOverdueColor->label());
   widLayout->addWidget(todoOverdueColor->button());
   topLayout->addWidget(wid,ii++,0);
@@ -994,58 +999,58 @@ void KOPrefsDialog::setupViewsTab()
 
 
 
    topFrame = addPage(i18n("Alarm"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,2,1);
+  topLayout = new Q3GridLayout(topFrame,2,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
   int iii = 0;
 
  dummy =
     addWidBool(i18n("Use internal alarm notification"),
                &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
   topLayout->addWidget(dummy->checkBox(),iii++,0);
   lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
 
    topLayout->addWidget(lab ,iii++,0);
 #ifndef DESKTOP_VERSION
-    lab->setAlignment( AlignLeft|WordBreak|AlignTop);
+    lab->setAlignment( Qt::AlignLeft|Qt::TextWordWrap|Qt::AlignTop);
 #else
-    lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
+    lab->setAlignment( Qt::AlignLeft|Qt::TextWrapAnywhere|Qt::TextWordWrap|Qt::AlignTop);
     lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 #endif
  
-    QHBox* dummyBox = new QHBox(topFrame);
+    Q3HBox* dummyBox = new Q3HBox(topFrame);
     new QLabel(i18n("Play beeps count:"),dummyBox);
     mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
     new QLabel(i18n("Beeps interval in sec:"),dummyBox);
     mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
     new QLabel(i18n("Default suspend time in min:"),dummyBox);
     mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
     new QLabel(i18n("Auto suspend count:"),dummyBox);
     mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
 
 
 
 
 
 
-    QHBox* hbo = new QHBox ( topFrame );
+    Q3HBox* hbo = new Q3HBox ( topFrame );
     mDefaultAlarmFile = new QLineEdit(hbo);
     QPushButton * loadTemplate = new QPushButton(hbo); 
     QPixmap icon;
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileimport16");
     else
@@ -1079,16 +1084,16 @@ void KOPrefsDialog::selectSoundFile()
      if ( fileName.length() > 0 )
          mDefaultAlarmFile->setText( fileName );
 }
 void KOPrefsDialog::setupFontsTab()
 {
  
-    QFrame *topFrame = addPage(i18n("Fonts"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Fonts"),0,0);
     //  DesktopIcon("fonts",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
   KPrefsDialogWidFont * tVFont;
   int i = 0;
   KPrefsDialogWidFont *timeLabelsFont =
       addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
@@ -1149,13 +1154,13 @@ void KOPrefsDialog::setupFontsTab()
 
 
   i = 0;
   topFrame = addPage(i18n("View Fonts"),0,
                              DesktopIcon("fonts",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,7,3);
+  topLayout = new Q3GridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
 
   tVFont =
       addWidFont(i18n("Configure KO"),i18n("What's Next View:"),
                  &(KOPrefs::instance()->mWhatsNextFont),topFrame);
@@ -1217,26 +1222,26 @@ void KOPrefsDialog::setupFontsTab()
 
 
 }
 
 void KOPrefsDialog::setupColorsTab()
 {
-    QFrame *topFrame = addPage(i18n("Colors"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Colors"),0,0);
     //  DesktopIcon("colorize",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,2);
   // topLayout->setSpacing(spacingHint());
   // topLayout->setMargin(marginHint());
 
   topLayout->setSpacing(2);
   topLayout->setMargin(3);
 
   int ii = 1;
-  QGroupBox *categoryGroup ;
+  Q3GroupBox *categoryGroup ;
 
-  categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
+  categoryGroup = new Q3GroupBox(1,Qt::Vertical,i18n("Categories"),
                                            topFrame);
   topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
 
   mCategoryCombo = new QComboBox(categoryGroup);
   mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
   connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor()));
@@ -1323,26 +1328,26 @@ void KOPrefsDialog::updateCategoryColor()
 
 void KOPrefsDialog::setupPrinterTab()
 {
   mPrinterTab = addPage(i18n("Printing"),0,
                         DesktopIcon("fileprint",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(mPrinterTab,5,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
   topLayout->setRowStretch(4,1);
 }
 
 void KOPrefsDialog::setupGroupSchedulingTab()
 {
 #if 0
-  QFrame *topFrame  = addPage(i18n("Group Scheduling"),0,
+  Q3Frame *topFrame  = addPage(i18n("Group Scheduling"),0,
                               DesktopIcon("personal",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
 #if 0
   KPrefsWidRadios *schedulerGroup =
       addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
@@ -1359,13 +1364,13 @@ void KOPrefsDialog::setupGroupSchedulingTab()
   sendGroup->addRadio(i18n("Send to outbox"));
   sendGroup->addRadio(i18n("Send directly"));
 
   topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1);
 
   topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
-  mAMails = new QListView(topFrame);
+  mAMails = new Q3ListView(topFrame);
   mAMails->addColumn(i18n("Email"),300);
   topLayout->addMultiCellWidget(mAMails,3,3,0,1);
 
   topLayout->addWidget(new QLabel(i18n("Additional email address:"),topFrame),4,0);
   aEmailsEdit = new QLineEdit(topFrame);
   aEmailsEdit->setEnabled(false);
@@ -1377,23 +1382,23 @@ void KOPrefsDialog::setupGroupSchedulingTab()
   topLayout->addWidget(del,5,1);
 
   //topLayout->setRowStretch(2,1);
   connect(add, SIGNAL( clicked() ), this, SLOT(addItem()) );
   connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) );
   connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem()));
-  connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput()));
+  connect(mAMails,SIGNAL(selectionChanged(Q3ListViewItem *)),SLOT(updateInput()));
 #endif
 }
 
 void KOPrefsDialog::setupGroupAutomationTab()
 {
     return;
-  QFrame *topFrame  = addPage(i18n("Group Automation"),0,
+  Q3Frame *topFrame  = addPage(i18n("Group Automation"),0,
                               DesktopIcon("personal",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,1);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
   KPrefsWidRadios *autoRefreshGroup =
       addWidRadios(i18n("Auto Send Refresh"),
                    &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
@@ -1540,13 +1545,13 @@ void KOPrefsDialog::usrWriteConfig()
     KOPrefs::instance()->mStartTime = mStartTimeSpin->value();
     KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value();
     KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem();
     
     //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value();
     
-    QDictIterator<QColor> it(mCategoryDict);
+    Q3DictIterator<QColor> it(mCategoryDict);
     while (it.current()) {
         KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
         ++it;
     }
     
     KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value();
@@ -1680,20 +1685,20 @@ void KOPrefsDialog::updateTimezoneOffset( int index )
     }
     */
 }
 
 void KOPrefsDialog::setupTimeZoneTab()
 {
-    QFrame *topFrame = addPage(i18n("Time Zone"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Time Zone"),0,0);
     // DesktopIcon("clock",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,2);
   topLayout->setSpacing(spacingHint());
   topLayout->setMargin(marginHint());
 
-  QHBox *timeZoneBox = new QHBox( topFrame );
+  Q3HBox *timeZoneBox = new Q3HBox( topFrame );
   topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
 
   new QLabel( i18n("Timezone:"), timeZoneBox );
   mTimeZoneCombo = new QComboBox( timeZoneBox ); 
   if ( QApplication::desktop()->width() <  300 ) {
        mTimeZoneCombo->setMaximumWidth(150);
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index 7fa9261..042af3f 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -20,16 +20,18 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOPREFSDIALOG_H
 #define _KOPREFSDIALOG_H
 
-#include <qframe.h>
-#include <qdict.h>
+#include <q3frame.h>
+#include <q3dict.h>
 #include <qcolor.h>
-#include <qlistview.h>
+#include <q3listview.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include <kdialogbase.h>
 
 #include <libkdepim/kprefsdialog.h>
 #include <libkdepim/kdateedit.h>
 #include <kcmconfigs/kdepimconfigwidget.h>
@@ -116,13 +118,13 @@ protected:
 
 
   private:
     KPrefsWidBool *mEnableGroupScheduling;
     KPrefsWidBool *mEnableProjectView;
 
-    QFrame *mPrinterTab;
+    Q3Frame *mPrinterTab;
 
     QLineEdit *nameEdit;
     QLineEdit *emailEdit;
 
     QComboBox *timeCombo;
     QComboBox *tzCombo;
@@ -143,13 +145,13 @@ protected:
     QSpinBox     *mStartTimeSpin;
     QSpinBox     *mDefaultDurationSpin;
     QComboBox    *mAlarmTimeCombo;
 
     QComboBox     *mCategoryCombo;
     KColorButton  *mCategoryButton;
-    QDict<QColor> mCategoryDict;
+    Q3Dict<QColor> mCategoryDict;
 
     QSlider   *mHourSizeSlider;
 
     QSpinBox  *mNextXDaysSpin;
     QSpinBox  *mWhatsNextSpin;
 
diff --git a/kmicromail/libetpan/libetpan.pro b/kmicromail/libetpan/libetpan.pro
index dfafa07..4b2654e 100644
--- a/kmicromail/libetpan/libetpan.pro
+++ b/kmicromail/libetpan/libetpan.pro
@@ -1,12 +1,12 @@
 ######################################################################
 # Automatically generated by qmake (1.07a) Thu Jul 1 00:54:03 2004
 ######################################################################
 
 TEMPLATE = lib
-        TARGET  = microlibetpan
+        TARGET  = xmicrolibetpan
 
 OBJECTS_DIR = obj
 MOC_DIR = moc
 DESTDIR=../../bin
 
 DEPENDPATH += generic \
diff --git a/kmicromail/libetpan/libetpanE.pro b/kmicromail/libetpan/libetpanE.pro
index 7f37948..ea22692 100644
--- a/kmicromail/libetpan/libetpanE.pro
+++ b/kmicromail/libetpan/libetpanE.pro
@@ -1,12 +1,12 @@
 ######################################################################
 # Automatically generated by qmake (1.07a) Thu Jul 1 00:54:03 2004
 ######################################################################
 
 TEMPLATE = lib
-        TARGET  = microlibetpan
+        TARGET  = xmicrolibetpan
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/lib
 
 DEPENDPATH += generic \
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 870985e..746d2ae 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -5,19 +5,21 @@
 #include "nntpwrapper.h"
 #include "mhwrapper.h"
 #include "mailtypes.h"
 #include <qpe/global.h>
 
 
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <klocale.h>
 #include <kdecore/kstandarddirs.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <stdlib.h>
 #include <libetpan/mailmime_content.h>
 #include <libetpan/mailmime.h>
 
 using namespace Opie::Core;
 AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
@@ -108,16 +110,16 @@ QString AbstractMail::convert_String(const char*text)
 }
 
 /* cp & paste from launcher */
 QString AbstractMail::gen_attachment_id()
 {
     QFile file( "/proc/sys/kernel/random/uuid" );
-    if (!file.open(IO_ReadOnly ) )
+    if (!file.open(QIODevice::ReadOnly ) )
         return QString::null;
 
-    QTextStream stream(&file);
+    Q3TextStream stream(&file);
 
     return "{" + stream.read().stripWhiteSpace() + "}";
 }
 
 int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool)
 {
@@ -135,22 +137,22 @@ QString AbstractMail::defaultLocalfolder()
 QString AbstractMail::draftFolder()
 {
     return QString("Drafts");
 }
 
 /* temporary - will be removed when implemented in all classes */
-void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
+void AbstractMail::deleteMails(const QString &,const Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &)
 {
 }
-void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
+void AbstractMail::deleteMailList(const Q3ValueList<RecMailP>&target)
 {
     //qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
     // this is currently re-implemented in pop3wrapper and imapwrapper
     int iii = 0;
     int count = target.count(); 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
     while (iii < count ) {   
         Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count)); 
         wid.setProgress( iii ); 
         wid.raise();
@@ -174,26 +176,26 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
     if ( !targetMail->createMbox(lfName))
         {
             QMessageBox::critical(0,i18n("Error creating new Folder"),
                                   i18n("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName));
             return;
         }
-    QValueList<RecMailP> t;
+    Q3ValueList<RecMailP> t;
     listMessages(fromFolder->getName(),t,acc->getMaxMailSize() );
     if ( t.count() == 0 ) {
         qDebug("There are no new messages %s", fromFolder->getName().latin1());
         Global::statusMessage(i18n("There are no new messages"));
         return;
     }
     Global::statusMessage(i18n("%1 :Downloading mails..."). arg(acc->getAccountName()));
     qDebug(i18n("%1 :Downloading mails..."). arg(acc->getAccountName()));
     qApp->processEvents();
-    QValueList<RecMailP> e;
+    Q3ValueList<RecMailP> e;
     targetMail->listMessages(lfName,e,acc->getMaxMailSize() );
     //qDebug("target has mails %d ", e.count());
-    QValueList<RecMailP> n; 
+    Q3ValueList<RecMailP> n; 
     int iii = 0;
     int count = t.count();  
     while (iii < count ) {  
         RecMailP r = (*t.at( iii ));
         bool found = false; 
         int jjj = 0;
@@ -218,38 +220,38 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
         return;
     }
     mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer());
     Global::statusMessage(i18n("Downloaded %1 messages").arg(n.count()));
     
 #if 0
- QValueList<RecMailP> t;
+ Q3ValueList<RecMailP> t;
  listMessages(fromFolder->getName(),t, maxSizeInKb);
  mvcpMailList( t,targetFolder,targetWrapper,moveit);
 #endif 
 
 }
 void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
     const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
 {
- QValueList<RecMailP> t;
+ Q3ValueList<RecMailP> t;
  listMessages(fromFolder->getName(),t, maxSizeInKb);
  mvcpMailList( t,targetFolder,targetWrapper,moveit);
 
 }
-void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
+void AbstractMail::mvcpMailList(const Q3ValueList<RecMailP>& t,
                                 const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
     encodedString*st = 0;
     int iii = 0;
     int count = t.count();
     if ( count == 0 )
         return;
     // wel, processevents is qite strange, we need a widget for getting  
     // Global::statusMessage(i18n("Copy2 message %1").arg(iii)); displaye
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Copying..."));
     wid.show();
     while (iii < count ) {  
         Global::statusMessage(i18n("Copy message %1 of %2").arg(iii).arg(count));
         wid.setProgress( iii ); 
         wid.raise();
diff --git a/kmicromail/libmailwrapper/abstractmail.h b/kmicromail/libmailwrapper/abstractmail.h
index 2069ca1..f606b1f 100644
--- a/kmicromail/libmailwrapper/abstractmail.h
+++ b/kmicromail/libmailwrapper/abstractmail.h
@@ -4,12 +4,14 @@
 
 #include "maildefines.h"
 
 #include "settings.h"
 
 #include <qobject.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <opie2/osmartpointer.h>
 #include "mailtypes.h"
 
 
 #include "mailwrapper.h"
 
@@ -22,32 +24,32 @@ struct folderStat;
 class AbstractMail:public QObject
 {
     Q_OBJECT
 public:
     AbstractMail(){};
     virtual ~AbstractMail(){}
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0;
-    virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target, int sizeInKb = 0 )=0;
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0;
+    virtual void listMessages(const QString & mailbox,Q3ValueList<RecMailP>&target, int sizeInKb = 0 )=0;
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0;
     virtual RecBodyP fetchBody(const RecMailP&mail)=0;
     virtual QString fetchTextPart(const RecMailP&mail,const RecPartP&part)=0;
     virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPartP&part)=0;
     virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPartP&part)=0;
     virtual encodedString* fetchRawBody(const RecMailP&mail)=0;
 
     virtual void deleteMail(const RecMailP&mail)=0;
-    virtual void deleteMailList(const QValueList<RecMailP>&target);
+    virtual void deleteMailList(const Q3ValueList<RecMailP>&target);
     virtual void answeredMail(const RecMailP&mail)=0;
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&)=0;
-    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> >&target);
+    virtual void deleteMails(const QString & FolderName,const Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target);
     virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&)=0;
     virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
     void downloadNewMails(const FolderP&fromFolder,AbstractMail*targetWrapper  );
     virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
                               const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int sizeInKb = 0);
-    virtual void mvcpMailList(const QValueList<RecMailP>& t,
+    virtual void mvcpMailList(const Q3ValueList<RecMailP>& t,
                       const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
     virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
 
     virtual void cleanMimeCache(){};
     /* mail box methods */
     /* parameter is the box to create.
diff --git a/kmicromail/libmailwrapper/generatemail.cpp b/kmicromail/libmailwrapper/generatemail.cpp
index 2d213fe..ddad21b 100644
--- a/kmicromail/libmailwrapper/generatemail.cpp
+++ b/kmicromail/libmailwrapper/generatemail.cpp
@@ -4,12 +4,14 @@
 #include <libetpan/libetpan.h>
 
 //#include <qt.h>
 
 #include <stdlib.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace Opie::Core;
 const char* Generatemail::USER_AGENT="KOpieMail 33 1/3";
 
 Generatemail::Generatemail()
 {
@@ -225,13 +227,13 @@ void Generatemail::addFileParts( mailmime *message,const QList<Attachment>&files
 mailmime *Generatemail::buildTxtPart(const QString&str ) {
     mailmime *txtPart;
     mailmime_fields *fields;
     mailmime_content *content;
     mailmime_parameter *param;
     int err;
-    QCString __str;
+    Q3CString __str;
     //qDebug(" Generatemail::buildTxtPart %s", str.latin1());
     param = mailmime_parameter_new( strdup( "charset" ),
                                     strdup( mCharset.latin1() ) );
     if ( param == NULL )
         goto err_free;
 
@@ -249,13 +251,13 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) {
 
     txtPart = mailmime_new_empty( content, fields );
     if ( txtPart == NULL )
         goto err_free_fields;
     {
         //__str = str.utf8();
-        __str = QCString (str.latin1());
+        __str = Q3CString (str.latin1());
         err = mailmime_set_body_text( txtPart, strdup(__str.data()), __str.length() );
     }
     if ( err != MAILIMF_NO_ERROR )
         goto err_free_txtPart;
 
     return txtPart;     // Success :)
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index 0b6adf7..633ab42 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -3,12 +3,14 @@
 #include <libetpan/libetpan.h>
 #include "mailtypes.h"
 
 #include <kconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 
 using namespace Opie::Core;
 Genericwrapper::Genericwrapper()
     : AbstractMail()
 {
@@ -179,13 +181,13 @@ QString Genericwrapper::getencoding(mailmime_mechanism*aEnc)
         }
         break;
     }
     return enc;
 }
 
-void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rec,int current_count)
+void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,Q3ValueList<int>recList,unsigned int current_rec,int current_count)
 {
     if (current_rec >= 10) {
         ; // odebug << "too deep recursion!" << oendl; 
     }
     if (!message || !mime) {
         return;
@@ -197,13 +199,13 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
     QString b;
     RecPartP part = new RecPart();
 
     switch (mime->mm_type) {
     case MAILMIME_SINGLE:
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
         r = mailmessage_fetch_section(message,mime,&data,&len);
         part->setSize(len);
         part->setPositionlist(countlist);
         b = gen_attachment_id();
         part->setIdentifier(b);
@@ -247,13 +249,13 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
     }
     break;
     case MAILMIME_MULTIPLE:
     {
         unsigned int ccount = 1;
         mailmime*cbody=0;
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         for (cur = clist_begin(mime->mm_data.mm_multipart.mm_mp_list) ; cur != NULL ; cur = clist_next(cur)) {
             cbody = (mailmime*)clist_content(cur);
             if (cbody->mm_type==MAILMIME_MULTIPLE) {
                 RecPartP targetPart = new RecPart();
                 targetPart->setType("multipart");
                 countlist.append(current_count);
@@ -267,13 +269,13 @@ void Genericwrapper::traverseBody(RecBodyP&target,mailmessage*message,mailmime*m
             ++ccount;
         }
     }
     break;
     case MAILMIME_MESSAGE:
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
         /* the own header is always at recursion 0 - we don't need that */
         if (current_rec > 0) {
             part->setPositionlist(countlist);
             r = mailmessage_fetch_section(message,mime,&data,&len);
             part->setSize(len);
@@ -299,13 +301,13 @@ RecBodyP Genericwrapper::parseMail( mailmessage * msg )
     //mailmime_single_fields fields;
     /* is bound to msg and will be freed there */
     mailmime * mime=0;
     RecBodyP body = new RecBody();
     //memset(&fields, 0, sizeof(struct mailmime_single_fields));
     err = mailmessage_get_bodystructure(msg,&mime);
-    QValueList<int>recList;
+    Q3ValueList<int>recList;
     traverseBody(body,msg,mime,recList);
     return body;
 }
 
 
 QString Genericwrapper::parseAddressList( mailimf_address_list *list )
@@ -444,13 +446,13 @@ QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies)
             res.append(h);
         }
     }
     return res;
 }
 
-void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to, int maxSizeInKb)
+void Genericwrapper::parseList(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to, int maxSizeInKb)
 {
     int r;
     mailmessage_list * env_list = 0;
     r = mailsession_get_messages_list(session,&env_list);
     if (r != MAIL_NO_ERROR) {
         ; // odebug << "Error message list" << oendl; 
diff --git a/kmicromail/libmailwrapper/genericwrapper.h b/kmicromail/libmailwrapper/genericwrapper.h
index c35a6da..a50161d 100644
--- a/kmicromail/libmailwrapper/genericwrapper.h
+++ b/kmicromail/libmailwrapper/genericwrapper.h
@@ -2,12 +2,14 @@
 #ifndef __GENERIC_WRAPPER_H
 #define __GENERIC_WRAPPER_H
 
 #include "abstractmail.h"
 #include <qmap.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libetpan/clist.h>
 
 class RecMail;
 class RecBody;
 class encodedString;
 struct mailpop3;
@@ -48,17 +50,17 @@ protected:
     RecBodyP parseMail( mailmessage * msg );
     QString parseMailboxList( mailimf_mailbox_list *list );
     QString parseMailbox( mailimf_mailbox *box );
     QString parseGroup( mailimf_group *group );
     QString parseAddressList( mailimf_address_list *list );
 
-    void traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1);
+    void traverseBody(RecBodyP&target,mailmessage*message,mailmime*mime,Q3ValueList<int>recList,unsigned int current_rek=0,int current_count=1);
     static void fillSingleBody(RecPartP&target,mailmessage*message,mailmime*mime);
     static void fillParameters(RecPartP&target,clist*parameters);
     static QString getencoding(mailmime_mechanism*aEnc);
-    virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false, int maxSizeInKb = 0);
+    virtual void parseList(Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false, int maxSizeInKb = 0);
     QStringList parseInreplies(mailimf_in_reply_to * in_replies);
 
     QString msgTempName;
     unsigned int last_msg_id;
     QMap<QString,encodedString*> bodyCache;
     mailstorage * m_storage;
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 4f0c849..f73f4cc 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -1,15 +1,17 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 #include <stdlib.h>
 #include <libetpan/libetpan.h>
 #include <qpe/global.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "imapwrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include "genericwrapper.h"
 #include <kglobal.h>
 
 using namespace Opie::Core;
 int IMAPwrapper::mMax = 0;
 int IMAPwrapper::mCurrent = 0;
@@ -236,13 +238,13 @@ void IMAPwrapper::logout()
     err = mailimap_close( m_imap );
     mailimap_free( m_imap );
     m_imap = 0;
     m_Lastmbox = "";
 }
 
-void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target , int maxSizeInKb)
+void IMAPwrapper::listMessages(const QString&mailbox,Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target , int maxSizeInKb)
 {
 
     int tryAgain = 1;
     while ( tryAgain >= 0 ) {
         int err = MAILIMAP_NO_ERROR;
         clist *result = 0;
@@ -317,22 +319,22 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSma
         }
     
         if (result) mailimap_fetch_list_free(result);
     }
 }
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders()
 {
     const char *path, *mask;
     int err = MAILIMAP_NO_ERROR;
     clist *result = 0;
     clistcell *current = 0;
     clistcell*cur_flag = 0;
     mailimap_mbx_list_flags*bflags = 0;
 
-    QValueList<FolderP>* folders = new QValueList<FolderP>();
+    Q3ValueList<FolderP>* folders = new Q3ValueList<FolderP>();
     login();
     if (!m_imap) {
         return folders;
     }
 
 /*
@@ -610,13 +612,13 @@ RecBodyP IMAPwrapper::fetchBody(const RecMailP&mail)
     mailimap_fetch_type_free( fetchType );
 
     if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) {
         mailimap_msg_att * msg_att;
         msg_att = (mailimap_msg_att*)current->data;
         mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->att_list->first->data;
-        QValueList<int> path;
+        Q3ValueList<int> path;
         body_desc = item->att_data.att_static->att_data.att_body;
         traverseBody(mail,body_desc,body,0,path);
     } else {
         qDebug("error fetching body %d (%d): %s", err, MAILIMAP_NO_ERROR, m_imap->imap_response );
     }
     if (result) mailimap_fetch_list_free(result);
@@ -661,13 +663,13 @@ QStringList IMAPwrapper::address_list_to_stringlist(clist*list)
             break;
         }
     }
     return l;
 }
 
-encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call)
+encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const Q3ValueList<int>&path,bool internal_call)
 {
     encodedString*res=new encodedString;
     int err;
     mailimap_fetch_type *fetchType;
     mailimap_set *set;
     clistcell*current,*cur;
@@ -735,21 +737,21 @@ encodedString*IMAPwrapper::fetchRawPart(const RecMailP&mail,const QValueList<int
     return res;
 }
 
 /* current_recursion is for recursive calls.
    current_count means the position inside the internal loop! */
 void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,
-    int current_recursion,QValueList<int>recList,int current_count)
+    int current_recursion,Q3ValueList<int>recList,int current_count)
 {
     if (!body || current_recursion>=10) {
         return;
     }
     switch (body->bd_type) {
     case MAILIMAP_BODY_1PART:
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         countlist.append(current_count);
         RecPartP currentPart = new RecPart();
         mailimap_body_type_1part*part1 = body->bd_data.bd_body_1part;
         QString id("");
         currentPart->setPositionlist(countlist);
         for (unsigned int j = 0; j < countlist.count();++j) {
@@ -796,13 +798,13 @@ void IMAPwrapper::traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&t
             traverseBody(mail,part1->bd_data.bd_type_msg->bd_body,target_body,current_recursion+1,countlist);
         }
     }
     break;
     case MAILIMAP_BODY_MPART:
     {
-        QValueList<int>countlist = recList;
+        Q3ValueList<int>countlist = recList;
         clistcell*current=0;
         mailimap_body*current_body=0;
         unsigned int ccount = 1;
         mailimap_body_type_mpart*mailDescription = body->bd_data.bd_body_mpart;
         for (current=clist_begin(mailDescription->bd_list);current!=0;current=clist_next(current)) {
             current_body = (mailimap_body*)current->data;
@@ -982,13 +984,13 @@ void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which
     if (which->bd_description) {
         target_part->setDescription(QString(which->bd_description));
     }
     target_part->setEncoding(encoding);
     target_part->setSize(which->bd_size);
 }
-void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
+void IMAPwrapper::deleteMailList(const Q3ValueList<RecMailP>&target)
 {
     //#if 0
     mailimap_flag_list*flist;
     mailimap_set *set;
     mailimap_store_att_flags * store_flags;
     int err;
@@ -1002,13 +1004,13 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
     // qDebug("imap remove count %d ", count); 
 
     
     mMax = count;
     progress( i18n("Delete")); 
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
     while (iii < count ) {
         Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
         wid.setProgress( iii ); 
         wid.raise();
@@ -1111,13 +1113,13 @@ void IMAPwrapper::answeredMail(const RecMailP&mail)
     if (err != MAILIMAP_NO_ERROR) {
         // odebug << "error marking mail: " << m_imap->imap_response << "" << oendl; 
         return;
     }
 }
 
-QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call,const QString&enc)
+QString IMAPwrapper::fetchTextPart(const RecMailP&mail,const Q3ValueList<int>&path,bool internal_call,const QString&enc)
 {
     QString body("");
     encodedString*res = fetchRawPart(mail,path,internal_call);
     encodedString*r = decode_String(res,enc);
     delete res;
     if (r) {
@@ -1296,13 +1298,13 @@ const QString&IMAPwrapper::getName()const
     return account->getAccountName();
 }
 
 encodedString* IMAPwrapper::fetchRawBody(const RecMailP&mail)
 {
     // dummy
-    QValueList<int> path;
+    Q3ValueList<int> path;
     return fetchRawPart(mail,path,false);
 }
 
 void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
                                const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
 {
diff --git a/kmicromail/libmailwrapper/imapwrapper.h b/kmicromail/libmailwrapper/imapwrapper.h
index 31c60a8..d3d3ecd 100644
--- a/kmicromail/libmailwrapper/imapwrapper.h
+++ b/kmicromail/libmailwrapper/imapwrapper.h
@@ -1,11 +1,13 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 #ifndef __IMAPWRAPPER
 #define __IMAPWRAPPER
 
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "mailwrapper.h"
 #include "abstractmail.h"
 #include <libetpan/clist.h>
 
 struct mailimap;
 struct mailimap_body;
@@ -21,18 +23,18 @@ class encodedString;
 class IMAPwrapper : public AbstractMail
 {
     Q_OBJECT
 public:
     IMAPwrapper( IMAPaccount *a );
     virtual ~IMAPwrapper();
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
-    virtual void listMessages(const QString & mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> >&target , int sizeInKb = 0);
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox,Q3ValueList<Opie::Core::OSmartPointer<RecMail> >&target , int sizeInKb = 0);
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
     virtual void deleteMail(const RecMailP&mail);
-    void deleteMailList(const QValueList<RecMailP>&target);
+    void deleteMailList(const Q3ValueList<RecMailP>&target);
     virtual void answeredMail(const RecMailP&mail);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&folder);
     virtual void storeMessage(const char*msg,size_t length, const QString&folder);
     virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
                               const QString&targetFolder,AbstractMail*targetWrapper,bool moveit,int sizeInKb = 0);
     virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
@@ -56,22 +58,22 @@ public:
 
 protected:
     RecMail*parse_list_result(mailimap_msg_att*);
     void login(bool tryTLS = true);
     bool start_tls(bool force=true);
 
-    virtual QString fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call=false,const QString&enc="");
-    virtual encodedString*fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call);
+    virtual QString fetchTextPart(const RecMailP&mail,const Q3ValueList<int>&path,bool internal_call=false,const QString&enc="");
+    virtual encodedString*fetchRawPart(const RecMailP&mail,const Q3ValueList<int>&path,bool internal_call);
     int selectMbox(const QString&mbox);
 
     void fillSinglePart(RecPartP&target_part,mailimap_body_type_1part*Description);
     void fillSingleTextPart(RecPartP&target_part,mailimap_body_type_text*which);
     void fillSingleBasicPart(RecPartP&target_part,mailimap_body_type_basic*which);
     void fillSingleMsgPart(RecPartP&target_part,mailimap_body_type_msg*which);
     void fillMultiPart(RecPartP&target_part,mailimap_body_type_mpart*which);
-    void traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,int current_recursion,QValueList<int>recList,int current_count=1);
+    void traverseBody(const RecMailP&mail,mailimap_body*body,RecBodyP&target_body,int current_recursion,Q3ValueList<int>recList,int current_count=1);
 
     /* just helpers */
     static void fillBodyFields(RecPartP&target_part,mailimap_body_fields*which);
     static QStringList address_list_to_stringlist(clist*list);
 
     static void progress(QString mess = QString::null);
diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro
index 646630b..6b595ab 100644
--- a/kmicromail/libmailwrapper/libmailwrapper.pro
+++ b/kmicromail/libmailwrapper/libmailwrapper.pro
@@ -35,13 +35,14 @@ SOURCES         = imapwrapper.cpp \
               nntpwrapper.cpp \
               generatemail.cpp \
               storemail.cpp \
                ../qpe/qdialog_hacked.cpp \
                ../qpe/global.cpp
 
-INTERFACES     = logindialogui.ui \
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3     = logindialogui.ui \
               sendmailprogressui.ui
 
 INCLUDEPATH +=  ../qpe .. ../../microkde ../../microkde/kdecore ../../libetpan/include 
 LIBS        +=   -lssl -lcrypto
 
 #-lqpe -letpan
@@ -60,6 +61,11 @@ LIBS += mfc71u.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 #QMAKE_LINK += /NODEFAULTLIB:MSVCRT
 #QMAKE_LINK += /NODEFAULTLIB:uafxcw.lib
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+CONFIG += uic3
+
diff --git a/kmicromail/libmailwrapper/logindialog.cpp b/kmicromail/libmailwrapper/logindialog.cpp
index 31b75d0..d1f4b5d 100644
--- a/kmicromail/libmailwrapper/logindialog.cpp
+++ b/kmicromail/libmailwrapper/logindialog.cpp
@@ -3,13 +3,13 @@
 #include "logindialog.h"
 
 
 
 //using namespace Opie::Core;
 
-LoginDialog::LoginDialog(const QString&user,const QString&pass, QWidget *parent, const char *name, bool modal, WFlags flags )
+LoginDialog::LoginDialog(const QString&user,const QString&pass, QWidget *parent, const char *name, bool modal, Qt::WFlags flags )
     : LoginDialogUI( parent, name, modal, flags )
 {
     userLine->setText( (user.isEmpty()?QString(""):user) );
     passLine->setText( (pass.isEmpty()?QString(""):pass) );
     _user = user;
     _pass = pass;
diff --git a/kmicromail/libmailwrapper/logindialog.h b/kmicromail/libmailwrapper/logindialog.h
index f406f2c..a18daa5 100644
--- a/kmicromail/libmailwrapper/logindialog.h
+++ b/kmicromail/libmailwrapper/logindialog.h
@@ -5,13 +5,13 @@
 
 class LoginDialog : public LoginDialogUI
 {
     Q_OBJECT
 
 public:
-    LoginDialog(const QString&user,const QString&pass, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
+    LoginDialog(const QString&user,const QString&pass, QWidget *parent = 0, const char *name = 0, bool modal = false, Qt::WFlags flags = 0 );
     QString getUser() { return _user; }
     QString getPassword() { return _pass; }
 
 protected slots:
     void accept();
 
diff --git a/kmicromail/libmailwrapper/mailtypes.cpp b/kmicromail/libmailwrapper/mailtypes.cpp
index 70a0ab5..84ccf9f 100644
--- a/kmicromail/libmailwrapper/mailtypes.cpp
+++ b/kmicromail/libmailwrapper/mailtypes.cpp
@@ -1,11 +1,13 @@
 #include "mailtypes.h"
 
 //#include <opie2/odebug.h>
 
 #include <stdlib.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace Opie::Core;
 RecMail::RecMail()
     :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7)
 {
     init();
@@ -280,18 +282,18 @@ const QString RecPart::searchParamter(const QString&key)const
     if (it != m_Parameters.end()) {
         value = it.data();
     }
     return value;
 }
 
-void RecPart::setPositionlist(const QValueList<int>&poslist)
+void RecPart::setPositionlist(const Q3ValueList<int>&poslist)
 {
     m_poslist = poslist;
 }
 
-const QValueList<int>& RecPart::Positionlist()const
+const Q3ValueList<int>& RecPart::Positionlist()const
 {
     return m_poslist;
 }
 
 RecBody::RecBody()
     : Opie::Core::ORefCount(),m_BodyText(),m_description(new RecPart())
@@ -320,19 +322,19 @@ void RecBody::setBodytext(const QString&bodyText)
 
 const QString& RecBody::Bodytext()const
 {
     return m_BodyText;
 }
 
-void RecBody::setParts(const QValueList<RecPartP>&parts)
+void RecBody::setParts(const Q3ValueList<RecPartP>&parts)
 {
     m_PartsList.clear();
     m_PartsList = parts;
 }
 
-const QValueList<RecPartP>& RecBody::Parts()const
+const Q3ValueList<RecPartP>& RecBody::Parts()const
 {
     return m_PartsList;
 }
 
 void RecBody::addPart(const RecPartP& part)
 {
diff --git a/kmicromail/libmailwrapper/mailtypes.h b/kmicromail/libmailwrapper/mailtypes.h
index 97f10d7..ac7f8da 100644
--- a/kmicromail/libmailwrapper/mailtypes.h
+++ b/kmicromail/libmailwrapper/mailtypes.h
@@ -11,13 +11,13 @@
 #include <opie2/osmartpointer.h>
 
 #include <qbitarray.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qmap.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 class AbstractMail;
 /* a class to describe mails in a mailbox */
 /* Attention!
    From programmers point of view it would make sense to
    store the mail body into this class, too.
@@ -106,13 +106,13 @@ class RecPart:public Opie::Core::ORefCount
 {
 protected:
     QString m_type,m_subtype,m_identifier,m_encoding,m_description;
     unsigned int m_lines,m_size;
     part_plist_t m_Parameters;
     /* describes the position in the mail */
-    QValueList<int> m_poslist;
+    Q3ValueList<int> m_poslist;
 
 public:
     RecPart();
     RecPart(const RecPart&);
     virtual ~RecPart();
 
@@ -133,24 +133,24 @@ public:
 
 
     void setParameters(const part_plist_t&list);
     const part_plist_t&Parameters()const;
     void addParameter(const QString&key,const QString&value);
     const QString searchParamter(const QString&key)const;
-    void setPositionlist(const QValueList<int>&poslist);
-    const QValueList<int>& Positionlist()const;
+    void setPositionlist(const Q3ValueList<int>&poslist);
+    const Q3ValueList<int>& Positionlist()const;
 };
 
 typedef Opie::Core::OSmartPointer<RecPart> RecPartP;
 
 class RecBody:public Opie::Core::ORefCount
 {
 protected:
     QString m_BodyText;
     QString mCharset;
-    QValueList<RecPartP> m_PartsList;
+    Q3ValueList<RecPartP> m_PartsList;
     RecPartP m_description;
 
 public:
     RecBody();
     RecBody(const RecBody&old);
     virtual ~RecBody();
@@ -159,14 +159,14 @@ public:
     void setCharset(const QString&);
     QString getCharset()const;
 
     void setDescription(const RecPartP&des);
     const RecPartP& Description()const;
 
-    void setParts(const QValueList<RecPartP>&parts);
-    const QValueList<RecPartP>& Parts()const;
+    void setParts(const Q3ValueList<RecPartP>&parts);
+    const Q3ValueList<RecPartP>& Parts()const;
     void addPart(const RecPartP&part);
 };
 
 typedef Opie::Core::OSmartPointer<RecBody> RecBodyP;
 
 class encodedString
diff --git a/kmicromail/libmailwrapper/mailwrapper.cpp b/kmicromail/libmailwrapper/mailwrapper.cpp
index 2ee1ab3..9c299e8 100644
--- a/kmicromail/libmailwrapper/mailwrapper.cpp
+++ b/kmicromail/libmailwrapper/mailwrapper.cpp
@@ -2,12 +2,14 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "mailwrapper.h"
 //#include "logindialog.h"
 //#include "defines.h"
 
 #define UNDEFINED 64
@@ -78,37 +80,37 @@ static unsigned char base64chars[] =
 QString IMAPFolder::decodeFolderName( const QString &name )
 {
   unsigned char c, i, bitcount;
   unsigned long ucs4, utf16, bitbuf;
   unsigned char base64[256], utf8[6];
   unsigned long srcPtr = 0;
-  QCString dst = "";
-  QCString src = name.ascii();
+  Q3CString dst = "";
+  Q3CString src = name.ascii();
 
   /* initialize modified base64 decoding table */
   memset(base64, UNDEFINED, sizeof(base64));
   for (i = 0; i < sizeof(base64chars); ++i) {
     base64[(int)base64chars[i]] = i;
   }
 
   /* loop until end of string */
   while (srcPtr < src.length ()) {
-    c = src[srcPtr++];
+    c = src.at(srcPtr++);
     /* deal with literal characters and &- */
-    if (c != '&' || src[srcPtr] == '-') {
+    if (c != '&' || src.at(srcPtr) == '-') {
       /* encode literally */
       dst += c;
       /* skip over the '-' if this is an &- sequence */
       if (c == '&')
         srcPtr++;
     } else {
       /* convert modified UTF-7 -> UTF-16 -> UCS-4 -> UTF-8 -> HEX */
       bitbuf = 0;
       bitcount = 0;
       ucs4 = 0;
-      while ((c = base64[(unsigned char) src[srcPtr]]) != UNDEFINED) {
+      while ((c = base64[(unsigned char) src.at(srcPtr)]) != UNDEFINED) {
         ++srcPtr;
         bitbuf = (bitbuf << 6) | c;
         bitcount += 6;
         /* enough bits for a UTF-16 character? */
         if (bitcount >= 16) {
           bitcount -= 16;
@@ -146,13 +148,13 @@ QString IMAPFolder::decodeFolderName( const QString &name )
           for (c = 0; c < i; ++c) {
             dst += utf8[c];
           }
         }
       }
       /* skip over trailing '-' in modified UTF-7 encoding */
-      if (src[srcPtr] == '-')
+      if (src.at(srcPtr) == '-')
         ++srcPtr;
     }
   }
 
   return QString::fromUtf8( dst.data() );
 }
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h
index 3e8b51f..bebabf4 100644
--- a/kmicromail/libmailwrapper/mailwrapper.h
+++ b/kmicromail/libmailwrapper/mailwrapper.h
@@ -3,12 +3,14 @@
 
 //#include <qpe/applnk.h>
 
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <QPixmap>
 #include <kiconloader.h>
 
 #include "settings.h"
 
 #include <opie2/osmartpointer.h>
 /*
@@ -58,13 +60,13 @@ public:
      * 'cause it seems that it will never have some child classes.
      * in this case this object will not get a virtual table -> memory and
      * speed will be a little bit better?
      */
     virtual ~Mail(){}
     void addAttachment( Attachment *att ) { attList.append( att ); }
-    const QList<Attachment>& getAttachments()const { return attList; }
+    const QList<Attachment*>& getAttachments()const { return attList; }
     void removeAttachment( Attachment *att ) { attList.remove( att ); }
     const QString&getName()const { return name; }
     void setName( QString s ) { name = s; }
     const QString&getMail()const{ return mail; }
     void setMail( const QString&s ) { mail = s; }
     const QString&getTo()const{ return to; }
@@ -83,13 +85,13 @@ public:
     const QStringList&Inreply()const{return m_in_reply_to;}
 
     void setCharset( const QString&a ) { charset= a; }
     const QString& getCharset() const { return charset; }
 
 private:
-    QList<Attachment> attList;
+    QList<Attachment*> attList;
     QString name, mail, to, cc, bcc, reply, subject, message, charset;
     QStringList m_in_reply_to;
 };
 
 class Folder:public Opie::Core::ORefCount
 {
diff --git a/kmicromail/libmailwrapper/mboxwrapper.cpp b/kmicromail/libmailwrapper/mboxwrapper.cpp
index 87f8c8a..888cae2 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.cpp
+++ b/kmicromail/libmailwrapper/mboxwrapper.cpp
@@ -1,11 +1,13 @@
 #include "mboxwrapper.h"
 #include "mailtypes.h"
 #include "mailwrapper.h"
 #include <libetpan/libetpan.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
 #include <klocale.h>
 
 
 #include <qpe/global.h>
 
@@ -20,13 +22,13 @@ MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name)
 }
 
 MBOXwrapper::~MBOXwrapper()
 {
 }
 
-void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target )
+void MBOXwrapper::listMessages(const QString & mailbox, Q3ValueList<RecMailP> &target )
 {
     mailstorage*storage = mailstorage_new(NULL);
     QString p = MBOXPath+"/";
     p+=mailbox;
 
     int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0);
@@ -45,15 +47,15 @@ void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &ta
     mailfolder_disconnect(folder);
     mailfolder_free(folder);
     mailstorage_free(storage);
     Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count()));
 }
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* MBOXwrapper::listFolders()
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* MBOXwrapper::listFolders()
 {
-    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
+    Q3ValueList<Opie::Core::OSmartPointer<Folder> >* folders = new Q3ValueList<Opie::Core::OSmartPointer<Folder> >();
     QDir dir(MBOXPath);
     if (!dir.exists()) return folders;
     dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable);
     QStringList entries = dir.entryList();
     QStringList::ConstIterator it = entries.begin();
     for (;it!=entries.end();++it) {
@@ -214,13 +216,13 @@ encodedString* MBOXwrapper::fetchRawBody(const RecMailP&mail)
     mailfolder_free(folder);
     mailstorage_free(storage);
     mailmessage_free(msg);
     return result;
 }
 
-void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target)
+void MBOXwrapper::deleteMails(const QString & mailbox,const Q3ValueList<RecMailP> &target)
 {
     QString p = MBOXPath+"/";
     p+=mailbox;
     mailmbox_folder*f = 0;
     int r = mailmbox_init(p.latin1(),0,1,0,&f);
     if (r != MAIL_NO_ERROR) {
@@ -228,17 +230,17 @@ void MBOXwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP>
         return;
     }
     deleteMails(f,target);
     mailmbox_done(f);
 }
 
-void MBOXwrapper::deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target)
+void MBOXwrapper::deleteMails(mailmbox_folder*f,const Q3ValueList<RecMailP> &target)
 {
     if (!f) return;
     int r;
-    QValueList<RecMailP>::ConstIterator it;
+    Q3ValueList<RecMailP>::ConstIterator it;
     for (it=target.begin(); it != target.end();++it) {
         r = mailmbox_delete_msg(f,(*it)->getNumber());
         if (r!=MAILMBOX_NO_ERROR) {
             ; // << "error delete mail" << oendl; 
         }
     }
diff --git a/kmicromail/libmailwrapper/mboxwrapper.h b/kmicromail/libmailwrapper/mboxwrapper.h
index d03940f..e658a71 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.h
+++ b/kmicromail/libmailwrapper/mboxwrapper.h
@@ -1,25 +1,27 @@
 #ifndef __MBOX_WRAPPER_H
 #define __MBOX_WRAPPER_H
 
 #include "genericwrapper.h"
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 class encodedString;
 struct mailmbox_folder;
 
 class MBOXwrapper : public Genericwrapper
 {
     Q_OBJECT
 
 public:
     MBOXwrapper(const QString & dir,const QString&name);
     virtual ~MBOXwrapper();
 
-    virtual void listMessages(const QString & mailbox, QValueList<RecMailP>&target );
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, Q3ValueList<RecMailP>&target );
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
     virtual void deleteMail(const RecMailP&mail);
     virtual void answeredMail(const RecMailP&mail);
 
     virtual int createMbox(const QString&folder,const Opie::Core::OSmartPointer<Folder>&f=0,
@@ -29,19 +31,19 @@ public:
     virtual void storeMessage(const char*msg,size_t length, const QString&folder);
 
     virtual RecBodyP fetchBody( const RecMailP &mail );
     static void mbox_progress( size_t current, size_t maximum );
 
     virtual encodedString* fetchRawBody(const RecMailP&mail);
-    virtual void deleteMails(const QString & FolderName,const QValueList<RecMailP> &target);
+    virtual void deleteMails(const QString & FolderName,const Q3ValueList<RecMailP> &target);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
     virtual MAILLIB::ATYPE getType()const;
     virtual const QString&getName()const;
     virtual Account* getAccount() { return 0; };
 
 protected:
-    static void deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target);
+    static void deleteMails(mailmbox_folder*f,const Q3ValueList<RecMailP> &target);
     QString MBOXPath;
     QString MBOXName;
 };
 
 #endif
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp
index 787e85d..4cd7a94 100644
--- a/kmicromail/libmailwrapper/mhwrapper.cpp
+++ b/kmicromail/libmailwrapper/mhwrapper.cpp
@@ -2,12 +2,14 @@
 #include "mhwrapper.h"
 #include "mailtypes.h"
 #include "mailwrapper.h"
 #include <libetpan/libetpan.h>
 #include <qdir.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
 #include <qpe/global.h>
 #include <klocale.h>
 #include <kglobal.h>
 //#include <opie2/odebug.h> 
 
@@ -61,13 +63,13 @@ void MHwrapper::clean_storage()
 
 MHwrapper::~MHwrapper()
 {
     clean_storage();
 }
 
-void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb  )
+void MHwrapper::listMessages(const QString & mailbox, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb  )
 {
     init_storage();
     if (!m_storage) {
         return;
     }
     QString f = buildPath(mailbox);
@@ -77,15 +79,15 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
         return;
     }
     parseList(target,m_storage->sto_session,f, false, maxSizeInKb );
     Global::statusMessage(i18n("Mailbox has %1 mail(s)").arg(target.count()));
 }
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders()
 {
-    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
+    Q3ValueList<Opie::Core::OSmartPointer<Folder> >* folders = new Q3ValueList<Opie::Core::OSmartPointer<Folder> >();
     /* this is needed! */
     if (m_storage) mailstorage_disconnect(m_storage);
     init_storage();
     if (!m_storage) {
         return folders;
     }
@@ -252,21 +254,21 @@ encodedString* MHwrapper::fetchRawBody(const RecMailP&mail)
     }
     result = new encodedString(data,size);
     if (msg) mailmessage_free(msg);
     return result;
 }
 
-void MHwrapper::deleteMails(const QString & mailbox,const QValueList<RecMailP> &target)
+void MHwrapper::deleteMails(const QString & mailbox,const Q3ValueList<RecMailP> &target)
 {
     QString f = buildPath(mailbox);
     int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1());
     if (r!=MAIL_NO_ERROR) {
         qDebug("deleteMails: error selecting folder! ");
         return;
     }
-    QValueList<RecMailP>::ConstIterator it;
+    Q3ValueList<RecMailP>::ConstIterator it;
     for (it=target.begin(); it!=target.end();++it) {
         r = mailsession_remove_message(m_storage->sto_session,(*it)->getNumber());
         if (r != MAIL_NO_ERROR) {
             qDebug("error deleting mail ");
             break;
         }
diff --git a/kmicromail/libmailwrapper/mhwrapper.h b/kmicromail/libmailwrapper/mhwrapper.h
index 36a443a..6151ff1 100644
--- a/kmicromail/libmailwrapper/mhwrapper.h
+++ b/kmicromail/libmailwrapper/mhwrapper.h
@@ -3,24 +3,26 @@
 #define __MH_WRAPPER_H
 
 #include "maildefines.h"
 
 #include "genericwrapper.h"
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 class encodedString;
 struct mailmbox_folder;
 class MHwrapper : public Genericwrapper
 {
     Q_OBJECT
 public:
     MHwrapper(const QString & dir,const QString&name);
     virtual ~MHwrapper();
 
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
     virtual void deleteMail(const RecMailP&mail);
     virtual void answeredMail(const RecMailP&mail);
     virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
     virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
@@ -33,13 +35,13 @@ public:
     virtual void storeMessage(const char*msg,size_t length, const QString&folder);
 
     virtual RecBodyP fetchBody( const RecMailP &mail );
     static void mbox_progress( size_t current, size_t maximum );
 
     virtual encodedString* fetchRawBody(const RecMailP&mail);
-    virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> > &target);
+    virtual void deleteMails(const QString & FolderName,const Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
     virtual MAILLIB::ATYPE getType()const;
     virtual const QString&getName()const;
     virtual Account* getAccount() { return 0; };
 
 public slots:
diff --git a/kmicromail/libmailwrapper/nntpwrapper.cpp b/kmicromail/libmailwrapper/nntpwrapper.cpp
index 93cd2b5..b328ecd 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.cpp
+++ b/kmicromail/libmailwrapper/nntpwrapper.cpp
@@ -1,12 +1,14 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 #include "nntpwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <stdlib.h>
 
 #include <libetpan/libetpan.h>
 
 
@@ -57,20 +59,20 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
     cleanMimeCache();
 
     if (mail->getNumber()!=last_msg_id) {
         if (msg_cache.exists()) {
             msg_cache.remove();
         }
-        msg_cache.open(IO_ReadWrite|IO_Truncate);
+        msg_cache.open(QIODevice::ReadWrite|QIODevice::Truncate);
         last_msg_id = mail->getNumber();
         err = mailsession_get_message(m_nntp->sto_session, mail->getNumber(), &mailmsg);
         err = mailmessage_fetch(mailmsg,&message,&length);
         msg_cache.writeBlock(message,length);
     } else {
         QString msg="";
-        msg_cache.open(IO_ReadOnly);
+        msg_cache.open(QIODevice::ReadOnly);
         message = new char[4096];
         memset(message,0,4096);
         while (msg_cache.readBlock(message,4095)>0) {
             msg+=message;
             memset(message,0,4096);
         }
@@ -96,13 +98,13 @@ RecBodyP NNTPwrapper::fetchBody( const RecMailP &mail ) {
         free(message);
 
     return body;
 }
 
 
-void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb)
+void NNTPwrapper::listMessages(const QString & which, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb)
 {
     login();
     if (!m_nntp)
         return;
     uint32_t res_messages,res_recent,res_unseen;
     mailsession_status_folder(m_nntp->sto_session,(char*)which.latin1(),&res_messages,&res_recent,&res_unseen);
@@ -183,15 +185,15 @@ void NNTPwrapper::logout()
     if ( m_nntp == NULL )
         return;
     mailstorage_free(m_nntp);
    m_nntp = 0;
 }
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* NNTPwrapper::listFolders() {
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* NNTPwrapper::listFolders() {
 
-    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >();
+    Q3ValueList<Opie::Core::OSmartPointer<Folder> >* folders = new Q3ValueList<Opie::Core::OSmartPointer<Folder> >();
     QStringList groups;
     if (account) {
         groups = account->getGroups();
     }
     for ( QStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) {
         folders->append(new Folder((*it),"."));
diff --git a/kmicromail/libmailwrapper/nntpwrapper.h b/kmicromail/libmailwrapper/nntpwrapper.h
index 8c54f12..7c8e671 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.h
+++ b/kmicromail/libmailwrapper/nntpwrapper.h
@@ -2,12 +2,14 @@
 #ifndef __NNTPWRAPPER
 #define __NNTPWRAPPER
 
 #include "mailwrapper.h"
 #include "genericwrapper.h"
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libetpan/clist.h>
 
 class encodedString;
 struct mailstorage;
 struct mailfolder;
 
@@ -18,15 +20,15 @@ class NNTPwrapper : public Genericwrapper
 
 public:
     NNTPwrapper( NNTPaccount *a );
     virtual ~NNTPwrapper();
 
    /* mailbox will be ignored */
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
+    virtual void listMessages(const QString & mailbox, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
     /* should only get the subscribed one */
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     /* mailbox will be ignored */
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
     QStringList listAllNewsgroups(const QString&mask = QString::null);
     virtual void deleteMail(const RecMailP&mail);
     virtual void answeredMail(const RecMailP&mail);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index 2888f7c..ebeed71 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -6,14 +6,16 @@
 #include <libetpan/libetpan.h>
 
 #include <klocale.h>
 
 #include <qpe/global.h>
 #include <qfile.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 
 using namespace Opie::Core;
 POP3wrapper::POP3wrapper( POP3account *a )
@@ -59,20 +61,20 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
     cleanMimeCache();
 
     if (mail->getNumber()!=last_msg_id) {
         if (msg_cache.exists()) {
             msg_cache.remove();
         }
-        msg_cache.open(IO_ReadWrite|IO_Truncate);
+        msg_cache.open(QIODevice::ReadWrite|QIODevice::Truncate);
         last_msg_id = mail->getNumber();
         err = mailsession_get_message(m_pop3->sto_session, mail->getNumber(), &mailmsg);
         err = mailmessage_fetch(mailmsg,&message,&length);
         msg_cache.writeBlock(message,length);
     } else {
         QString msg="";
-        msg_cache.open(IO_ReadOnly);
+        msg_cache.open(QIODevice::ReadOnly);
         message = new char[4096];
         memset(message,0,4096);
         while (msg_cache.readBlock(message,4095)>0) {
             msg+=message;
             memset(message,0,4096);
         }
@@ -97,13 +99,13 @@ RecBodyP POP3wrapper::fetchBody( const RecMailP &mail ) {
     if (message)
         free(message);
 
     return body;
 }
 
-void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb )
+void POP3wrapper::listMessages(const QString &, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb )
 {
     login();
     if (!m_pop3)
         return;
     uint32_t res_messages,res_recent,res_unseen;
     mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen);
@@ -184,28 +186,28 @@ void POP3wrapper::logout()
         return;
     mailstorage_free(m_pop3);
     m_pop3 = 0;
 }
 
 
-QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
-    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<FolderP>();
+Q3ValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
+    Q3ValueList<Opie::Core::OSmartPointer<Folder> >* folders = new Q3ValueList<FolderP>();
     FolderP inb=new Folder("INBOX","/");
     folders->append(inb);
     return folders;
 }
 
-void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
+void POP3wrapper::deleteMailList(const Q3ValueList<RecMailP>&target)
 {
     login();
     if (!m_pop3)
         return;
     int iii = 0;
     int count = target.count(); 
 
-    QProgressBar wid ( count );
+    Q3ProgressBar wid ( count );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
     while (iii < count ) {  
         Global::statusMessage(i18n("Delete message %1 of %2").arg(iii).arg(count));
         wid.setProgress( iii ); 
         wid.raise();
@@ -243,13 +245,13 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
         Global::statusMessage(i18n("Error getting folder info"));
         return 0;
     }
 
 
 
-    QProgressBar wid ( result );
+    Q3ProgressBar wid ( result );
     wid.setCaption( i18n("Deleting ..."));
     wid.show();
     for (unsigned int i = 0; i < result; ++i) { 
         Global::statusMessage(i18n("Delete message %1 of %2").arg(i).arg(result));
         wid.setProgress( i ); 
         wid.raise();
diff --git a/kmicromail/libmailwrapper/pop3wrapper.h b/kmicromail/libmailwrapper/pop3wrapper.h
index ebc2fc7..a077877 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.h
+++ b/kmicromail/libmailwrapper/pop3wrapper.h
@@ -2,12 +2,14 @@
 #ifndef __POP3WRAPPER
 #define __POP3WRAPPER
 
 #include "mailwrapper.h"
 #include "genericwrapper.h"
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 class encodedString;
 struct mailstorage;
 struct mailfolder;
 
 class POP3wrapper : public Genericwrapper
@@ -15,19 +17,19 @@ class POP3wrapper : public Genericwrapper
     Q_OBJECT
 
 public:
     POP3wrapper( POP3account *a );
     virtual ~POP3wrapper();
     /* mailbox will be ignored */
-    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
-    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
+    virtual void listMessages(const QString & mailbox, Q3ValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
+    virtual Q3ValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
     /* mailbox will be ignored */
     virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
 
     virtual void deleteMail(const RecMailP&mail);
-    virtual void deleteMailList(const QValueList<RecMailP>&target);
+    virtual void deleteMailList(const Q3ValueList<RecMailP>&target);
     virtual void answeredMail(const RecMailP&mail);
     virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
 
     virtual RecBodyP fetchBody( const RecMailP &mail );
     virtual encodedString* fetchRawBody(const RecMailP&mail);
     virtual void logout();
diff --git a/kmicromail/libmailwrapper/sendmailprogress.cpp b/kmicromail/libmailwrapper/sendmailprogress.cpp
index 20dfe9b..6cd6409 100644
--- a/kmicromail/libmailwrapper/sendmailprogress.cpp
+++ b/kmicromail/libmailwrapper/sendmailprogress.cpp
@@ -1,8 +1,8 @@
 #include "sendmailprogress.h"
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qlabel.h>
 #include <klocale.h>
 
 progressMailSend::progressMailSend(QWidget*parent, const char * name)
     :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0)
 {
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 9436d43..fc01528 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -1,11 +1,11 @@
 #include <stdlib.h>
 #include <qdir.h>
 
 #include <qtextcodec.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 
 //#include <opie2/odebug.h>
 #include <kconfig.h>
 
 #include <kstandarddirs.h>
@@ -373,17 +373,17 @@ QString SMTPaccount::getSignature()
 {
     QFileInfo fi ( signature );
     if ( ! fi.exists() )
         return QString();
 
     QFile file( signature );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return QString();
         
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
     QString text = ts.read();
     file.close();
     
     return text;
 
@@ -396,17 +396,17 @@ void SMTPaccount::setSignature( QString b )
         QString filedir( locateLocal("data", "kopiemail" ) );
          signature = filedir+ "/" + getAccountName() +".sig";
          qDebug("new sig %s ", signature.latin1());
          save();
     }
     QFile fileIn( signature );
-    if (!fileIn.open( IO_WriteOnly ) ) {
+    if (!fileIn.open( QIODevice::WriteOnly ) ) {
         qDebug("OM: Cannot write signature file %s ", signature.latin1() );
         return ;
     } 
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     tsIn << b ;
     fileIn.close();  
 }
 QString SMTPaccount::getUniqueFileName()
 {
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 7c813cc..2df55ff 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -6,12 +6,14 @@
 #include "sendmailprogress.h"
 
 //#include <opie2/odebug.h>
 //#include <qt.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <stdlib.h>
 #ifndef DESKTOP_VERSION
 //#include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #endif
 #include <libetpan/libetpan.h>
@@ -431,14 +433,14 @@ bool SMTPwrapper::flushOutbox() {
     AbstractMail*wrap = AbstractMail::getWrapper(localfolders);
     if (!wrap) {
         ; // odebug << "memory error" << oendl; 
         return false;
     }
     QString oldPw, oldUser;
-    QValueList<RecMailP> mailsToSend;
-    QValueList<RecMailP> mailsToRemove;
+    Q3ValueList<RecMailP> mailsToSend;
+    Q3ValueList<RecMailP> mailsToRemove;
     QString mbox("Outgoing");
     wrap->listMessages(mbox,mailsToSend);
     if (mailsToSend.count()==0) {
         delete wrap;
         ; // odebug << "No mails to send" << oendl; 
         return false;
diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index 41cee52..d8eee7d 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -1,15 +1,15 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include "mailistviewitem.h"
 #include <libmailwrapper/abstractmail.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <kiconloader.h>
 #include "koprefs.h"
 //#include <qpe/resource.h>
 
-MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
+MailListViewItem::MailListViewItem(Q3ListView * parent, MailListViewItem * item )
         :KListViewItem(parent,item),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
 {
diff --git a/kmicromail/mailistviewitem.h b/kmicromail/mailistviewitem.h
index b409c9d..ecc01ba 100644
--- a/kmicromail/mailistviewitem.h
+++ b/kmicromail/mailistviewitem.h
@@ -6,13 +6,13 @@
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/maildefines.h>
 
 class MailListViewItem:public KListViewItem
 {
 public:
-    MailListViewItem(QListView * parent, MailListViewItem * after );
+    MailListViewItem(Q3ListView * parent, MailListViewItem * after );
     virtual ~MailListViewItem(){}
 
     void storeData(const RecMailP&data);
     const RecMailP&data()const;
     void showEntry();
     MAILLIB::ATYPE wrapperType();
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index fe4bc76..dc73455 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -1,11 +1,13 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <libkdepim/externalapphandler.h>
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qstring.h>
 #include <qwindowsstyle.h> 
@@ -20,12 +22,13 @@
 #include "mainwindow.h"
 #include "koprefs.h"
 #include <libkdepim/kpimglobalprefs.h>
 void dumpMissing();
 //using namespace Opie::Core;
 int main( int argc,  char **argv ) {  
+    if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
 
 #ifndef DESKTOP_VERSION
     QPEApplication a( argc, argv );
     a.setKeepRunning ();
 #else
     QApplication a( argc, argv ); 
@@ -48,13 +51,13 @@ int main( int argc,  char **argv ) {
     KPimGlobalPrefs::instance()->setGlobalConfig();
     QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont );
     QApplication::setFont( KOPrefs::instance()->mAppFont );
     OpieMail  mw;
 #ifndef DESKTOP_VERSION
     //qDebug("CONNECT ");
-    QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message(  const QCString&, const QByteArray& ))); 
+    QObject::connect( &a, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )),&mw, SLOT(message(  const Q3CString&, const QByteArray& ))); 
     // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
     a.showMainWidget(&mw );
 #else
     a.setMainWidget(&mw );
     mw.show();
     //m.resize( 800, 600 );
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index d547dda..627d92e 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,13 +1,19 @@
 
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qlabel.h>
-#include <qvbox.h>
-#include <qheader.h>
+#include <q3vbox.h>
+#include <q3header.h>
 #include <qtimer.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3GridLayout>
+#include <Q3ValueList>
+#include <QPixmap>
+#include <Q3PopupMenu>
 //#include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
@@ -24,26 +30,26 @@ extern QStatusBar* globalSstatusBarMainWindow;
 #include "mailistviewitem.h"
 #include <KDGanttMinimizeSplitter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "koprefs.h"
 
-MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
-    : QMainWindow( parent, name ) //, flags )
+MainWindow::MainWindow( QWidget *parent, const char *name, Qt::WFlags flags )
+    : Q3MainWindow( parent, name ) //, flags )
 {
 #ifdef DESKTOP_VERSION
     globalSstatusBarMainWindow = statusBar();
 #endif
     setCaption( i18n( "KOpieMail/Pi" ) );
     setToolBarsMovable( false ); 
     //KABC::StdAddressBook::self();
-    toolBar = new QToolBar( this );
+    toolBar = new Q3ToolBar( this );
     menuBar = new QPEMenuBar( toolBar );
-    mailMenu = new QPopupMenu( menuBar );
+    mailMenu = new Q3PopupMenu( menuBar );
     menuBar->insertItem( i18n( "Mail" ), mailMenu );
-    settingsMenu = new QPopupMenu( menuBar );
+    settingsMenu = new Q3PopupMenu( menuBar );
     menuBar->insertItem( i18n( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
     QAction* getMail = new QAction( i18n( "Get all new mails" ), SmallIcon("enter"),
                                0, 0, this );
@@ -111,24 +117,24 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
 
 
     editAccounts = new QAction( i18n( "Configure accounts" ),  SmallIcon("editaccounts")  ,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
-    codecMenu = new QPopupMenu( menuBar );
+    codecMenu = new Q3PopupMenu( menuBar );
     codecMenu->insertItem( "Western (iso-8859-1)",0,0);
     codecMenu->insertItem( "Cyrillic (iso-8859-5)",1,1);
     codecMenu->insertItem( "Western (iso-8859-15)",2,2);
     codecMenu->insertItem( "Chinese (big-5)",3,3);
     codecMenu->insertItem( "Unicode (utf-8)",4,4);
     codecMenu->insertItem( "Userdefined ("+KOPrefs::instance()->mSendCodec+")",5,5);
     //disabled
     //settingsMenu->insertItem( i18n("Codec for new mails"), codecMenu);
     //setCentralWidget( view );
 
-    QVBox* wrapperBox = new QVBox( this );
+    Q3VBox* wrapperBox = new Q3VBox( this );
     setCentralWidget( wrapperBox );
 
     // QWidget *view = new QWidget( wrapperBox );
     KDGanttMinimizeSplitter* splithor = new KDGanttMinimizeSplitter( Qt::Vertical, wrapperBox);
     splithor->setMinimizeDirection( KDGanttMinimizeSplitter::Down);
     KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor);
@@ -136,13 +142,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight );
     subLE = 0;
     fromLE = 0;
     toLE = 0;
     if ( KOPrefs::instance()->mShowInfoSub ||  KOPrefs::instance()->mShowInfoFrom ||  KOPrefs::instance()->mShowInfoTo ) {
         QWidget* infoBox = new QWidget( splithor );
-        QGridLayout *griLay = new QGridLayout( infoBox, 2,2);
+        Q3GridLayout *griLay = new Q3GridLayout( infoBox, 2,2);
         if ( KOPrefs::instance()->mShowInfoSub ) {
             griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 );
             griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ;
         }
         if (  KOPrefs::instance()->mShowInfoFrom ) {
             griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
@@ -165,24 +171,24 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     folderView->addColumn( i18n( "Mailbox" ) );
 
     //layout->addWidget( folderView );
 
     mailView = new KListView( split );
     mailView->addColumn( i18n( " " ) );
-    mailView->addColumn( i18n( "Subject" ),QListView::Manual );
-    mailView->addColumn( i18n( "Sender" ),QListView::Manual );
-    mailView->addColumn( i18n( "Size" ),QListView::Manual);
-    mailView->addColumn( i18n( "Date" ),QListView::Manual);
+    mailView->addColumn( i18n( "Subject" ),Q3ListView::Manual );
+    mailView->addColumn( i18n( "Sender" ),Q3ListView::Manual );
+    mailView->addColumn( i18n( "Size" ),Q3ListView::Manual);
+    mailView->addColumn( i18n( "Date" ),Q3ListView::Manual);
     if ( KOPrefs::instance()->mShowToField )
-        mailView->addColumn( i18n( "To" ),QListView::Manual);
+        mailView->addColumn( i18n( "To" ),Q3ListView::Manual);
     mailView->setAllColumnsShowFocus(true);
     //mailView->setSorting(-1);
     mailView->setRootIsDecorated( false );
     statusWidget = new StatusWidget( wrapperBox );
     statusWidget->hide();
-    mailView->setSelectionMode( QListView::Multi );   
+    mailView->setSelectionMode( Q3ListView::Multi );   
     mailView->setMultiSelection( true);
     mailView->setAlternateBackground(KPimGlobalPrefs::instance()->mAlternateColor );
     //layout->addWidget( mailView );
     //layout->setStretchFactor( folderView, 1 );
     //layout->setStretchFactor( mailView, 2 );
 
@@ -194,31 +200,31 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
         QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold);
     if ( fromLE ) 
         QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold);
     if ( toLE ) 
         QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold);
 #endif
-    connect( mailView, SIGNAL(  doubleClicked (QListViewItem* )),this,
-             SLOT( mailLeftClicked(QListViewItem*) ) );
-    connect( mailView, SIGNAL(  returnPressed (QListViewItem* )),this,
-             SLOT( mailLeftClicked(QListViewItem*) ) );
-    connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
-             SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) );
-    connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)),
-            this,SLOT(refreshMailView(const QValueList<RecMailP>&)));
-
-    connect( mailView, SIGNAL(  currentChanged  (QListViewItem* )),this,
-             SLOT( setInfoFields(QListViewItem*) ) );
+    connect( mailView, SIGNAL(  doubleClicked (Q3ListViewItem* )),this,
+             SLOT( mailLeftClicked(Q3ListViewItem*) ) );
+    connect( mailView, SIGNAL(  returnPressed (Q3ListViewItem* )),this,
+             SLOT( mailLeftClicked(Q3ListViewItem*) ) );
+    connect( mailView, SIGNAL( mouseButtonPressed(int,Q3ListViewItem*,const QPoint&,int) ),this,
+             SLOT( mailHold(int,Q3ListViewItem*,const QPoint&,int) ) );
+    connect(folderView, SIGNAL(refreshMailview(const Q3ValueList<RecMailP>&)),
+            this,SLOT(refreshMailView(const Q3ValueList<RecMailP>&)));
+
+    connect( mailView, SIGNAL(  currentChanged  (Q3ListViewItem* )),this,
+             SLOT( setInfoFields(Q3ListViewItem*) ) );
 
     connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
     connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
     //mailView->setMultiSelection ( true );
     //mailView->setSelectionMode( QListView::Extended );
-    QValueList<int> list;
+    Q3ValueList<int> list;
     int fw = 100;
     if ( QApplication::desktop()->width() > 320 )
         fw = 50;
     list.append( fw );
     list.append( 100 );
     split->setSizes( list );
@@ -232,13 +238,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
     if ( QApplication::desktop()->width() > 320 )
         closeMail->addTo(toolBar);
         closeMail->addTo(mailMenu);
 
 
-   QPopupMenu* helpMenu = new QPopupMenu( menuBar );
+   Q3PopupMenu* helpMenu = new Q3PopupMenu( menuBar );
    menuBar->insertItem( i18n( "Help" ), helpMenu ); 
    QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); 
    connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
    li->addTo(helpMenu);
    li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this); 
    connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
@@ -256,13 +262,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 }
 
 MainWindow::~MainWindow()
 {
 }
 
-void MainWindow::setInfoFields(QListViewItem* item )
+void MainWindow::setInfoFields(Q3ListViewItem* item )
 {
     if ( item == 0) {
     if ( subLE ) subLE->setText("");
     if ( fromLE ) fromLE->setText("");
     if ( toLE ) toLE->setText("");
         return;
@@ -342,13 +348,13 @@ void  MainWindow::showAbout()
 }
 void  MainWindow::showEtpanLicence()
 {
     KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" );
 
 } 
-void MainWindow::appMessage(const QCString &, const QByteArray &)
+void MainWindow::appMessage(const Q3CString &, const QByteArray &)
 {
     qDebug("appMessage implemented by subclass");
 }
 
 void MainWindow::slotAdjustLayout() {
 
@@ -402,18 +408,18 @@ void MainWindow::slotEditGlobalSettings()
 
 void MainWindow::slotShowFolders( bool )
 {
     qDebug("not implemented:  ");
 }
 
-void MainWindow::refreshMailView(const QValueList<RecMailP>&)
+void MainWindow::refreshMailView(const Q3ValueList<RecMailP>&)
 { 
     qDebug("not implemented:  ");
 }
 
-void MainWindow::mailLeftClicked(QListViewItem * )
+void MainWindow::mailLeftClicked(Q3ListViewItem * )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::displayMail()
 {
@@ -422,13 +428,13 @@ void MainWindow::displayMail()
 
 void MainWindow::slotDeleteMail()
 {
     qDebug("not implemented:  ");
 }
 
-void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int  )
+void MainWindow::mailHold(int, Q3ListViewItem *,const QPoint&,int  )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::slotSendQueued()
 {
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index f65f3b4..1ccadc2 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -1,17 +1,21 @@
 
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3ValueList>
+#include <Q3PopupMenu>
 #include <klistview.h>
 #include <qaction.h>
 #include <qlineedit.h>
 
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #ifdef DESKTOP_VERSION
 #include <qmenubar.h>
 #define QPEMenuBar QMenuBar
 #else
 #include <qpe/qpemenubar.h>
 #endif
@@ -21,52 +25,52 @@
 
 #include <libmailwrapper/mailtypes.h>
 #include <opie2/osmartpointer.h>
 
 class RecMail;
 
-class MainWindow : public QMainWindow
+class MainWindow : public Q3MainWindow
 {
     Q_OBJECT
 
 public:
-    MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
+    MainWindow( QWidget *parent = 0, const char *name = 0, Qt::WFlags flags = 0 );
     virtual ~MainWindow();
 
 public slots:
     virtual void slotAdjustColumns();
     virtual void slotAdjustColumnsWide();
-    virtual void appMessage(const QCString &msg, const QByteArray &data);
+    virtual void appMessage(const Q3CString &msg, const QByteArray &data);
     virtual void slotComposeMail();
 
 protected slots:
-    virtual void setInfoFields(QListViewItem* );
+    virtual void setInfoFields(Q3ListViewItem* );
     virtual void slotSendQueued();
     virtual void slotEditAccounts();
     virtual void slotShowFolders( bool show );
-    virtual void refreshMailView(const QValueList<RecMailP>&);
+    virtual void refreshMailView(const Q3ValueList<RecMailP>&);
     virtual void displayMail();
     virtual void slotGetMail() = 0;
     virtual void slotGetAllMail() = 0;
     virtual void slotDeleteMail();
     virtual void slotDeleteAllMail() = 0;
     virtual void slotSetCodec(int);
-    virtual void mailHold(int, QListViewItem *,const QPoint&,int);
+    virtual void mailHold(int, Q3ListViewItem *,const QPoint&,int);
     virtual void slotAdjustLayout();
     virtual void slotEditSettings();
     virtual void slotEditGlobalSettings();
-    virtual void mailLeftClicked( QListViewItem * );
+    virtual void mailLeftClicked( Q3ListViewItem * );
     void showLicence();
     void showAbout();
     void showEtpanLicence(); 
 
 protected:
-    QToolBar *toolBar;
+    Q3ToolBar *toolBar;
     StatusWidget *statusWidget;
     QPEMenuBar *menuBar;
-    QPopupMenu *mailMenu, *settingsMenu, *codecMenu;
+    Q3PopupMenu *mailMenu, *settingsMenu, *codecMenu;
     QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
             *editSettings, *editAccounts, *syncFolders;
     AccountView *folderView;
     KListView *mailView;
     QLineEdit* toLE,*fromLE,*subLE;
     //QBoxLayout *layout;
diff --git a/kmicromail/nntpgroups.cpp b/kmicromail/nntpgroups.cpp
index c729f79..d2213d4 100644
--- a/kmicromail/nntpgroups.cpp
+++ b/kmicromail/nntpgroups.cpp
@@ -1,15 +1,15 @@
 #include "nntpgroups.h"
 
 #include <libmailwrapper/settings.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlineedit.h>
 
 using namespace Opie::Core;
 
-NNTPGroups::NNTPGroups(NNTPaccount *account, QWidget* parent, const char* name, WFlags fl)
+NNTPGroups::NNTPGroups(NNTPaccount *account, QWidget* parent, const char* name, Qt::WFlags fl)
     : NNTPGroupsUI(parent,name,fl),subscribedGroups()
 {
     m_Account = account;
     fillGroups();
 }
 
@@ -24,39 +24,39 @@ void NNTPGroups::slotGetNG()
     GroupListView->clear();
     NNTPwrapper tmp( m_Account );
     QString filter = Groupfilteredit->text();
     QStringList list =  tmp.listAllNewsgroups(filter);
     subscribedGroupsNotListed = subscribedGroups;
     for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
-         QCheckListItem *item;
-         item = new QCheckListItem( GroupListView, (*it), QCheckListItem::CheckBox );
+         Q3CheckListItem *item;
+         item = new Q3CheckListItem( GroupListView, (*it), Q3CheckListItem::CheckBox );
          if ( subscribedGroups.contains( (*it) ) >= 1 ) {
              item->setOn( true );
              subscribedGroupsNotListed.remove((*it));
          }
     }
 }
 
 void NNTPGroups::fillGroups()
 {
     if (!m_Account) return;
     subscribedGroups = m_Account->getGroups();
     for ( QStringList::Iterator it = subscribedGroups.begin(); it != subscribedGroups.end(); ++it ) {
-         QCheckListItem *item;
-         item = new QCheckListItem( GroupListView, (*it), QCheckListItem::CheckBox );
+         Q3CheckListItem *item;
+         item = new Q3CheckListItem( GroupListView, (*it), Q3CheckListItem::CheckBox );
          item->setOn( true );
     }
 }
 
 void NNTPGroups::storeValues()
 {
     if (!m_Account) return;
-    QListViewItemIterator list_it( GroupListView );
+    Q3ListViewItemIterator list_it( GroupListView );
     subscribedGroups.clear();
     for ( ; list_it.current(); ++list_it ) {
-        if ( ( (QCheckListItem*)list_it.current() )->isOn() ) {
+        if ( ( (Q3CheckListItem*)list_it.current() )->isOn() ) {
             subscribedGroups.append(  list_it.current()->text(0) );
         }
     }
     subscribedGroups+=subscribedGroupsNotListed;
     m_Account->setGroups( subscribedGroups );
 }
diff --git a/kmicromail/nntpgroups.h b/kmicromail/nntpgroups.h
index e5b7c35..80cc329 100644
--- a/kmicromail/nntpgroups.h
+++ b/kmicromail/nntpgroups.h
@@ -9,13 +9,13 @@ class NNTPaccount;
 class QStringList;
 
 class NNTPGroups:public NNTPGroupsUI
 {
     Q_OBJECT
 public:
-    NNTPGroups(NNTPaccount *account, QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
+    NNTPGroups(NNTPaccount *account, QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);
     virtual ~NNTPGroups();
     /* must be called from external.
      * it will store the new subscription list into the account
      * but don't save them, this must be done by the calling class.
      */
     void storeValues();
diff --git a/kmicromail/nntpgroupsdlg.cpp b/kmicromail/nntpgroupsdlg.cpp
index f564b10..bfe1d35 100644
--- a/kmicromail/nntpgroupsdlg.cpp
+++ b/kmicromail/nntpgroupsdlg.cpp
@@ -2,19 +2,21 @@
 #include "nntpgroups.h"
 #include <klocale.h>
 
 #include <libmailwrapper/settings.h>
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 NNTPGroupsDlg::NNTPGroupsDlg(NNTPaccount *account,QWidget * parent, const char * name)
     : QDialog(parent,name,true,0)
 {
     setCaption(i18n("Subscribed newsgroups"));
     m_Account = account;
-    QVBoxLayout*dlglayout = new QVBoxLayout(this);
+    Q3VBoxLayout*dlglayout = new Q3VBoxLayout(this);
     dlglayout->setSpacing(2);
     dlglayout->setMargin(1);
     groupsWidget = new NNTPGroups(account,this);
     dlglayout->addWidget(groupsWidget);
 }
 
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 75a75b9..f453be5 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -1,12 +1,17 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 // CHANGED 2004-08-06 Lutz Rogowski
 
 
 #define protected public
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3CString>
+#include <QPixmap>
+#include <Q3PopupMenu>
 #undef protected
 #include "koprefsdialog.h"
 #include <kapplication.h>
 #include <libkdepim/externalapphandler.h>
 #include <libkdepim/kpimglobalprefs.h>
 #ifdef  MINIKDE_KDIALOG_H
@@ -24,13 +29,13 @@
 #include "accountview.h"
 #include "klocale.h"
 
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qcursor.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qregexp.h>
 #include <qpe/global.h>
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #else
@@ -60,18 +65,18 @@ OpieMail::~OpieMail()
 {
     if (settings) delete settings;
     if ( tb )
         delete tb;
 }
 
-void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
+void OpieMail::appMessage(const Q3CString &msg, const QByteArray &data)
 {
     
 }
 #include <stdlib.h>
-void OpieMail::message(const QCString &msg, const QByteArray &data)
+void OpieMail::message(const Q3CString &msg, const QByteArray &data)
 {
     // copied from old mail2
     static int ii = 0;
     //qDebug("QCOP CALL ############################# %d ", ii);
     //QString mess ( msg  );
     //qDebug("Message = %s ",mess.latin1());
@@ -80,13 +85,13 @@ void OpieMail::message(const QCString &msg, const QByteArray &data)
 
     mPendingEmail = QString::null;
     mPendingName = QString::null;
     if (msg == "writeMail(QString,QString)")
     {
         //qDebug("writeMail(QString,QString) ");
-        QDataStream stream(data,IO_ReadOnly);
+        QDataStream stream(data,QIODevice::ReadOnly);
         stream >> mPendingName >> mPendingEmail;
         // removing the whitespaces at beginning and end is needed!
         QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
     }
     else if (msg == "newMail()")
     {
@@ -97,13 +102,13 @@ void OpieMail::message(const QCString &msg, const QByteArray &data)
         QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
         // slotComposeMail();
     }
     else if (msg == "newMail(QString)")
     {
         //qDebug(" newMail(QString)");
-        QDataStream stream(data,IO_ReadOnly);
+        QDataStream stream(data,QIODevice::ReadOnly);
         stream >> mPendingName;
         // the format is 
         //  NAME <EMAIL>:SUBJECT
         QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
     } else {
         mPendingData = data;
@@ -276,13 +281,13 @@ void OpieMail::slotEditAccounts()
 
     folderView->populate( settings->getAccounts() );
 }
 void OpieMail::replyMail()
 {
 
-    QListViewItem*item = mailView->currentItem();
+    Q3ListViewItem*item = mailView->currentItem();
     if (!item) return;
     RecMailP mail = ((MailListViewItem*)item)->data();
     RecBodyP body = folderView->fetchBody(mail);
 
     QString rtext;
     rtext += QString("* %1 wrote on %2:\n")        // no i18n on purpose
@@ -328,13 +333,13 @@ void OpieMail::closeViewMail(ViewMail * vm)
 {
     vm->hide();
 }
 
 void  OpieMail::slotDownloadMail( )
 {
-    QListViewItem*item = mailView->currentItem();
+    Q3ListViewItem*item = mailView->currentItem();
     if (!item ) {
         Global::statusMessage("Error: No item slected!");
         return;
     }
     RecMailP mail = ((MailListViewItem*)item)->data();
     Account * acc = mail->Wrapper()->getAccount();
@@ -369,13 +374,13 @@ void  OpieMail::slotDownloadMail( )
     }
 }
 
 
 void OpieMail::deleteAndDisplayNextMail(ViewMail * vm)
 {
-    QListViewItem*item = mailView->currentItem();
+    Q3ListViewItem*item = mailView->currentItem();
     if (!item ) {
         closeViewMail(vm);
         return;
     }
     RecMailP mail = ((MailListViewItem*)item)->data();
     mail->Wrapper()->deleteMail( mail );
@@ -389,13 +394,13 @@ void OpieMail::deleteAndDisplayNextMail(ViewMail * vm)
     RecBodyP body = folderView->fetchBody(mail);
     vm->setBody( body );
     vm->setMail( mail );
 }
 void OpieMail::displayNextMail(ViewMail * vm)
 {
-    QListViewItem*item = mailView->currentItem();
+    Q3ListViewItem*item = mailView->currentItem();
     if (!item) return;
     ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
     item = item->itemBelow();
     if (!item) {
         vm->setCaption(i18n("End of List" ));
         return;
@@ -405,13 +410,13 @@ void OpieMail::displayNextMail(ViewMail * vm)
     RecBodyP body = folderView->fetchBody(mail);
     vm->setBody( body );
     vm->setMail( mail );
 }
 void OpieMail::displayMail()
 {
-    QListViewItem*item = mailView->currentItem();
+    Q3ListViewItem*item = mailView->currentItem();
     if (!item) return;
     RecMailP mail = ((MailListViewItem*)item)->data();
     RecBodyP body = folderView->fetchBody(mail);
     ViewMail readMail( this,"", Qt::WType_Modal   );
     readMail.setBody( body );
     readMail.setMail( mail );
@@ -429,28 +434,28 @@ void OpieMail::displayMail()
     if (  readMail.deleted )
     {
         folderView->refreshCurrent();
     }
     else
     {
-        QListViewItem*item = mailView->currentItem();
+        Q3ListViewItem*item = mailView->currentItem();
         if (item)
             ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
     }
 }
 void OpieMail::slotGetAllMail()
 {
-    QListViewItem * item = folderView->firstChild();
+    Q3ListViewItem * item = folderView->firstChild();
     while ( item ){
         ((AccountViewItem *)item)->contextMenuSelected( 101 );
         item = item->nextSibling ();
     }
 }
 void OpieMail::slotGetMail()
 {
-    QListViewItem * item = folderView->currentItem();
+    Q3ListViewItem * item = folderView->currentItem();
     if ( ! item ) return;
     ((AccountViewItem *)item)->contextMenuSelected( 101 );
 }
 void OpieMail::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
@@ -461,13 +466,13 @@ void OpieMail::slotDeleteMail()
         folderView->refreshCurrent();
     }
 }
 void OpieMail::slotDeleteAllMail()
 {
 
-    QValueList<RecMailP> t;
+    Q3ValueList<RecMailP> t;
     if ( QMessageBox::warning(this, i18n("Delete All Mails"), i18n("Do you really want to delete\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
         {
             MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
             while ( item ) {
                 if ( item->isSelected() ) {
                     t.append( item->data() );
@@ -489,27 +494,27 @@ void OpieMail::clearSelection()
 {
     mailView->clearSelection();
   
 }
 void OpieMail::selectAll()
 {
-    QListViewItem* item = mailView->firstChild ();
+    Q3ListViewItem* item = mailView->firstChild ();
     while ( item ) {
         mailView->setSelected ( item, true ); 
         item = item->nextSibling();
     }
 }
 
-void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
+void OpieMail::mailHold(int button, Q3ListViewItem *item,const QPoint&,int  )
 {
     if (!mailView->currentItem()) return;
     MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType();
     /* just the RIGHT button - or hold on pda */
     if (button!=2) {return;}
     if (!item) return;
-    QPopupMenu *m = new QPopupMenu(0);
+    Q3PopupMenu *m = new Q3PopupMenu(0);
     if (m)
     {
         if (mailtype==MAILLIB::A_NNTP) {
             m->insertItem(i18n("Read this posting"),this,SLOT(displayMail()));
             m->insertItem(i18n("Copy this posting"),this,SLOT(slotMoveCopyMail()));
             m->insertSeparator();
@@ -550,28 +555,28 @@ void OpieMail::slotShowFolders( bool show )
         slotAdjustColumnsWide();
         folderView->hide();
         //slotAdjustColumnsWide();
     }
 }
 
-void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
+void OpieMail::refreshMailView(const Q3ValueList<RecMailP>&list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
 
-    QValueList<RecMailP>::ConstIterator it;
+    Q3ValueList<RecMailP>::ConstIterator it;
     for (it = list.begin(); it != list.end();++it)
     {
         item = new MailListViewItem(mailView,item);
         item->storeData((*it));
         item->showEntry();
     }
     mailView->setSorting ( 4, false );
 }
 
-void OpieMail::mailLeftClicked( QListViewItem *item )
+void OpieMail::mailLeftClicked( Q3ListViewItem *item )
 {
     mailView->clearSelection();
     /* just LEFT button - or tap with stylus on pda */
     //if (button!=1) return;
     if (!item) return;
     if (folderView->currentisDraft()) {
@@ -611,13 +616,13 @@ void OpieMail::slotMoveCopyMail()
 }
 
 void OpieMail::slotMoveCopyAllMail()
 {
 
     if (!mailView->currentItem()) return;
-    QValueList<RecMailP> t;
+    Q3ValueList<RecMailP> t;
     // if ( QMessageBox::warning(this, i18n("Move/Copy all selected mails"), i18n("Do you really want to copy/move\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
         MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
         while ( item ) {
             if ( item->isSelected() ) {
                 t.append( item->data() );
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index bdd9058..ea64dc4 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -6,12 +6,15 @@
 #include <libmailwrapper/settings.h>
 
 #include <opie2/osmartpointer.h>
 #include <libmailwrapper/mailtypes.h>
 #include <viewmail.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3ValueList>
 
 class ComposeMail;
 
 class OpieMail : public MainWindow
 {
     Q_OBJECT
@@ -23,14 +26,14 @@ public:
 
 public slots:
     virtual void slotwriteMail(const QString&name,const QString&email);
     virtual void slotwriteMail2(const QString&nameemail);
     virtual void slotComposeMail();
     virtual void slotExtAppHandler();
-    virtual void appMessage(const QCString &msg, const QByteArray &data);
-    virtual void message(const QCString &msg, const QByteArray &data);
+    virtual void appMessage(const Q3CString &msg, const QByteArray &data);
+    virtual void message(const Q3CString &msg, const QByteArray &data);
     void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist);
 protected slots:
     virtual void deleteAndDisplayNextMail(ViewMail * vm);
     virtual void displayNextMail(ViewMail * vm);
     virtual void slotSendQueued();
     virtual void slotSearchMails();
@@ -40,29 +43,29 @@ protected slots:
     virtual void displayMail();
     virtual void replyMail();
     virtual void slotDeleteMail();
     virtual void slotGetMail();
     virtual void slotGetAllMail();
     virtual void slotDeleteAllMail();
-    virtual void mailHold(int, QListViewItem *,const QPoint&,int);
+    virtual void mailHold(int, Q3ListViewItem *,const QPoint&,int);
     virtual void slotShowFolders( bool show );
-    virtual void refreshMailView(const QValueList<RecMailP>&);
-    virtual void mailLeftClicked(  QListViewItem * );
+    virtual void refreshMailView(const Q3ValueList<RecMailP>&);
+    virtual void mailLeftClicked(  Q3ListViewItem * );
     virtual void slotMoveCopyMail();
     virtual void slotMoveCopyAllMail();
     virtual void reEditMail();
     void clearSelection();
     void selectAll();
     void slotDownloadMail();
 private:
     ComposeMail* mCurrentComposer; 
     void closeViewMail(ViewMail * vm);
     QString mPendingEmail;
     QString mPendingName;
     QByteArray mPendingData;
-    QCString mPendingMessage;
+    Q3CString mPendingMessage;
     Settings *settings;
-    QTextBrowser * tb;
+    Q3TextBrowser * tb;
 
 };
 
 #endif
diff --git a/kmicromail/qpe/qdialog.h b/kmicromail/qpe/qdialog.h
index c63133d..3720182 100644
--- a/kmicromail/qpe/qdialog.h
+++ b/kmicromail/qpe/qdialog.h
@@ -11,13 +11,13 @@
 #include "/usr/local/qt/include/qdialog.h"
 class QDialog_hacked : public QDialog
 {
     //Q__OBJECT
 
  public:
-    QDialog_hacked ( QWidget * parent=0, const char * name=0, bool modal=true, WFlags f=0 );
+    QDialog_hacked ( QWidget * parent=0, const char * name=0, bool modal=true, Qt::WFlags f=0 );
     
 };
 
 #define QDialog QDialog_hacked
 
 #endif
diff --git a/kmicromail/qpe/qdialog_hacked.cpp b/kmicromail/qpe/qdialog_hacked.cpp
index 0a34cec..5d4d353 100644
--- a/kmicromail/qpe/qdialog_hacked.cpp
+++ b/kmicromail/qpe/qdialog_hacked.cpp
@@ -1,22 +1,22 @@
 
 #include <qdialog.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qpushbutton.h>
 #include <klocale.h>
 #ifdef QDialog
 #undef QDialog
 #endif
-    QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f ) 
+    QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, Qt::WFlags f ) 
         :  QDialog(  parent,name,modal, f)
         {
             qDebug("New hacked QDialog for ompi desktop");
             //QTimer::singleShot(  1, this,SLOT(addaddbuttons()) );
 
             setOrientation ( Vertical ); 
-            QHBox * hb = new QHBox ( this );
+            Q3HBox * hb = new Q3HBox ( this );
             QPushButton *ok = new QPushButton( i18n("OK"), hb );
             QPushButton *cancel = new QPushButton( i18n("Cancel"), hb );
             setExtension ( hb );
             showExtension ( true );
             connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) );
             connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) );
diff --git a/kmicromail/selectsmtp.cpp b/kmicromail/selectsmtp.cpp
index 10b6d79..ead723c 100644
--- a/kmicromail/selectsmtp.cpp
+++ b/kmicromail/selectsmtp.cpp
@@ -5,15 +5,15 @@
 #include <qcheckbox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <klocale.h>
-selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl)
+selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, Qt::WFlags fl)
     : selectstoreui(parent,name,modal,fl)
 {
     //m_smtpList.setAutoDelete(false);
     m_smtpList = 0;
     //headlabel->setText(i18n("<center>Select SMTP account to use</center>"));
     headlabel->hide();
diff --git a/kmicromail/selectsmtp.h b/kmicromail/selectsmtp.h
index 9157ddf..d7accf6 100644
--- a/kmicromail/selectsmtp.h
+++ b/kmicromail/selectsmtp.h
@@ -8,13 +8,13 @@
 class SMTPaccount;
 
 class selectsmtp : public selectstoreui
 {
     Q_OBJECT
 public:
-    selectsmtp(QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 );
+    selectsmtp(QWidget* parent = 0, const char* name = 0, bool modal = TRUE, Qt::WFlags fl = 0 );
     virtual ~selectsmtp();
     void setSelectionlist(QList<SMTPaccount>*list);
     SMTPaccount*selected_smtp();
 
 protected:
     QList<SMTPaccount>*m_smtpList;
diff --git a/kmicromail/selectstore.h b/kmicromail/selectstore.h
index 447a6ae..d312c1d 100644
--- a/kmicromail/selectstore.h
+++ b/kmicromail/selectstore.h
@@ -1,11 +1,11 @@
 #ifndef _SELECTSTORE_H
 #define _SELECTSTORE_H
 
 #include "selectstoreui.h"
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qmap.h>
 #include <qstringlist.h>
 
 class AbstractMail;
 
 class Selectstore:public selectstoreui
diff --git a/kmicromail/settingsdialog.cpp b/kmicromail/settingsdialog.cpp
index c593b48..889c490 100644
--- a/kmicromail/settingsdialog.cpp
+++ b/kmicromail/settingsdialog.cpp
@@ -1,27 +1,29 @@
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qtabwidget.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kconfig.h>
 #include <kprefs.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 
 #include "settingsdialog.h"
 
 
-SettingsDialog::SettingsDialog( QWidget* parent, const char* name, bool modal, WFlags fl )
+SettingsDialog::SettingsDialog( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
     : SettingsDialogUI( parent, name, modal, fl ) {
 
 #if 0
     QTabWidget *topFrame = TabWidget2;
 
-    QGridLayout *topLayout = new QGridLayout(topFrame,3,3);
+    Q3GridLayout *topLayout = new Q3GridLayout(topFrame,3,3);
     topLayout->setSpacing(2);
     topLayout->setMargin(3);
     KPrefsWidFont * tVFont;
     int i = 0;
     KPrefsWidFont *timeLabelsFont =
         addWidFont(i18n("OK"),i18n("Application(nr):"),
diff --git a/kmicromail/settingsdialog.h b/kmicromail/settingsdialog.h
index 042b69f..b168226 100644
--- a/kmicromail/settingsdialog.h
+++ b/kmicromail/settingsdialog.h
@@ -8,13 +8,13 @@
 
 class SettingsDialog : public SettingsDialogUI {
 
 Q_OBJECT
 
 public:
-    SettingsDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    SettingsDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
     ~SettingsDialog();
 
 private:
     void readConfig();
     void writeConfig();
     QFont mAppFont, mComposeFont, mReadFont;
diff --git a/kmicromail/statuswidget.cpp b/kmicromail/statuswidget.cpp
index 19cf635..6da6f54 100644
--- a/kmicromail/statuswidget.cpp
+++ b/kmicromail/statuswidget.cpp
@@ -1,16 +1,16 @@
 #include <qtimer.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qlabel.h>
 
 #include "statuswidget.h"
 
 // the current problem I see is "locking": used exclusive by one sender
 
 
-StatusWidget::StatusWidget( QWidget* parent, const char* name,WFlags fl )
+StatusWidget::StatusWidget( QWidget* parent, const char* name,Qt::WFlags fl )
     : StatusWidgetUI( parent, name, fl ) {
 
         setMaximumHeight( 15 );
         // hide for now since nothing reports decent progress data yet.
         statusProgress->hide();
     }
diff --git a/kmicromail/statuswidget.h b/kmicromail/statuswidget.h
index 73f0d75..1d29daf 100644
--- a/kmicromail/statuswidget.h
+++ b/kmicromail/statuswidget.h
@@ -6,13 +6,13 @@
 
 class StatusWidget : public StatusWidgetUI {
 
 Q_OBJECT
 
 public:
-    StatusWidget( QWidget* parent = 0, const char* name = 0,WFlags fl = 0 );
+    StatusWidget( QWidget* parent = 0, const char* name = 0,Qt::WFlags fl = 0 );
     ~StatusWidget();
     
 
 public slots:
 
     void setText( const QString& text );
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 685b4e4..c9dedb0 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -21,61 +21,64 @@
 
 #include <qdialog.h>
 
 #include <qpe/qpeapplication.h>
 
 /* QT */
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qmessagebox.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qaction.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qfile.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 
 //using namespace Opie::Ui;
 //using namespace Opie::Core;
 
-AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
-                       const QString&fsize,int num,const QValueList<int>&path)
-        : QListViewItem(parent,after),_partNum(num)
+AttachItem::AttachItem(Q3ListView * parent,Q3ListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+                       const QString&fsize,int num,const Q3ValueList<int>&path)
+        : Q3ListViewItem(parent,after),_partNum(num)
 {
     _path=path;
     setText(0, mime);
     setText(1, desc);
     setText(2, file);
     setText(3, fsize);
 }
 
-AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
-                       const QString&fsize,int num,const QValueList<int>&path)
-        : QListViewItem(parent,after),_partNum(num)
+AttachItem::AttachItem(Q3ListViewItem * parent,Q3ListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+                       const QString&fsize,int num,const Q3ValueList<int>&path)
+        : Q3ListViewItem(parent,after),_partNum(num)
 {
     _path=path;
     setText(0, mime);
     setText(1, desc);
     setText(2, file);
     setText(3, fsize);
 }
 
-bool AttachItem::isParentof(const QValueList<int>&path)
+bool AttachItem::isParentof(const Q3ValueList<int>&path)
 {
     /* if not set, then no parent */
     if (path.count()==0||_path.count()==0) return false;
     /* the parent must have one digit less then a child */
     if (path.count()!=_path.count()+1) return false;
     for (unsigned int i=0; i < _path.count();++i)
     {
         if (_path[i]!=path[i]) return false;
     }
     return true;
 }
 
-AttachItem* ViewMail::searchParent(const QValueList<int>&path)
+AttachItem* ViewMail::searchParent(const Q3ValueList<int>&path)
 {
-    QListViewItemIterator it( attachments );
+    Q3ListViewItemIterator it( attachments );
     for ( ; it.current(); ++it )
     {
         AttachItem*ati = (AttachItem*)it.current();
         if (ati->isParentof(path)) return ati;
     }
     return 0;
@@ -151,13 +154,13 @@ void ViewMail::setBody(const RecBodyP&body )
            so I use this construct that the stream will re-constructed in each
            loop. To let it work, the textstream is packed into a own area of
            code is it will be destructed after finishing its small job.
         */
         QTextOStream o(&fsize);
         if (w>0) o.precision(2); else o.precision(0);
-        o.setf(QTextStream::fixed);
+        o.setf(Q3TextStream::fixed);
         o << s << " " << q << "Byte";
     }
 
     curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body->Description()->Positionlist());
     QString filename = "";
 
@@ -192,13 +195,13 @@ void ViewMail::setBody(const RecBodyP&body )
         default:
             q="";
             break;
         }
         QTextOStream o(&fsize);
         if (w>0) o.precision(2); else o.precision(0);
-        o.setf(QTextStream::fixed);
+        o.setf(Q3TextStream::fixed);
         o << s << " " << q << "Byte";
         desc = body->Parts()[i]->Description();
         parentItem = searchParent(body->Parts()[i]->Positionlist());
         if (parentItem)
         {
             AttachItem*temp = lastChild(parentItem);
@@ -236,23 +239,23 @@ void ViewMail::slotViewSource()
 void ViewMail::slotShowHtml( bool state )
 {
     m_showHtml = state;
     setText();
 }
 
-void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int )
+void ViewMail::slotItemClicked( Q3ListViewItem * item , const QPoint & point, int )
 {
     if (!item )
         return;
 
     if (  ( ( AttachItem* )item )->Partnumber() == -1 )
     {
         setText();
         return;
     }
-    QPopupMenu *menu = new QPopupMenu();
+    Q3PopupMenu *menu = new Q3PopupMenu();
     int ret=0;
 
     if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )
     {
         menu->insertItem( i18n( "Show Text" ), 1 );
     }
@@ -275,13 +278,13 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
             if( !str.isEmpty() )
             {
                 encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
                 if (content)
                 {
                     QFile output(str);
-                    output.open(IO_WriteOnly);
+                    output.open(QIODevice::WriteOnly);
                     output.writeBlock(content->Content(),content->Length());
                     output.close();
                     delete content;
                 }
             }
         }
@@ -294,13 +297,13 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 #else
             QString tmpfile = "/tmp/opiemail-image";
 #endif
             encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
             if (content) {
                 QFile output(tmpfile);
-                output.open(IO_WriteOnly);
+                output.open(QIODevice::WriteOnly);
                 output.writeBlock(content->Content(),content->Length());
                 output.close();
                 delete content;
                 MailImageDlg iview("");
                 iview.setName(tmpfile);
                 KApplication::execDialog(&iview);
@@ -349,13 +352,13 @@ void ViewMail::slotNextMail()
     setCaption(i18n("Displaying next mail...please wait!")); 
     qApp->processEvents();
     emit  showNextMail(this); 
     nextMail->blockSignals( false );
 }
 
-ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
+ViewMail::ViewMail( QWidget *parent, const char *name, Qt::WFlags fl)
         : ViewMailBase(parent, name, fl), _inLoop(false)
 {
     m_gotBody = false;
     deleted = false;
     sourceOn = false;
     readConfig();
@@ -366,13 +369,13 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
     connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); 
     connect( nextMail, SIGNAL( activated() ), SLOT( slotNextMail() ) );
     connect( viewSource, SIGNAL( activated() ), SLOT( slotViewSource() ) );
     connect( downloadMail, SIGNAL( activated() ), SIGNAL( signalDownloadMail() ) );
 
     attachments->setEnabled(m_gotBody);
-    connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
+    connect( attachments,  SIGNAL( clicked(Q3ListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(Q3ListViewItem*,const QPoint&, int) ) );
 
     attachments->setSorting(-1);
 }
 
 void ViewMail::readConfig()
 {
@@ -554,16 +557,16 @@ void ViewMail::slotDeleteMail( )
         //m_recMail->Wrapper()->deleteMail( m_recMail );
         //hide();
         deleted = true;
     }
 }
 
-MailImageDlg::MailImageDlg(const QString&fname,QWidget *parent, const char *name, bool modal, WFlags f)
+MailImageDlg::MailImageDlg(const QString&fname,QWidget *parent, const char *name, bool modal, Qt::WFlags f)
     : QDialog(parent,name,modal)
 {
-    QVBoxLayout*dlglayout = new QVBoxLayout(this);
+    Q3VBoxLayout*dlglayout = new Q3VBoxLayout(this);
     dlglayout->setSpacing(2);
     dlglayout->setMargin(1);
     //m_imageview = new Opie::MM::OImageScrollView(this);
     //dlglayout->addWidget(m_imageview);
 }
 
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index bb5b685..6cf6efb 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -4,42 +4,42 @@
 #include "viewmailbase.h"
 #include <libmailwrapper/mailtypes.h>
 
 #include <qdialog.h>
 #include <qapplication.h>
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qmap.h>
 #include <klocale.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 //namespace Opie { namespace MM { class OImageScrollView; } }
 
-class AttachItem : public QListViewItem
+class AttachItem : public Q3ListViewItem
 {
 public:
-    AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
-        const QString&fsize,int num,const QValueList<int>&path);
-    AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
-        const QString&fsize,int num,const QValueList<int>&path);
+    AttachItem(Q3ListView * parent,Q3ListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+        const QString&fsize,int num,const Q3ValueList<int>&path);
+    AttachItem(Q3ListViewItem * parent,Q3ListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+        const QString&fsize,int num,const Q3ValueList<int>&path);
     int Partnumber() { return _partNum; }
-    bool isParentof(const QValueList<int>&path);
+    bool isParentof(const Q3ValueList<int>&path);
 
 private:
     int _partNum;
     /* needed for a better display of attachments */
-    QValueList<int> _path;
+    Q3ValueList<int> _path;
 };
 
 class ViewMail : public ViewMailBase
 {
     Q_OBJECT
 
 public:
-    ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
+    ViewMail(  QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0);
     ~ViewMail();
 
     void hide();
     void exec();
     void setMail(const RecMailP&mail );
     void setBody(const RecBodyP&body);
@@ -47,21 +47,21 @@ public:
  signals:
     void showNextMail(ViewMail*);
     void deleteAndDisplayNextMail(ViewMail *);
     void signalDownloadMail();
 protected:
     QString deHtml(const QString &string);
-    AttachItem* searchParent(const QValueList<int>&path);
+    AttachItem* searchParent(const Q3ValueList<int>&path);
     AttachItem* lastChild(AttachItem*parent);
 
 protected slots:
     void slotNextMail();
     void slotReply();
     void slotForward();
     void setText();
-    void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
+    void slotItemClicked( Q3ListViewItem * item , const QPoint & point, int c );
     void slotDeleteMail( );
     void slotShowHtml( bool );
     void slotViewSource();
 
 private:
     void readConfig();
@@ -80,13 +80,13 @@ private:
 };
 
 class MailImageDlg:public QDialog
 {
     Q_OBJECT
 public:
-    MailImageDlg(const QString&,QWidget *parent = 0, const char *name = 0, bool modal = true, WFlags f = 0);
+    MailImageDlg(const QString&,QWidget *parent = 0, const char *name = 0, bool modal = true, Qt::WFlags f = 0);
     ~MailImageDlg();
     void setName(const QString&);
 protected:
     //Opie::MM::OImageScrollView*m_imageview;
 };
 
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 3bb964e..371ee91 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -1,32 +1,35 @@
 // CHANGED 2004-08-06 Lutz Rogowski
-#include <qtextbrowser.h>
-#include <qlistview.h>
+#include <q3textbrowser.h>
+#include <q3listview.h>
 #include <qaction.h>
 #include <qlabel.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qapplication.h>
 
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #include <qmenubar.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3PopupMenu>
 #include <kiconloader.h>
 //#include <qpe/resource.h>
 #include <klocale.h>
 
 #include "viewmailbase.h"
 //#include "opendiag.h"
 
-ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
-        : QMainWindow(parent, name, fl)
+ViewMailBase::ViewMailBase(QWidget *parent, const char *name, Qt::WFlags fl)
+        : Q3MainWindow(parent, name, fl)
 {
 
         setToolBarsMovable(false);
 
-        toolbar = new QToolBar(this);
+        toolbar = new Q3ToolBar(this);
   menubar = new QMenuBar( toolbar );
-  mailmenu = new QPopupMenu( menubar );
+  mailmenu = new Q3PopupMenu( menubar );
   menubar->insertItem( i18n( "Mail" ), mailmenu );
 
         toolbar->setHorizontalStretchable(true);
         addToolBar(toolbar);
 
         viewSource = new QAction(i18n("View Source"), 0, 0, this);
@@ -66,29 +69,29 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
           closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
         //QLabel *spacer = new QLabel(toolbar);
         spacer->setBackgroundMode(QWidget::PaletteButton);
         toolbar->setStretchableWidget(spacer);
         closeMail->addTo(toolbar);
         closeMail->addTo(mailmenu);
-        QVBox *view = new QVBox(this);
+        Q3VBox *view = new Q3VBox(this);
         setCentralWidget(view);
 
-        attachments = new QListView(view);
+        attachments = new Q3ListView(view);
     int fixh = 100;
     if ( QApplication::desktop()->width() > 320 )
         fixh = 200;
         attachments->setFixedHeight(fixh);
         attachments->setAllColumnsShowFocus(true);
         attachments->addColumn("Mime Type", fixh-30);
         attachments->addColumn(i18n("Description"), 100);
         attachments->addColumn(i18n("Filename"), 80);
     attachments->addColumn(i18n("Size"), 80);
     attachments->setSorting(-1);
         attachments->hide();
 
-        browser = new QTextBrowser(view);
+        browser = new Q3TextBrowser(view);
 
         //openDiag = new OpenDiag(view);
         //openDiag->hide();
 
 }
 
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h
index 7c075eb..3f1dead 100644
--- a/kmicromail/viewmailbase.h
+++ b/kmicromail/viewmailbase.h
@@ -1,40 +1,43 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef VIEWMAILBASE_H
 #define VIEWMAILBASE_H
 
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
+#include <QKeyEvent>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpemenubar.h>
 #define QMenuBar QPEMenuBar
 #endif
 
 class QAction;
 class OpenDiag;
-class QListView;
-class QToolBar;
-class QTextBrowser;
+class Q3ListView;
+class Q3ToolBar;
+class Q3TextBrowser;
 class QMenuBar;
-class QPopupMenu;
+class Q3PopupMenu;
 
-class ViewMailBase : public QMainWindow
+class ViewMailBase : public Q3MainWindow
 {
         Q_OBJECT
 
 public:
-        ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
+        ViewMailBase(QWidget *parent = 0, const char *name = 0, Qt::WFlags fl = 0);
 
 protected:
         QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail, *nextMail, *downloadMail, *viewSource;
-        QListView *attachments;
-        QToolBar *toolbar;
-        QTextBrowser *browser;
+        Q3ListView *attachments;
+        Q3ToolBar *toolbar;
+        Q3TextBrowser *browser;
         OpenDiag *openDiag;
          QMenuBar *menubar;
-    QPopupMenu *mailmenu;
+    Q3PopupMenu *mailmenu;
 
 protected slots:
         void slotChangeAttachview(bool state);
     virtual void keyPressEvent ( QKeyEvent * e );
 
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 8385bcc..c1a2f76 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -29,28 +29,34 @@
 */
 
 #include <stdlib.h>
 
 #include <qapplication.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlayout.h>
 #include <qclipboard.h>
 #include <qcursor.h>
 #include <qmessagebox.h>
-#include <qprogressbar.h>
-#include <qmultilineedit.h>
+#include <q3progressbar.h>
+#include <q3multilineedit.h>
 #include <qtimer.h>
-#include <qwidgetstack.h>
-#include <qptrlist.h>
+#include <q3widgetstack.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qfile.h>
 #include <qdir.h>
 #ifndef KORG_NOSPLITTER
 #include <qsplitter.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QKeyEvent>
+#include <Q3Frame>
+#include <QLabel>
+#include <Q3ValueList>
 #endif
 
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kfiledialog.h>
@@ -125,25 +131,25 @@
 #endif
 #ifndef _WIN32_
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #else
-#include <qprocess.h>
+#include <q3process.h>
 #endif
 
 #ifdef DESKTOP_VERSION
 #include <kabc/stdaddressbook.h>
 #endif
 using namespace KOrg;
 using namespace KCal;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 
 
-MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) 
+MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, Q3PtrList<Incidence> alarms,QDateTime start ) : Q3TextBrowser(parent) 
 
 {
     mAlarms = alarms;
     viewport()->setBackgroundColor( QColor( 255, 255, 255 ) );
     QString mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
@@ -274,19 +280,19 @@ class KOBeamPrefs : public QDialog
 {
   public:
     KOBeamPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Beam Options") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("File format"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("File format"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
-        QButtonGroup* time = new  QButtonGroup(1, Horizontal, i18n("Time format"), this );
+        Q3ButtonGroup* time = new  Q3ButtonGroup(1, Qt::Horizontal, i18n("Time format"), this );
         lay->addWidget( time ); time->setExclusive ( true ) ;
         vcal = new QRadioButton(" vCalendar ", format );
         ical = new QRadioButton(" iCalendar ", format );
         vcal->setChecked( true );
         tz = new QRadioButton(i18n(" With timezone "), time );
         local = new QRadioButton(i18n(" Local time "), time );
@@ -309,18 +315,18 @@ class KOCatPrefs : public QDialog
 {
   public:
     KOCatPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Manage new Categories") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:"), this );
         lay->addWidget( lab ); 
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("New categories not in list:"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         addCatBut = new QRadioButton(i18n("Add to category list"), format );
         new QRadioButton(i18n("Remove from Events/Todos"), format );
         addCatBut->setChecked( true );
         QPushButton * ok = new QPushButton( i18n("Change category list now!"), this );
@@ -370,13 +376,13 @@ void CalendarView::init()
     flag_blockConflict = false; 
     flag_blockScrollBar = false;
     flag_checkFileFirsttime = true;
     flag_clearallviewsEventDisplay = false;
     flag_clearallviewsupdateView = false;
     mNextAlarmDateTime = QDateTime::currentDateTime();
-    setFocusPolicy (NoFocus ); 
+    setFocusPolicy (Qt::NoFocus ); 
     mViewerCallerIsSearchDialog = false;
     mBlockShowDates = false;
     mConflictingEvent = 0;
     mDatePickerMode = 0;
     mCurrentSyncDevice = "";
     mViewManager = new KOViewManager( this );
@@ -391,13 +397,13 @@ void CalendarView::init()
     mCalendar->registerObserver( this );
     // TODO: Make sure that view is updated, when calendar is changed.
 
     mStorage = new FileStorage( mCalendar );
     mNavigator = new DateNavigator( this, "datevav", mViewManager );
 
-    QBoxLayout *topLayout = (QBoxLayout*)layout();
+    Q3BoxLayout *topLayout = (Q3BoxLayout*)layout();
 #ifndef KORG_NOSPLITTER
     // create the main layout frames.
     mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner");
     topLayout->addWidget(mPanner);
 
     mLeftSplitter = new QSplitter(QSplitter::Vertical,mPanner,
@@ -422,15 +428,15 @@ void CalendarView::init()
                  SLOT( updateView() ) );
     } else {
         mResourceView = 0;
     }
 #endif
     QWidget *rightBox = new QWidget( mPanner );
-    QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
+    Q3BoxLayout *rightLayout = new Q3VBoxLayout( rightBox );
 
-    mRightFrame = new QWidgetStack( rightBox );
+    mRightFrame = new Q3WidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 1 );
 
     mLeftFrame = mLeftSplitter;
 #else
     //QWidget *mainBox = new QWidget( this );
     //QWidget *leftFrame = new QWidget( mainBox );
@@ -451,13 +457,13 @@ void CalendarView::init()
         mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
     }
     mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
     //QBoxLayout * leftFrameLayout;
     topLayout->addWidget( mMainFrame );
 #ifdef DESKTOP_VERSION
-    mDateScrollBar = new QScrollBar ( 1, 365, 1,30, 200,QScrollBar::Horizontal, this );
+    mDateScrollBar = new QScrollBar ( 1, 365, 1,30, 200,Qt::Horizontal, this );
     topLayout->addWidget( mDateScrollBar ); 
     connect( mDateScrollBar, SIGNAL( valueChanged ( int )  ),this, SLOT( scrollBarValue( int )) );
     if ( QApplication::desktop()->width() < 800 ) 
         mDateScrollBar->hide();
 #endif
     //mainBoxLayout->addWidget (mLeftFrame);  
@@ -498,14 +504,14 @@ void CalendarView::init()
     } 
 #endif
     mFilterView->hide();
     mCalEditView->hide();
     QWidget *rightBox = new QWidget( mMainFrame );
     //mainBoxLayout->addWidget ( rightBox, 10 );
-    QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
-    mRightFrame = new QWidgetStack( rightBox );
+    Q3BoxLayout *rightLayout = new Q3VBoxLayout( rightBox );
+    mRightFrame = new Q3WidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 10 );
 
     //mLeftFrame = (QWidget *)leftFrame;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() );
         //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() );
@@ -613,15 +619,15 @@ void CalendarView::init()
     connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processTodoListSelection( Incidence * ) ) );
     connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool)));
 
     // kdDebug() << "CalendarView::CalendarView() done" << endl; 
 
-    mDateFrame = new QVBox(0,0,WType_Popup);
+    mDateFrame = new Q3VBox(0,0,Qt::WType_Popup);
     //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
-    mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
+    mDateFrame->setFrameStyle( Q3Frame::WinPanel |Q3Frame::Raised );
     mDateFrame->setLineWidth(3);
     mDateFrame->hide(); 
     mDateFrame->setCaption( i18n( "Pick a date to display"));
     mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() );
  
     connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate)));
@@ -666,13 +672,13 @@ CalendarView::~CalendarView()
 
 
 void CalendarView::nextConflict( bool all, bool allday )
 {
     if ( flag_blockConflict ) return;
     flag_blockConflict = true;
-    QPtrList<Event> testlist = mCalendar->events();
+    Q3PtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     while ( test ) {
         test->setTagged( false );
         test = testlist.next();
     }
     QTime st ( 0,0,0);
@@ -682,13 +688,13 @@ void CalendarView::nextConflict( bool all, bool allday )
     QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st);
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     Event * cE2 = 0;
-    QPtrList<Event> testlist2 = testlist;
+    Q3PtrList<Event> testlist2 = testlist;
     test = testlist.first();
     bool skip = false;
     topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     //QTime tm;
     //tm.start();
     while ( test ) {
@@ -832,13 +838,13 @@ void CalendarView::updateView(const QDate &start, const QDate &end)
 
 
 
 void CalendarView::checkFiles()
 {
     QString message;
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     while ( cal ) {
         if (  cal->mErrorOnLoad ) {
             message +=  cal->mName +"\n"+KGlobal::formatMessage ( "(" +i18n( "Filepath: ")+ cal->mFileName+")" ,0 )+"\n";
         }
         cal = calendars.next();
@@ -854,24 +860,24 @@ void CalendarView::checkFiles()
 }
 void CalendarView::checkAlarms()
 {   
     KConfig *config = KOGlobals::config();
     config->setGroup( "AppRun" );
     QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
-    int daysto = dt.daysTo( QDate::currentDate() );
+    int daysto = dt.daysTo( (QDateTime)QDate::currentDate() );
     int days = config->readNumEntry( "LatestProgramStopDays" , daysto);
     dt =  dt.addDays( days );
     int secto = dt.secsTo( QDateTime::currentDateTime() );
     int secs = config->readNumEntry( "LatestProgramStopSecs" , secto) - 30;
     //qDebug("KO: Reading program stop %d ", secs);
     //secs -= ( 3600 * 24*3 ); // debug only 
     QDateTime latest = dt.addSecs ( secs );
     qDebug("KO: Last termination on %s ", latest.toString().latin1());
     //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() );
-    QPtrList<Incidence> el = mCalendar->rawIncidences(); 
-    QPtrList<Incidence> al;
+    Q3PtrList<Incidence> el = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> al;
     Incidence* inL = el.first(); 
     QDateTime cur = QDateTime::currentDateTime().addSecs(-59);
     qDebug("KO: Checking alarm until %s ", cur.toString().latin1());
     while ( inL ) {  
         bool ok = false;
         int offset = 0;
@@ -883,15 +889,15 @@ void CalendarView::checkAlarms()
                 //qDebug("found missed alarm: %s ", inL->summary().latin1() );
             }
         }
         inL = el.next();
     }
     if ( al.count() ) {
-        QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop  );
+        QDialog* dia = new QDialog( this, "huhu", false, Qt::WDestructiveClose | Qt::WStyle_StaysOnTop  );
         dia->setCaption( i18n("KO/Pi: Missing alarms!") );
-        QVBoxLayout* lay = new QVBoxLayout( dia );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( dia );
         lay->setSpacing( 0 );
         lay->setMargin( 0 );
         MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest );
         connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) ));
         lay->addWidget( matb ); 
         if ( QApplication::desktop()->width() == 480 || QApplication::desktop()->width() == 640 ) {
@@ -1213,13 +1219,13 @@ void  CalendarView::computeAlarm( QString msg )
 #ifndef _WIN32_
             if ( vfork () == 0 ) {
                 execl ( tempfilename.latin1(), 0 );
                 return;
             }
 #else
-                QProcess* p = new QProcess();
+                Q3Process* p = new Q3Process();
                 p->addArgument(  tempfilename.latin1()  );
                 p->start();
                 return;
 #endif
             
             return;
@@ -1263,16 +1269,16 @@ void CalendarView::addSuspendAlarm(const QDateTime &qdt, const QString &noti  )
 #ifdef DESKTOP_VERSION
     if ( QApplication::desktop()->width() < 1024 ) {
         QString mess = qdt.toString( "yyyy-MM-dd hh:mm:ss" ) + "\n" + noti;
         //qDebug("nextsuspendalarm = \n%s ",mess.latin1() );
         QString fn = QDir::homeDirPath() + "/.kopi_suspend_alarm";
         QFile file( fn );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             qDebug("KO: Error writing next suspend alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1());
         } else {
-            QTextStream ts( &file );
+            Q3TextStream ts( &file );
             ts << mess;
             file.close();
         }
     }
 #endif
 
@@ -1291,16 +1297,16 @@ void CalendarView::addAlarm(const QDateTime &qdt, const QString &noti  )
 #ifdef DESKTOP_VERSION
     if ( QApplication::desktop()->width() < 1024 ) {
         QString mess = qdt.toString( "yyyy-MM-dd hh:mm:ss" ) + "\n" + noti;
         //qDebug("nextalarm = \n%s ",mess.latin1() );
         QString fn = QDir::homeDirPath() + "/.kopi_next_alarm";
         QFile file( fn );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             qDebug("KO: Error writing next alarm file %s\nContent: \n%s ", fn.latin1(), mess.latin1());
         } else {
-            QTextStream ts( &file );
+            Q3TextStream ts( &file );
             ts << mess;
             file.close();
         }
     }
 #endif
     int maxSec;
@@ -1567,13 +1573,13 @@ Event* CalendarView::getLastSyncEvent()
     return lse;
 
 }
 
 // we check, if the to delete event has a id for a profile
 //  if yes, we set this id in the profile to delete
-void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete )
+void CalendarView::checkExternSyncEvent( Q3PtrList<Event> lastSync , Incidence* toDelete )
 {
     if ( lastSync.count() == 0 ) {
         //qDebug(" lastSync.count() == 0");
         return;
     }
     if ( toDelete->typeID() == journalID )
@@ -1597,13 +1603,13 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t
         eve = lastSync.next();
     }
 
 }
 void CalendarView::checkExternalId( Incidence * inc )
 {
-    QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
+    Q3PtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ;
     checkExternSyncEvent( lastSync, inc );
 
 }
 // SSSSSSSSSSSSSSSSSSSSSS
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
@@ -1621,14 +1627,14 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     Event* eventR;
     QString uid;
     int take;
     Event* eventRSync;
     Event* eventLSync;
     clearAllViews();
-    QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
-    QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
+    Q3PtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
+    Q3PtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
     bool fullDateRange = false;
     local->resetTempSyncStat();
     mLastCalendarSync = QDateTime::currentDateTime();
     if ( mSyncManager->syncWithDesktop() ) {
         remote->resetPilotStat(1);
         if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
@@ -1681,16 +1687,16 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastCalendarSync = loadedFileVersion;
         //qDebug("setting mLastCalendarSync ");
     }
     //qDebug("*************************** ");
     qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
-    QPtrList<Incidence> er = remote->rawIncidences(); 
+    Q3PtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     Incidence* inL;
-    QProgressBar bar( er.count(),0 );
+    Q3ProgressBar bar( er.count(),0 );
     bar.setCaption (i18n("Syncing - close to abort!") );
     
     // ************** setting up filter *************
     CalFilter *filterIN = 0;
     CalFilter *filterOUT = 0;
     CalFilter *filter = mFilters.first();
@@ -1828,13 +1834,13 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     ++filteredIN;
                 }
             }
         }
         inR =  er.next();
     }
-    QPtrList<Incidence> el = local->rawIncidences(); 
+    Q3PtrList<Incidence> el = local->rawIncidences(); 
     inL = el.first();
     modulo = (el.count()/10)+1;
     bar.setCaption (i18n("Add / remove events") ); 
     bar.setTotalSteps (  el.count()  ) ;
     bar.show();
     incCounter = 0;
@@ -2045,13 +2051,13 @@ void CalendarView::syncExternal( int mode  )
         syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs );
         getEventViewerDialog()->setSyncMode( false );
         qApp->processEvents();
         if (  syncOK ) {
             if ( mSyncManager->mWriteBackFile )
             {
-                QPtrList<Incidence> iL = mCalendar->rawIncidences(); 
+                Q3PtrList<Incidence> iL = mCalendar->rawIncidences(); 
                 Incidence* inc = iL.first();
                 if ( phoneFormat ) {
                     while ( inc ) {
                         inc->removeID(mCurrentSyncDevice);
                         inc =  iL.next();
                     }
@@ -2112,13 +2118,13 @@ bool CalendarView::importBday()
     KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true );
     KABC::AddressBook::Iterator it;
     int count = 0;
     for( it = AddressBook->begin(); it != AddressBook->end(); ++it ) { 
         ++count;
     }
-    QProgressBar bar(count,0 );
+    Q3ProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
@@ -2183,13 +2189,13 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd
     int count = birthdayList.count();
     int addCount = 0;
     KCal::Attendee* a = 0;
 
     //qDebug("CalView 1 %i", count);
 
-    QProgressBar bar(count,0 );
+    Q3ProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
@@ -2347,13 +2353,13 @@ void CalendarView::setSyncEventsReadOnly()
 {
     mCalendar->setSyncEventsReadOnly(); 
 }
 
 bool CalendarView::loadCalendars()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 );
     openCalendar( MainWindow::defaultFileName(), false );
     cal = calendars.next();
     while ( cal ) {
         addCalendar( cal );
@@ -2361,13 +2367,13 @@ bool CalendarView::loadCalendars()
     }
     restoreCalendarSettings();
     return true;
 }
 bool CalendarView::restoreCalendarSettings()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     while ( cal ) {
         mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled );
         mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled );
         mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly );
         if ( cal->isStandard )
@@ -2526,13 +2532,13 @@ void CalendarView::watchSavedFile()
     return;
   }
   loadedFileVersion = dt;
 }
 bool CalendarView::checkAllFileVersions()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 ); 
     mCalendar->setDefaultCalendarEnabledOnly();
     if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
         if ( !checkFileVersion(MainWindow::defaultFileName())) {
             restoreCalendarSettings();
@@ -2588,13 +2594,13 @@ bool CalendarView::checkFileVersion(QString fn)
     if ( e )
         mCalendar->deleteEvent( e );
     return true;
 }
 bool CalendarView::saveCalendars()
 {
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 ); 
     mCalendar->setDefaultCalendarEnabledOnly();
     QString saveError;
     if ( !saveCalendar( MainWindow::defaultFileName() ) )
         saveError =  cal->mName +"\n";
@@ -2692,13 +2698,13 @@ void CalendarView::readSettings()
     // read settings from the KConfig, supplying reasonable
     // defaults where none are to be found
     KConfig *config = KOGlobals::config();
 #ifndef KORG_NOSPLITTER
     config->setGroup("KOrganizer Geometry");
 
-    QValueList<int> sizes = config->readIntListEntry("Separator1");
+    Q3ValueList<int> sizes = config->readIntListEntry("Separator1");
     if (sizes.count() != 2) {
         sizes << mDateNavigator->minimumSizeHint().width();
         sizes << 300;
     }
     mPanner->setSizes(sizes);
 
@@ -2760,13 +2766,13 @@ void CalendarView::readSettings()
         getEventViewerDialog()->setGeometry(x,y,w,h);
     }
 #endif
     config->setGroup( "Views" );
     int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
 
-    QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
+    Q3ValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
    
     int resetval = 0;
     int maxVal = 0;
     if (sizes.count() != 3) { 
         if ( KOPrefs::instance()->mVerticalScreen ) {
             resetval = mDateNavigator->sizeHint().width()+2;
@@ -2839,13 +2845,13 @@ void CalendarView::writeSettings()
     //KOPrefs::instance()->usrWriteConfig();
     KOPrefs::instance()->writeConfig();
 
     writeFilterSettings(config);
     config->setGroup( "AppRun" );
     QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
-    int days = dt.daysTo( QDate::currentDate() );
+    int days = dt.daysTo( (QDateTime)QDate::currentDate() );
     dt =  dt.addDays( days );
     int secs = dt.secsTo( QDateTime::currentDateTime() );
     config->writeEntry( "LatestProgramStopDays", days );
     config->writeEntry( "LatestProgramStopSecs", secs );
     //qDebug("KO: Writing stop time: %d ", secs);
     //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() );
@@ -2866,15 +2872,15 @@ void CalendarView::writeSettings()
     qDebug("dt daylight_wrong %s ",dt_daylight_wrong.toString().latin1() );
     qDebug("Computed secsTo %d . in minutes: %d . in hours: %d ", secsto, secsto/60, secsto/3600);
     qDebug("********************* testcode end");
 
 #endif
 
-    QValueList<int> listINT = mLeftFrame->sizes();
+    Q3ValueList<int> listINT = mLeftFrame->sizes();
     config->writeEntry("Left Splitter Frame",listINT);
-    QValueList<int> listINT2 = mMainFrame->sizes();
+    Q3ValueList<int> listINT2 = mMainFrame->sizes();
     config->writeEntry("Main Splitter Frame",listINT2);
 #ifdef DESKTOP_VERSION
     config->setGroup("WidgetLayout");
     QStringList list ;//= config->readListEntry("MainLayout");
     int x,y,w,h;
     QWidget* wid;
@@ -3163,13 +3169,13 @@ void CalendarView::checkConflictForEvent()
     }
     if ( filterIN ) {
         if ( !filterIN->filterCalendarItem( conflictingEvent ) ) {
             return;   
         }
     }
-    QPtrList<Event> testlist = mCalendar->events();
+    Q3PtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     bool chAD = KOPrefs::instance()->mCheckConflictsAllDayAllDay;
@@ -3425,13 +3431,13 @@ void  CalendarView::slotSelectPickerDate( QDate  d)
         mMoveIncidence->setRevision( mMoveIncidence->revision()+1  );
     }
 }
 
 void CalendarView::removeCategories()
 {
-    QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     QStringList newCatList;
     Incidence* inc = incList.first();
     uint i;
     while ( inc ) {
@@ -3446,13 +3452,13 @@ void CalendarView::removeCategories()
         inc = incList.next();
     }
 }
 
 int CalendarView::addCategories()
 { 
-    QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> incList  = mCalendar->rawIncidences(); 
     QStringList catList = KOPrefs::instance()->mCustomCategories;
     QStringList catIncList;
     Incidence* inc = incList.first();
     uint i;
     int count = 0;
      while ( inc ) {
@@ -3504,29 +3510,29 @@ void CalendarView::manageCategories()
     }
     delete cp;
 }
 
 void CalendarView::beamIncidence(Incidence * Inc) 
 {
-    QPtrList<Incidence> delSel ;
+    Q3PtrList<Incidence> delSel ;
     delSel.append(Inc);
     beamIncidenceList( delSel );
 } 
 void CalendarView::beamCalendar() 
 {
-    QPtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
+    Q3PtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
     //qDebug("beamCalendar()  ");
     beamIncidenceList( delSel );
 }
 void CalendarView::beamFilteredCalendar() 
 {
-    QPtrList<Incidence> delSel  = mCalendar->incidences(); 
+    Q3PtrList<Incidence> delSel  = mCalendar->incidences(); 
     //qDebug("beamFilteredCalendar()  ");
     beamIncidenceList( delSel );
 }
-void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
+void  CalendarView::beamIncidenceList(Q3PtrList<Incidence> delSel )
 {
     
     KOBeamPrefs beamDialog;
     if ( beamDialog.exec () == QDialog::Rejected ) 
         return;
 #ifdef DESKTOP_VERSION
@@ -4312,13 +4318,13 @@ void CalendarView::schedule_publish(Incidence *incidence)
         KMessageBox::sorry(this,i18n("No event selected."));
         return;
     }
 
     PublishDialog *publishdlg = new PublishDialog();
     if (incidence->attendeeCount()>0) {
-        QPtrList<Attendee> attendees = incidence->attendees();
+        Q3PtrList<Attendee> attendees = incidence->attendees();
         attendees.first();
         while ( attendees.current()!=0 ) {
             publishdlg->addAttendee(attendees.current());
             attendees.next();
         }
     }
@@ -4721,13 +4727,13 @@ void CalendarView::showDates(const DateList &selectedDates)
         }
     }
     topLevelWidget()->setCaption( i18n("Dates: ") + selDates );
   
 }
 
-QPtrList<CalFilter> CalendarView::filters()
+Q3PtrList<CalFilter> CalendarView::filters()
 {
     return mFilters;
 
 }
 void CalendarView::editFilters()
 {
@@ -4762,13 +4768,13 @@ void CalendarView::selectFilter( int fil )
 void CalendarView::showFilter(bool visible)
 {
 #if 1
     if (visible)  {
         mCalEditView->readConfig(); 
         mCalEditView->show(); 
-        QValueList<int> sizes;
+        Q3ValueList<int> sizes;
         sizes = mLeftFrame->sizes();
         if ( sizes.count() == 4 &&  sizes[3] < 20 ) {
             sizes.clear();
             sizes << 100;
             sizes << 0;
             sizes << 0;
@@ -4843,27 +4849,27 @@ void CalendarView::takeOverEvent()
 
 void CalendarView::takeOverCalendar()
 {
     // TODO: Create Calendar::allIncidences() function and use it here
 
     clearAllViews();
-    QPtrList<Event> events = mCalendar->events();
+    Q3PtrList<Event> events = mCalendar->events();
     for(uint i=0; i<events.count(); ++i) {
         events.at(i)->setOrganizer(KOPrefs::instance()->email());
         events.at(i)->recreate();
         events.at(i)->setReadOnly(false);
     }
 
-    QPtrList<Todo> todos = mCalendar->todos();
+    Q3PtrList<Todo> todos = mCalendar->todos();
     for(uint i=0; i<todos.count(); ++i) {
         todos.at(i)->setOrganizer(KOPrefs::instance()->email());
         todos.at(i)->recreate();
         todos.at(i)->setReadOnly(false);
     }
 
-    QPtrList<Journal> journals = mCalendar->journals();
+    Q3PtrList<Journal> journals = mCalendar->journals();
     for(uint i=0; i<journals.count(); ++i) {
         journals.at(i)->setOrganizer(KOPrefs::instance()->email());
         journals.at(i)->recreate();
         journals.at(i)->setReadOnly(false);
     }
 
@@ -4872,13 +4878,13 @@ void CalendarView::takeOverCalendar()
 
 void CalendarView::showIntro()
 {
     kdDebug() << "To be implemented." << endl;
 }
 
-QWidgetStack *CalendarView::viewStack()
+Q3WidgetStack *CalendarView::viewStack()
 {
     return mRightFrame;
 }
 
 QWidget *CalendarView::leftFrame()
 {
@@ -5057,13 +5063,13 @@ void CalendarView::lookForIncomingMessages()
     icd->retrieve();
 }
 
 bool  CalendarView::removeCompletedSubTodos( Todo* t )
 {
     bool deleteTodo = true;
-    QPtrList<Incidence> subTodos;
+    Q3PtrList<Incidence> subTodos;
     Incidence *aTodo;
     subTodos = t->relations();
     for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) {
         if (! removeCompletedSubTodos( (Todo*) aTodo ))
             deleteTodo = false;
     }
@@ -5083,14 +5089,14 @@ void CalendarView::purgeCompleted()
 {
     int result = KMessageBox::warningContinueCancel(this,
                                                     i18n("Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)"),i18n("Purge Todos"),i18n("Purge"));
 
     if (result == KMessageBox::Continue) {
 
-        QPtrList<Todo> todoCal;
-        QPtrList<Todo> rootTodos;
+        Q3PtrList<Todo> todoCal;
+        Q3PtrList<Todo> rootTodos;
         //QPtrList<Incidence> rel;
         Todo *aTodo;
         todoCal = calendar()->todos();
         for (aTodo = todoCal.first(); aTodo; aTodo = todoCal.next()) {
             if ( !aTodo->relatedTo() )
                 rootTodos.append( aTodo );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 60b1276..b4eada7 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -21,19 +21,21 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef CALENDARVIEW_H
 #define CALENDARVIEW_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlayout.h>
 #include <qwidget.h>
-#include <qptrlist.h>
-#include <qvbox.h>
+#include <q3ptrlist.h>
+#include <q3vbox.h>
 #include <qmap.h>
 #include <qscrollbar.h>
+//Added by qt3to4:
+#include <QKeyEvent>
 #ifndef DESKTOP_VERSION
 #include <qtopia/ir.h> 
 #else
 #define Ir char
 #endif
 #include <libkcal/calendar.h>
@@ -44,13 +46,13 @@
 
 #include <korganizer/calendarviewbase.h>
 
 #include <ksyncmanager.h>
 //#include <koprefs.h>
 
-class QWidgetStack;
+class Q3WidgetStack;
 class QSplitter;
 class KopiCalendarFile;
 class CalPrinter;
 class KOFilterView;
 class KOCalEditView;
 class KOViewManager;
@@ -81,25 +83,25 @@ using namespace KCal;
   event editor, search dialog etc.
   
   @short main calendar view widget
   @author Cornelius Schumacher
 */
 
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qtextcodec.h>
 
-class MissedAlarmTextBrowser : public QTextBrowser {
+class MissedAlarmTextBrowser : public Q3TextBrowser {
     Q_OBJECT
   public:
-    MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start);
+    MissedAlarmTextBrowser(QWidget *parent, Q3PtrList<Incidence> alarms ,QDateTime start);
     ~MissedAlarmTextBrowser();
     void setSource(const QString & n);
     
  private:
     Incidence * getNextInc(QDateTime start );
-    QPtrList<Incidence> mAlarms;
+    Q3PtrList<Incidence> mAlarms;
   signals:
     void showIncidence( QString uid);
 };
 
 
 class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface
@@ -124,13 +126,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     KOViewManager *viewManager();
     KODialogManager *dialogManager();
 
     QDate startDate();
     QDate endDate();
 
-    QWidgetStack *viewStack();
+    Q3WidgetStack *viewStack();
     QWidget *leftFrame();
 
     DateNavigator *dateNavigator();
     KDateNavigator *dateNavigatorWidget();
 
     void addView(KOrg::BaseView *);
@@ -438,13 +440,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void schedule_publish_freebusy(int daysToPublish = 30);
 
     void openAddressbook();
 
     void editFilters();
     void toggleFilerEnabled();
-    QPtrList<CalFilter> filters();
+    Q3PtrList<CalFilter> filters();
     void toggleFilter();
     void showFilter(bool visible);
     void updateFilter();
     void filterEdited();
     void selectFilter( int );
     KOFilterView *filterView();
@@ -492,13 +494,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void showDatePicker() ;
     void showDatePickerPopup() ;
     void moveIncidence(Incidence *) ;
     void beamIncidence(Incidence *) ;
     void beamCalendar() ;
     void beamFilteredCalendar() ;
-    void beamIncidenceList(QPtrList<Incidence>) ;
+    void beamIncidenceList(Q3PtrList<Incidence>) ;
     void manageCategories();
     void editCategories();
     int addCategories();
     void removeCategories();
     void setSyncDevice( QString );
     void setSyncName( QString );
@@ -572,13 +574,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     QTimer* mRecheckAlarmTimer;
     void computeAlarm( QString );
     void startAlarm( QString, QString );
     void setSyncEventsReadOnly();
     
     QDateTime loadedFileVersion;
-    void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
+    void checkExternSyncEvent( Q3PtrList<Event> lastSync , Incidence* toDelete );
     void checkExternalId( Incidence * inc );
     int mGlobalSyncMode;
     QString  mCurrentSyncDevice;
     QString  mCurrentSyncName;
     void init();
     int mDatePickerMode;
@@ -590,16 +592,16 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
     CalPrinter *mCalPrinter;
 
     QSplitter    *mPanner;
     QSplitter    *mLeftSplitter;
     KDGanttMinimizeSplitter  *mLeftFrame, *mMainFrame;
-    QWidgetStack *mRightFrame;
+    Q3WidgetStack *mRightFrame;
 
     KDatePicker* mDatePicker;
-    QVBox* mDateFrame;
+    Q3VBox* mDateFrame;
 
     DateNavigatorContainer *mDateNavigator;       // widget showing small month view.
 
     KOFilterView *mFilterView;
     KOCalEditView *mCalEditView;
 
@@ -615,13 +617,13 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     DateNavigator *mNavigator;
 
     KOViewManager *mViewManager;
     KODialogManager *mDialogManager;
 
     // Calendar filters
-    QPtrList<CalFilter> mFilters;
+    Q3PtrList<CalFilter> mFilters;
 
     // various housekeeping variables.
             bool            mModified;   // flag indicating if calendar is modified
     bool            mReadOnly; // flag indicating if calendar is read-only
     QDate mSaveSingleDate;
 
diff --git a/korganizer/calprintbase.cpp b/korganizer/calprintbase.cpp
index 7b7d54c..ecb9e03 100644
--- a/korganizer/calprintbase.cpp
+++ b/korganizer/calprintbase.cpp
@@ -22,17 +22,19 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qpainter.h>
 #include <qlayout.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
-#include <qptrlist.h>
-#include <qintdict.h>
+#include <q3ptrlist.h>
+#include <q3intdict.h>
 #include <qfontmetrics.h> 
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kcalendarsystem.h>
@@ -142,14 +144,14 @@ CalPrintBase::~CalPrintBase()
 }
 
 
 
 QWidget *CalPrintBase::configWidget( QWidget *w )
 {
-  QFrame *wdg = new QFrame( w );
-  QVBoxLayout *layout = new QVBoxLayout( wdg );
+  Q3Frame *wdg = new Q3Frame( w );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( wdg );
 
   QLabel *title = new QLabel( description(), wdg );
   QFont titleFont( title->font() );
   titleFont.setPointSize( 20 );
   titleFont.setBold( true );
   title->setFont( titleFont );
@@ -282,13 +284,13 @@ void CalPrintBase::drawSmallMonth(QPainter &p, const QDate &qd,
   int month = monthDate.month();
 
   // draw the title
   p.setFont(QFont("helvetica", 7, QFont::Bold));
   //  int lineSpacing = p.fontMetrics().lineSpacing();
   const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
-  p.drawText(x, y, width, height/4, AlignCenter, calSys->monthName( qd ) );
+  p.drawText(x, y, width, height/4, Qt::AlignCenter, calSys->monthName( qd ) );
 
   int cellWidth = width/7;
   int cellHeight = height/8;
   QString tmpStr;
 
   // correct begin of week
@@ -298,13 +300,13 @@ void CalPrintBase::drawSmallMonth(QPainter &p, const QDate &qd,
   // draw days of week
    p.setFont(QFont("helvetica", 7, QFont::Bold));
   for (int col = 0; col < 7; col++) {
     // tmpStr.sprintf("%c",(const char*)monthDate2.dayName(monthDate2.dayOfWeek()));
     tmpStr=calSys->weekDayName( monthDate2 )[0].upper();
     p.drawText(x+col*cellWidth, y+height/4, cellWidth, cellHeight,
-               AlignCenter, tmpStr);
+               Qt::AlignCenter, tmpStr);
     monthDate2 = monthDate2.addDays(1);
   }
 
   // draw separator line
   p.drawLine(x, y+height/4+cellHeight, x+width, y+height/4+cellHeight);
 
@@ -315,13 +317,13 @@ void CalPrintBase::drawSmallMonth(QPainter &p, const QDate &qd,
       if (firstCol) {
         firstCol = true;
         col = weekdayColumn( monthDate.dayOfWeek() );
       }
       p.drawText( x+col*cellWidth,
                   y+height/4+cellHeight+(row*cellHeight),
-                  cellWidth, cellHeight, AlignCenter,
+                  cellWidth, cellHeight, Qt::AlignCenter,
                   tmpStr.setNum(monthDate.day()) );
       monthDate = monthDate.addDays(1);
     }
   }
 }
 
@@ -355,13 +357,13 @@ void CalPrintBase::drawDaysOfWeekBox(QPainter &p, const QDate &qd,
 
   p.setFont( QFont( "helvetica", 10, QFont::Bold ) );
   p.drawRect( x, y, width, height );
 //   p.fillRect( x+1, y+1,
 //               width-2, height-2,
 //               QBrush( Dense7Pattern ) );
-  p.drawText( x+5, y, width-10, height, AlignCenter | AlignVCenter,
+  p.drawText( x+5, y, width-10, height, Qt::AlignCenter | Qt::AlignVCenter,
              calSys->weekDayName( qd ) );
 }
 
 
 void CalPrintBase::drawTimeLine(QPainter &p,
     const QTime &fromTime, const QTime &toTime,
@@ -398,22 +400,22 @@ void CalPrintBase::drawTimeLine(QPainter &p,
         if (cellHeight > 30) {
           p.setFont(QFont("helvetica", 16, QFont::Bold));
         } else {
           p.setFont(QFont("helvetica", 12, QFont::Bold));
         }
         p.drawText(x+2, (int)currY+2, width/2-2, (int)cellHeight,
-                  AlignTop|AlignRight, numStr);
+                  Qt::AlignTop|Qt::AlignRight, numStr);
         p.setFont(QFont("helvetica", 10, QFont::Normal));
         p.drawText(x+width/2, (int)currY+2, width/2+2, (int)(cellHeight/2)-3,
-                  AlignTop | AlignLeft, "00");
+                  Qt::AlignTop | Qt::AlignLeft, "00");
       } else {
         QTime time( curTime.hour(), 0 );
         numStr = KGlobal::locale()->formatTime( time );
         p.setFont(QFont("helvetica", 14, QFont::Bold));
         p.drawText(x+2, (int)currY+2, width-4, (int)cellHeight/2-3,
-                  AlignTop|AlignLeft, numStr);
+                  Qt::AlignTop|Qt::AlignLeft, numStr);
       }
       currY+=cellHeight;
     } // enough space for half-hour line and time
     if (curTime.secsTo(endTime)>3600)
       curTime=curTime.addSecs(3600);
     else curTime=endTime;
@@ -469,13 +471,13 @@ void CalPrintBase::drawAllDayBox(QPainter &p, Event::List &eventList,
         if (mUseColors)
           setCategoryColors(p, currEvent);
 
         p.drawRect( x, offset, width, height );
        
         p.drawText( x+5, offset+5, width-10, height-10, 
-                    AlignCenter | AlignVCenter | AlignJustify | WordBreak,
+                    Qt::AlignCenter | Qt::AlignVCenter | Qt::AlignJustify | Qt::WordBreak,
                     text );
         // reset the colors
         p.setBrush( oldBrush );
         p.setPen( oldPen );
         p.setBackgroundColor(oldBgColor);
 
@@ -490,13 +492,13 @@ void CalPrintBase::drawAllDayBox(QPainter &p, Event::List &eventList,
 
   if (!expandable) {
     p.drawRect(x, offset, width, height);
     if (!multiDayStr.isEmpty()) {
         // p.fillRect(x+1, offset+1, width-2, height-2, QBrush(Dense5Pattern) );
       p.drawText( x+5, offset+5, width-10, height-10, 
-                  AlignLeft | AlignTop | AlignJustify , 
+                  Qt::AlignLeft | Qt::AlignTop | Qt::AlignJustify , 
                   multiDayStr);
     }
   } else {
     height=offset-y;
   }
 }
@@ -557,21 +559,21 @@ void CalPrintBase::drawAgendaDayBox( QPainter &p, Event::List &events,
   QDateTime startPrintDate = QDateTime( qd, fromTime );
   QDateTime endPrintDate = QDateTime( qd, toTime );
 
   // Calculate horizontal positions and widths of events taking into account
   // overlapping events
 
-  QPtrList<KOrg::CellItem> cells;
+  Q3PtrList<KOrg::CellItem> cells;
   cells.setAutoDelete( true );
 
   Event::List::ConstIterator itEvents;
   for( itEvents = events.begin(); itEvents != events.end(); ++itEvents ) {
     cells.append( new PrintCellItem( *itEvents, qd ) );
   }
 
-  QPtrListIterator<KOrg::CellItem> it1( cells );
+  Q3PtrListIterator<KOrg::CellItem> it1( cells );
   for( it1.toFirst(); it1.current(); ++it1 ) {
     KOrg::CellItem *placeItem = it1.current();
 
     KOrg::CellItem::placeItem( cells, placeItem );
   }
 
@@ -590,13 +592,13 @@ void CalPrintBase::drawAgendaDayBox( QPainter &p, Event::List &events,
 
     p.setBrush( oldBrush );
     p.setPen( oldPen );
     p.setBackgroundColor( oldBgColor );
   }
   
-  p.setBrush( QBrush( NoBrush ) );
+  p.setBrush( QBrush( Qt::NoBrush ) );
 }
 
 
 void CalPrintBase::drawAgendaItem( PrintCellItem *item, QPainter &p,
                                    const QDate &qd,
                                    const QDateTime &startPrintDate,
@@ -632,13 +634,13 @@ void CalPrintBase::drawAgendaItem( PrintCellItem *item, QPainter &p,
     // p.save();
     QPen pe = p.pen();
     pe.setWidth( 2 );
     p.setPen( pe );
     p.drawRect( currentX, currentyPos+1, currentWidth+1, eventLength+1 );
     p.drawText( currentX+3, currentyPos+2, currentWidth-5, eventLength-3,
-                AlignLeft | AlignTop | AlignJustify | WordBreak,
+                Qt::AlignLeft | Qt::AlignTop | Qt::AlignJustify | Qt::TextWordWrap,
                 text);
     // p.restore();
   }
 }
 
 void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
@@ -667,23 +669,23 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
   hstring=KOCore::self()->holiday(qd);
 #endif
 
   if (!hstring.isEmpty()) {
     p.setFont( QFont( "helvetica", 8, QFont::Bold, true ) );
 
-    p.drawText( x+5, y, width-25, mSubHeaderHeight, AlignLeft | AlignVCenter,
+    p.drawText( x+5, y, width-25, mSubHeaderHeight, Qt::AlignLeft | Qt::AlignVCenter,
                 hstring );
   }
   p.setFont(QFont("helvetica", 10, QFont::Bold));
   if ( fullDate) {
       // use short date format, if long date is too long
       QFontMetrics fm ( p.font() );
       if ( fm.width( dayNumStr ) > width -10 )
           dayNumStr = local->formatDate(qd, true);
   }
-  p.drawText(x+5, y, width-10, mSubHeaderHeight, AlignRight | AlignVCenter,
+  p.drawText(x+5, y, width-10, mSubHeaderHeight, Qt::AlignRight | Qt::AlignVCenter,
              dayNumStr);
   Event::List eventList;
   eventList.fill( mCalendar->events( qd, true ));
   Todo::List todos;
   todos.fill( mCalendar->todos( qd ));
   QString outStr;
@@ -721,13 +723,13 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
             outStr += " " + currEvent->summary();
         }
         
     } // doesFloat
 
     p.drawText(x+5, y+textY, width-10, lineSpacing,
-               AlignLeft|AlignBottom, outStr);
+               Qt::AlignLeft|Qt::AlignBottom, outStr);
     textY+=lineSpacing;
   }
 
   if ( textY<height ) {
     
     Todo::List::ConstIterator it2;
@@ -740,13 +742,13 @@ void CalPrintBase::drawDayBox(QPainter &p, const QDate &qd,
           text += " ";
         }
       }
       text += i18n("To-Do: %1").arg(todo->summary());
 
       p.drawText(x+5, y+textY, width-10, lineSpacing,
-                AlignLeft|AlignBottom, text);
+                Qt::AlignLeft|Qt::AlignBottom, text);
       textY+=lineSpacing;
     }
   }
 }
 
 
@@ -846,13 +848,13 @@ void CalPrintBase::drawMonth(QPainter &p, const QDate &qd, bool weeknumbers,
     p.setFont(newFont);
     xoffset += 18;
     QDate weekDate(monthDate);
     for (int row = 0; row<rows; row++) {
       int calWeek = weekDate.weekNumber();
       QRect rc(x, y+yoffset+cellHeight*row, xoffset-1, cellHeight);
-      p.drawText( rc, AlignRight|AlignVCenter, QString::number(calWeek) );
+      p.drawText( rc, Qt::AlignRight|Qt::AlignVCenter, QString::number(calWeek) );
       weekDate = weekDate.addDays(7);
     }
     p.setFont(oldFont);
   }
 
   drawDaysOfWeek( p, monthDate, monthDate.addDays(6), x+xoffset, y, width-xoffset, mSubHeaderHeight );
@@ -894,31 +896,31 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
   int posdue=posDueDt;
   if (posdue<0) posdue=x+width;
   QRect rect;
   TodoParentStart startpt;
   // This list keeps all starting points of the parent todos so the connection
   // lines of the tree can easily be drawn (needed if a new page is started)
-  static QPtrList<TodoParentStart> startPoints;
+  static Q3PtrList<TodoParentStart> startPoints;
   if (level<1) {
     startPoints.clear();
   }
 
   // size of item
   outStr=item->summary(); 
   if ( ! item->location().isEmpty() )
       outStr += " ("+item->location()+")";
   if ( item->hasDueDate() && posDueDt>=0 ) {
     outStr += " [" +local->formatDate(item->dtDue().date(),true)+"]";
   }
   int left = possummary+(level*10);
-  rect = p.boundingRect(left, y, (posdue-left-5),-1, WordBreak, outStr);
+  rect = p.boundingRect(left, y, (posdue-left-5),-1, Qt::WordBreak, outStr);
   //qDebug("bottom1 %d ", rect.bottom() );
   if ( !item->description().isEmpty() && desc ) {
     outStr = item->description();
     rect = p.boundingRect( left+20, rect.bottom()+5, width-(left+10-x), -1,
-                           WordBreak, outStr );
+                           Qt::WordBreak, outStr );
   }
   //qDebug("bottom2 %d y+h %d   y %d  ph %d", rect.bottom(), y+height, y , pageHeight );
   // if too big make new page
   if ( rect.bottom() > y+height) {
     // first draw the connection lines from parent todos:
     if (level > 0 && connectSubTodos) {
@@ -930,14 +932,13 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
 
         // draw either from start point of parent or from top of the page
         if (rct->mSamePage)
           start = rct->mRect.bottom() + 1;
         else
           start = p.viewport().top();
-        p.moveTo( center, start );
-        p.lineTo( center, to );
+        p.drawLine( center, start, center, to );
         rct->mSamePage=false;
       }
     }
     y=0;
     height=pageHeight-y;
     mPrinter->newPage();
@@ -948,26 +949,26 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
   if (r && pospriority >= 0 ) {
     pospriority = r->mRect.right() + 1;
   }
 
   // Priority
   outStr.setNum(priority);
-  rect = p.boundingRect(pospriority, y + 10, 5, -1, AlignCenter, outStr);
+  rect = p.boundingRect(pospriority, y + 10, 5, -1, Qt::AlignCenter, outStr);
   // Make it a more reasonable size
   rect.setWidth(19);
   rect.setHeight(19);
   if ( priority > 0 && pospriority>=0 ) {
-    p.drawText(rect, AlignCenter, outStr);
+    p.drawText(rect, Qt::AlignCenter, outStr);
     p.drawRect(rect);
     // cross out the rectangle for completed items
     if ( item->isCompleted() ) {
         p.drawLine( rect.topLeft(), rect.bottomRight() );
         p.drawLine( rect.topRight(), rect.bottomLeft() );
     } else  if (item->cancelled() ) {
         QPen pen = p.pen();
-        p.setPen ( QPen ( black, 2) );
+        p.setPen ( QPen ( Qt::black, 2) );
         p.drawLine( rect.left()+2,rect.top()+rect.height()/2, rect.right()-2, +rect.top()+rect.height()/2 );
         p.setPen( pen );
     }
   }
   startpt.mRect = rect; //save for later
 
@@ -978,15 +979,14 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
     if (r->mSamePage )
         bottom = r->mRect.bottom();//lutz + 1;
     else
       bottom = 0;
     int to( rect.top() + (rect.height()/2)+1 );
     int endx( rect.left() );
-    p.moveTo(center, bottom);
-    p.lineTo(center, to);
-    p.lineTo(endx, to);
+    p.drawLine(center,bottom, center,to);
+    p.drawLine(center,to, endx,to);
   }
 
   // if completed, use strike out font
   // LR does not work - font is underlined, not striked out
   //QFont ft=p.font();
   //ft.setStrikeOut( item->isCompleted() );
@@ -996,15 +996,15 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
   if ( ! item->location().isEmpty() )
       outStr += " ("+item->location()+")";
   if ( item->hasDueDate() && posDueDt>=0 ) {
       outStr += " [" +item->dtDueStr(true)+"]";
   }
   rect = p.boundingRect( left, rect.top(), (posdue-(left + rect.width() + 5)),
-    -1, WordBreak, outStr);
+    -1, Qt::WordBreak, outStr);
   QRect newrect;
-  p.drawText( rect, WordBreak, outStr, -1, &newrect );
+  p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect );
   //ft.setStrikeOut(false);
   // p.setFont(ft);
 
   // due
  //  if ( item->hasDueDate() && posDueDt>=0 ) {
 //     outStr = local->formatDate(item->dtDue().date(),true);
@@ -1013,14 +1013,14 @@ void CalPrintBase::drawTodo( bool completed, int &count, Todo * item, QPainter &
 //   }
 
   if ( !item->description().isEmpty() && desc ) {
     y=newrect.bottom() + 5;
     outStr = item->description();
     rect = p.boundingRect( left+20, y, x+width-(left+10), -1,
-                           WordBreak, outStr );
-    p.drawText( rect, WordBreak, outStr, -1, &newrect );
+                           Qt::WordBreak, outStr );
+    p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect );
   }
 
   // Set the new line position
   y=newrect.bottom() + 10; //set the line position
 
   // If the item has subitems, we need to call ourselves recursively
@@ -1135,14 +1135,14 @@ void CalPrintBase::drawSplitHeaderRight( QPainter &p, const QDate &fd,
                                          int width, int )
 { 
     int tempStore = mSubHeaderHeight;
     mSubHeaderHeight+= mSubHeaderHeight;
   KLocale *local = KGlobal::locale();
   QFont font("helvetica", 18, QFont::Bold);
-  QPen penA( black,0);
-  QPen penB( black,3);
+  QPen penA( Qt::black,0);
+  QPen penB( Qt::black,3);
   p.setFont(font);
   int lineSpacing = p.fontMetrics().lineSpacing();
   QString title;
   QString myOwner(mCalendar->getOwner());
   if ( fd.month() == td.month() ) {
     title = local->monthName(fd.month(), false) + ' ' + QString::number(fd.day()) + ' ' 
@@ -1158,23 +1158,23 @@ void CalPrintBase::drawSplitHeaderRight( QPainter &p, const QDate &fd,
 //  serifFont.setWeight(87);
 //  serifFont.setItalic(true);
   p.setFont(serifFont);
   QFontInfo info(p.font());
 
   lineSpacing = p.fontMetrics().lineSpacing();
-  p.drawText(0, lineSpacing * 0, width, lineSpacing, AlignRight |AlignTop, title );
+  p.drawText(0, lineSpacing * 0, width, lineSpacing, Qt::AlignRight |Qt::AlignTop, title );
 
   title.truncate(0);
 
   p.setPen(penB );
   p.drawLine(200, lineSpacing * 1, width, lineSpacing * 1);
   p.setPen(penA );
 
   p.setFont(QFont("Helvetica", 20, QFont::Bold, TRUE));
   title += QString::number(fd.year());
-  p.drawText(0, lineSpacing * 1, width, lineSpacing, AlignRight |AlignTop, title );
+  p.drawText(0, lineSpacing * 1, width, lineSpacing, Qt::AlignRight |Qt::AlignTop, title );
   mSubHeaderHeight = tempStore ;
 }
 
 void CalPrintBase::drawSplitDay( QPainter &p, const QDate &qd, int width,
                                  int height, int offsetLeft )
 {
@@ -1194,13 +1194,13 @@ void CalPrintBase::drawSplitDay( QPainter &p, const QDate &qd, int width,
 // width+1 to make sure there's a continuous, black bar across the top.
   p.setPen( QPen(Qt::black,2));
   p.drawRect(offsetLeft, mHeaderHeight + 5, width +1, mSubHeaderHeight);
   p.setPen( Qt::black);
   p.setFont(QFont("helvetica", 12, QFont::Bold, true));
   p.drawText(offsetLeft, mHeaderHeight + 5, 
-          width, mSubHeaderHeight, AlignHCenter | AlignVCenter,
+          width, mSubHeaderHeight, Qt::AlignHCenter | Qt::AlignVCenter,
           dayName);
 
   p.setPen( QPen(Qt::black,2));
   p.setFont(QFont("helvetica", 12));
   p.setBrush(Qt::white);
   it = eventList.begin();
@@ -1251,16 +1251,16 @@ void CalPrintBase::drawSplitDay( QPainter &p, const QDate &qd, int width,
       int endMinuteOff = (int) (minuteInc * currEvent->dtEnd().time().minute());
       int cheight = (int) (minuteInc * 
                     currEvent->dtStart().secsTo(currEvent->dtEnd()) / 60 );
       p.drawRect(offsetLeft+2, 1+offset+startMinuteOff+startTime*cellHeight, 
                  width-4, cheight);
       p.drawText(offsetLeft+12, offset+startMinuteOff+startTime*cellHeight+5, width-24, 
-                 cheight-10, AlignHCenter | AlignTop, text);
+                 cheight-10, Qt::AlignHCenter | Qt::AlignTop, text);
     }
   }
-  p.setBrush(QBrush(NoBrush));
+  p.setBrush(QBrush(Qt::NoBrush));
   mSubHeaderHeight = tempStore ;
 }
 
 void CalPrintBase::drawSplitTimes( QPainter &p, int width, int timeWidth,
                                    int height )
 {
@@ -1271,36 +1271,36 @@ void CalPrintBase::drawSplitTimes( QPainter &p, int width, int timeWidth,
   int offset = mHeaderHeight + mSubHeaderHeight + 10;
   int hours = endHour - startHour;
   int cellHeight = (height-offset) / hours; // hour increments.
   
   QString numStr;
   for (int i = 0; i < hours; i++) {
-      p.setPen(QPen(black,1));
+      p.setPen(QPen(Qt::black,1));
       p.drawLine(0, offset+i*cellHeight, width, offset+i*cellHeight);
-      p.setPen(QPen(gray,0));
+      p.setPen(QPen(Qt::gray,0));
       p.drawLine(37, offset+i*cellHeight+(cellHeight/2),
                  width, offset+i*cellHeight+(cellHeight/2));
-      p.setPen(QPen(black,0));
+      p.setPen(QPen(Qt::black,0));
 
     if ( !KGlobal::locale()->use12Clock() ) {
       numStr.setNum(i+startHour);
       if (cellHeight > 40) {
         p.setFont(QFont("helvetica", 16, QFont::Bold));
       } else {
         p.setFont(QFont("helvetica", 14, QFont::Bold));
       }
       p.drawText(0, offset+i*cellHeight, 33, cellHeight/2,
-                 AlignTop|AlignRight, numStr);
+                 Qt::AlignTop|Qt::AlignRight, numStr);
       p.setFont(QFont("helvetica", 12, QFont::Bold));
       p.drawText(37, offset+i*cellHeight, 45, cellHeight/2,
-                 AlignTop | AlignLeft, "00");
+                 Qt::AlignTop | Qt::AlignLeft, "00");
     } else {
       QTime time( i + startHour, 0 );
       numStr = KGlobal::locale()->formatTime( time );
       p.setFont(QFont("helvetica", 12, QFont::Bold));
       p.drawText(4, offset+i*cellHeight, 70, cellHeight/2,
-                 AlignTop|AlignLeft, numStr);
+                 Qt::AlignTop|Qt::AlignLeft, numStr);
     }
   } mSubHeaderHeight = tempStore ;
 }
 
 #endif
diff --git a/korganizer/calprinter.cpp b/korganizer/calprinter.cpp
index 0cdf28e..d4bf988 100644
--- a/korganizer/calprinter.cpp
+++ b/korganizer/calprinter.cpp
@@ -18,21 +18,24 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qvbuttongroup.h>
-#include <qwidgetstack.h>
+// #include <qvbuttongroup.h>
+#include <q3widgetstack.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qlabel.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qsplitter.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PtrList>
 
 #include <kprinter.h>
 #include <kglobal.h>
 #include <ksimpleconfig.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
@@ -171,43 +174,43 @@ void CalPrinter::updateConfig()
 {
 }
 
 
 /****************************************************************************/
 
-CalPrintDialog::CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p,
+CalPrintDialog::CalPrintDialog( Q3PtrList<CalPrintBase> plugins, KPrinter *p,
                                 QWidget *parent, const char *name )
   : KDialogBase( parent, name, /*modal*/true, i18n("Print"), Ok | Cancel ),
     mPrinter( p ), mPrintPlugins( plugins )
 {
-    QVBox *page = new QVBox(this);//makeVBoxMainWidget();
+    Q3VBox *page = new Q3VBox(this);//makeVBoxMainWidget();
     setMainWidget( page );
-  QHBox *printerLayout = new QHBox( page );
+  Q3HBox *printerLayout = new Q3HBox( page );
 
   mPrinterLabel = new QLabel( printerLayout );
   QPushButton *setupButton = new QPushButton( i18n("&Setup Printer..."),
                                               printerLayout );
   setupButton->setSizePolicy( QSizePolicy(
       (QSizePolicy::SizeType)4, (QSizePolicy::SizeType)0,
       0, 0, setupButton->sizePolicy().hasHeightForWidth() ) );
 
   QSplitter *splitter = new QSplitter( page );
-  splitter->setOrientation( QSplitter::Horizontal );
+  splitter->setOrientation( Qt::Horizontal );
 
-  mTypeGroup = new QVButtonGroup( i18n("View Type"), splitter, "buttonGroup" );
+  mTypeGroup = new Q3VButtonGroup( i18n("View Type"), splitter, "buttonGroup" );
   // use the minimal width possible = max width of the radio buttons, not extensible
 /*  mTypeGroup->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)4,
     (QSizePolicy::SizeType)5, 0, 0,
       mTypeGroup->sizePolicy().hasHeightForWidth() ) );*/
 
   QWidget *splitterRight = new QWidget( splitter, "splitterRight" );
-  QGridLayout *splitterRightLayout = new QGridLayout( splitterRight );
+  Q3GridLayout *splitterRightLayout = new Q3GridLayout( splitterRight );
   splitterRightLayout->setMargin( marginHint() );
   splitterRightLayout->setSpacing( spacingHint() );
 
-  mConfigArea = new QWidgetStack( splitterRight, "configWidgetStack" );
+  mConfigArea = new Q3WidgetStack( splitterRight, "configWidgetStack" );
   splitterRightLayout->addMultiCellWidget( mConfigArea, 0,0, 0,1 );
 
   QLabel *orientationLabel = new QLabel( i18n("Page &orientation:"),
                                          splitterRight, "orientationLabel" );
   splitterRightLayout->addWidget( orientationLabel, 1, 0 );
 
diff --git a/korganizer/calprinter.h b/korganizer/calprinter.h
index 7b58f4f..e065779 100644
--- a/korganizer/calprinter.h
+++ b/korganizer/calprinter.h
@@ -1,6 +1,8 @@
+//Added by qt3to4:
+#include <QLabel>
 /*
     This file is part of KOrganizer.
 
     Copyright (c) 1998 Preston Brown
 
     This program is free software; you can redistribute it and/or modify
@@ -25,24 +27,24 @@
 #define _CALPRINTER_H
 
 // #define KORG_NOPRINTER
 
 #ifndef KORG_NOPRINTER
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kdialogbase.h>
 
 #include <korganizer/baseview.h>
 
 #include "calprintbase.h"
 
 using namespace KCal;
 
-class QVButtonGroup;
-class QWidgetStack;
+class Q3VButtonGroup;
+class Q3WidgetStack;
 class KPrinter;
 class CalPrintDialog;
 class KConfig;
 class QComboBox;
 class QLabel;
 
@@ -91,13 +93,13 @@ class CalPrinter : public QObject, public KOrg::CalPrinterBase
 
   public:
     void preview( PrintType type, const QDate &fd, const QDate &td );
     void print( PrintType type, const QDate &fd, const QDate &td );
 
   protected:
-    QPtrList<CalPrintBase> mPrintPlugins;
+    Q3PtrList<CalPrintBase> mPrintPlugins;
 
   private:
     KPrinter *mPrinter;
     Calendar *mCalendar;
     QWidget *mParent;
     KConfig *mConfig;
@@ -106,13 +108,13 @@ class CalPrinter : public QObject, public KOrg::CalPrinterBase
 };
 
 class CalPrintDialog : public KDialogBase
 {
     Q_OBJECT
   public:
-    CalPrintDialog( QPtrList<CalPrintBase> plugins, KPrinter *p,
+    CalPrintDialog( Q3PtrList<CalPrintBase> plugins, KPrinter *p,
                     QWidget *parent = 0, const char *name = 0 );
     virtual ~CalPrintDialog();
     CalPrintBase *selectedPlugin();
     CalPrinter::ePrintOrientation orientation() { return mOrientation; }
 
   public slots:
@@ -124,15 +126,15 @@ class CalPrintDialog : public KDialogBase
     void setupPrinter();
     void setPrinterLabel();
 signals:
     void okClicked(); 
   private:
     KPrinter *mPrinter;
-    QVButtonGroup *mTypeGroup;
-    QWidgetStack *mConfigArea;
-    QPtrList<CalPrintBase> mPrintPlugins;
+    Q3VButtonGroup *mTypeGroup;
+    Q3WidgetStack *mConfigArea;
+    Q3PtrList<CalPrintBase> mPrintPlugins;
     QLabel *mPrinterLabel;
     QString mPreviewText;
     QComboBox *mOrientationSelection;
 
     CalPrinter::ePrintOrientation mOrientation;
 };
diff --git a/korganizer/calprintplugins.cpp b/korganizer/calprintplugins.cpp
index bc35ca4..9b6dc6e 100644
--- a/korganizer/calprintplugins.cpp
+++ b/korganizer/calprintplugins.cpp
@@ -22,17 +22,17 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qpainter.h>
-#include <qdatetimeedit.h>
+#include <q3datetimeedit.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kprinter.h>
 #include <kconfig.h>
diff --git a/korganizer/cellitem.cpp b/korganizer/cellitem.cpp
index 61d06ac..1fd703c 100644
--- a/korganizer/cellitem.cpp
+++ b/korganizer/cellitem.cpp
@@ -24,32 +24,34 @@
 
 #include "cellitem.h"
 
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <qintdict.h>
+#include <q3intdict.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KOrg;
 
 QString CellItem::label() const
 {
   return i18n("<undefined>");
 }
 
-QPtrList<CellItem> CellItem::placeItem( QPtrList<CellItem> cells,
+Q3PtrList<CellItem> CellItem::placeItem( Q3PtrList<CellItem> cells,
                                         CellItem *placeItem )
 {
   kdDebug(5855) << "Placing " << placeItem->label() << endl;
 
-  QPtrList<KOrg::CellItem> conflictItems;
+  Q3PtrList<KOrg::CellItem> conflictItems;
   int maxSubCells = 0;
-  QIntDict<KOrg::CellItem> subCellDict;
+  Q3IntDict<KOrg::CellItem> subCellDict;
 
   // Find all items which are in same cell
-  QPtrListIterator<KOrg::CellItem> it2( cells );
+  Q3PtrListIterator<KOrg::CellItem> it2( cells );
   for( it2.toFirst(); it2.current(); ++it2 ) {
     KOrg::CellItem *item = it2.current();
     if ( item == placeItem ) continue;
 
     if ( item->overlaps( placeItem ) ) {
       kdDebug(5855) << "  Overlaps: " << item->label() << endl;
@@ -80,13 +82,13 @@ QPtrList<CellItem> CellItem::placeItem( QPtrList<CellItem> cells,
     kdDebug(5855) << "  Sub cells: " << maxSubCells << endl;
 
     // Write results to item to be placed
     conflictItems.append( placeItem );
     placeItem->setSubCells( maxSubCells );
 
-    QPtrListIterator<KOrg::CellItem> it3( conflictItems );
+    Q3PtrListIterator<KOrg::CellItem> it3( conflictItems );
     for( it3.toFirst(); it3.current(); ++it3 ) {
       (*it3)->setSubCells( maxSubCells );
     }
     // Todo: Adapt subCells of items conflicting with conflicting items
   } else {
     kdDebug(5855) << "  no conflicts" << endl;
diff --git a/korganizer/cellitem.h b/korganizer/cellitem.h
index 72773d0..b917bd5 100644
--- a/korganizer/cellitem.h
+++ b/korganizer/cellitem.h
@@ -22,13 +22,13 @@
     without including the source code for Qt in the source distribution.
 */
 #ifndef KORG_CELLITEM_H
 #define KORG_CELLITEM_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 namespace KOrg {
 
 class CellItem
 {
   public:
@@ -50,13 +50,13 @@ class CellItem
     /**
       Place item \arg placeItem into stripe containing items \arg cells in a
       way that items don't overlap.
       
       \return Placed items
     */
-    static QPtrList<CellItem> placeItem( QPtrList<CellItem> cells,
+    static Q3PtrList<CellItem> placeItem( Q3PtrList<CellItem> cells,
                                          CellItem *placeItem );
     
   private:
     int mSubCells;
     int mSubCell;
 };
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index ea510f1..53507d3 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -31,12 +31,14 @@
 #include "kdatenavigator.h"
 
 #include <kcalendarsystem.h>
 
 #include "datenavigatorcontainer.h"
 #include "koprefs.h"
+//Added by qt3to4:
+#include <QResizeEvent>
 
 DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
                                                 const char *name )
   : QWidget( parent, name ), mCalendar( 0 ),
     mHorizontalCount( 1 ), mVerticalCount( 1 )
 {
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index 87cc59f..75d387c 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -1,6 +1,9 @@
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3PtrList>
 /*
     This file is part of KOrganizer.
 
     Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
     Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
 
@@ -97,13 +100,13 @@ class DateNavigatorContainer: public QWidget
     QDate mFirstSelectedDate;
     int mSelectedDateCount;
     KDateNavigator *mNavigatorView;
 
     KCal::Calendar *mCalendar;
 
-    QPtrList<KDateNavigator> mExtraViews;
+    Q3PtrList<KDateNavigator> mExtraViews;
 
     int mHorizontalCount;
     int mVerticalCount;
 };
 
 #endif
diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp
index 505edf6..9425963 100644
--- a/korganizer/filteredit_base.cpp
+++ b/korganizer/filteredit_base.cpp
@@ -8,78 +8,83 @@
 ****************************************************************************/
 
 #include "filteredit_base.h"
 
 #include <qvariant.h>
 #include <qpushbutton.h>
-#include <qframe.h>
-#include <qbuttongroup.h>
+#include <q3frame.h>
+#include <q3buttongroup.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qradiobutton.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 #include "tr.h"
 
 /*
  *  Constructs a FilterEdit_base as a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  */
-FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
+FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, Qt::WFlags fl )
     : QWidget( parent, name, fl )
 {
     if ( !name )
         setName( "FilterEdit_base" );
-    FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); 
+    FilterEdit_baseLayout = new Q3VBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); 
 
-    mCriteriaFrame = new QFrame( this, "mCriteriaFrame" );
-    mCriteriaFrame->setFrameShape( QFrame::StyledPanel );
-    mCriteriaFrame->setFrameShadow( QFrame::Raised );
-    mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); 
+    mCriteriaFrame = new Q3Frame( this, "mCriteriaFrame" );
+    mCriteriaFrame->setFrameShape( Q3Frame::StyledPanel );
+    mCriteriaFrame->setFrameShadow( Q3Frame::Raised );
+    mCriteriaFrameLayout = new Q3VBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); 
 
-    ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" );
+    ButtonGroup1 = new Q3ButtonGroup( mCriteriaFrame, "ButtonGroup1" );
     ButtonGroup1->setColumnLayout(0, Qt::Vertical );
     ButtonGroup1->layout()->setSpacing( 6 );
     ButtonGroup1->layout()->setMargin( 6 );
-    ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
+    ButtonGroup1Layout = new Q3GridLayout( ButtonGroup1->layout() );
     ButtonGroup1Layout->setAlignment( Qt::AlignTop );
 
-    layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); 
+    layout4 = new Q3HBoxLayout( 0, 0, 6, "layout4"); 
 
     mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" );
     layout4->addWidget( mCatShowCheck );
 
     mCatHideCheck = new QRadioButton( ButtonGroup1, "mCatHideCheck" );
     layout4->addWidget( mCatHideCheck );
 
     mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" );
     layout4->addWidget( mCatEditButton );
 
     ButtonGroup1Layout->addLayout( layout4, 0, 0 );
 
-    mCatList = new QListBox( ButtonGroup1, "mCatList" );
+    mCatList = new Q3ListBox( ButtonGroup1, "mCatList" );
 
     ButtonGroup1Layout->addWidget( mCatList, 1, 0 );
     mCriteriaFrameLayout->addWidget( ButtonGroup1 );
 
-    layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 
+    layout7 = new Q3HBoxLayout( 0, 0, 6, "layout7"); 
 
     textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" );
     layout7->addWidget( textLabel1 );
 
     mRecurringCheck = new QCheckBox( mCriteriaFrame, "mRecurringCheck" );
     layout7->addWidget( mRecurringCheck );
 
     mCompletedCheck = new QCheckBox( mCriteriaFrame, "mCompletedCheck" );
     layout7->addWidget( mCompletedCheck );
     mCriteriaFrameLayout->addLayout( layout7 );
 
-    layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); 
+    layout9 = new Q3HBoxLayout( 0, 0, 6, "layout9"); 
 
     textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" );
     layout9->addWidget( textLabel1_2 );
 
     mEventCheck = new QCheckBox( mCriteriaFrame, "mEventCheck" );
     layout9->addWidget( mEventCheck );
@@ -88,13 +93,13 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
     layout9->addWidget( mTodoCheck );
 
     mJournalCheck = new QCheckBox( mCriteriaFrame, "mJournalCheck" );
     layout9->addWidget( mJournalCheck );
     mCriteriaFrameLayout->addLayout( layout9 );
 
-    layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); 
+    layout2 = new Q3HBoxLayout( 0, 0, 0, "layout2"); 
 
     textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" );
     layout2->addWidget( textLabel2 );
 
     mPublicCheck = new QCheckBox( mCriteriaFrame, "mPublicCheck" );
     layout2->addWidget( mPublicCheck );
@@ -106,13 +111,12 @@ FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
     mConfidentialCheck->setChecked( FALSE );
     layout2->addWidget( mConfidentialCheck );
     mCriteriaFrameLayout->addLayout( layout2 );
     FilterEdit_baseLayout->addWidget( mCriteriaFrame );
     languageChange();
     resize( QSize(300, 200).expandedTo(minimumSizeHint()) );
-    clearWState( WState_Polished );
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 FilterEdit_base::~FilterEdit_base()
diff --git a/korganizer/filteredit_base.h b/korganizer/filteredit_base.h
index 13a02c3..135f6fa 100644
--- a/korganizer/filteredit_base.h
+++ b/korganizer/filteredit_base.h
@@ -9,40 +9,46 @@
 
 #ifndef FILTEREDIT_BASE_H
 #define FILTEREDIT_BASE_H
 
 #include <qvariant.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
 class QSpacerItem;
-class QFrame;
-class QButtonGroup;
+class Q3Frame;
+class Q3ButtonGroup;
 class QRadioButton;
 class QPushButton;
-class QListBox;
-class QListBoxItem;
+class Q3ListBox;
+class Q3ListBoxItem;
 class QLabel;
 class QCheckBox;
 
 class FilterEdit_base : public QWidget
 {
     Q_OBJECT
 
 public:
-    FilterEdit_base( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    FilterEdit_base( QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0 );
     ~FilterEdit_base();
 
-    QFrame* mCriteriaFrame;
-    QButtonGroup* ButtonGroup1;
+    Q3Frame* mCriteriaFrame;
+    Q3ButtonGroup* ButtonGroup1;
     QRadioButton* mCatShowCheck;
     QRadioButton* mCatHideCheck;
     QPushButton* mCatEditButton;
-    QListBox* mCatList;
+    Q3ListBox* mCatList;
     QLabel* textLabel1;
     QCheckBox* mRecurringCheck;
     QCheckBox* mCompletedCheck;
     QLabel* textLabel1_2;
     QCheckBox* mEventCheck;
     QCheckBox* mTodoCheck;
@@ -50,19 +56,19 @@ public:
     QLabel* textLabel2;
     QCheckBox* mPublicCheck;
     QCheckBox* mPrivateCheck;
     QCheckBox* mConfidentialCheck;
 
 protected:
-    QVBoxLayout* FilterEdit_baseLayout;
-    QVBoxLayout* mCriteriaFrameLayout;
-    QGridLayout* ButtonGroup1Layout;
-    QHBoxLayout* layout4;
-    QHBoxLayout* layout7;
-    QHBoxLayout* layout9;
-    QHBoxLayout* layout2;
+    Q3VBoxLayout* FilterEdit_baseLayout;
+    Q3VBoxLayout* mCriteriaFrameLayout;
+    Q3GridLayout* ButtonGroup1Layout;
+    Q3HBoxLayout* layout4;
+    Q3HBoxLayout* layout7;
+    Q3HBoxLayout* layout9;
+    Q3HBoxLayout* layout2;
 
 protected slots:
     virtual void languageChange();
 
 };
 
diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index df84911..a3cff49 100644
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@@ -23,14 +23,19 @@
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PtrList>
+
+#include <QDesktopWidget>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
   
@@ -50,13 +55,13 @@ public:
     ComboFilterBox( QWidget *parent=0, const char *name=0) : 
         QComboBox( parent,name ) { }
     void popupBox() { popup(); }
 
 };
 
-FilterEditDialog::FilterEditDialog(QPtrList<CalFilter> *filters,QWidget *parent,
+FilterEditDialog::FilterEditDialog(Q3PtrList<CalFilter> *filters,QWidget *parent,
                                    const char *name) :
   KDialogBase(parent,name,true,i18n("Edit Calendar Filters"),
               Ok|Apply|Cancel)
 {
   mFilters = filters;
 
@@ -77,13 +82,13 @@ FilterEditDialog::FilterEditDialog(QPtrList<CalFilter> *filters,QWidget *parent,
   upButton->setMaximumSize( upButton->sizeHint());
   connect(upButton,SIGNAL(clicked()),SLOT(slotUp()));
 
   
   mEditor = new FilterEdit_base(mainWidget);
 
-  QGridLayout *topLayout = new QGridLayout(mainWidget,2,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(mainWidget,2,2);
   topLayout->setSpacing(spacingHint());
   topLayout->addWidget(mSelectionCombo,0,0);
   topLayout->addWidget(upButton,0,1);
   topLayout->addWidget(addButton,0,2);
   topLayout->addWidget(mRemoveButton,0,3);
   topLayout->addMultiCellWidget(mEditor,1,1,0,3);
diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h
index 42aa3da..c1a52ed 100644
--- a/korganizer/filtereditdialog.h
+++ b/korganizer/filtereditdialog.h
@@ -20,13 +20,13 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _FILTEREDITDIALOG_H
 #define _FILTEREDITDIALOG_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kdialogbase.h>
 
 #include <libkcal/calfilter.h>
 
 class QComboBox;
@@ -43,13 +43,13 @@ using namespace KCal;
   @author Cornelius Schumacher
 */
 class FilterEditDialog : public KDialogBase
 {
     Q_OBJECT
   public:
-    FilterEditDialog(QPtrList<CalFilter> *,QWidget *parent=0, const char *name=0);
+    FilterEditDialog(Q3PtrList<CalFilter> *,QWidget *parent=0, const char *name=0);
     virtual ~FilterEditDialog();
 
   public slots:
     void updateFilterList();
 
   signals:
@@ -71,13 +71,13 @@ class FilterEditDialog : public KDialogBase
 
   protected:
     void readFilter(CalFilter *);
     void writeFilter(CalFilter *);
 
   private:
-    QPtrList<CalFilter> *mFilters;
+    Q3PtrList<CalFilter> *mFilters;
 
     ComboFilterBox *mSelectionCombo;
     QPushButton *mRemoveButton;
     FilterEdit_base *mEditor;
 
     QStringList mCategories;
diff --git a/korganizer/incomingdialog.cpp b/korganizer/incomingdialog.cpp
index fe78356..c2402d4 100644
--- a/korganizer/incomingdialog.cpp
+++ b/korganizer/incomingdialog.cpp
@@ -14,16 +14,18 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
@@ -53,15 +55,15 @@
 #define KORG_NOKABC
 //#include <kabc/stdaddressbook.h>
 #define size count
 #endif
 
 
-ScheduleItemIn::ScheduleItemIn(QListView *parent,IncidenceBase *ev,
+ScheduleItemIn::ScheduleItemIn(Q3ListView *parent,IncidenceBase *ev,
                                Scheduler::Method method,ScheduleMessage::Status status)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
   mIncidence = ev;
   mMethod = method;
   mStatus = status;
   setText(6,Scheduler::translatedMethodName(mMethod)+" ");
   setText(7,ScheduleMessage::statusName(status));
@@ -132,28 +134,28 @@ bool ScheduleItemVisitor::visit(Journal *)
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
 IncomingDialog::IncomingDialog(Calendar *calendar,OutgoingDialog *outgoing,
-                QWidget* parent,const char* name,bool modal,WFlags fl) :
+                QWidget* parent,const char* name,bool modal,Qt::WFlags fl) :
   IncomingDialog_base(parent,name,modal,fl)
 {
   mCalendar = calendar;
   mOutgoing = outgoing;
 #ifndef KORG_NOMAIL
   mScheduler = new MailScheduler(mCalendar);
 #else
   mScheduler = new DummyScheduler(mCalendar);
 #endif
-  mMessageListView->setColumnAlignment(1,AlignHCenter);
-  mMessageListView->setColumnAlignment(2,AlignHCenter);
-  mMessageListView->setColumnAlignment(3,AlignHCenter);
-  mMessageListView->setColumnAlignment(4,AlignHCenter);
-  QObject::connect(mMessageListView,SIGNAL(doubleClicked(QListViewItem *)),
-                   this,SLOT(showEvent(QListViewItem *)));
+  mMessageListView->setColumnAlignment(1,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(2,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(3,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(4,Qt::AlignHCenter);
+  QObject::connect(mMessageListView,SIGNAL(doubleClicked(Q3ListViewItem *)),
+                   this,SLOT(showEvent(Q3ListViewItem *)));
   retrieve();
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
@@ -166,13 +168,13 @@ void IncomingDialog::setOutgoingDialog(OutgoingDialog *outgoing)
 {
   mOutgoing = outgoing;
 }
 
 void IncomingDialog::retrieve()
 {
-  QPtrList <ScheduleMessage> messages = mScheduler->retrieveTransactions();
+  Q3PtrList <ScheduleMessage> messages = mScheduler->retrieveTransactions();
 
   ScheduleMessage *message;
   for(message = messages.first();message;message = messages.next()) {
     IncidenceBase *inc = message->event();
     Scheduler::Method method = (Scheduler::Method)message->method();
     ScheduleMessage::Status status = message->status();
@@ -249,13 +251,13 @@ void IncomingDialog::rejectMessage()
     mScheduler->deleteTransaction(item->event());
     delete item;
     emit numMessagesChanged(mMessageListView->childCount());
   }
 }
 
-void IncomingDialog::showEvent(QListViewItem *item)
+void IncomingDialog::showEvent(Q3ListViewItem *item)
 {
   IncidenceBase *incidence = ((ScheduleItemIn *)item)->event();
   if( incidence && incidence->typeID() == eventID ) {
     Event *event = static_cast<Event *>(incidence);
     KOEventViewerDialog *eventViewer = new KOEventViewerDialog(this);
     eventViewer->setEvent(event);
@@ -266,13 +268,13 @@ void IncomingDialog::showEvent(QListViewItem *item)
 bool IncomingDialog::incomeRefresh(ScheduleItemIn *item)
 {
   Event *ev = mCalendar->event(item->event()->uid());
   if (ev) {
     //user interaction before??
     Attendee *att;
-    QPtrList<Attendee> attlist = ev->attendees();
+    Q3PtrList<Attendee> attlist = ev->attendees();
     for (att=attlist.first(); att; att=attlist.next()) {
       Event *event = new Event(*ev);
       mOutgoing->addMessage(event,Scheduler::Request,att->email());
       delete(event);
     }
     mScheduler->deleteTransaction(item->event());
@@ -511,13 +513,13 @@ bool IncomingDialog::checkOrganizerInAddressbook(QString organizer)
 bool IncomingDialog::checkAttendeesInAddressbook(IncidenceBase *inc)
 {
   bool inBook = false;
 #ifndef KORG_NOKABC
   KABC::AddressBook *add_book = KABC::StdAddressBook::self();
   KABC::Addressee::List addressList;
-  QPtrList <Attendee> attendees;
+  Q3PtrList <Attendee> attendees;
   Attendee *att;
   attendees = inc->attendees();
   for (att=attendees.first();att;att=attendees.next()) {
     addressList = add_book->findByEmail(att->email());
     if (addressList.size()>0 ) inBook = true;
   }
diff --git a/korganizer/incomingdialog.h b/korganizer/incomingdialog.h
index 413ce6a..e002b25 100644
--- a/korganizer/incomingdialog.h
+++ b/korganizer/incomingdialog.h
@@ -16,26 +16,26 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #ifndef INCOMINGDIALOG_H
 #define INCOMINGDIALOG_H
 
-#include <qlistview.h>
+#include <q3listview.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/scheduler.h>
 
 #include "incomingdialog_base.h"
 #include "outgoingdialog.h"
 
 using namespace KCal;
 
-class ScheduleItemIn : public QListViewItem
+class ScheduleItemIn : public Q3ListViewItem
 {
   public:
-    ScheduleItemIn(QListView *parent,IncidenceBase *ev,Scheduler::Method method,
+    ScheduleItemIn(Q3ListView *parent,IncidenceBase *ev,Scheduler::Method method,
                    ScheduleMessage::Status status);
     virtual ~ScheduleItemIn() {}
 
     IncidenceBase *event() { return mIncidence; }
     Scheduler::Method method() { return mMethod; }
     ScheduleMessage::Status status() { return mStatus; }
@@ -69,13 +69,13 @@ class ScheduleItemVisitor : public Incidence::Visitor
 
 class IncomingDialog : public IncomingDialog_base
 {
     Q_OBJECT
   public:
     IncomingDialog(Calendar *calendar,OutgoingDialog *outgoing,
-            QWidget* parent=0,const char* name=0,bool modal=false,WFlags fl=0);
+            QWidget* parent=0,const char* name=0,bool modal=false,Qt::WFlags fl=0);
     ~IncomingDialog();
     
     void setOutgoingDialog(OutgoingDialog *outgoing);
 
   signals:
     void calendarUpdated();
@@ -84,13 +84,13 @@ class IncomingDialog : public IncomingDialog_base
     void retrieve();
     
   protected slots:
     void acceptAllMessages();
     void acceptMessage();
     void rejectMessage();
-    void showEvent(QListViewItem *);
+    void showEvent(Q3ListViewItem *);
 
   protected:
     bool acceptMessage(ScheduleItemIn *item);
     bool incomeRefresh(ScheduleItemIn *item);
     bool incomeCounter(ScheduleItemIn *item);
     bool incomeDeclineCounter(ScheduleItemIn *item);
diff --git a/korganizer/incomingdialog_base.cpp b/korganizer/incomingdialog_base.cpp
index 8589803..5c5ace4 100644
--- a/korganizer/incomingdialog_base.cpp
+++ b/korganizer/incomingdialog_base.cpp
@@ -8,44 +8,46 @@
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 
 #include "incomingdialog_base.h"
 
 #include <qvariant.h>
-#include <qheader.h>
-#include <qlistview.h>
+#include <q3header.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 /* 
  *  Constructs a IncomingDialog_base as a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-IncomingDialog_base::IncomingDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
+IncomingDialog_base::IncomingDialog_base( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
     : QDialog( parent, name, modal, fl )
 
 {
     if ( !name )
         setName( "IncomingDialog_base" );
-    IncomingDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "IncomingDialog_baseLayout"); 
+    IncomingDialog_baseLayout = new Q3GridLayout( this, 1, 1, 11, 6, "IncomingDialog_baseLayout"); 
 
     PushButton4 = new QPushButton( this, "PushButton4" );
 
     IncomingDialog_baseLayout->addWidget( PushButton4, 0, 1 );
 
     PushButton7 = new QPushButton( this, "PushButton7" );
     PushButton7->setDefault( TRUE );
 
     IncomingDialog_baseLayout->addWidget( PushButton7, 5, 1 );
 
-    mMessageListView = new QListView( this, "mMessageListView" );
+    mMessageListView = new Q3ListView( this, "mMessageListView" );
     mMessageListView->addColumn( tr2i18n( "Summary" ) );
     mMessageListView->addColumn( tr2i18n( "Start Date" ) );
     mMessageListView->addColumn( tr2i18n( "Start Time" ) );
     mMessageListView->addColumn( tr2i18n( "End Date" ) );
     mMessageListView->addColumn( tr2i18n( "End Time" ) );
     mMessageListView->addColumn( tr2i18n( "Organizer" ) );
diff --git a/korganizer/incomingdialog_base.h b/korganizer/incomingdialog_base.h
index 7732384..537ef86 100644
--- a/korganizer/incomingdialog_base.h
+++ b/korganizer/incomingdialog_base.h
@@ -9,37 +9,41 @@
 
 #ifndef INCOMINGDIALOG_BASE_H
 #define INCOMINGDIALOG_BASE_H
 
 #include <qvariant.h>
 #include <qdialog.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QListView;
-class QListViewItem;
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
+class Q3ListView;
+class Q3ListViewItem;
 class QPushButton;
 
 class IncomingDialog_base : public QDialog
 {
     Q_OBJECT
 
 public:
-    IncomingDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    IncomingDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
     ~IncomingDialog_base();
 
     QPushButton* PushButton4;
     QPushButton* PushButton7;
-    QListView* mMessageListView;
+    Q3ListView* mMessageListView;
     QPushButton* PushButton7_2;
     QPushButton* PushButton8;
     QPushButton* PushButton9;
 
 protected:
-    QGridLayout* IncomingDialog_baseLayout;
+    Q3GridLayout* IncomingDialog_baseLayout;
 
 protected slots:
     virtual void languageChange();
 
     virtual void acceptAllMessages();
     virtual void acceptMessage();
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index 2ac9de1..c828573 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -21,14 +21,14 @@
 #ifndef KORG_BASEVIEW_H
 #define KORG_BASEVIEW_H
 // $Id$
 // KOBaseView is the abstract base class of all calendar views.
 
 #include <qwidget.h>
-#include <qptrlist.h>
-#include <qvaluelist.h>
+#include <q3ptrlist.h>
+#include <q3valuelist.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
 #include <libkcal/event.h>
@@ -85,13 +85,13 @@ class BaseView : public QWidget
   
     /**
       @return a list of selected events.  Most views can probably only
       select a single event at a time, but some may be able to select
       more than one.
     */
-    virtual QPtrList<Incidence> selectedIncidences() = 0;
+    virtual Q3PtrList<Incidence> selectedIncidences() = 0;
   
     /**
       @return a list of the dates of selected events.  Most views can probably only
       select a single event at a time, but some may be able to select
       more than one.
     */
@@ -150,13 +150,13 @@ class BaseView : public QWidget
     /**
       Show given events. Depending on the actual view it might not be possible to
       show all given events.
 
       @param eventList a list of events to show.
     */
-    virtual void showEvents(QPtrList<Event> eventList) = 0;
+    virtual void showEvents(Q3PtrList<Event> eventList) = 0;
 
     /**
       Updates the current display to reflect changes that may have happened
       in the calendar since the last display refresh.
     */
     virtual void updateView() = 0;
diff --git a/korganizer/interfaces/korganizer/calendarviewbase.h b/korganizer/interfaces/korganizer/calendarviewbase.h
index 3c715b1..1f49357 100644
--- a/korganizer/interfaces/korganizer/calendarviewbase.h
+++ b/korganizer/interfaces/korganizer/calendarviewbase.h
@@ -20,12 +20,14 @@
 #ifndef KORG_CALENDARVIEWBASE_H
 #define KORG_CALENDARVIEWBASE_H
 // $Id$
 
 #include <qwidget.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 
 #include <libkcal/calendar.h>
 
 #include <korganizer/baseview.h>
 
@@ -37,13 +39,13 @@ namespace KOrg {
 */
 class CalendarViewBase : public QWidget
 {  
     Q_OBJECT
   public:
     CalendarViewBase(QWidget *parent, const char *name) :
-        QWidget(parent,name) {new QVBoxLayout(this);}
+        QWidget(parent,name) {new Q3VBoxLayout(this);}
     virtual ~CalendarViewBase() {};
   
     virtual KCal::Calendar *calendar() = 0;
 
     virtual QDate startDate() = 0;
     virtual QDate endDate() = 0;
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5269af7..2814c61 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -23,20 +23,27 @@
 
 //
 // Journal Entry
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktextedit.h>
 #include <kfiledialog.h>
@@ -54,26 +61,26 @@
 #include "journalentry.h"
 //#include "journalentry.moc"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
-  QFrame(parent)
+  Q3Frame(parent)
 {
 
     int fac = 5;
     heiHint = QApplication::desktop()->height();
     if ( heiHint > 800 )
         fac += 2;
     heiHint = heiHint / fac;
 
     showOnlyMode = false;
   mCalendar = calendar;
   mJournal = 0;
   visibleMode = true;
-  QHBox * vb = new QHBox ( this );
+  Q3HBox * vb = new Q3HBox ( this );
   QPixmap iconp;
   vb->setMargin ( KDialog::marginHint()-1 );
   QPushButton * toggleJournal = new QPushButton( vb );
   iconp = SmallIcon("1updownarrow");
   toggleJournal->setPixmap (iconp ) ;
   QLabel* textLabel = new QLabel(" "+i18n("Title: "),vb);
@@ -126,19 +133,19 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   } else {
       mTitle->setMaximumWidth( (maxwid/4)*3);
       mCalendarBox->setMaximumWidth( maxwid/2 );
   }
   //mCalendarBox->setMaximumWidth( maxwid/2 -20 );
   mEditor->setWordWrap( KTextEdit::WidgetWidth );
-  QBoxLayout *topLayout = new QVBoxLayout(this);
+  Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
   topLayout->addWidget(vb);
   topLayout->addWidget(mEditor);
   mEditor->installEventFilter(this);
   installEventFilter(this);
   mTitle->installEventFilter(this);
-  setFocusPolicy (QWidget::NoFocus); 
+  setFocusPolicy (Qt::NoFocus); 
 
   connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
   connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
   connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
   mTitle->load( KOLocationBox::SUMMARYJOURNAL );
   mTitle->lineEdit ()->setText("");
@@ -165,13 +172,13 @@ void JournalEntry::resizeEvent(QResizeEvent* e )
         }
         //mCalendarBox->setMaximumWidth( maxwid/2 -20 );
     }
     //setMaximumWidth( QApplication::desktop()->width() );
     //qDebug("MAXXX %d ", QApplication::desktop()->width());
 #endif
-    QFrame::resizeEvent( e ); 
+    Q3Frame::resizeEvent( e ); 
 }
 QSize JournalEntry::sizeHint() const
 {
     return QSize ( 240, heiHint );
 }
 void JournalEntry::slotSaveTemplate()
@@ -183,19 +190,19 @@ void JournalEntry::slotSaveTemplate()
     fileName += "/journal";
     fileName = KFileDialog::getSaveFileName(  fileName , i18n("Save as Journal template"), this );
     if ( fileName.length() == 0 )
         return;
 
     QFile fileIn( fileName );
-    if (!fileIn.open( IO_WriteOnly ) ) {
+    if (!fileIn.open( QIODevice::WriteOnly ) ) {
         KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
                             .arg( fileName ) );
         return;
     } 
     // QString text;
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     tsIn << mEditor->text();
     fileIn.close();  
 }
 void JournalEntry::slotLoadTemplate()
 {
@@ -205,18 +212,18 @@ void JournalEntry::slotLoadTemplate()
         t_dir.mkdir ( fileName );
     fileName += "/journal";
     fileName = KFileDialog::getOpenFileName(  fileName , i18n("Insert Journal template"), this );
     if ( fileName.length() == 0 )
         return;
     QFile fileIn( fileName );
-    if (!fileIn.open( IO_ReadOnly ) ) {
+    if (!fileIn.open( QIODevice::ReadOnly ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return;
     }
-    QTextStream tsIn( &fileIn );
+    Q3TextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     QString text =  tsIn.read();
     fileIn.close();  
     int line, col;
     mEditor->getCursorPosition (& line, & col );
     mEditor-> insertAt ( text, line, col, true ); 
@@ -313,17 +320,17 @@ void JournalEntry::clear()
 }
 
 bool JournalEntry::eventFilter( QObject *o, QEvent *e )
 {
 //  kdDebug() << "JournalEntry::event received " << e->type() << endl;
     if ( isVisible() ) {
-        mEditor->setFocusPolicy (QWidget::StrongFocus); 
-        mTitle->setFocusPolicy (QWidget::StrongFocus); 
+        mEditor->setFocusPolicy (Qt::StrongFocus); 
+        mTitle->setFocusPolicy (Qt::StrongFocus); 
     } else {
-        mEditor->setFocusPolicy (QWidget::NoFocus); 
-        mTitle->setFocusPolicy (QWidget::NoFocus); 
+        mEditor->setFocusPolicy (Qt::NoFocus); 
+        mTitle->setFocusPolicy (Qt::NoFocus); 
     }
   if ( e->type() == QEvent::FocusOut ) {
     writeJournal();
   }
   if ( e->type() == QEvent::KeyPress ) {
       QKeyEvent * k = (QKeyEvent *) e; 
@@ -332,13 +339,13 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
       if ( k->state() == Qt::ControlButton ) {
           k->ignore();
           //return true;
       }
   }
 
-  return QFrame::eventFilter( o, e );    // standard event processing
+  return Q3Frame::eventFilter( o, e );    // standard event processing
 }
 
 void JournalEntry::writeJournal()
 {
     if ( !visibleMode ) return;
     if ( !mTitle->isEnabled() ) return;
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index ee17da8..0adebe9 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -22,25 +22,30 @@
 */
 #ifndef JOURNALENTRY_H
 #define JOURNALENTRY_H
 //
 // Widget showing one Journal entry
 
-#include <qframe.h>
+#include <q3frame.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QEvent>
+#include <QLabel>
+#include <QKeyEvent>
 
 #include <libkcal/calendar.h>
 
 class QLabel;
 class KTextEdit;
 class QComboBox;
 class KLineEdit;
 class KOLocationBox;
 
 using namespace KCal;
 
-class JournalEntry : public QFrame {
+class JournalEntry : public Q3Frame {
     Q_OBJECT
   public:
     JournalEntry(Calendar *,QWidget *parent);
     virtual ~JournalEntry();
     
     void setJournal(Journal *, bool saveJournal = true );
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 6697602..ecc7a2f 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -19,18 +19,22 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qstring.h>
-#include <qkeycode.h>
+#include <qnamespace.h>
 #include <qlayout.h>
 #include <qtimer.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <Q3GridLayout>
+#include <QEvent>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 #include "koglobals.h"
@@ -43,18 +47,18 @@
 
 #include "navigatorbar.h"
 
 #include "kdatenavigator.h"
 
 KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
-  : QFrame(parent, name),
+  : Q3Frame(parent, name),
     updateTimer(0L)
 {
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
     QDate startDate = QDate::currentDate();
-  QGridLayout *topLayout = new QGridLayout(this,8,8);
+  Q3GridLayout *topLayout = new Q3GridLayout(this,8,8);
 
   if (! startDate.isValid()) {
       qDebug("KDateNavigator::invalid startdate ");
     startDate = QDate::currentDate();
   }
   mMonthSignalOffset = 0;
@@ -78,33 +82,33 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
   int i;
 
   // Set up the heading fields.
   for( i = 0; i < 7; i++ ) {
     headings[i] = new QLabel("",this);
     //headings[i]->setFont(QFont("Arial", 10, QFont::Bold));
-    headings[i]->setAlignment(AlignCenter);
+    headings[i]->setAlignment(Qt::AlignCenter);
     headings[i]->installEventFilter(this);
 
     topLayout->addWidget(headings[i],1,i+1);
   }
 
   // Create the weeknumber labels
   for( i = 0; i < 6; i++ ) {
     weeknos[i] = new QLabel(this);
-    weeknos[i]->setAlignment(AlignCenter );
+    weeknos[i]->setAlignment(Qt::AlignCenter );
     //weeknos[i]->setFont(QFont("Arial", 10));
     if(!m_bShowWeekNums) {
       weeknos[i]->hide();
     }
     weeknos[i]->installEventFilter(this);
 
     topLayout->addWidget(weeknos[i],i+2,0);
   }
 
   daymatrix = new KODayMatrix( this, "KDateNavigator::DayMatrix");
-  daymatrix->setFrameStyle(QFrame::Panel|QFrame::Sunken);
+  daymatrix->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken);
   daymatrix->setLineWidth(1);
 
   connect( daymatrix, SIGNAL( selected( const KCal::DateList & ) ),
            SIGNAL( datesSelected( const KCal::DateList & ) ) );
 
   connect( daymatrix, SIGNAL( eventDropped( Event * ) ),
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h
index 780ebb8..2cbca76 100644
--- a/korganizer/kdatenavigator.h
+++ b/korganizer/kdatenavigator.h
@@ -20,28 +20,31 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KDATENAVIGATOR_H
 #define KDATENAVIGATOR_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qdatetime.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <QEvent>
 
 #include <libkcal/calendar.h>
 
 #include "kodaymatrix.h"
 
 class QPushButton;
 class QTimer;
 
 class KCalendarSystem;
 
 class NavigatorBar;
 
-class KDateNavigator: public QFrame
+class KDateNavigator: public Q3Frame
 {
     Q_OBJECT
   public:
     KDateNavigator( QWidget *parent = 0,const char *name = 0 );
     ~KDateNavigator();
 
@@ -130,14 +133,14 @@ class KDateNavigator: public QFrame
     QSize mySizeHint;
     QSize myFullSizeHint;
     bool mFontChanged;
     int mMonthSignalOffset;
     NavigatorBar *mNavigatorBar;
 
-    QFrame *headingSep;
-    QFrame *weeknumSep;
+    Q3Frame *headingSep;
+    Q3Frame *weeknumSep;
     QLabel *headings[7];
     QLabel *weeknos[7];
     KODayMatrix *daymatrix;
 
     KCal::DateList mSelectedDates;
     QDate m_MthYr;
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 1d4d6de..fe59787 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -26,18 +26,29 @@
 
 #ifndef _WIN32_
 #define protected public
 #include <qwidget.h>
 #undef protected 
 #endif
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qdatetime.h>
 #include <qapplication.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <Q3MemArray>
+#include <QEvent>
+#include <Q3Frame>
+#include <Q3PtrList>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 
@@ -60,13 +71,13 @@ extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockStartup;
 
 
 ////////////////////////////////////////////////////////////////////////////
 MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
-    : QFrame(_agenda->viewport(),name), agenda(_agenda)
+    : Q3Frame(_agenda->viewport(),name), agenda(_agenda)
 {
     setLineWidth(0);
     setMargin(0);
     setBackgroundColor(Qt::red);
     minutes = new QTimer(this);
     connect(minutes, SIGNAL(timeout()), this, SLOT(updateLoc()));
@@ -166,14 +177,14 @@ void MarcusBains::updateLocation(bool recalculate)
 
 
 /*
   Create an agenda widget with rows rows and columns columns.
 */
 KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
-                   const char *name,WFlags f) :
-  QScrollView(parent,name,f)
+                   const char *name,Qt::WFlags f) :
+  Q3ScrollView(parent,name,f)
 {
    
     mAllAgendaPopup = 0;
   mColumns = columns;
   mRows = rows;
   mGridSpacingY = rowSize;
@@ -187,14 +198,14 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
 }
 
 /*
   Create an agenda widget with columns columns and one row. This is used for
   all-day events.
 */
-KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
-  QScrollView(parent,name,f)
+KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,Qt::WFlags f) :
+  Q3ScrollView(parent,name,f)
 {
     mAllAgendaPopup = 0;
   blockResize = false;
   mColumns = columns;
   mRows = 1;
   //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize);
@@ -228,45 +239,45 @@ QDate KOAgenda::selectedIncidenceDate() const
 
 void KOAgenda::init()
 {  
     mPopupTimer = new QTimer(this);
     connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));
 
-    mNewItemPopup = new QPopupMenu( this );
+    mNewItemPopup = new Q3PopupMenu( this );
     connect ( mNewItemPopup, SIGNAL (activated ( int )  ), this, SLOT ( newItem(int)) );
     QString pathString = "";
     if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
     if ( QApplication::desktop()->width() < 480 )
         pathString += "icons16/";
     } else
         pathString += "iconsmini/";
     
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"newtodo" ),  i18n("New Todo..."),2 ); 
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"newevent" ), i18n("New Event..."), 1 ); 
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"newtodo" ),  i18n("New Todo..."),2 ); 
     mNewItemPopup->insertSeparator ( ); 
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"xdays" ),  i18n("Next days"),8 );  
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next week"),4 );  
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next two weeks"),5 );   
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("This month"),6 );  
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"xdays" ),  i18n("Next days"),8 );  
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"week" ),  i18n("Next week"),4 );  
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"week" ),  i18n("Next two weeks"),5 );   
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"month" ),  i18n("This month"),6 );  
+    mNewItemPopup->insertItem ( (QIcon)SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
 #ifndef _WIN32_
-  int wflags = viewport()-> getWFlags() |WRepaintNoErase;//WResizeNoErase
-  viewport()->setWFlags ( wflags);
+    Qt::WindowFlags wflags = viewport()-> windowFlags() |Qt::WRepaintNoErase;//WResizeNoErase
+  viewport()->setWindowFlags ( wflags);
 #endif
   mGridSpacingX = 80;
   mResizeBorderWidth = 8;
   mScrollBorderWidth = 8;
   mScrollDelay = 30;
   mScrollOffset = 10;
   mPaintPixmap.resize( 20,20);
   //enableClipper(true);
 
   // Grab key strokes for keyboard navigation of agenda. Seems to have no
   // effect. Has to be fixed.
-  setFocusPolicy(WheelFocus);
+  setFocusPolicy(Qt::WheelFocus);
 
   connect(&mScrollUpTimer,SIGNAL(timeout()),SLOT(scrollUp()));
   connect(&mScrollDownTimer,SIGNAL(timeout()),SLOT(scrollDown()));
   connect(&mResizeTimer,SIGNAL(timeout()),SLOT(finishResize()));
 
   mStartCellX = 0;
@@ -392,17 +403,17 @@ bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
     case QEvent::MouseButtonRelease:
     case QEvent::MouseMove:
         return eventFilter_mouse(object, static_cast<QMouseEvent *>(event));
 
     case (QEvent::Leave):
         if (!mActionItem)
-            setCursor(arrowCursor);
+            setCursor(Qt::arrowCursor);
         return true;
 
     default:
-        return QScrollView::eventFilter(object,event);
+        return Q3ScrollView::eventFilter(object,event);
     }
 }
 void KOAgenda::popupMenu()
 {
     mPopupTimer->stop();
     if (  mPopupKind == 1 || mPopupKind == 3 ) {
@@ -502,17 +513,17 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
     } else {
         viewportPos = me->pos();
     }
     bool objIsNotViewport = (object != viewport());
     bool leftButt = false;
 #ifdef DESKTOP_VERSION
-    leftButt  = (me->button() == LeftButton);
+    leftButt  = (me->button() == Qt::LeftButton);
 #endif
     switch (me->type())  {
     case QEvent::MouseButtonPress:
-        if (me->button() == LeftButton) {
+        if (me->button() == Qt::LeftButton) {
             mPopupTimer->start( 600 );
             mLeftMouseDown = true;
         }
         blockMoving = true;
         startX = viewportPos.x();
         startY = viewportPos.y();  
@@ -575,16 +586,16 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
                 }
             }
         }
         if ( objIsNotViewport ) {
             mPopupItem = (KOAgendaItem *)object;
             mPopupKind = 1;
-            if (me->button() == RightButton) {
+            if (me->button() == Qt::RightButton) {
                 mPopupKind = 3;
                 popupMenu();
-            } else if (me->button() == LeftButton) {
+            } else if (me->button() == Qt::LeftButton) {
                 mActionItem = (KOAgendaItem *)object;
                 if (mActionItem) {
                     emit signalClearSelection();
                     slotClearSelection();
                     selectItem(mActionItem);
                     Incidence *incidence = mActionItem->incidence();
@@ -597,62 +608,62 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             }
         } else { // ---------- viewport()
             mPopupItem = 0;
             mPopupKind = 2;
             selectItem(0);
             mActionItem = 0;   
-            if (me->button() == RightButton) {
+            if (me->button() == Qt::RightButton) {
                 int x,y;
                 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
                 int gx,gy;
                 contentsToGrid(x,y,gx,gy); 
                 mCurrentCellX = gx;
                 mCurrentCellY = gy;
                 mStartCellX = gx;
                 mStartCellY = gy;
                 mPopupKind = 4;
                 popupMenu();
-            } else if (me->button() == LeftButton) {
-                setCursor(arrowCursor);
+            } else if (me->button() == Qt::LeftButton) {
+                setCursor(Qt::arrowCursor);
                 startSelectAction(viewportPos);
             }
         }
         break;
 
     case QEvent::MouseButtonRelease:
-        if (me->button() == LeftButton ) {  
+        if (me->button() == Qt::LeftButton ) {  
             mPopupTimer->stop();
         }
         if (object != viewport()) { 
-            if (me->button() == LeftButton && mLeftMouseDown) {
+            if (me->button() == Qt::LeftButton && mLeftMouseDown) {
                 if (mActionItem) {  
                     QPoint clipperPos = clipper()->mapFromGlobal(viewport()->mapToGlobal(viewportPos));
                     //qDebug(" %d %d %d  ",clipperPos.y(),visibleHeight() , 9  );
                     if ( mActionType == MOVE && (clipperPos.y() > visibleHeight()-2 ||clipperPos.y() < 0 ) ) {
                         mScrollUpTimer.stop();
                         mScrollDownTimer.stop();
                         mActionItem->resetMove();
                         placeSubCells( mActionItem );
                         // emit startDragSignal( mActionItem->incidence() );
-                        setCursor( arrowCursor );
+                        setCursor( Qt::arrowCursor );
                         mActionItem = 0;
                         mActionType = NOP;
                         mItemMoved = 0;
                         mLeftMouseDown = false;
                         return true;
                     }
                     endItemAction();
                 }
             }
             
         } else { // ---------- viewport()
-           if (me->button() == LeftButton && mLeftMouseDown ) { //left click
+           if (me->button() == Qt::LeftButton && mLeftMouseDown ) { //left click
                 endSelectAction( true ); // emit new event signal
             }
         }
-        if (me->button() == LeftButton) 
+        if (me->button() == Qt::LeftButton) 
             mLeftMouseDown = false;
        
         break;
 
     case QEvent::MouseMove:
         //qDebug("mm ");
@@ -847,38 +858,38 @@ void KOAgenda::startItemAction(QPoint viewportPos)
 
   if (mAllDayMode) {
     int gridDistanceX = (x - gx * mGridSpacingX);
     if ( allowResize && gridDistanceX < mResizeBorderWidth &&
         mActionItem->cellX() == mCurrentCellX) {
       mActionType = RESIZELEFT;
-      setCursor(sizeHorCursor);
+      setCursor(Qt::sizeHorCursor);
     } else if ( allowResize && (mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
                mActionItem->cellXWidth() == mCurrentCellX) {
       mActionType = RESIZERIGHT;
-      setCursor(sizeHorCursor);
+      setCursor(Qt::sizeHorCursor);
     } else {
       mActionType = MOVE;
       mActionItem->startMove();
-      setCursor(sizeAllCursor);
+      setCursor(Qt::sizeAllCursor);
     }
   } else {
     int gridDistanceY = (y - gy * mGridSpacingY);
     if (allowResize && gridDistanceY < mResizeBorderWidth &&
         mActionItem->cellYTop() == mCurrentCellY &&
         !mActionItem->firstMultiItem()) {
       mActionType = RESIZETOP;
-      setCursor(sizeVerCursor);
+      setCursor(Qt::sizeVerCursor);
     } else if (allowResize &&(mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
                mActionItem->cellYBottom() == mCurrentCellY &&
                !mActionItem->lastMultiItem())  {
       mActionType = RESIZEBOTTOM;
-      setCursor(sizeVerCursor);
+      setCursor(Qt::sizeVerCursor);
     } else {
       mActionType = MOVE;
       mActionItem->startMove();
-      setCursor(sizeAllCursor);
+      setCursor(Qt::sizeAllCursor);
     }
   }
 }
 
 void KOAgenda::performItemAction(QPoint viewportPos)
 {
@@ -903,33 +914,33 @@ void KOAgenda::performItemAction(QPoint viewportPos)
     if ( mActionType == MOVE ) {
       mScrollUpTimer.stop();
       mScrollDownTimer.stop();
       mActionItem->resetMove();
       placeSubCells( mActionItem );
       // emit startDragSignal( mActionItem->incidence() );
-      setCursor( arrowCursor );
+      setCursor( Qt::arrowCursor );
       mActionItem = 0;
       mActionType = NOP;
       mItemMoved = 0;
       return;
     }
   } else {
     switch ( mActionType ) {
       case MOVE:
-        setCursor( sizeAllCursor );
+        setCursor( Qt::sizeAllCursor );
         break;
       case RESIZETOP:
       case RESIZEBOTTOM:
-        setCursor( sizeVerCursor );
+        setCursor( Qt::sizeVerCursor );
         break;
       case RESIZELEFT:
       case RESIZERIGHT:
-        setCursor( sizeHorCursor );
+        setCursor( Qt::sizeHorCursor );
         break;
       default:
-        setCursor( arrowCursor );
+        setCursor( Qt::arrowCursor );
     }
   }
 
   // Scroll if item was moved to upper or lower end of agenda.
   if (clipperPos.y() < mScrollBorderWidth) {
     mScrollUpTimer.start(mScrollDelay);
@@ -968,13 +979,13 @@ void KOAgenda::performItemAction(QPoint viewportPos)
         mActionItem->expandTop(gy - mCurrentCellY);
         mActionItem->resize(mActionItem->width(),
                             mGridSpacingY * mActionItem->cellHeight());
         int x,y;
         gridToContents(mCurrentCellX,mActionItem->cellYTop(),x,y);
         //moveChild(mActionItem,childX(mActionItem),y);
-        QScrollView::moveChild( mActionItem,childX(mActionItem),y );
+        Q3ScrollView::moveChild( mActionItem,childX(mActionItem),y );
       }
     } else if (mActionType == RESIZEBOTTOM) {
       if (mCurrentCellY >= mActionItem->cellYTop()) {
         mActionItem->expandBottom(gy - mCurrentCellY);
         mActionItem->resize(mActionItem->width(),
                             mGridSpacingY * mActionItem->cellHeight());
@@ -1016,13 +1027,13 @@ void KOAgenda::endItemAction()
         }
         int type = mActionType;
         if ( mAllDayMode )
             type = -1;
         KOAgendaItem *modifiedItem = placeItem;
         //emit itemModified( placeItem, mActionType /*KOGlobals::EVENTEDITED */);
-        QPtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems();
+        Q3PtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems();
         KOAgendaItem *item;
   
         if ( placeItem->incidence()->typeID() == todoID ) {
             mSelectedItem = 0;
             //qDebug("todo %d %d %d ", mCurrentCellX, modifiedItem->cellX() ,modifiedItem->cellXWidth());
             modifiedItem->mLastMoveXPos = mCurrentCellX;
@@ -1107,13 +1118,13 @@ void KOAgenda::endItemAction()
      
     }
     if ( mActionItem )
         emit incidenceSelected( mActionItem->incidence() );
     mScrollUpTimer.stop();
     mScrollDownTimer.stop();
-    setCursor( arrowCursor );
+    setCursor( Qt::arrowCursor );
     mActionItem = 0;
     mActionType = NOP;
     mItemMoved = 0;
 
 }
 
@@ -1133,31 +1144,31 @@ void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)
 
   // Change cursor to resize cursor if appropriate
   if (mAllDayMode) {
     int gridDistanceX = (x - gx * mGridSpacingX);
     if (gridDistanceX < mResizeBorderWidth &&
         moveItem->cellX() == gx) {
-      setCursor(sizeHorCursor);
+      setCursor(Qt::sizeHorCursor);
     } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
              moveItem->cellXWidth() == gx) {
-      setCursor(sizeHorCursor);
+      setCursor(Qt::sizeHorCursor);
     } else {
-      setCursor(arrowCursor);
+      setCursor(Qt::arrowCursor);
     }
   } else {
     int gridDistanceY = (y - gy * mGridSpacingY);
     if (gridDistanceY < mResizeBorderWidth &&
         moveItem->cellYTop() == gy &&
         !moveItem->firstMultiItem()) {
-      setCursor(sizeVerCursor);
+      setCursor(Qt::sizeVerCursor);
     } else if ((mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
                moveItem->cellYBottom() == gy &&
                !moveItem->lastMultiItem()) {
-      setCursor(sizeVerCursor);
+      setCursor(Qt::sizeVerCursor);
     } else {
-      setCursor(arrowCursor);
+      setCursor(Qt::arrowCursor);
     }
   }
 }
 
 
 /*
@@ -1170,15 +1181,15 @@ void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)
   cell, where other items are, which do not overlap in Y with the item to place,
   the display gets corrupted, although the corruption looks quite nice.
 */
 void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
 {
 
-    QPtrList<KOAgendaItem> conflictItems;
+    Q3PtrList<KOAgendaItem> conflictItems;
     int maxSubCells = 0;
-    QIntDict<KOAgendaItem> subCellDict(7);
+    Q3IntDict<KOAgendaItem> subCellDict(7);
 
     KOAgendaItem *item;
     for ( item=mItems.first(); item != 0; item=mItems.next() ) {
         if (item != placeItem) {
             if (placeItem->cellX() <= item->cellXWidth() &&
                 placeItem->cellXWidth() >= item->cellX()) {
@@ -1237,13 +1248,13 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
         }
         // Adjust sub cell geometry of all conflict items of all conflict items
         for ( item=conflictItems.first(); item != 0;
               item=conflictItems.next() ) {
             if ( placeItem != item ) {
                 KOAgendaItem *item2;
-                QPtrList<KOAgendaItem> conflictItems2 = item->conflictItems();
+                Q3PtrList<KOAgendaItem> conflictItems2 = item->conflictItems();
                 for ( item2=conflictItems2.first(); item2 != 0;
                       item2=conflictItems2.next() ) {
                     if ( item2->subCells() != maxSubCells) {
                         item2->setSubCells(maxSubCells);
                         int diff = 0;
                         if (mAllDayMode) {
@@ -1322,15 +1333,15 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
                 int vxSel, vySel;
                 contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
                 int off = mSelectionHeight;
                 if ( vySel < 0 )
                     off += vySel;
                 //qDebug("OFF %d %d %d", off,vySel, vy );  
-                bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,CopyROP);
+                bitBlt ( pd, vx, vy+off, &mPaintPixmap, cx, cy+off, cw , ch-off  ,QPainter::CompositionMode_Source);
             } else {
-                bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+                bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,QPainter::CompositionMode_Source);
             }
         }
         if ( mSelectionHeight > 0 ) { 
             //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
             if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                  ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
@@ -1339,13 +1350,13 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
                 int hei = mSelectionHeight;
                 int offset = 0;
                 while ( hei > 0 ) {
                     int p_hei = 5;
                     if ( hei < 5 ) p_hei = hei;
                     hei -= 5;
-                    bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
+                    bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,QPainter::CompositionMode_Source); 
                     offset += 5;
                 }
             }     
         } 
         p->begin( pd );
     } else {
@@ -1362,13 +1373,13 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
         int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
         contentsToViewport ( cx, cy, vx,vy); 
         // qDebug("  %d %d %d %d ",  cx, cy, cw,ch) ;
         if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) )
-            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,CopyROP);
+            bitBlt ( pd, vx, vy, &mPaintPixmap, cx, cy, cw, ch ,QPainter::CompositionMode_Source);
     
         if ( mSelectionHeight > 0 ) { 
             //qDebug("----  %d %d %d %d ", selectionX, mSelectionYTop, mGridSpacingX, mSelectionHeight );
             if ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                  ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) {
                 contentsToViewport ( selectionX, mSelectionYTop, vx,vy); 
@@ -1376,13 +1387,13 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
                 int hei = mSelectionHeight;
                 int offset = 0;
                 while ( hei > 0 ) {
                     int p_hei = 5;
                     if ( hei < 5 ) p_hei = hei;
                     hei -= 5;
-                    bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
+                    bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,QPainter::CompositionMode_Source); 
                     offset += 5;
                 }
             }     
         } 
         p->begin( pd );
     }
@@ -1573,20 +1584,20 @@ void KOAgenda::drawContentsToPainter( QPainter* paint, bool backgroundOnly )// i
         }
     }
     // Draw horizontal lines of grid
     int y = ((int)(cy/lGridSpacingY))*lGridSpacingY;
     if ( lGridSpacingY > 0 ) {
         while (y < cy + ch) {
-            p->setPen( SolidLine );
+            p->setPen( Qt::SolidLine );
             p->drawLine(cx,y,cx+cw,y);
             y+=lGridSpacingY;
-            p->setPen( DotLine );
+            p->setPen( Qt::DotLine );
             p->drawLine(cx,y,cx+cw,y);
             y+=lGridSpacingY;
         } 
-        p->setPen( SolidLine );
+        p->setPen( Qt::SolidLine );
     }
     mPixPainter.end() ;
 }
 
 /*
   Convert srcollview contents coordinates to agenda grid coordinates.
@@ -1714,13 +1725,13 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
         //qDebug("item found ");
         item->hide();
         item->setCellX(-2, -1 );
         item->select(false);
         mUnusedItems.append( item );
         mItems.remove( item );
-        QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
+        Q3PtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
         KOAgendaItem *itemit; 
         //globalFlagBlockAgendaItemPaint = 1;
         for ( itemit=oldconflictItems.first(); itemit != 0;
               itemit=oldconflictItems.next() ) {
             if ( itemit != item )
                 placeSubCells(itemit); 
@@ -1744,13 +1755,13 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
         return;
     }
     if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda )
         return;
     //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ ");
     QDate currentDate = QDate::currentDate();
-    bool overdue = (!todo->isCompleted()) && (todo->dtDue() < currentDate)&&  ( KOPrefs::instance()->mShowTodoInAgenda );
+    bool overdue = (!todo->isCompleted()) && (todo->dtDue() < (QDateTime)currentDate)&&  ( KOPrefs::instance()->mShowTodoInAgenda );
     QDateTime dt;
     if ( todo->hasCompletedDate() )
         dt =  todo->completed();
     else
         dt = todo->dtDue();
     if ( overdue ) {
@@ -1776,13 +1787,13 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
         int startY = endY - 1-hi;
         item = insertItem(todo,currentDate,days,startY,endY);
         item->show();
     }
     qApp->processEvents();
     globalFlagBlockAgendaItemPaint = 0; 
-    QPtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
+    Q3PtrList<KOAgendaItem> oldconflictItems = item->conflictItems();
     KOAgendaItem *itemit; 
     for ( itemit=oldconflictItems.first(); itemit != 0;
           itemit=oldconflictItems.next() ) {
         globalFlagBlockAgendaItemUpdate = 0;
         itemit->repaintMe();
         globalFlagBlockAgendaItemUpdate = 1;
@@ -1864,13 +1875,13 @@ void KOAgenda::insertMultiItem (Event *event,QDate qd,int XBegin,int XEnd,
 
   int cellX,cellYTop,cellYBottom;
   QString newtext;
   int width = XEnd - XBegin + 1;
   int count = 0;
   KOAgendaItem *current = 0;
-  QPtrList<KOAgendaItem> multiItems;
+  Q3PtrList<KOAgendaItem> multiItems;
   for (cellX = XBegin;cellX <= XEnd;++cellX) {
     if (cellX == XBegin) cellYTop = YTop;
     else cellYTop = 0;
     if (cellX == XEnd) cellYBottom = YBottom;
     else cellYBottom = rows() - 1;
     newtext = QString("(%1/%2): ").arg(++count).arg(width);
@@ -1924,13 +1935,13 @@ void KOAgenda::finishResize ( )
 */
 void KOAgenda::resizeEvent ( QResizeEvent *ev )
 {
     mSelectionHeight = 0;
     mResizeTimer.start( 150 , true );
     computeSizes(); 
-    QScrollView::resizeEvent( ev );
+    Q3ScrollView::resizeEvent( ev );
     return;
 
 }
 void KOAgenda::computeSizes()
 {   
     if ( globalFlagBlockStartup )
@@ -2013,13 +2024,13 @@ void KOAgenda::popupAlarm()
     if (!mClickedItem) {
         qDebug("KOAgenda::popupAlarm() called without having a clicked item ");
         return;
     }
     // TODO: deal correctly with multiple alarms
     Alarm* alarm;
-    QPtrList<Alarm> list(mClickedItem->incidence()->alarms());
+    Q3PtrList<Alarm> list(mClickedItem->incidence()->alarms());
     for(alarm=list.first();alarm;alarm=list.next()) {
         alarm->toggleAlarm();
     }
     emit itemModified( mClickedItem , KOGlobals::EVENTEDITED );
     mClickedItem->paintMe( true );
     mClickedItem->repaint( false );
@@ -2104,22 +2115,22 @@ void KOAgenda::selectItem(KOAgendaItem *item)
 }
 
 // This function seems never be called.
 void KOAgenda::keyPressEvent( QKeyEvent *kev )
 {
   switch(kev->key()) {
-    case Key_PageDown:
+      case Qt::Key_PageDown:
       verticalScrollBar()->addPage();
       break;
-    case Key_PageUp:
+      case Qt::Key_PageUp:
       verticalScrollBar()->subtractPage();
       break;
-    case Key_Down:
+      case Qt::Key_Down:
       verticalScrollBar()->addLine();
       break;
-    case Key_Up:
+      case Qt::Key_Up:
       verticalScrollBar()->subtractLine();
       break;
     default:
       ;
   }
 }
@@ -2143,13 +2154,13 @@ DateList KOAgenda::dateList() const
 
 void KOAgenda::setDateList(const DateList &selectedDates)
 {
     mSelectedDates = selectedDates;
 }
 
-void KOAgenda::setHolidayMask(QMemArray<bool> *mask)
+void KOAgenda::setHolidayMask(Q3MemArray<bool> *mask)
 {
   mHolidayMask = mask;
 
 /*
   kdDebug() << "HolidayMask: ";
   for(uint i=0;i<mask->count();++i) {
@@ -2159,13 +2170,13 @@ void KOAgenda::setHolidayMask(QMemArray<bool> *mask)
 */
 }
 
 void KOAgenda::contentsMousePressEvent ( QMouseEvent *event )
 {
  
-  QScrollView::contentsMousePressEvent(event);
+  Q3ScrollView::contentsMousePressEvent(event);
 }
 
 void KOAgenda::storePosition()
 {
     //mContentPosition
     int max = mGridSpacingY*4*24; 
@@ -2193,19 +2204,19 @@ void KOAgenda::restorePosition()
     //qDebug("posY %d hei %d", posY, max);
 
 }
 void KOAgenda::moveChild( QWidget *w, int x , int y )
 {
     ++x;
-    QScrollView::moveChild( w, x , y );
+    Q3ScrollView::moveChild( w, x , y );
 }
 #include <qmessagebox.h>
 #ifdef DESKTOP_VERSION
 #include <qprinter.h>
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 
 #endif
 void KOAgenda::printSelection()
 {
 #ifdef DESKTOP_VERSION
     if ( mStartCellY == mCurrentCellY ) {
@@ -2228,13 +2239,13 @@ void KOAgenda::printSelection()
     QPrinter* printer = new QPrinter(); 
     if ( !printer->setup()) {
         delete printer;
         return;
     }
     QPainter p( printer );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( printer ); 
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( printer ); 
     QString date = i18n("Date range: ")+KGlobal::locale()->formatDate( mSelectedDates.first()  )+" - "+KGlobal::locale()->formatDate( mSelectedDates.last()  );
     //date += " --- printing time: " + KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), true );
     int hei = p.boundingRect(0,0, 5, 5, Qt::AlignLeft, date ).height();
     // p.drawText( 0, 0, date );
     int offset = m.width()/8;
     // compute the scale
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 380ce62..0708341 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -20,33 +20,42 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOAGENDA_H
 #define KOAGENDA_H
 
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qtimer.h>
-#include <qmemarray.h>
+#include <q3memarray.h>
 #include <qpainter.h>
 #include <qpixmap.h>
-#include <qguardedptr.h>
+#include <qpointer.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QLabel>
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QKeyEvent>
+#include <QEvent>
 
 #include "koagendaitem.h"
 #include "koeventview.h"
 
-class QPopupMenu;
+class Q3PopupMenu;
 class QTime;
 class KConfig;
-class QFrame;
+class Q3Frame;
 class KOAgenda;
 class KCal::Event;
 class KCal::Todo;
 
 using namespace KCal;
 
-class MarcusBains : public QFrame {
+class MarcusBains : public Q3Frame {
     Q_OBJECT
   public:
     MarcusBains(KOAgenda *agenda=0,const char *name=0);
     virtual ~MarcusBains();
     void hideMe();
   public slots:
@@ -60,23 +69,23 @@ class MarcusBains : public QFrame {
     KOAgenda *agenda;
     QTime oldTime;
     int oldToday;
 };
 
 
-class KOAgenda : public QScrollView
+class KOAgenda : public Q3ScrollView
 {
     Q_OBJECT
   public:
     enum MouseActionType { NOP, MOVE, SELECT,
                            RESIZETOP, RESIZEBOTTOM, RESIZELEFT, RESIZERIGHT };
 
     KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0,
-               const char * name=0, WFlags f=0 );
+               const char * name=0, Qt::WFlags f=0 );
     KOAgenda ( int columns, QWidget * parent=0,
-               const char * name=0, WFlags f=0 );
+               const char * name=0, Qt::WFlags f=0 );
     virtual ~KOAgenda();
     bool mInvalidPixmap;
 
     Incidence *selectedIncidence() const;
     QDate selectedIncidenceDate() const;
 
@@ -114,13 +123,13 @@ class KOAgenda : public QScrollView
     virtual int minimumWidth() const;
     /** Update configuration from preference settings */
     void updateConfig();
 
     void checkScrollBoundaries();
 
-    void setHolidayMask(QMemArray<bool> *);
+    void setHolidayMask(Q3MemArray<bool> *);
     void setDateList(const DateList &selectedDates);
     DateList dateList() const;
     void drawContentsToPainter( QPainter* paint = 0, bool backgroundOnly = false);
     void finishUpdate();
     void printSelection();
     void storePosition();
@@ -274,35 +283,35 @@ class KOAgenda : public QScrollView
     DateList mSelectedDates;
 
     // The KOAgendaItem, which has been right-clicked last
     KOAgendaItem *mClickedItem;
 
     // The KOAgendaItem, which is being moved/resized
-    QGuardedPtr<KOAgendaItem> mActionItem;
+    QPointer<KOAgendaItem> mActionItem;
 
     // Currently selected item
-    QGuardedPtr<KOAgendaItem> mSelectedItem;
+    QPointer<KOAgendaItem> mSelectedItem;
 
     // The Marcus Bains Line widget.
     MarcusBains *mMarcusBains;
     void computeSizes();
   
     MouseActionType mActionType;
 
     bool mItemMoved;
 
     // List of all Items contained in agenda
-    QPtrList<KOAgendaItem> mItems;
-    QPtrList<KOAgendaItem> mUnusedItems;
+    Q3PtrList<KOAgendaItem> mItems;
+    Q3PtrList<KOAgendaItem> mUnusedItems;
     KOAgendaItem* getNewItem(Incidence * event,QDate qd, QWidget* viewport);
-    QPopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
-    QPopupMenu *mNewItemPopup;
+    Q3PopupMenu *mItemPopup; // Right mouse button popup menu for KOAgendaItems
+    Q3PopupMenu *mNewItemPopup;
 
     int mOldLowerScrollValue;
     int mOldUpperScrollValue;
     KOAgendaItem * getItemForTodo ( Todo * todo );
-    QMemArray<bool> *mHolidayMask;
+    Q3MemArray<bool> *mHolidayMask;
     int mCurPixWid;
     int mCurPixHei;
 };
 
 #endif // KOAGENDA_H
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 407424d..0f9a38f 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -16,19 +16,29 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qdragobject.h>
+#include <q3whatsthis.h>
+#include <q3dragobject.h>
 #include <qdrawutil.h> 
 #include <qpainter.h> 
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3PtrList>
+#include <QPixmap>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QEvent>
+#include <QPaintEvent>
 
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #ifndef DESKTOP_VERSION
@@ -54,36 +64,36 @@ extern int globalFlagBlockAgendaItemUpdate;
 //--------------------------------------------------------------------------
 
 QToolTipGroup *KOAgendaItem::mToolTipGroup = 0;
 
 //--------------------------------------------------------------------------
 
-class KOAgendaItemWhatsThis :public QWhatsThis
+class KOAgendaItemWhatsThis :public Q3WhatsThis
 {
 public:
-  KOAgendaItemWhatsThis( KOAgendaItem* view ) : QWhatsThis( view ),_view (view) { };
+  KOAgendaItemWhatsThis( KOAgendaItem* view ) : Q3WhatsThis( view ),_view (view) { };
 
 protected:
   virtual QString text( const QPoint& )
   {
     return _view->getWhatsThisText() ;
   }
 private:
   KOAgendaItem * _view;
 };
 
 KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday,
-                           const char *name,WFlags) :
+                           const char *name,Qt::WFlags) :
     QWidget(parent, name), mIncidence(incidence), mDate(qd)
 {
 #ifndef DESKTOP_VERSION
     //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 #endif
     mKOAgendaItemWhatsThis =  new KOAgendaItemWhatsThis(this);
-    int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
-    setWFlags ( wflags);
+    Qt::WindowFlags wflags = windowFlags() |Qt::WRepaintNoErase;// WResizeNoErase
+    setWindowFlags ( wflags);
     mAllDay = allday;
     init ( incidence, qd );
     //setMouseTracking(true);
     //setAcceptDrops(true);
     xPaintCoord = -1;
     yPaintCoord = -1;
@@ -100,13 +110,13 @@ QString KOAgendaItem::getWhatsThisText()
 
 void KOAgendaItem::initColor ()
 {
     if ( (mIncidence->typeID() == todoID ) &&
          ( !((static_cast<Todo*>(mIncidence))->isCompleted()) &&
            ((static_cast<Todo*>(mIncidence))->dtDue().date() <=  QDate::currentDate()) ) ) {
-        if (  (static_cast<Todo*>(mIncidence))->dtDue() <  QDateTime::currentDateTime().date()) 
+        if (  (static_cast<Todo*>(mIncidence))->dtDue() <  (QDateTime)QDateTime::currentDateTime().date()) 
             mBackgroundColor = KOPrefs::instance()->mTodoOverdueColor ;
         else 
             mBackgroundColor = KOPrefs::instance()->mTodoDueTodayColor;
     }
     else {
         QStringList categories = mIncidence->categories();
@@ -129,13 +139,13 @@ void KOAgendaItem::initColor ()
     QColor BackgroundColor ( mBackgroundColor );
     if ( mIncidence->calID() > 1 ) {
         //BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() );
     }
     mColorGroup  = QColorGroup( BackgroundColor.light(), 
                                 BackgroundColor.dark(),BackgroundColor.light(),
-                                BackgroundColor.dark(),BackgroundColor, black, BackgroundColor) ;
+                                BackgroundColor.dark(),BackgroundColor, Qt::black, BackgroundColor) ;
     setBackgroundColor( mBackgroundColor );
     mWhiteText = (mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue() < 250);
 }
 void KOAgendaItem::init ( Incidence *incidence, QDate qd )
 {
     mIncidence = incidence;
@@ -225,62 +235,62 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
     if (mIncidence->isAlarmEnabled() && mIncidence->alarmEnabled()) {
-        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, red );
+        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::red );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
     if (mIncidence->doesRecur()) {
-        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, blue );
+        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::blue );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
     if (mIncidence->description().length() > 0) {
-        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkGreen );
+        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::darkGreen );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
    if (mIncidence->isReadOnly()) {
-        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, white );
+        p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::white );
         if ( horLayout )
             ++xOff;
         else
             ++yOff;
     }
 
     if (mIncidence->attendeeCount()>0) {
         
         if (mIncidence->organizer() == KOPrefs::instance()->email()) {
-            p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, black );
+            p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::black );
             if ( horLayout )
                 ++xOff;
             else
                 ++yOff;
         } else {
             Attendee *me = mIncidence->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
             if (me!=0) {
 
 
             } else {
-                p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, yellow  );
+                p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::yellow  );
                 if ( horLayout )
                     ++xOff;
                 else
                     ++yOff;
 
             }
-            p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, darkYellow );
+            p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, Qt::darkYellow );
             if ( horLayout )
                 ++xOff;
             else
                 ++yOff;
 
         }
@@ -417,39 +427,39 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
         else
             if ( nfh < h -2 )
                 ++yy;
     }
     int align;
 #ifndef DESKTOP_VERSION
-    align = ( AlignLeft|WordBreak|AlignTop);
+    align = ( Qt::AlignLeft|Qt::TextWordWrap|Qt::AlignTop);
 #else
-    align = ( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
+    align = ( Qt::AlignLeft|Qt::TextWrapAnywhere|Qt::TextWordWrap|Qt::AlignTop);
 #endif
     if (  addIcon  ) {
         if ( ! horLayout ) {
             x += AGENDA_ICON_SIZE+3;
             w -= (AGENDA_ICON_SIZE+3);
         }
         else {
             yy+= AGENDA_ICON_SIZE+2;
             h -=(AGENDA_ICON_SIZE+3);
         }
     } 
     if ( mWhiteText )
-        paint->setPen ( white); 
+        paint->setPen ( Qt::white); 
     if ( x < 0 ) {
         w = w+x-3;
         x = 3;
         if ( !horLayout && addIcon )
             x += AGENDA_ICON_SIZE+3;
         if ( w > parentWidget()->width() ){
             w = parentWidget()->width() - 6;
 #ifndef DESKTOP_VERSION
-    align = ( AlignHCenter|WordBreak|AlignTop);
+    align = ( Qt::AlignHCenter|Qt::TextWordWrap|Qt::AlignTop);
 #else
-    align = ( AlignHCenter|BreakAnywhere|WordBreak|AlignTop);
+    align = ( Qt::AlignHCenter|Qt::TextWrapAnywhere|Qt::TextWordWrap|Qt::AlignTop);
 #endif
 
         }
     }
     QRect dr;
     if ( w + x > parentWidget()->width() )
@@ -558,13 +568,13 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
         if ( rw <= 1 ) {
             //qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() );
             return;
         }
     }
     //qDebug("%d %d %d %d %d  %d %d",rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh);
-    bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); 
+    bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,QPainter::CompositionMode_Source); 
 }
 void KOAgendaItem::computeText()
 {
     mDisplayedText =  mIncidence->summary();
     if ( (mIncidence->typeID() == todoID ) ) {
         if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) {
@@ -625,13 +635,13 @@ void KOAgendaItem::computeText()
                 tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr();
         }
 
     if (!mIncidence->location().isEmpty()) {
         tipText += "\n"+i18n("Location: ")+mIncidence->location();
     }
-    QToolTip::add(this,tipText,toolTipGroup(),""); 
+    QToolTip::add(this,tipText /*TODO:hacker: ,toolTipGroup(),"" */); 
 #endif
 }
 void KOAgendaItem::updateItem()
 {  
     computeText();
      
@@ -792,33 +802,33 @@ void KOAgendaItem::expandRight(int dx)
   if (newXWidth < newX) newXWidth = newX;
   setCellX(newX,newXWidth);
 }
 
 QToolTipGroup *KOAgendaItem::toolTipGroup()
 {
-  if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
+  /* TODO:hacker: if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0); */
   return mToolTipGroup;
 }
 
 void KOAgendaItem::dragEnterEvent( QDragEnterEvent *e )
 {
 #ifndef KORG_NODND
   if ( ICalDrag::canDecode( e ) || VCalDrag::canDecode( e ) ||
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
   e->accept();
 #endif
 }
 
 void KOAgendaItem::dropEvent( QDropEvent *e )
 {
 #ifndef KORG_NODND
   QString text;
-  if(QTextDrag::decode(e,text))
+  if(Q3TextDrag::decode(e,text))
   {
     kdDebug() << "Dropped : " << text << endl;
     QStringList emails = QStringList::split(",",text);
     for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
       kdDebug() << " Email: " << (*it) << endl;
       int pos = (*it).find("<");
@@ -830,18 +840,18 @@ void KOAgendaItem::dropEvent( QDropEvent *e )
     }
   }
 #endif
 }
 
 
-QPtrList<KOAgendaItem> KOAgendaItem::conflictItems()
+Q3PtrList<KOAgendaItem> KOAgendaItem::conflictItems()
 {
   return mConflictItems;
 }
 
-void KOAgendaItem::setConflictItems(QPtrList<KOAgendaItem> ci)
+void KOAgendaItem::setConflictItems(Q3PtrList<KOAgendaItem> ci)
 {
   mConflictItems = ci;
   KOAgendaItem *item;
   for ( item=mConflictItems.first(); item != 0;
         item=mConflictItems.next() ) {
     item->addConflictItem(this);
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 27ee720..17cf975 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -16,17 +16,24 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #ifndef KOAGENDAITEM_H
 #define KOAGENDAITEM_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qdatetime.h>
 #include <qpalette.h> 
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <Q3PtrList>
+#include <QEvent>
+#include <QDragEnterEvent>
 
 #include <libkcal/incidence.h>
 
 class KOAgendaItemWhatsThis;
 class QToolTipGroup;
 class QDragEnterEvent;
@@ -42,13 +49,13 @@ using namespace KCal;
 */
 class KOAgendaItem : public QWidget
 {
     Q_OBJECT
   public:
     KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent, bool allday, const char *name=0,
-                 WFlags f=0 );
+                 Qt::WFlags f=0 );
     ~KOAgendaItem();
     QString getWhatsThisText();
     void init ( Incidence *incidence, QDate qd );
     int cellX() { return mCellX; }
     int cellXWidth() { return mCellXWidth; }
     int cellYTop() { return mCellYTop; }
@@ -93,14 +100,14 @@ class KOAgendaItem : public QWidget
     QString text () { return mDisplayedText; }
 
     virtual bool eventFilter ( QObject *, QEvent * );
 
     static QToolTipGroup *toolTipGroup();
     
-    QPtrList<KOAgendaItem> conflictItems();
-    void setConflictItems(QPtrList<KOAgendaItem>);
+    Q3PtrList<KOAgendaItem> conflictItems();
+    void setConflictItems(Q3PtrList<KOAgendaItem>);
     void addConflictItem(KOAgendaItem *ci);
     void paintMe( bool, QPainter* painter = 0 );
     void repaintMe();
     static QPixmap * paintPix();
     static QPixmap * paintPixAllday();
     void updateItem();
@@ -158,10 +165,10 @@ class KOAgendaItem : public QWidget
     static QToolTipGroup *mToolTipGroup;
 
     QColor mBackgroundColor;
     QColorGroup mColorGroup;
     QString mDisplayedText;
     bool mSelected;
-    QPtrList<KOAgendaItem> mConflictItems;
+    Q3PtrList<KOAgendaItem> mConflictItems;
 };
 
 #endif // KOAGENDAITEM_H
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 6e65a03..87993ae 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -18,27 +18,39 @@
 
   As a special exception, permission is given to link this program
   with any edition of Qt, and distribute the resulting executable,
   without including the source code for Qt in the source distribution.
 */
 
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qlabel.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlayout.h>
 #ifndef KORG_NOSPLITTER
 #include <qsplitter.h>
 #endif
 #include <qfont.h>
 #include <qfontmetrics.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <Q3GridLayout>
+#include <Q3ValueList>
+#include <QKeyEvent>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <QPaintEvent>
+#include <Q3PtrList>
 
 #include <kapplication.h>
 #include <KDGanttMinimizeSplitter.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
@@ -75,14 +87,14 @@ extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockLabel;
 using namespace KOrg;
 
 #define IDLETIMEOUT 45
 
-TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
-    QScrollView(parent,name,f)
+TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,Qt::WFlags f) :
+    Q3ScrollView(parent,name,f)
 {
     myPix.resize( 1, 1 );
     mRows = rows;
 
     mRedrawNeeded = true;
     setMinimumHeight( 20 );
@@ -92,13 +104,13 @@ TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
 
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
 
     resizeContents(50,mRows * mCellHeight);
 
-    viewport()->setBackgroundMode( PaletteBackground );
+    viewport()->setBackgroundMode( Qt::PaletteBackground );
 }
 
 void TimeLabels::setCellHeight(int height)
 {
     mCellHeight = height;
 }
@@ -280,13 +292,13 @@ void TimeLabels::paintEvent(QPaintEvent*)
     repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
 EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
-    : QFrame(parent,name)
+    : Q3Frame(parent,name)
 {
     mColumns = 1;
     mTopBox = 0;
     mLocation = loc;
     mTopLayout = 0;
     mPaintWidget = 0;
@@ -390,60 +402,60 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     if ( KOPrefs::instance()->mVerticalScreen ) {
          expandPix = SmallIcon( "1updownarrow" );
     } else {
         expandPix = SmallIcon("1leftrightarrow" );
     }
 
-    QBoxLayout *topLayout = new QVBoxLayout(this);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
 
     // Create day name labels for agenda columns
     // Create agenda splitter
 
     mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this);
     mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
     topLayout->addWidget( mSplitterAgenda );
-    mAllDayFrame = new QHBox(mSplitterAgenda);
-    mAllDayFrame->setFocusPolicy(NoFocus);
+    mAllDayFrame = new Q3HBox(mSplitterAgenda);
+    mAllDayFrame->setFocusPolicy(Qt::NoFocus);
     QWidget *agendaFrame = new QWidget(mSplitterAgenda);
-    agendaFrame->setFocusPolicy(NoFocus);
+    agendaFrame->setFocusPolicy(Qt::NoFocus);
   
     // Create all-day agenda widget
-    mDummyAllDayLeft = new QVBox( mAllDayFrame );
+    mDummyAllDayLeft = new Q3VBox( mAllDayFrame );
 
     mExpandButton = new QPushButton(mDummyAllDayLeft);
     mExpandButton->setPixmap( expandPix );
     int widebut = mExpandButton->sizeHint().width()+4;
     int heibut = mExpandButton->sizeHint().height()+4;
     if ( heibut > widebut  )
         widebut = heibut ;
    
     //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed,
     //                                         QSizePolicy::Fixed ) );
     mExpandButton->setFixedSize( widebut, widebut);
     connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
-    mExpandButton->setFocusPolicy(NoFocus);
+    mExpandButton->setFocusPolicy(Qt::NoFocus);
     mAllDayAgenda = new KOAgenda(1,mAllDayFrame);
-    mAllDayAgenda->setFocusPolicy(NoFocus);
+    mAllDayAgenda->setFocusPolicy(Qt::NoFocus);
     QLabel *dummyAllDayRight = new QLabel (mAllDayFrame);
 
     // Create event context menu for all day agenda
     //mAllDayAgendaPopup = eventPopup();
 
     // Create agenda frame
-    QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3);
+    Q3GridLayout *agendaLayout = new Q3GridLayout(agendaFrame,4,3);
     //  QHBox *agendaFrame = new QHBox(splitterAgenda);
 
     // create event indicator bars
     mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame);
 #ifndef DESKTOP_VERSION
     mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
 #endif
-    mDayLabelsFrame = new QHBox(agendaFrame);
+    mDayLabelsFrame = new Q3HBox(agendaFrame);
     //topLayout->addWidget(mDayLabelsFrame);
-    mDayLabels = new QFrame (mDayLabelsFrame);
-    mLayoutDayLabels = new QHBoxLayout(mDayLabels);
+    mDayLabels = new Q3Frame (mDayLabelsFrame);
+    mLayoutDayLabels = new Q3HBoxLayout(mDayLabels);
     agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2);
     agendaLayout->addWidget(mEventIndicatorTop,1,1);
 
     mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
                                                agendaFrame);
     agendaLayout->addWidget(mEventIndicatorBottom,3,1);
@@ -457,18 +469,18 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
             this,SLOT(updateConfig()));
 
     // Create agenda
     mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
     agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
     agendaLayout->setColStretch(1,1);
-    mAgenda->setFocusPolicy(NoFocus);
+    mAgenda->setFocusPolicy(Qt::NoFocus);
     // Create event context menu for agenda
     mAllAgendaPopup = eventPopup();
   
 #if 0
-    mAllAgendaPopup->addAdditionalItem(QIconSet(SmallIcon("bell")),
+    mAllAgendaPopup->addAdditionalItem(QIcon(SmallIcon("bell")),
                                     i18n("Toggle Alarm"),mAgenda,
                                     SLOT(popupAlarm()),true);
 
 #endif
     connect(mAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)),
             mAllAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
@@ -915,15 +927,15 @@ int KOAgendaView::maxDatesHint()
 
 int KOAgendaView::currentDateCount()
 {
     return mSelectedDates.count();
 }
 
-QPtrList<Incidence> KOAgendaView::selectedIncidences()
+Q3PtrList<Incidence> KOAgendaView::selectedIncidences()
 {
-    QPtrList<Incidence> selected;
+    Q3PtrList<Incidence> selected;
     Incidence *incidence;
 
     incidence = mAgenda->selectedIncidence();
     if (incidence) selected.append(incidence);
 
     incidence = mAllDayAgenda->selectedIncidence();
@@ -984,14 +996,14 @@ void KOAgendaView::updateConfig()
     // for some reason, this needs to be called explicitly
     mTimeLabels->repaint();
 
     mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
 
     // ToolTips displaying summary of events
-    KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
-                                             ->mEnableToolTips);
+    /* TODO:hacker: KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
+                                             ->mEnableToolTips); */
   
     //setHolidayMasks();
 
     //createDayLabels(); called by via updateView();
     mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); 
     updateView();
@@ -1114,13 +1126,13 @@ void KOAgendaView::showDates( const QDate &start, const QDate &end )
 
     // and update the view
     fillAgenda();
 }
 
 
-void KOAgendaView::showEvents(QPtrList<Event>)
+void KOAgendaView::showEvents(Q3PtrList<Event>)
 {
     kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl;
 }
 
 void KOAgendaView::changeEventDisplay(Event *, int)
 {
@@ -1162,17 +1174,17 @@ void KOAgendaView::fillAgenda()
     mEventIndicatorBottom->changeColumns(mSelectedDates.count());
     setHolidayMasks();
 
     mMinY.resize(mSelectedDates.count());
     mMaxY.resize(mSelectedDates.count());
 
-    QPtrList<Event> dayEvents;
+    Q3PtrList<Event> dayEvents;
 
     // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
     // Therefore, gtodoset all of them.
-    QPtrList<Todo> todos  = calendar()->todos();
+    Q3PtrList<Todo> todos  = calendar()->todos();
 
     mAgenda->setDateList(mSelectedDates);
 
     QDate today = QDate::currentDate();
 
     DateList::ConstIterator dit;
@@ -1297,13 +1309,13 @@ void KOAgendaView::fillAgenda()
 
             if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue;  // todo shall not be displayed if it has no date
             if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda ) continue;
             // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
             // Already completed items can be displayed on their original due date
             //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
-            bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
+            bool overdue = (!todo->isCompleted()) && (todo->dtDue() < (QDateTime)today) && KOPrefs::instance()->mShowTodoInAgenda;
             bool fillIn = false;
             if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
                 fillIn = true;
             if ( ! fillIn && !todo->hasCompletedDate() ) 
                 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue);
             if ( fillIn ) {
@@ -1500,13 +1512,13 @@ void KOAgendaView::readSettings(KConfig *config)
 {
     //  kdDebug() << "KOAgendaView::readSettings()" << endl;
 
     config->setGroup("Views");
 
     //#ifndef KORG_NOSPLITTER
-    QValueList<int> sizes = config->readIntListEntry("Separator AgendaView");
+    Q3ValueList<int> sizes = config->readIntListEntry("Separator AgendaView");
     if (sizes.count() == 2) {
         if ( sizes[0] < 20 ) {
             sizes[1] = sizes[1] +20 - sizes[0];
             sizes[0] = 20;
         }
         mSplitterAgenda->setSizes(sizes);
@@ -1521,13 +1533,13 @@ void KOAgendaView::writeSettings(KConfig *config)
 {
     //  kdDebug() << "KOAgendaView::writeSettings()" << endl;
 
     config->setGroup("Views");
 
     //#ifndef KORG_NOSPLITTER
-    QValueList<int> list = mSplitterAgenda->sizes();
+    Q3ValueList<int> list = mSplitterAgenda->sizes();
     config->writeEntry("Separator AgendaView",list);
     //qDebug("write %d %d ", list[0],list[1] );
     //#endif
 }
 
 void KOAgendaView::setHolidayMasks()
@@ -1538,13 +1550,13 @@ void KOAgendaView::setHolidayMasks()
     for(i=0;i<mSelectedDates.count();++i) {
         QDate date = mSelectedDates[i];
         bool showSaturday = KOPrefs::instance()->mExcludeSaturdays && (date.dayOfWeek() == 6);
         bool showSunday = KOPrefs::instance()->mExcludeHolidays && (date.dayOfWeek() == 7);
         bool showHoliday = false;
         if ( KOPrefs::instance()->mExcludeHolidays ) {
-            QPtrList<Event> events = calendar()->events( date, true );
+            Q3PtrList<Event> events = calendar()->events( date, true );
             Event *event;
             for( event = events.first(); event; event = events.next() ) {
                 if ( event->isHoliday()) {
                     showHoliday = true;
                     break;
                 }
@@ -1660,13 +1672,13 @@ void  KOAgendaView::updateTodo( Todo * t, int )
         da = t->dtDue().date();
     if ( ! t->hasDueDate() && !t->hasCompletedDate() ) {
         remove = true;
         removeAD = true;
     }
     else {
-        bool overdue = (!t->isCompleted()) && (t->dtDue() < QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ;
+        bool overdue = (!t->isCompleted()) && (t->dtDue() < (QDateTime)QDate::currentDate()) && KOPrefs::instance()->mShowTodoInAgenda ;
         if ( overdue && 
              QDate::currentDate() >= mSelectedDates.first() &&
              QDate::currentDate() <= mSelectedDates.last()) {
             removeAD = false;
             remove = true;
         }
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 5e68146..3b871d9 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -20,27 +20,37 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOAGENDAVIEW_H
 #define KOAGENDAVIEW_H
 
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
+#include <Q3BoxLayout>
 #ifndef DESKTOP_VERSION
 #include <qksplitter.h>
 #else
 #include <qsplitter.h>
 #endif
-#include <qmemarray.h>
+#include <q3memarray.h>
+//Added by qt3to4:
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <Q3Frame>
+#include <QPixmap>
+#include <QLabel>
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <QKeyEvent>
 
 #include "koeventview.h"
 
-class QHBox;
-class QFrame;
+class Q3HBox;
+class Q3Frame;
 class QLabel;
 class QPushButton;
 class CalendarView;
 class KOAgenda;
 class KOAgendaItem;
 class KConfig;
@@ -52,13 +62,13 @@ class KOAgendaButton : public QPushButton
   public:
     KOAgendaButton( QWidget *parent=0, const char *name=0 ) :
       QPushButton( parent, name ) 
     {
         mNum = -3;
         setFlat( true );
-        setFocusPolicy(NoFocus); 
+        setFocusPolicy(Qt::NoFocus); 
         setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding ));
         connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) );
     };
      
     QSize sizeHint () const { return QSize( 5,5) ;}
     void setNum( int n) { mNum = n; }
@@ -67,16 +77,16 @@ private slots:
 signals:
     void numClicked( int );
 private:
     int mNum;
 };
 
-class TimeLabels : public QScrollView {
+class TimeLabels : public Q3ScrollView {
     Q_OBJECT
   public:
-    TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0);
+    TimeLabels(int rows,QWidget *parent=0,const char *name=0,Qt::WFlags f=0);
 
     void setCellHeight(int height);
 
     /** Calculates the minimum width */
     virtual int minimumWidth() const;
 
@@ -110,13 +120,13 @@ class TimeLabels : public QScrollView {
     int mCellHeight;
 
     /**  */
     KOAgenda* mAgenda;
 };
 
-class EventIndicator : public QFrame {
+class EventIndicator : public Q3Frame {
     Q_OBJECT
   public:
     enum Location { Top, Bottom };
     EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0);
     virtual ~EventIndicator();
 
@@ -129,17 +139,17 @@ class EventIndicator : public QFrame {
     void drawContents(QPainter *);
 
   private:
     int mXOffset;
     KDGanttMinimizeSplitter* mPaintWidget;
     int mColumns;
-    QHBox *mTopBox;
-    QBoxLayout *mTopLayout;
+    Q3HBox *mTopBox;
+    Q3BoxLayout *mTopLayout;
     Location mLocation;
     QPixmap mPixmap;
-    QMemArray<bool> mEnabled;
+    Q3MemArray<bool> mEnabled;
 };
 
 /**
   KOAgendaView is the agenda-like view used to display events in an one or
   multi-day view.
 */
@@ -156,13 +166,13 @@ class KOAgendaView : public KOEventView {
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
     virtual int currentDateCount();
 
     /** returns the currently selected events */
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
     
     /** returns the currently selected events */
     virtual DateList selectedDates();
 
     /** Remove all events from view */
     void clearView();
@@ -182,13 +192,13 @@ class KOAgendaView : public KOEventView {
     void repaintAgenda();
   public slots:
     void setInitStartHour();
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
-    virtual void showEvents(QPtrList<Event> eventList);
+    virtual void showEvents(Q3PtrList<Event> eventList);
 
     void updateTodo( Todo *, int );
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
@@ -257,16 +267,16 @@ class KOAgendaView : public KOEventView {
 
   private:
     bool flag_blockfillAgenda;
     QTimer* mIdleTimer;
     QDateTime mIdleStart;
     // view widgets
-    QFrame *mDayLabels;
-    QHBox *mDayLabelsFrame;
-    QBoxLayout *mLayoutDayLabels;
-    QFrame *mAllDayFrame;
+    Q3Frame *mDayLabels;
+    Q3HBox *mDayLabelsFrame;
+    Q3BoxLayout *mLayoutDayLabels;
+    Q3Frame *mAllDayFrame;
     KOAgenda *mAllDayAgenda;
     KOAgenda *mAgenda;
     TimeLabels *mTimeLabels;
     QWidget *mDummyAllDayLeft;
 
     KDGanttMinimizeSplitter* mSplitterAgenda;
@@ -281,18 +291,18 @@ class KOAgendaView : public KOEventView {
     KOEventPopupMenu *mAllAgendaPopup;
     //KOEventPopupMenu *mAllDayAgendaPopup;
 
     EventIndicator *mEventIndicatorTop;
     EventIndicator *mEventIndicatorBottom;
 
-    QMemArray<int> mMinY;
-    QMemArray<int> mMaxY;
+    Q3MemArray<int> mMinY;
+    Q3MemArray<int> mMaxY;
 
-    QMemArray<bool> mHolidayMask;
+    Q3MemArray<bool> mHolidayMask;
     
-    QPtrList<KOAgendaButton> mDayLabelsList;
+    Q3PtrList<KOAgendaButton> mDayLabelsList;
     QDateTime mTimeSpanBegin;
     QDateTime mTimeSpanEnd;
     bool mTimeSpanInAllDay;
     void keyPressEvent ( QKeyEvent * e ); 
 };
 
diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h
index c8dcf45..493d9e1 100644
--- a/korganizer/kocounterdialog.h
+++ b/korganizer/kocounterdialog.h
@@ -19,13 +19,13 @@
 #ifndef KOCOUNTERDIALOG_H
 #define KOCOUNTERDIALOG_H
 //
 // Viewer dialog for counter events.
 //
 
-#include <qtextview.h>
+#include <q3textview.h>
 
 #include <kdialogbase.h>
 
 #include <libkcal/event.h>
 
 using namespace KCal;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 52fd1e8..4f681b3 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -21,15 +21,24 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source ode for Qt in the source distribution.
 */
 
 #include <qevent.h>
 #include <qpainter.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qtimer.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <QDragLeaveEvent>
+#include <Q3Frame>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QPaintEvent>
 
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include <libkcal/vcaldrag.h>
@@ -51,21 +60,21 @@
 
 // ============================================================================
 //  D Y N A M I C   T I P
 // ============================================================================
 
 DynamicTip::DynamicTip( QWidget * parent )
-    : QToolTip( parent )
+    /* TODO:hacker: : QToolTip( parent ) */
 {
     matrix = (KODayMatrix*)parent;
 }
 
-class KODaymatrixWhatsThis :public QWhatsThis
+class KODaymatrixWhatsThis :public Q3WhatsThis
 {
 public:
-    KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
+    KODaymatrixWhatsThis( KODayMatrix* view ) : Q3WhatsThis( view ),_view (view) { ;};
     ~KODaymatrixWhatsThis() { ;  };
 
 protected:
   virtual QString text( const QPoint& p )
   {
     return _view->getWhatsThisText( p ) ;
@@ -88,25 +97,25 @@ void DynamicTip::maybeTip( const QPoint &pos )
 //  kdDebug() << "DynamicTip::maybeTip matrix cell index [" <<
 //                col << "][" << row << "] => " <<(col+row*7) << endl;
 
   //show holiday names only
   QString str = matrix->getHolidayLabel(col+row*7);
   if (str.isEmpty()) return;
-  tip(rct, str);
+  /* TODO:hacker: tip(rct, str);*/
 }
 
 
 // ============================================================================
 //  K O D A Y M A T R I X
 // ============================================================================
 
 const int KODayMatrix::NOSELECTION = -1000;
 const int KODayMatrix::NUMDAYS = 42;
 
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
-    : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 )
+    : Q3Frame( parent, name , Qt::WNoAutoErase ), mCalendar( 0 )
 
 
 { 
     mLastView = -1;
     oldW = 0;
     oldH = 0;
@@ -148,13 +157,13 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
 {
 
     int tmp = getDayIndexFrom(p.x(), p.y());
     if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar )
         return QString();
     QDate mDate = days[tmp];
-    QPtrList<Event> eventlist = mCalendar->events(mDate);
+    Q3PtrList<Event> eventlist = mCalendar->events(mDate);
     Event *event;
     QStringList mToolTip;
     for(event=eventlist.first();event != 0;event=eventlist.next()) {
         QString mToolTipText;
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
@@ -202,13 +211,13 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
             mToolTipText += " (" + event->location() + ")";
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( deTag( mToolTipText ) );
     }
     mToolTip.sort();
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
-        QPtrList<Todo> todolist = mCalendar->todos(mDate);
+        Q3PtrList<Todo> todolist = mCalendar->todos(mDate);
         Todo  *todo;
         for(todo=todolist.first();todo != 0;todo=todolist.next()) { 
             QString mToolTipText;
             if ( !todo->doesFloat() )
                 mToolTipText += KGlobal::locale()->formatTime(todo->dtDue().time())+" ";
             mToolTipText +=  todo->summary();
@@ -217,13 +226,13 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
             mToolTipText = deTag( mToolTipText);
             mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText;
             mToolTip.append(  mToolTipText );
         }               
     }
     if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
-        QPtrList<Journal> j_list = mCalendar->journals4Date( mDate );
+        Q3PtrList<Journal> j_list = mCalendar->journals4Date( mDate );
         Journal *j = j_list.first();
         while ( j ) {
             QString mToolTipText;
             if ( !j->summary().isEmpty() ) {
                 mToolTipText = j->summary().left(30);
                 if ( j->summary().length() > 30 )
@@ -438,13 +447,13 @@ void KODayMatrix::updateViewTimed()
     }
 #if 1
 
    
  int i;
     int timeSpan = NUMDAYS-1;
-    QPtrList<Event> events = mCalendar->events();
+    Q3PtrList<Event> events = mCalendar->events();
     Event *event;
     QDateTime dt;
     bool ok;
     bDays.fill( false);
     pDays.fill( false);
     hDays.fill( false);
@@ -523,13 +532,13 @@ void KODayMatrix::updateViewTimed()
             pDays.setBit(i);
         }
     }
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW  ) {
         bDays.fill( false);
         // insert due todos
-        QPtrList<Todo> todos = mCalendar->todos( );
+        Q3PtrList<Todo> todos = mCalendar->todos( );
         Todo *todo;
         for(todo = todos.first(); todo; todo = todos.next()) {
             //insertTodo( todo );
             if ( todo->hasDueDate() ) {
                 int day = mStartDate.daysTo( todo->dtDue().date() );
                 if ( day >= 0 && day < timeSpan + 1)  {
@@ -548,13 +557,13 @@ void KODayMatrix::updateViewTimed()
             }
         }
     } 
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW  ) {
         bDays.fill( false);
         // insert due todos
-        QPtrList<Journal> todos = mCalendar->journals( );
+        Q3PtrList<Journal> todos = mCalendar->journals( );
         Journal *todo;
         for(todo = todos.first(); todo; todo = todos.next()) {
             int day = mStartDate.daysTo( todo->dtStart().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
                 int i = day;
                 QString holiStr = mHolidays[i];
@@ -572,13 +581,13 @@ void KODayMatrix::updateViewTimed()
         }
     }
 #else
     //qDebug("KODayMatrix::updateViewTimed ");
     for(int i = 0; i < NUMDAYS; i++) {
         // if events are set for the day then remember to draw it bold
-        QPtrList<Event> eventlist = mCalendar->events(days[i]);
+        Q3PtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
         int numEvents = eventlist.count();
         QString holiStr = "";
         bDays.clearBit(i);
         hDays.clearBit(i);
         eDays.clearBit(i);
@@ -672,13 +681,13 @@ void KODayMatrix::updateView(QDate actdate)
 void KODayMatrix::updateEvents()
 {
   if ( !mCalendar ) return;
 
   for( int i = 0; i < NUMDAYS; i++ ) {
     // if events are set for the day then remember to draw it bold
-    QPtrList<Event>  eventlist = mCalendar->events( days[ i ] );
+    Q3PtrList<Event>  eventlist = mCalendar->events( days[ i ] );
     int numEvents = eventlist.count();
     Event *event;
     for( event = eventlist.first(); event != 0;event=eventlist.next()) {
       ushort recurType = event->doesRecur();
 
       if ( ( recurType == Recurrence::rDaily &&
@@ -736,26 +745,26 @@ int KODayMatrix::getDayIndexFrom(int x, int y)
 //  M O U S E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::mousePressEvent (QMouseEvent* e)
 {
   
-    if ( e->button() == LeftButton )
+    if ( e->button() == Qt::LeftButton )
         mouseDown = true; 
   mSelStart = getDayIndexFrom(e->x(), e->y());
   if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1;
   mSelInit = mSelStart;
   mSelEnd = mSelStart; 
   mRedrawNeeded = true;
   repaint(false);
 }
 
 void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
 {
   mRedrawNeeded = true;
-  if ( e->button() == LeftButton )
+  if ( e->button() == Qt::LeftButton )
       if ( ! mouseDown ) {
           return;
       }
       else
           mouseDown = false; 
   int tmp = getDayIndexFrom(e->x(), e->y());
@@ -1192,26 +1201,26 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
         p.setPen(mDefaultTextColor);
         p.drawRect(0, 0, width(), height());
     } else {
         //qDebug("NO  redraw ");
     }
     
-    bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP);
+    bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,QPainter::CompositionMode_Source);
     mRedrawNeeded = false;
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::resizeEvent(QResizeEvent * e)
 {
   QRect sz = frameRect();
   daysize.setHeight(sz.height()*7 / NUMDAYS);
   daysize.setWidth(sz.width() / 7);
-  QFrame::resizeEvent( e );
+  Q3Frame::resizeEvent( e );
 }
 
 QSize KODayMatrix::sizeHint() const
 {
 
   QFontMetrics fm ( font() );
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index b96e08f..6edf7cd 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -23,20 +23,28 @@
 #ifndef _KODAYMAT_H
 #define _KODAYMAT_H
 
 #include <libkcal/calendar.h>
 
 #include <qstring.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qcolor.h>
 #include <qpen.h>
 #include <qdatetime.h>
 #include <qtooltip.h>
 #include <qpixmap.h>
 #include <qbitarray.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QDragEnterEvent>
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 
@@ -48,13 +56,13 @@ using namespace KCal;
 
 /**
  *  small helper class to dynamically show tooltips inside the day matrix.
  *  This class asks the day matrix object for a appropriate label which
  *  is in our special case the name of the holiday or null if this day is no holiday.
  */
-class DynamicTip : public QToolTip
+class DynamicTip /* TODO:hacker: : public QToolTip */
 {
 public:
 
     /**
      * Constructor that expects a KODayMatrix object as parent.
      *
@@ -100,13 +108,13 @@ private:
  *    adjust the selection and leave some days undisplayed while scrolling through the months
  *
  *  @short day matrix widget of the KDateNavigator
  *
  *  @author Eitzenberger Thomas
  */
-class KODayMatrix: public QFrame {
+class KODayMatrix: public Q3Frame {
 
     Q_OBJECT
 
 public:
 
     /** constructor to create a day matrix widget.
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index ea30fac..deb1e46 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -38,12 +38,14 @@
 #include "archivedialog.h"
 #endif
 
 #include "kconfig.h"
 #include "kodialogmanager.h"
 #include <kapplication.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 KODialogManager::KODialogManager( CalendarView *mainView ) :
   QObject(), mMainView( mainView )
 {
   mOutgoingDialog = 0;
   mIncomingDialog = 0;
@@ -185,14 +187,14 @@ void KODialogManager::showSearchDialog()
         connect(lview, SIGNAL(cloneIncidenceSignal(Incidence *)),
                 mMainView, SLOT(cloneIncidence(Incidence *)));
         connect(lview, SIGNAL(beamIncidenceSignal(Incidence *)),
                 mMainView, SLOT(beamIncidence(Incidence *)));
         connect(lview, SIGNAL(moveIncidenceSignal(Incidence *)),
                 mMainView, SLOT(moveIncidence(Incidence *)));
-        connect(lview, SIGNAL(beamIncidenceList(QPtrList<Incidence> )),
-                mMainView, SLOT(beamIncidenceList(QPtrList<Incidence> )));
+        connect(lview, SIGNAL(beamIncidenceList(Q3PtrList<Incidence> )),
+                mMainView, SLOT(beamIncidenceList(Q3PtrList<Incidence> )));
 
         connect(mMainView, SIGNAL(configChanged()), mSearchDialog, SLOT(updateConfig()));
         connect(mMainView, SIGNAL(updateSearchDialog()), mSearchDialog, SLOT(updateList()));
         //  connect( lview, SIGNAL( incidenceSelected( Incidence * ) ),
         //       mMainView, SLOT( processMainViewSelection( Incidence * ) ) );  
 #ifndef DESKTOP_VERSION    
@@ -243,13 +245,13 @@ void KODialogManager::showArchiveDialog()
 
   // Workaround.
   QApplication::restoreOverrideCursor();
 #endif
 }
 
-void KODialogManager::showFilterEditDialog(QPtrList<CalFilter> *filters)
+void KODialogManager::showFilterEditDialog(Q3PtrList<CalFilter> *filters)
 {
   if (!mFilterEditDialog) {
     mFilterEditDialog = new FilterEditDialog(filters,mMainView);
     connect(mFilterEditDialog,SIGNAL(filterChanged()),
             mMainView,SLOT(filterEdited()));
     
diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h
index b68ddc2..00ad1df 100644
--- a/korganizer/kodialogmanager.h
+++ b/korganizer/kodialogmanager.h
@@ -22,13 +22,13 @@
   without including the source code for Qt in the source distribution.
 */
 #ifndef KODIALOGMANAGER_H
 #define KODIALOGMANAGER_H
 
 #include <qobject.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <libkcal/calfilter.h>
 
 class CalendarView;
 class OutgoingDialog;
 class IncomingDialog;
@@ -75,13 +75,13 @@ class KODialogManager : public QObject
     void showSyncOptions();
     void showIncomingDialog();
     void showOutgoingDialog();
     //  void showCategoryEditDialog();
     void showSearchDialog();
     void showArchiveDialog();
-    void showFilterEditDialog(QPtrList<CalFilter> *filters);
+    void showFilterEditDialog(Q3PtrList<CalFilter> *filters);
     void showPluginDialog();
     void hideSearchDialog();
 
   private:
     void createOutgoingDialog();
     void createIncomingDialog();
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 9a4b4ec..a01c838 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -19,20 +19,26 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
-#include <qfiledialog.h>
+#include <q3filedialog.h>
 #include <qlayout.h>
-#include <qvbox.h>
-#include <qbuttongroup.h>
-#include <qvgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3vbox.h>
+#include <q3buttongroup.h>
+#include <q3vgroupbox.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
-#include <qapp.h>
+#include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <QLabel>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
@@ -77,13 +83,13 @@ void CustomListViewItem<Attendee *>::updateItem()
 }
 
 
 KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
   : QWidget( parent, name), mDisableItemUpdate( false )
 {
-  QGridLayout *topLayout = new QGridLayout(this);
+  Q3GridLayout *topLayout = new Q3GridLayout(this);
   topLayout->setSpacing(spacing);
   topLayout->setMargin(KDialog::marginHint()-2);
 
   QString organizer = KOPrefs::instance()->email();
   mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this);
 
@@ -98,17 +104,17 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
       if ( QApplication::desktop()->height() <= 240  )
           hei = 60;
       mListView->setFixedHeight(hei);
   }
   mListView->setAllColumnsShowFocus (true );
   //mListView->setSingleClick( true );
-  connect(mListView,SIGNAL(selectionChanged(QListViewItem *)),
+  connect(mListView,SIGNAL(selectionChanged(Q3ListViewItem *)),
           SLOT(updateAttendeeInput()));
 
-  connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )),
-          SLOT(itemClicked(QListViewItem * ,const QPoint& , int )));
+  connect(mListView,SIGNAL(executed(Q3ListViewItem * ,const QPoint&, int )),
+          SLOT(itemClicked(Q3ListViewItem * ,const QPoint& , int )));
 
   mRsvpButton = new QCheckBox(this);
   mRsvpButton->setText(i18n("Request response"));
   mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
   QLabel *attendeeLabel = new QLabel(this);
   attendeeLabel->setText(i18n("Name:"));
@@ -137,13 +143,13 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
   mStatusCombo->insertStringList(Attendee::statusList());
   connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
 
 
   connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem()));
   QWidget *buttonBox = new QWidget(this);
-  QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox);
+  Q3VBoxLayout *buttonLayout = new Q3VBoxLayout(buttonBox);
 
   QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox);
   buttonLayout->addWidget(newButton);
   connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee()));
 
   mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox);
@@ -362,25 +368,25 @@ void KOEditorDetails::setDefaults()
 
 void KOEditorDetails::readEvent(Incidence *event)
 {
     setDefaults();
     //mListView->clear();
     //mdelAttendees.clear();
-  QPtrList<Attendee> tmpAList = event->attendees();
+  Q3PtrList<Attendee> tmpAList = event->attendees();
   Attendee *a;
   for (a = tmpAList.first(); a; a = tmpAList.next())
     insertAttendee(new Attendee(*a));
 
   mListView->setSelected( mListView->firstChild(), true );
   mOrganizerLabel->setText(i18n("Organizer: %1").arg(event->organizer()));
 }
 
 void KOEditorDetails::writeEvent(Incidence *event)
 {
   event->clearAttendees();
-  QListViewItem *item;
+  Q3ListViewItem *item;
   AttendeeListItem *a;
   for (item = mListView->firstChild(); item;
        item = item->nextSibling()) {
     a = (AttendeeListItem *)item;
     event->addAttendee(new Attendee(*(a->data())));
   }
@@ -401,13 +407,13 @@ bool KOEditorDetails::validateInput()
 {
   return true;
 }
 
 void KOEditorDetails::updateAttendeeInput()
 {
-  QListViewItem *item = mListView->selectedItem();
+  Q3ListViewItem *item = mListView->selectedItem();
   AttendeeListItem *aItem = static_cast<AttendeeListItem *>( item );
   if (aItem) {
     fillAttendeeInput( aItem );
   } else {
     clearAttendeeInput();
   }
@@ -448,24 +454,24 @@ void KOEditorDetails::setEnabledAttendeeInput( bool enabled )
   mStatusCombo->setEnabled( enabled );
   mRsvpButton->setEnabled( enabled );
 
   mRemoveButton->setEnabled( enabled );
 }
 
-void KOEditorDetails::itemClicked(QListViewItem * item ,const QPoint & pnt, int c )
+void KOEditorDetails::itemClicked(Q3ListViewItem * item ,const QPoint & pnt, int c )
 {
     if ( item  && c == 4 ) {
         mRsvpButton->setChecked( !mRsvpButton->isChecked() );
         updateAttendeeItem();
     }
 }
 void KOEditorDetails::updateAttendeeItem()
 {
   if (mDisableItemUpdate) return;
 
-  QListViewItem *item = mListView->selectedItem();
+  Q3ListViewItem *item = mListView->selectedItem();
   AttendeeListItem *aItem = static_cast<AttendeeListItem *>( item );
   if ( !aItem ) return;
 
   Attendee *a = aItem->data();
 
   a->setName( mNameEdit->text() );
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index 5f8f6f2..40e896c 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -21,23 +21,23 @@
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOEDITORDETAILS_H
 #define _KOEDITORDETAILS_H
 
 #include <qmap.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <klistview.h>
 #include <qradiobutton.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kapplication.h>
 
 #include <libkcal/event.h>
 
 #include "ktimeedit.h"
@@ -80,13 +80,13 @@ class KOEditorDetails : public QWidget
     void addNewAttendee();
     void removeAttendee();
     void openAddressBook();
     void updateAttendeeInput();
     void clearAttendeeInput();
     void fillAttendeeInput(AttendeeListItem *);
-    void itemClicked(QListViewItem *,const QPoint & pnt, int c);
+    void itemClicked(Q3ListViewItem *,const QPoint & pnt, int c);
     void updateAttendeeItem();
     void setEnabledAttendeeInput(bool);
 
   private:
     bool mDisableItemUpdate;
 
@@ -100,10 +100,10 @@ class KOEditorDetails : public QWidget
     QLabel *mOrganizerLabel;
 
     QPushButton* mAddButton;
     QPushButton* mRemoveButton;
     QPushButton* mAddressBookButton;
 
-    QPtrList<Attendee> mdelAttendees;
+    Q3PtrList<Attendee> mdelAttendees;
 };
 
 #endif
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 21f220c..8105432 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -21,21 +21,28 @@
     without including the source code for Qt in the source distribution.
 */
 
 #include <qwidget.h>
 #include <qtooltip.h>
 #include <qlayout.h>
-#include <qvbox.h>
-#include <qbuttongroup.h>
-#include <qvgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3vbox.h>
+#include <q3buttongroup.h>
+#include <q3vgroupbox.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qtimer.h>
 #include <qfile.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
 
+#include <QDesktopWidget>
 
 #include <kglobal.h>
 #include <kdialog.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -66,15 +73,15 @@ KOEditorGeneral::KOEditorGeneral(QObject* parent, const char* name) :
 }
 
 KOEditorGeneral::~KOEditorGeneral()
 {
 }
 
-void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initHeader(QWidget *parent,Q3BoxLayout *topLayout)
 {
-    QGridLayout *headerLayout = new QGridLayout(topLayout);
+    Q3GridLayout *headerLayout = new Q3GridLayout(topLayout);
 
 #if 0
     mOwnerLabel = new QLabel(i18n("Owner:"),parent);
     headerLayout->addMultiCellWidget(mOwnerLabel,0,0,0,1);
 #endif
     // 1 on pda
@@ -192,16 +199,16 @@ void KOEditorGeneral::selectedCatPopup( int index )
             categories.prepend( colcat );
         }
     }
     setCategories( categories.join(",") );
 }
 
-void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneral::initCategories(QWidget *parent, Q3BoxLayout *topLayout)
 {
-    QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout );
-    mCatPopup = new QPopupMenu ( parent );
+    Q3BoxLayout *categoriesLayout = new Q3HBoxLayout( topLayout );
+    mCatPopup = new Q3PopupMenu ( parent );
     mCatPopup->setCheckable (true);
     connect(mCatPopup,SIGNAL(aboutToShow ()  ), this ,SLOT(showCatPopup()));
     connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT(selectedCatPopup( int )));
     mCategoriesButton = new QPushButton(parent);
     mCategoriesButton->setText(i18n("Categories..."));
     connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() ));
@@ -211,27 +218,27 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
     mCategoriesLabel->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Fixed  ,FALSE) );
     mCategoriesLabel->setPopup( mCatPopup );
     //mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken);
     categoriesLayout->addWidget(mCategoriesLabel,1);
 }
 
-void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneral::initSecrecy(QWidget *parent, Q3BoxLayout *topLayout)
 {
-    QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout );
+    Q3BoxLayout *secrecyLayout = new Q3HBoxLayout( topLayout );
 
     QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent);
     mCancelBox = new QCheckBox ( i18n("Cancelled"), parent);
     secrecyLayout->addWidget(mCancelBox);
     secrecyLayout->addWidget(secrecyLabel);
 
     mSecrecyCombo = new QComboBox(parent);
     mSecrecyCombo->insertStringList(Incidence::secrecyList());
     secrecyLayout->addWidget(mSecrecyCombo);
 }
 
-void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initDescription(QWidget *parent,Q3BoxLayout *topLayout)
 {
     mDescriptionEdit = new KTextEdit(parent);
     mDescriptionEdit->setFont(KOPrefs::instance()->mEditBoxFont );
     mDescriptionEdit->append("");
     mDescriptionEdit->setReadOnly(false);
     mDescriptionEdit->setOverwriteMode(false);
@@ -240,15 +247,15 @@ void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( mDescriptionEdit, QPEApplication::RightOnHold );
 #endif
  
 }
 
-void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initAlarm(QWidget *parent,Q3BoxLayout *topLayout)
 {
-    QBoxLayout *alarmLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *alarmLayout = new Q3HBoxLayout(topLayout);
 
     //mAlarmBell = new QLabel(parent);
     //mAlarmBell->setPixmap(SmallIcon("bell"));
     //alarmLayout->addWidget(mAlarmBell);
     if ( QApplication::desktop()->width() < 320 ) 
         mAlarmButton = new QCheckBox(i18n("Rem."),parent);
@@ -525,13 +532,13 @@ void KOEditorGeneral::readIncidence(Incidence *event)
     mSecrecyCombo->setCurrentItem(event->secrecy());
     mCancelBox->setChecked( event->cancelled() ); 
     mAlarmProgramButton->setOn(false);
     mAlarmSoundButton->setOn(false);
 
     // set up alarm stuff
-    QPtrList<Alarm> alarms = event->alarms();
+    Q3PtrList<Alarm> alarms = event->alarms();
     Alarm* alarm;
     mAlarmIncrCombo->setCurrentItem(0);
     for ( alarm = alarms.first(); alarm; alarm = alarms.next() ) {
         int offset;
         if ( alarm->hasTime() ) {
             QDateTime t = alarm->time();
@@ -587,13 +594,13 @@ void KOEditorGeneral::writeIncidence(Incidence *event)
     event->setSecrecy(mSecrecyCombo->currentItem());
     event->setCancelled(mCancelBox->isChecked() );; 
     // alarm stuff
     if (mAlarmButton->isChecked()) {
         if (event->alarms().count() == 0) 
             event->newAlarm();
-        QPtrList<Alarm> alarms = event->alarms();
+        Q3PtrList<Alarm> alarms = event->alarms();
         Alarm *alarm;
         for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
             alarm->setEnabled(true);
             int j = mAlarmTimeEdit->value()* -60;
             if (mAlarmIncrCombo->currentItem() == 1)
                 j = j * 60;
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index b10a5d4..45f26fd 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -20,25 +20,26 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOEDITORGENERAL_H
 #define KOEDITORGENERAL_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qpopupmenu.h>
-#include <qgroupbox.h>
+#include <q3popupmenu.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
 #include <qspinbox.h>
 #include <qcombobox.h>
+#include <Q3BoxLayout>
 
 #include <ktextedit.h>
 #include <krestrictedline.h>
 
 #include <libkcal/incidence.h>
 
@@ -52,17 +53,17 @@ class KOEditorGeneral : public QObject
 {
     Q_OBJECT
   public:
     KOEditorGeneral (QObject* parent=0,const char* name=0);
     virtual ~KOEditorGeneral();
     void setFocusOn( int i );
-    void initHeader(QWidget *,QBoxLayout *);
-    void initDescription(QWidget *,QBoxLayout *);
-    void initSecrecy(QWidget *,QBoxLayout *);
-    void initCategories(QWidget *,QBoxLayout *);    
-    void initAlarm(QWidget *,QBoxLayout *);
+    void initHeader(QWidget *,Q3BoxLayout *);
+    void initDescription(QWidget *,Q3BoxLayout *);
+    void initSecrecy(QWidget *,Q3BoxLayout *);
+    void initCategories(QWidget *,Q3BoxLayout *);    
+    void initAlarm(QWidget *,Q3BoxLayout *);
 
     /** Set widgets to default values */
     void setDefaults(bool allDay);
     /** Read event object and setup widgets accordingly */
     void readIncidence(Incidence *);
     /** Write event settings to event object */
@@ -112,13 +113,13 @@ class KOEditorGeneral : public QObject
     QComboBox               *mSecrecyCombo;
     QCheckBox               *mCancelBox;
     QPushButton             *mCategoriesButton;
     QPushButton             *mCategoriesLabel;
      
   private:
-    QPopupMenu * mCatPopup;
+    Q3PopupMenu * mCatPopup;
     QString getFittingPath( const QString &) ;
     QString mAlarmSound;
     QString mAlarmProgram;
     QString mAlarmMessage;
 };
 
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 2c6ed9f..73a4139 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -20,17 +20,23 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qlayout.h>
-#include <qvbox.h>
-#include <qbuttongroup.h>
-#include <qvgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3vbox.h>
+#include <q3buttongroup.h>
+#include <q3vgroupbox.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <QLabel>
+#include <Q3VBoxLayout>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -81,25 +87,25 @@ void KOEditorGeneralEvent::finishSetup()
  
 
   mSummaryEdit->load(KOLocationBox::SUMMARYEVENT);
   mSummaryEdit->setFocus();
 }
 
-void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneralEvent::initTime(QWidget *parent,Q3BoxLayout *topLayout)
 {
-  QBoxLayout *timeLayout = new QVBoxLayout(topLayout);
+  Q3BoxLayout *timeLayout = new Q3VBoxLayout(topLayout);
 
-  QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal,
+  Q3GroupBox *timeGroupBox = new Q3GroupBox(1,Qt::Horizontal,
                                           i18n("Date && Time"),parent);
   timeLayout->addWidget(timeGroupBox);
 
   timeGroupBox->layout()->setSpacing( KDialog::spacingHintSmall() ); 
   timeGroupBox->layout()->setMargin( KDialog::marginHint() ); 
-  QFrame *timeBoxFrame = new QFrame(timeGroupBox);
+  Q3Frame *timeBoxFrame = new Q3Frame(timeGroupBox);
 
-  QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,2,3);
+  Q3GridLayout *layoutTimeBox = new Q3GridLayout(timeBoxFrame,2,3);
   layoutTimeBox->setSpacing(topLayout->spacing());
 
   mStartDateLabel = new QLabel(i18n("Start:"),timeBoxFrame);
   layoutTimeBox->addWidget(mStartDateLabel,0,0);
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
@@ -115,24 +121,24 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
   mEndDateEdit = new KDateEdit(timeBoxFrame);
   layoutTimeBox->addWidget(mEndDateEdit,1,1);
 
   mEndTimeEdit = new KOTimeEdit(timeBoxFrame);
   layoutTimeBox->addWidget(mEndTimeEdit,1,2);
   QWidget* duration = new QWidget( timeBoxFrame );
-  QHBoxLayout *flagsBox = new QHBoxLayout( duration );
+  Q3HBoxLayout *flagsBox = new Q3HBoxLayout( duration );
   mNoTimeButton = new QCheckBox(i18n("All day event"),duration);
   flagsBox->addWidget(mNoTimeButton);
   connect(mNoTimeButton, SIGNAL(toggled(bool)),SLOT(dontAssociateTime(bool)));
   mDurationLabel = new QLabel( duration );
   //  if ( KOPrefs::instance()->mCompactDialogs ) {
   //layoutTimeBox->addMultiCellWidget( mDurationLabel, 3, 3, 0, 3 );
   //} else {
     flagsBox->addWidget( mDurationLabel );
     //}
     flagsBox->setStretchFactor(mDurationLabel, 10 );
-    mDurationLabel->setAlignment( AlignRight | AlignVCenter);
+    mDurationLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter);
   layoutTimeBox->addMultiCellWidget( duration, 2, 2, 0, 3 );
 
   // time widgets are checked if they contain a valid time
   connect(mStartTimeEdit, SIGNAL(timeChanged(QTime)),
           this, SLOT(startTimeChanged(QTime)));
   connect(mEndTimeEdit, SIGNAL(timeChanged(QTime)),
@@ -144,15 +150,15 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
   connect(mEndDateEdit, SIGNAL(dateChanged(QDate)),
           this, SLOT(endDateChanged(QDate)));
   connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),this,SLOT(sTimeChanged(QTime)));
   connect(mEndDateEdit,SIGNAL(setTimeTo(QTime)),this,SLOT(eTimeChanged(QTime)));
 }
 
-void KOEditorGeneralEvent::initClass(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneralEvent::initClass(QWidget *parent,Q3BoxLayout *topLayout)
 {
-  QBoxLayout *classLayout = new QHBoxLayout(topLayout);
+  Q3BoxLayout *classLayout = new Q3HBoxLayout(topLayout);
 
   QLabel *freeTimeLabel = new QLabel(i18n("Show time as:"),parent);
   classLayout->addWidget(freeTimeLabel);
 
   mFreeTimeCombo = new QComboBox(false, parent);
   mFreeTimeCombo->insertItem(i18n("Busy"));
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index d798905..5d97a5c 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -20,21 +20,21 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOEDITORGENERALEVENT_H
 #define _KOEDITORGENERALEVENT_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qmultilineedit.h>
-#include <qlistview.h>
+#include <q3multilineedit.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
 
 #include <krestrictedline.h>
 
 #include "koeditorgeneral.h"
 
@@ -48,14 +48,14 @@ class KOEditorGeneralEvent : public KOEditorGeneral
 {
     Q_OBJECT
   public:
     KOEditorGeneralEvent (QObject* parent=0,const char* name=0);
     virtual ~KOEditorGeneralEvent();
 
-    void initTime(QWidget *,QBoxLayout *);
-    void initClass(QWidget *,QBoxLayout *);
+    void initTime(QWidget *,Q3BoxLayout *);
+    void initClass(QWidget *,Q3BoxLayout *);
 
     void finishSetup();
 
     /** Set widgets to default values */
     void setDefaults(QDateTime from,QDateTime to,bool allDay);
     /**
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index d32d5a5..baee9fc 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -19,20 +19,27 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
-#include <qfiledialog.h>
+#include <q3filedialog.h>
 #include <qlayout.h>
-#include <qvbox.h>
-#include <qbuttongroup.h>
-#include <qvgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3vbox.h>
+#include <q3buttongroup.h>
+#include <q3vgroupbox.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <QLabel>
+#include <Q3VBoxLayout>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
@@ -79,24 +86,24 @@ void KOEditorGeneralTodo::finishSetup()
 //   QWidget::setTabOrder(mCategoriesButton, mSecrecyCombo);
 //   QWidget::setTabOrder(mSecrecyCombo, mDescriptionEdit);
    mSummaryEdit->load(KOLocationBox::SUMMARYTODO);
   mSummaryEdit->setFocus();
 }
 
-void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneralTodo::initTime(QWidget *parent,Q3BoxLayout *topLayout)
 {
-  QBoxLayout *timeLayout = new QVBoxLayout(topLayout);
+  Q3BoxLayout *timeLayout = new Q3VBoxLayout(topLayout);
 
-  QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal,
+  Q3GroupBox *timeGroupBox = new Q3GroupBox(1,Qt::Horizontal,
                                           i18n("Date && Time"),parent);
   timeLayout->addWidget(timeGroupBox);
   timeGroupBox->layout()->setSpacing( KDialog::spacingHint()-2 ); 
   timeGroupBox->layout()->setMargin(  KDialog::marginHint() ); 
-  QFrame *timeBoxFrame = new QFrame(timeGroupBox);
+  Q3Frame *timeBoxFrame = new Q3Frame(timeGroupBox);
 
-  QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3);
+  Q3GridLayout *layoutTimeBox = new Q3GridLayout(timeBoxFrame,3,3);
   layoutTimeBox->setSpacing(KDialog::spacingHintSmall());
   layoutTimeBox->setColStretch( 1, 1 );
 
   mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame);
   layoutTimeBox->addWidget(mStartCheck,0,0);
   connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool)));
@@ -130,13 +137,13 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
           this, SLOT(startDateChanged(QDate)));
   // some more layouting
   //layoutTimeBox->setColStretch(3,1);  
 }
 
 
-void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneralTodo::initCompletion(QWidget *parent, Q3BoxLayout *topLayout)
 {
   mCompletedCombo = new QComboBox(parent);
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n("  0 %"));
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n(" 20 %"));
@@ -170,31 +177,31 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
       else 
           mCompleteDateEdit->setMaximumWidth( 140 );
       topLayout->setSpacing( 0 );
   }
 }
 
-void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneralTodo::initPriority(QWidget *parent, Q3BoxLayout *topLayout)
 {
 
-    QHBox* h = new QHBox ( parent );
+    Q3HBox* h = new Q3HBox ( parent );
     topLayout->addWidget( h );
   QLabel *priorityLabel = new QLabel(i18n("Priority:"), h);
   // topLayout->addWidget(priorityLabel);
   mPriorityCombo = new QComboBox( h );
   mPriorityCombo->insertItem(i18n("1 (high)"));
   mPriorityCombo->insertItem(i18n("2"));
   mPriorityCombo->insertItem(i18n("3"));
   mPriorityCombo->insertItem(i18n("4"));
   mPriorityCombo->insertItem(i18n("5 (low)"));
   //topLayout->addWidget(mPriorityCombo);
 }
 
-void KOEditorGeneralTodo::initStatus(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneralTodo::initStatus(QWidget *parent,Q3BoxLayout *topLayout)
 {
-  QBoxLayout *statusLayout = new QHBoxLayout(topLayout);
+  Q3BoxLayout *statusLayout = new Q3HBoxLayout(topLayout);
 
   initCompletion( parent, statusLayout );
 
   statusLayout->addStretch( 1 );
 
   initPriority( parent, statusLayout );
@@ -393,13 +400,13 @@ void KOEditorGeneralTodo::enableStartEdit( bool enable )
   }
   emit datesChecked();
 }
 void KOEditorGeneralTodo::startDateChanged(QDate newdate)
 {
     if ( mDueCheck->isChecked() )
-        emit dateTimesChanged(newdate,mDueDateEdit->date());
+        emit dateTimesChanged((QDateTime)newdate,(QDateTime)mDueDateEdit->date());
 }
 void KOEditorGeneralTodo::enableTimeEdits(bool enable)
 {
   if(mStartCheck->isChecked()) {
     mStartTimeEdit->setEnabled( enable );
   }
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 2e56a7a..2e97ff5 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -20,21 +20,21 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOEDITORGENERALTODO_H
 #define _KOEDITORGENERALTODO_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qmultilineedit.h>
-#include <qlistview.h>
+#include <q3multilineedit.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
 
 #include "koeditorgeneral.h"
 #include "koglobals.h"
 
 class KRestrictedLine;
@@ -47,16 +47,16 @@ class KOEditorGeneralTodo : public KOEditorGeneral
 {
     Q_OBJECT
   public:
     KOEditorGeneralTodo (QObject* parent=0,const char* name=0);
     virtual ~KOEditorGeneralTodo();
 
-    void initTime(QWidget *, QBoxLayout *);
-    void initStatus(QWidget *, QBoxLayout *);
-    void initCompletion(QWidget *, QBoxLayout *);
-    void initPriority(QWidget *, QBoxLayout *);
+    void initTime(QWidget *, Q3BoxLayout *);
+    void initStatus(QWidget *, Q3BoxLayout *);
+    void initCompletion(QWidget *, Q3BoxLayout *);
+    void initPriority(QWidget *, Q3BoxLayout *);
 
     void finishSetup();
 
     /** Set widgets to default values */
     void setDefaults(QDateTime due,bool allDay);
     /** Read todo object and setup widgets accordingly */
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index e0380c4..e0ae3a0 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -19,23 +19,31 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
-#include <qfiledialog.h>
+#include <q3filedialog.h>
 #include <qlayout.h>
-#include <qvbox.h>
-#include <qbuttongroup.h>
-#include <qvgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3vbox.h>
+#include <q3buttongroup.h>
+#include <q3vgroupbox.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -78,13 +86,13 @@ int RecurBase::frequency()
 
 /////////////////////////// RecurDaily ///////////////////////////////
 
 RecurDaily::RecurDaily( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3HBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
   QLabel *preLabel = new QLabel( i18n("Recur every"), this );
   topLayout->addWidget( preLabel );
 
@@ -97,30 +105,30 @@ RecurDaily::RecurDaily( QWidget *parent, const char *name ) :
 
 /////////////////////////// RecurWeekly ///////////////////////////////
 
 RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
   //topLayout->addStretch( 1 );
 
-  QBoxLayout *weeksLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *weeksLayout = new Q3HBoxLayout( topLayout );
 
   QLabel *preLabel = new QLabel( i18n("Recur every"), this );
   weeksLayout->addWidget( preLabel );
 
   weeksLayout->addWidget( frequencyEdit() );
 
   QLabel *postLabel = new QLabel( i18n("week(s) on:"), this );
   weeksLayout->addWidget( postLabel );
 
-  QHBox *dayBox = new QHBox( this );
-  topLayout->addWidget( dayBox, 1, AlignVCenter );
+  Q3HBox *dayBox = new Q3HBox( this );
+  topLayout->addWidget( dayBox, 1, Qt::AlignVCenter );
   // TODO: Respect start of week setting
   for ( int i = 0; i < 7; ++i ) {
     QString weekDayName = KGlobal::locale()->weekDayName( i + 1, true );
     int left = 1;
     if ( QApplication::desktop()->width() > 480 ) {
         ++left;
@@ -153,46 +161,46 @@ QBitArray RecurWeekly::days()
 
 /////////////////////////// RecurMonthly ///////////////////////////////
 
 RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
 
-  QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout );
 
   QLabel *preLabel = new QLabel( i18n("every"), this );
   freqLayout->addWidget( preLabel );
 
   freqLayout->addWidget( frequencyEdit() );
 
   QLabel *postLabel = new QLabel( i18n("month(s)"), this );
   freqLayout->addWidget( postLabel );
 
 
-  QButtonGroup *buttonGroup = new QButtonGroup( this );
-  buttonGroup->setFrameStyle( QFrame::NoFrame );
-  topLayout->addWidget( buttonGroup, 1, AlignVCenter );
+  Q3ButtonGroup *buttonGroup = new Q3ButtonGroup( this );
+  buttonGroup->setFrameStyle( Q3Frame::NoFrame );
+  topLayout->addWidget( buttonGroup, 1, Qt::AlignVCenter );
 
-  QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 3, 2 );
+  Q3GridLayout *buttonLayout = new Q3GridLayout( buttonGroup, 3, 2 );
   buttonLayout->setSpacing( KDialog::spacingHint() );
   buttonLayout->setMargin( KDialog::marginHintSmall() );
 
 
   QString recurOnText;
   if ( QApplication::desktop()->width() > 320 ) {
     recurOnText = i18n("Recur on the");
   }
 
   mByDayRadio = new QRadioButton( recurOnText, buttonGroup );
   buttonLayout->addWidget( mByDayRadio, 0, 0 );
 
-  mByDayCombo = new QComboBox( buttonGroup );
+  mByDayCombo = new Q3ComboBox( buttonGroup );
   mByDayCombo->setSizeLimit( 7 );
   mByDayCombo->insertItem( i18n("1st") );
   mByDayCombo->insertItem( i18n("2nd") );
   mByDayCombo->insertItem( i18n("3rd") );
   mByDayCombo->insertItem( i18n("4th") );
   mByDayCombo->insertItem( i18n("5th") );
@@ -290,40 +298,40 @@ int RecurMonthly::weekday()
 
 /////////////////////////// RecurYearly ///////////////////////////////
 
 RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
 
-  QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout );
 
   QLabel *preLabel = new QLabel( i18n("every"), this );
   freqLayout->addWidget( preLabel );
 
   freqLayout->addWidget( frequencyEdit() );
 
   QLabel *postLabel = new QLabel( i18n("year(s)"), this );
   freqLayout->addWidget( postLabel );
 
 
-  QButtonGroup *buttonGroup = new QButtonGroup( this );
-  buttonGroup->setFrameStyle( QFrame::NoFrame );
-  topLayout->addWidget( buttonGroup, 1, AlignVCenter );
+  Q3ButtonGroup *buttonGroup = new Q3ButtonGroup( this );
+  buttonGroup->setFrameStyle( Q3Frame::NoFrame );
+  topLayout->addWidget( buttonGroup, 1, Qt::AlignVCenter );
 
-  QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 2, 3 );
+  Q3GridLayout *buttonLayout = new Q3GridLayout( buttonGroup, 2, 3 );
 
   mByMonthRadio = new QRadioButton( i18n("On day "), buttonGroup);
   buttonLayout->addWidget( mByMonthRadio, 0, 0  , Qt::AlignRight);
   mByDayLabel = new QLabel( i18n("%1 of ").arg(1), buttonGroup );
  
   buttonLayout->addWidget( mByDayLabel, 0, 1 ); 
-  mByMonthCombo = new QComboBox( buttonGroup );
+  mByMonthCombo = new Q3ComboBox( buttonGroup );
   mByMonthCombo->insertItem( i18n("January") );
   mByMonthCombo->insertItem( i18n("February") );
   mByMonthCombo->insertItem( i18n("March") );
   mByMonthCombo->insertItem( i18n("April") );
   mByMonthCombo->insertItem( i18n("May") );
   mByMonthCombo->insertItem( i18n("June") );
@@ -380,33 +388,33 @@ int RecurYearly::day()
 
 //////////////////////////// ExceptionsWidget //////////////////////////
 
 ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
   QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 
-  QGroupBox *groupBox = new QGroupBox( 1, Horizontal, i18n("Exceptions"),
+  Q3GroupBox *groupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Exceptions"),
                                        this );
   topLayout->addWidget( groupBox );
 
   QWidget *box = new QWidget( groupBox );
 
-  QGridLayout *boxLayout = new QGridLayout( box );
+  Q3GridLayout *boxLayout = new Q3GridLayout( box );
 
   mExceptionDateEdit = new KDateEdit( box );
   boxLayout->addWidget( mExceptionDateEdit, 0, 0 );
 
   QPushButton *addExceptionButton = new QPushButton( i18n("Add"), box );
   boxLayout->addWidget( addExceptionButton, 1, 0 );
   QPushButton *changeExceptionButton = new QPushButton( i18n("Change"), box );
   boxLayout->addWidget( changeExceptionButton, 2, 0 );
   QPushButton *deleteExceptionButton = new QPushButton( i18n("Delete"), box );
   boxLayout->addWidget( deleteExceptionButton, 3, 0 );
 
-  mExceptionList = new QListBox( box );
+  mExceptionList = new Q3ListBox( box );
   boxLayout->addMultiCellWidget( mExceptionList, 0, 3, 1, 1 );
 
   boxLayout->setRowStretch( 4, 1 );
   boxLayout->setColStretch( 1, 3 );
 
   connect( addExceptionButton, SIGNAL( clicked() ),
@@ -503,46 +511,46 @@ DateList ExceptionsDialog::dates()
 ///////////////////////// RecurrenceRangeWidget ///////////////////////////
 
 RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
                                               const char *name )
   : QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 
-  mRangeGroupBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Range"),
+  mRangeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"),
                                   this );
   topLayout->addWidget( mRangeGroupBox );
 
   QWidget *rangeBox = new QWidget( mRangeGroupBox );
-  QVBoxLayout *rangeLayout = new QVBoxLayout( rangeBox );
+  Q3VBoxLayout *rangeLayout = new Q3VBoxLayout( rangeBox );
   rangeLayout->setSpacing( KDialog::spacingHint() );
   rangeLayout->setMargin( KDialog::marginHintSmall() );
 
   mStartDateLabel = new QLabel( i18n("Begin on:"), rangeBox );
   rangeLayout->addWidget( mStartDateLabel );
 
-  mRangeButtonGroup = new QButtonGroup;
+  mRangeButtonGroup = new Q3ButtonGroup;
 
   mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox );
   mRangeButtonGroup->insert( mNoEndDateButton );
   rangeLayout->addWidget( mNoEndDateButton );
 
-  QBoxLayout *durationLayout = new QHBoxLayout( rangeLayout );
+  Q3BoxLayout *durationLayout = new Q3HBoxLayout( rangeLayout );
   durationLayout->setSpacing( KDialog::spacingHint() );
 
   mEndDurationButton = new QRadioButton( i18n("End after"), rangeBox );
   mRangeButtonGroup->insert( mEndDurationButton );
   durationLayout->addWidget( mEndDurationButton );
 
   mEndDurationEdit = new QSpinBox( 1, 9999, 1, rangeBox );
   durationLayout->addWidget( mEndDurationEdit );
 
   QLabel *endDurationLabel = new QLabel( i18n("occurrence(s)"), rangeBox );
   durationLayout ->addWidget( endDurationLabel );
 
-  QBoxLayout *endDateLayout = new QHBoxLayout( rangeLayout );
+  Q3BoxLayout *endDateLayout = new Q3HBoxLayout( rangeLayout );
   endDateLayout->setSpacing( KDialog::spacingHint() );
 
   mEndDateButton = new QRadioButton( i18n("End by:"), rangeBox );
   mRangeButtonGroup->insert( mEndDateButton );
   endDateLayout->addWidget( mEndDateButton );
 
@@ -663,13 +671,13 @@ void RecurrenceRangeDialog::setDateTimes( const QDateTime &start,
 
 //////////////////////////// RecurrenceChooser ////////////////////////
 
 RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) :
   QWidget( parent, name )
 {
-    QBoxLayout *topLayout = new QVBoxLayout( this );
+    Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 
     mTypeCombo = new QComboBox( this );
     mTypeCombo->insertItem( i18n("Daily") );
     mTypeCombo->insertItem( i18n("Weekly") );
     mTypeCombo->insertItem( i18n("Monthly") );
     mTypeCombo->insertItem( i18n("Yearly") );
@@ -722,23 +730,23 @@ void RecurrenceChooser::emitChoice()
 
 /////////////////////////////// Main Widget /////////////////////////////
 
 KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
   QWidget( parent, name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2,2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2,2 );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
   mEnabledCheck = new QCheckBox( i18n("Enable Recurrence"), this );
   connect( mEnabledCheck, SIGNAL( toggled( bool ) ),
            SLOT( setEnabled( bool ) ) );
   topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 );
 
 
-  mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"),  
+  mTimeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Time"),  
                                  this );
   topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 );
 
   if ( QApplication::desktop()->width() <= 640 ) {
     mTimeGroupBox->hide();
   }
@@ -749,20 +757,20 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 
   mDateTimeLabel = new QLabel( mTimeGroupBox );
 //  mDateTimeLabel = new QLabel( timeFrame );
 //  layoutTimeFrame->addWidget( mDateTimeLabel );
   //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) );
   //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) );
-  mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this );
+  mRuleBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Recurrence Rule"), this );
   topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 );
   mRecurrenceChooser = new RecurrenceChooser( mRuleBox );
   connect( mRecurrenceChooser, SIGNAL( chosen( int ) ),
            SLOT( showCurrentRule( int ) ) );
 
 
-  mRuleStack = new QWidgetStack( mRuleBox );
+  mRuleStack = new Q3WidgetStack( mRuleBox );
 
   mDaily = new RecurDaily( mRuleStack );
   mRuleStack->addWidget( mDaily, 0 );
 
   mWeekly = new RecurWeekly( mRuleStack );
   mRuleStack->addWidget( mWeekly, 0 );
@@ -893,14 +901,14 @@ void KOEditorRecurrence::readEvent(Incidence *event)
         dtEnd = ((Event*)event)->dtEnd();
     else
         dtEnd = ((Todo*)event)->dtDue();
         
     setDefaults( event->dtStart(), dtEnd );
   QBitArray rDays( 7 );
-  QPtrList<Recurrence::rMonthPos> rmp;
-  QPtrList<int> rmd;
+  Q3PtrList<Recurrence::rMonthPos> rmp;
+  Q3PtrList<int> rmd;
   int day = 0;
   int count = 0;
   int month = 0;
   setDateTimes( event->dtStart(), dtEnd );
 
  
@@ -965,13 +973,13 @@ void KOEditorRecurrence::readEvent(Incidence *event)
                   month = *rmd.first();
               else
                   month = event->dtStart().date().month() ;
               mYearly->setByMonth( month, day );
 #if 0
               //qDebug("2day = %d ",day );
-              QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
+              Q3PtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
               int month;
               if ( !monthlist.isEmpty() ) {
                   month =  monthlist.first()->rPos ;
               } else {
                   month = event->dtStart().date().month() ;
               }
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 75e0c73..6c012bd 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -20,31 +20,33 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOEDITORRECURRENCE_H
 #define _KOEDITORRECURRENCE_H
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qmultilineedit.h>
-#include <qlistview.h>
+#include <q3multilineedit.h>
+#include <q3listview.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
+#include <Q3ListBox>
+#include <Q3ComboBox>
 
 #include <kdialogbase.h>
 
 #include <libkcal/event.h>
 
 #include "ktimeedit.h"
 
-class QWidgetStack;
+class Q3WidgetStack;
 class QSpinBox;
 
 class KDateEdit;
 
 using namespace KCal;
 
@@ -95,13 +97,13 @@ class RecurMonthly : public RecurBase
 
     int count();
     int weekday();
     
   private:
     QRadioButton *mByDayRadio;
-    QComboBox *mByDayCombo;
+    Q3ComboBox *mByDayCombo;
 
     QRadioButton *mByPosRadio;
     QComboBox *mByPosCountCombo;
     QComboBox *mByPosWeekdayCombo;
 };
 
@@ -119,13 +121,13 @@ class RecurYearly : public RecurBase
     int month();
     int day();
     
   private:
     int mDay;
     QRadioButton *mByMonthRadio;
-    QComboBox *mByMonthCombo;
+    Q3ComboBox *mByMonthCombo;
     QLabel* mByDayLabel;
     QLabel* mDayOfLabel;
     QRadioButton *mByDayRadio;
 };
 
 class RecurrenceChooser : public QWidget
@@ -177,13 +179,13 @@ class ExceptionsWidget : public QWidget, public ExceptionsBase
     void addException();
     void changeException();
     void deleteException();
     
   private:
     KDateEdit *mExceptionDateEdit;
-    QListBox *mExceptionList;
+    Q3ListBox *mExceptionList;
     DateList mExceptionDates;  
 };
 
 class ExceptionsDialog : public KDialogBase, public ExceptionsBase
 {
   public:
@@ -232,14 +234,14 @@ class RecurrenceRangeWidget : public QWidget, public RecurrenceRangeBase
                        const QDateTime &end = QDateTime() );
 
   protected slots:
     void showCurrentRange();
 
   private:
-    QButtonGroup *mRangeButtonGroup;
-    QGroupBox *mRangeGroupBox;
+    Q3ButtonGroup *mRangeButtonGroup;
+    Q3GroupBox *mRangeGroupBox;
     QLabel *mStartDateLabel;
     QRadioButton *mNoEndDateButton;
     QRadioButton *mEndDurationButton;
     QSpinBox *mEndDurationEdit;
     QRadioButton *mEndDateButton;
     KDateEdit *mEndDateEdit;  
@@ -297,17 +299,17 @@ class KOEditorRecurrence : public QWidget
     void showExceptionsDialog();
     void showRecurrenceRangeDialog();
     
   private:
     QCheckBox *mEnabledCheck;
   
-    QGroupBox *mTimeGroupBox;
+    Q3GroupBox *mTimeGroupBox;
     QLabel *mDateTimeLabel;
   
-    QGroupBox *mRuleBox;
-    QWidgetStack *mRuleStack;
+    Q3GroupBox *mRuleBox;
+    Q3WidgetStack *mRuleStack;
     RecurrenceChooser *mRecurrenceChooser;
     
     RecurDaily *mDaily;
     RecurWeekly *mWeekly;
     RecurMonthly *mMonthly;
     RecurYearly *mYearly;
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 3e87197..62ad250 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -19,20 +19,25 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qtimer.h>
 #include <qdir.h>
 #include <qlayout.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kfiledialog.h>
@@ -102,33 +107,33 @@ void  KOEventEditor::setCategories( QString s )
 void KOEventEditor::setupGeneral()
 {
   mGeneral = new KOEditorGeneralEvent( this, "KOEditorGeneralEvent" );
   connect ( mGeneral, SIGNAL ( allAccepted() ), this, SLOT ( slotOk () ) );
 
   if( KOPrefs::instance()->mCompactDialogs ) {
-    QFrame *topFrame = addPage(i18n("General"));
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3Frame *topFrame = addPage(i18n("General"));
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
     topLayout->setSpacing(spacingHint()-1);
     topLayout->setMargin(marginHint()-1);
     topLayout->addStretch ( 1 );
     mGeneral->initHeader(topFrame,topLayout);
     topLayout->addStretch ( 1 );
     mGeneral->initTime(topFrame,topLayout);
     topLayout->addStretch ( 1 );
 //    QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
     mGeneral->initAlarm(topFrame,topLayout);
     topLayout->addStretch ( 1 );
     mGeneral->enableAlarm( false );
 
-    QBoxLayout *buttonLayout;
+    Q3BoxLayout *buttonLayout;
     if ( QApplication::desktop()->width() < 500 && QApplication::desktop()->height() > 240 ) 
-        buttonLayout = new QVBoxLayout( topLayout );
+        buttonLayout = new Q3VBoxLayout( topLayout );
     else
-        buttonLayout = new QHBoxLayout( topLayout );
-    QHBox* buttonWidget = new QHBox (topFrame);
-    QIconSet icon;
+        buttonLayout = new Q3HBoxLayout( topLayout );
+    Q3HBox* buttonWidget = new Q3HBox (topFrame);
+    QIcon icon;
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileexport16");
     else
         icon = SmallIcon("fileexport");
     QPushButton * loadTemplate = new QPushButton( buttonWidget);
     QPushButton * saveTemplate = new QPushButton( buttonWidget);
@@ -143,50 +148,50 @@ void KOEventEditor::setupGeneral()
     loadTemplate->setFixedSize(  size, size );
     buttonLayout->addWidget( buttonWidget );
     mGeneral->initCategories( topFrame, buttonLayout );
 
     topLayout->addStretch( 1 );
 
-    QFrame *topFrame2 = addPage(i18n("Details"));
+    Q3Frame *topFrame2 = addPage(i18n("Details"));
 
-    QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2);
+    Q3BoxLayout *topLayout2 = new Q3VBoxLayout(topFrame2);
     topLayout2->setSpacing(spacingHint()-1);
     topLayout2->setMargin(marginHint()-1);
     topLayout2->setSpacing(spacingHint());
 
     mGeneral->initClass(topFrame2,topLayout2);
     mGeneral->initSecrecy( topFrame2, topLayout2 );
     mGeneral->initDescription(topFrame2,topLayout2);
 
     connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
     connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
   } else {
-    QFrame *topFrame = addPage(i18n("General"));
+    Q3Frame *topFrame = addPage(i18n("General"));
 
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
     topLayout->setSpacing(spacingHint());
 
     mGeneral->initHeader(topFrame,topLayout);
     mGeneral->initTime(topFrame,topLayout);
-    QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *alarmLineLayout = new Q3HBoxLayout(topLayout);
     mGeneral->initAlarm(topFrame,alarmLineLayout);
     mGeneral->initClass(topFrame,alarmLineLayout);
     mGeneral->initDescription(topFrame,topLayout);
-    QBoxLayout *detailsLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *detailsLayout = new Q3HBoxLayout(topLayout);
     mGeneral->initCategories( topFrame, detailsLayout );
     mGeneral->initSecrecy( topFrame, detailsLayout );
   }
 
   mGeneral->finishSetup();
  
 }
 
 void KOEventEditor::setupRecurrence()
 {
-  QFrame *topFrame = addPage( i18n("Recurrence") );
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = addPage( i18n("Recurrence") );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
   mRecurrence = new KOEditorRecurrence( topFrame );
   topLayout->addWidget( mRecurrence );
 }
 
 void KOEventEditor::editEvent(Event *event, bool showDescription)
@@ -353,13 +358,13 @@ void KOEventEditor::slotLoadTemplate()
     ICalFormat format;
     if ( !format.load( &cal, fileName ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return ;
     }
-    QPtrList<Event> events = cal.events();
+    Q3PtrList<Event> events = cal.events();
     Event* event = events.first();
     if ( !event ) {
         KMessageBox::error( this,
                             i18n("Template does not contain\na valid Event."));
     } else {
         kdDebug() << "KOEventEditor::slotLoadTemplate(): readTemplate" << endl;
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index fc4d9a4..81047c1 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -19,23 +19,26 @@
   As a special exception, permission is given to link this program
   with any edition of Qt, and distribute the resulting executable,
   without including the source code for Qt in the source distribution.
 */
 
 #include <qcursor.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PopupMenu>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
 #include <libkcal/event.h>
 
 #include "koeventpopupmenu.h"
 #include "koprefs.h"
 
-KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
+KOEventPopupMenu::KOEventPopupMenu(): Q3PopupMenu()
 {
     mCurrentIncidence = 0;
     mHasAdditionalItems = false;
 
   
     mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow())));
@@ -50,34 +53,34 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
     mEditOnlyItems.append(insertItem (i18n("&Beam..."),
                                       this,SLOT(popupBeam())));
 #endif
     mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"),
                                       this,SLOT(popupCancel())));
     isDisabled = false;  
-    mCatPopup = new QPopupMenu ( this );
+    mCatPopup = new Q3PopupMenu ( this );
     mCatPopup->setCheckable (true);
     connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup()));
     connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCatPopup( int )));
-    mCalPopup = new QPopupMenu ( this );
+    mCalPopup = new Q3PopupMenu ( this );
     mCalPopup->setCheckable (true);
     connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup()));
     connect(mCalPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCalPopup( int )));
     //mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
     //mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
     insertItem (i18n("Categories"),mCatPopup );
     insertItem (i18n("Calendar"),mCalPopup );
-    QValueList<int>::Iterator it;
+    Q3ValueList<int>::Iterator it;
     for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
         mSingleOnlyItems.append(*it);
     }
 
 }
 void KOEventPopupMenu::enableDefault( bool enable )
 {
     isDisabled = !enable;
-    QValueList<int>::Iterator it;
+    Q3ValueList<int>::Iterator it;
     for( it = mSingleOnlyItems.begin(); it != mSingleOnlyItems.end(); ++it ) {
         setItemEnabled(*it,enable);
     }
 }
 
 void KOEventPopupMenu::fillCalPopup() // CAL
@@ -143,22 +146,22 @@ void KOEventPopupMenu::showIncidencePopup(Incidence *incidence)
     if ( !incidence) return;
     mCurrentIncidence = incidence;
   
     if (mCurrentIncidence) {
         // Enable/Disabled menu items only valid for editable events.
         if ( !isDisabled  ) {
-            QValueList<int>::Iterator it;
+            Q3ValueList<int>::Iterator it;
             for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
                 setItemEnabled(*it,!mCurrentIncidence->isReadOnly());
             }
         }
         popup(QCursor::pos());
     }
 }
 
-void KOEventPopupMenu::addAdditionalItem(const QIconSet &icon,const QString &text,
+void KOEventPopupMenu::addAdditionalItem(const QIcon &icon,const QString &text,
                                          const QObject *receiver, const char *member,
                                          bool editOnly)
 {
     if (!mHasAdditionalItems) {
         mHasAdditionalItems = true;
         insertSeparator();
diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h
index e28745b..de5220b 100644
--- a/korganizer/koeventpopupmenu.h
+++ b/korganizer/koeventpopupmenu.h
@@ -23,24 +23,26 @@
 #ifndef KOEVENTPOPUPMENU_H
 #define KOEVENTPOPUPMENU_H
 //
 // Context menu for event views with standard event actions
 //
 
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <libkcal/incidence.h>
 
 using namespace KCal;
 
-class KOEventPopupMenu : public QPopupMenu {
+class KOEventPopupMenu : public Q3PopupMenu {
     Q_OBJECT
   public:
     KOEventPopupMenu();
   
-    void addAdditionalItem(const QIconSet &icon,const QString &text,
+    void addAdditionalItem(const QIcon &icon,const QString &text,
                            const QObject *receiver, const char *member,
                            bool editOnly=false);
 
 
   public slots:
     void showIncidencePopup(Incidence *);
@@ -70,14 +72,14 @@ class KOEventPopupMenu : public QPopupMenu {
     void categoryChanged( Incidence * );
     
   private:
     Incidence *mCurrentIncidence;
     
     bool mHasAdditionalItems;
-    QValueList<int> mEditOnlyItems;
-    QValueList<int> mSingleOnlyItems;
+    Q3ValueList<int> mEditOnlyItems;
+    Q3ValueList<int> mSingleOnlyItems;
     bool isDisabled;
-    QPopupMenu *mCatPopup;
-    QPopupMenu *mCalPopup;
+    Q3PopupMenu *mCatPopup;
+    Q3PopupMenu *mCalPopup;
 };
 
 #endif
diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp
index 1d26930..a4ba85e 100644
--- a/korganizer/koeventview.cpp
+++ b/korganizer/koeventview.cpp
@@ -18,13 +18,13 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcursor.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -70,13 +70,13 @@ KOEventPopupMenu *KOEventView::eventPopup()
 
   return eventPopup;
 }
 
 //---------------------------------------------------------------------------
 
-void KOEventView::showIncidencePopup(QPopupMenu *popup,Incidence *event)
+void KOEventView::showIncidencePopup(Q3PopupMenu *popup,Incidence *event)
 {
   mCurrentIncidence = event;
   if (event) popup->popup(QCursor::pos());
 }
 
 //---------------------------------------------------------------------------
diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h
index 77ec111..f28e68b 100644
--- a/korganizer/koeventview.h
+++ b/korganizer/koeventview.h
@@ -27,12 +27,14 @@
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 
 #include <korganizer/baseview.h>
 
 #include "koeventpopupmenu.h"
+//Added by qt3to4:
+#include <Q3PopupMenu>
 
 using namespace KCal;
 
 class CalPrinter;
 
 /**
@@ -84,13 +86,13 @@ class KOEventView : public KOrg::BaseView
   
     /**
      * Show context menu for event.
      * @param event event, which is to be manipulated by the menu actions
      * @param popup a popop menu created with eventPopup()
      */
-    void showIncidencePopup(QPopupMenu *popup, Incidence *event);
+    void showIncidencePopup(Q3PopupMenu *popup, Incidence *event);
 
     /**
      Perform the default action for an incidence, e.g. open the event editor,
      when double-clicking an event in the agenda view.
     */
     void defaultAction( Incidence * );
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index c0acf34..4df26a9 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -14,18 +14,23 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <qcstring.h>
-#include <qwhatsthis.h>
+#include <q3cstring.h>
+#include <q3whatsthis.h>
 #include <qdialog.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kapplication.h>
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
 #include <kdebug.h>
@@ -52,20 +57,20 @@
 
 #ifdef DESKTOP_VERSION
 #include <kabc/addresseedialog.h>
 #include <kabc/addresseeview.h>
 #include <qprinter.h>
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #else //DESKTOP_VERSION
 #include <qtopia/qcopenvelope_qws.h> 
 #endif //DESKTOP_VERSION
 #include <externalapphandler.h>
 
 KOEventViewer::KOEventViewer(QWidget *parent,const char *name)
-  : QTextBrowser(parent,name)
+  : Q3TextBrowser(parent,name)
 {
     mSyncMode = false;
     mColorMode = 0;
 }
 
 KOEventViewer::~KOEventViewer()
@@ -83,13 +88,13 @@ void KOEventViewer::printMe()
 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
@@ -131,13 +136,13 @@ void KOEventViewer::setSource(const QString& n)
 
             //qDebug("for *%s*          +%s+ ", n.latin1(), uid.latin1());
             if (n == uid ) {
                 //qDebug("found %s ",(*it).mobileHomePhone().latin1() );
                 QDialog dia( this,"dia123", true );
                 dia.setCaption( i18n("Details of attendee") );
-                QVBoxLayout lay ( &dia );
+                Q3VBoxLayout lay ( &dia );
                 KABC::AddresseeView av ( &dia );
                 av.setAddressee( (*it) );
                 lay.addWidget( &av );
                 if ( QApplication::desktop()->width() < 480 )
                     dia.resize( 220, 240);
                 else {
@@ -152,13 +157,13 @@ void KOEventViewer::setSource(const QString& n)
 #else  
     {
         if (  "uid:organizer" == n ) {
             ExternalAppHandler::instance()->requestDetailsFromKAPI("", mCurrentIncidence->organizer(),"");
             return;
         } 
-        QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
+        Q3PtrList<Attendee> attendees = mCurrentIncidence->attendees();
         if (attendees.count()) {  
             Attendee *a;
             for(a=attendees.first();a;a=attendees.next()) {
                 if ( "uid:"+a->uid() == n ) {
                     bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI(a->name(), a->email(), a->uid());
                     return;
@@ -197,20 +202,20 @@ void KOEventViewer::setSource(const QString& n)
         return;
     } else if (n.startsWith("uid:")) {
         DCOPClient *client = KApplication::kApplication()->dcopClient();
         const QByteArray noParamData;
         const QByteArray paramData;
         QByteArray replyData;
-        QCString replyTypeStr;
+        Q3CString replyTypeStr;
 #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()",  noParamData, replyTypeStr, replyData))
         bool foundAbbrowser = PING_ABBROWSER;
 
         if (foundAbbrowser) {
             //KAddressbook is already running, so just DCOP to it to bring up the contact editor
             //client->send("kaddressbook","KAddressBookIface",
-            QDataStream arg(paramData, IO_WriteOnly);
+            QDataStream arg(paramData, QIODevice::WriteOnly);
             arg << n.mid(6);
             client->send("kaddressbook", "KAddressBookIface", "showContactEditor( QString )",  paramData);
             return;
         } else {
             /*
               KaddressBook is not already running.  Pass it the UID of the contact via the command line while starting it - its neater.
@@ -228,13 +233,13 @@ void KOEventViewer::setSource(const QString& n)
         //QTextBrowser::setSource(n);
     }
 #endif
 }
 void KOEventViewer::mailToAttendees( bool all )
 {
-    QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
+    Q3PtrList<Attendee> attendees = mCurrentIncidence->attendees();
     if (attendees.count() == 0) return;
     QStringList nameList;
     QStringList emailList;
     QStringList uidList;
     Attendee* a;
     for(a=attendees.first();a;a=attendees.next()) {
@@ -257,13 +262,13 @@ void KOEventViewer::mailToAttendees( bool all )
     ExternalAppHandler::instance()->mailToMultipleContacts( emailList.join(","), mMailSubject );
 #endif
 
 }
 void KOEventViewer::addTag(const QString & tag,const QString & text)
 {
-    int number=text.contains("\n");
+    int number=text.count("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1) 
         {
             if (number > 0) {
@@ -584,13 +589,13 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         mText += "<a href=\"todo_uid:" + event->relatedTo()->uid() + "\">";
         mText += deTag(event->relatedTo()->summary());
         mText += "</a><br>";
 
         //        mText.append(deTag("[" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] " +event->relatedTo()->summary()) +"<br>");
     }
-    QPtrList<Incidence> Relations = event->relations();
+    Q3PtrList<Incidence> Relations = event->relations();
     Incidence *to;
     if ( Relations.first() )
         addTag("b",i18n("Sub todos:<br>"));
     for (to=Relations.first();to;to=Relations.next()) {
         QString t_name = "[" +QString::number(((Todo*)to)->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%] ";// +to->relatedTo()->summary());
         mText += t_name;
@@ -618,13 +623,13 @@ void KOEventViewer::formatCategories(Incidence *event)
             addTag("p","<b>"+i18n("Categories")+":</b> " + event->categoriesStrWithSpace() ) ;
         }
     }
 }
 void KOEventViewer::formatAttendees(Incidence *event)
 {
-    QPtrList<Attendee> attendees = event->attendees();
+    Q3PtrList<Attendee> attendees = event->attendees();
     if (attendees.count()) {
         
   
         QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small);
         QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small);
         addTag("h3",i18n("Organizer"));
@@ -651,13 +656,13 @@ void KOEventViewer::formatAttendees(Incidence *event)
 
 
 #else
         mText.append(event->organizer());
 #endif
        
-        if (iconPath) {
+        if (!iconPath.isEmpty()) {
             mText += " <a href=\"mailto:" + event->organizer() + "\">";
             mText += "<IMG src=\"" + iconPath + "\">";
             mText += "</a>\n";
         }
         mText.append("</li></ul>");
 
@@ -701,13 +706,13 @@ void KOEventViewer::formatAttendees(Incidence *event)
             else mText += a->email();
             mText += "</a>\n";
 #endif
 
           
             if (!a->email().isEmpty()) {
-                if (iconPath) {
+                if (!iconPath.isEmpty()) {
                     mText += "<a href=\"mailto:" + a->realName() +" <" + a->email() + ">:" + mMailSubject + "\">";
                     if ( a->RSVP() ) {
                         ++a_count_nr;
                         mText += "<IMG src=\"" + iconPath + "\">";
                     }
                     else {
@@ -859,10 +864,10 @@ void KOEventViewer::keyPressEvent ( QKeyEvent * e )
     switch ( e->key() ) {
     case Qt::Key_Return:
     case Qt::Key_Enter :
         e->ignore();
         break;
     default:
-        QTextBrowser::keyPressEvent ( e );
+        Q3TextBrowser::keyPressEvent ( e );
         break; 
     }
 }
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 64eb4ff..3df667f 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -19,13 +19,16 @@
 #ifndef KOEVENTVIEWER_H
 #define KOEVENTVIEWER_H
 //
 // Viewer widget for events.
 //
 
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QKeyEvent>
 
 #include <libkcal/event.h>
 #include <libkcal/journal.h>
 
 
 using namespace KCal;
@@ -34,29 +37,29 @@ using namespace KCal;
 
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qdialog.h>
 #include <qlabel.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <kglobal.h>
 
 class KOPrintPrefs : public QDialog
 {
   public:
     KOPrintPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("KO/Pi Printout") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 9 );
         lay->setMargin( 9 );
         QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n"), this );
         lay->addWidget( lab ); 
-        lab->setAlignment( AlignCenter );
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("Printout Mode"), this );
+        lab->setAlignment( Qt::AlignCenter );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("Printout Mode"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         pmNo = new QRadioButton(i18n("Print unscaled"), format );
         pmScaledDown = new QRadioButton(i18n("Print scaled down to fit one page"), format );
         new QRadioButton(i18n("Print scaled up/down to fit one page"), format );
         pmScaledDown->setChecked( true );
@@ -80,13 +83,13 @@ private:
     QRadioButton* pmNo;
     QRadioButton* pmScaledDown;
 };
 
 #endif
 
-class KOEventViewer : public QTextBrowser {
+class KOEventViewer : public Q3TextBrowser {
     Q_OBJECT
   public:
     KOEventViewer(QWidget *parent=0,const char *name=0);
     virtual ~KOEventViewer();
 
     void setSource(const QString &);
@@ -114,13 +117,13 @@ class KOEventViewer : public QTextBrowser {
     void formatCategories(Incidence *event);
     void formatAttendees(Incidence *event);
     void formatReadOnly(Incidence *event);
     void keyPressEvent ( QKeyEvent * e );
 
   private:
-    QTextBrowser *mEventTextView;
+    Q3TextBrowser *mEventTextView;
     bool mSyncMode;
     QString deTag(QString text);
 
     QString mText;
     QString mMailSubject;
     Incidence* mCurrentIncidence;  
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 2e936f3..3a37852 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -19,18 +19,21 @@
 
 #include <klocale.h>
 
 #include <libkcal/event.h>
 #include <qtimer.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <QHideEvent>
+#include <QKeyEvent>
 
 #include "koeventviewer.h"
 #include <kmessagebox.h>
 #include "koprefs.h"
 #include <libkcal/todo.h>
-#include "qapp.h"
+#include "qapplication.h"
 
 #include "koeventviewerdialog.h"
 extern int globalFlagBlockAgenda;
 
 KOEventViewerDialog::KOEventViewerDialog(QWidget *parent,const char *name)
   : KDialogBase(parent,name,
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index 71696f4..947c10b 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -19,13 +19,16 @@
 #ifndef KOEVENTVIEWERDIALOG_H
 #define KOEVENTVIEWERDIALOG_H
 //
 // Viewer dialog for events.
 //
 
-#include <qtextview.h>
+#include <q3textview.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <QHideEvent>
 
 #include <kdialogbase.h>
 
 #include <libkcal/event.h>
 
 using namespace KCal;
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index ee9c9f6..8335ba9 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -24,16 +24,20 @@
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3PtrList>
 
 
 #include <libkcal/calfilter.h>
 
 #include "kofilterview.h"
 #include "koprefs.h"
@@ -44,14 +48,14 @@
 #include <kmessagebox.h>
 
 
 
  
 
-KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent,
-                           const char* name,WFlags fl )
+KOFilterView::KOFilterView(Q3PtrList<CalFilter> *filterList,QWidget* parent,
+                           const char* name,Qt::WFlags fl )
   : KOFilterView_base(parent,name,fl)
 {
   mFilters = filterList;
 
   connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged()));
   connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged()));
@@ -111,20 +115,20 @@ void KOFilterView::setSelectedFilter( int fil )
 }
 
 
 
 KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
-  : QScrollView(parent,name)
+  : Q3ScrollView(parent,name)
 {
     mw = 0; 
     setResizePolicy( AutoOneFit );
-    setFrameStyle ( QFrame::Panel | QFrame::Plain );
+    setFrameStyle ( Q3Frame::Panel | Q3Frame::Plain );
     setLineWidth ( 1 ); 
     setMidLineWidth ( 1 ); 
-    setFocusPolicy(NoFocus); 
+    setFocusPolicy(Qt::NoFocus); 
 }
 
 KOCalEditView::~KOCalEditView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
@@ -244,61 +248,61 @@ void KOCalEditView::readConfig()
     mROB.clear();
 
     if ( mw ) delete mw;
     mw = new QWidget ( viewport() );
     addChild(mw);
     int ii = 0;
-    mainLayout = new QGridLayout ( mw , 2, 8 );
+    mainLayout = new Q3GridLayout ( mw , 2, 8 );
     mainLayout->setMargin( 2 );
     mainLayout->setSpacing( 2 );
     QPushButton * addButT = new QPushButton ( mw );
-    addButT->setFocusPolicy(NoFocus); 
+    addButT->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addButT,0,0 );
     addButT->setText( "D");
     connect(addButT,SIGNAL(clicked()),SLOT(defaultInfo()));
-    QWhatsThis::add( addButT, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") );
+    Q3WhatsThis::add( addButT, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") );
     //addBut->setPixmap ( SmallIcon("greenhook16"));
     QPushButton *addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("eye"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>set a calendar to be visible</b>. If a calendar is not visible its entries are not displayed in the views. You can add items to it and it is loaded/saved as usual.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>set a calendar to be visible</b>. If a calendar is not visible its entries are not displayed in the views. You can add items to it and it is loaded/saved as usual.") );
     connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
     int max = addBut->sizeHint().height();
     addBut->setMaximumWidth( max );
     addButT->setFixedSize( QSize( max, max ) );
     QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw );
     mainLayout->addWidget( lab,0,++ii ); 
-    QWhatsThis::add( lab, i18n("In this column you can see the <b>name of the calendar</b>. If you click on the name button you will get an information box about the loaded calendar file. If the file was not loaded at startup you can try to load it here again.") );
+    Q3WhatsThis::add( lab, i18n("In this column you can see the <b>name of the calendar</b>. If you click on the name button you will get an information box about the loaded calendar file. If the file was not loaded at startup you can try to load it here again.") );
     //lab = new QLabel ( i18n(" "), mw );
     //mainLayout->addWidget( lab,0,++ii );
     //lab->setFixedWidth( 1 );
     addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("bell"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>disable the alarms of a calendar all together</b>. The alarm data in the calendar itself is not changed, the alarms are marked internally as \"do not use\". Useful if you load a calendar of another person but do not want to get notified about alarms of that person.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>disable the alarms of a calendar all together</b>. The alarm data in the calendar itself is not changed, the alarms are marked internally as \"do not use\". Useful if you load a calendar of another person but do not want to get notified about alarms of that person.") );
     connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("pencil"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>set a calendar and all entries of the calendar to read only</b>. If a calendar is readonly the entries cannot be edited and no items can be added to the calendar. If you change a setting of a calendar to readonly in this column all data will be saved because the data of a readonly calendar is not saved later.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>set a calendar and all entries of the calendar to read only</b>. If a calendar is readonly the entries cannot be edited and no items can be added to the calendar. If you change a setting of a calendar to readonly in this column all data will be saved because the data of a readonly calendar is not saved later.") );
     connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
     lab = new QLabel ( "", mw );
     mainLayout->addWidget( lab,0,++ii );
 
     addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("plus"));
     connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
-    QWhatsThis::add( addBut, i18n("Click this button to <b>add a calendar</b>. You can add an existing calendar file or you can add a new calendar and KO/Pi creates a new empty calendar file for you.") );
+    Q3WhatsThis::add( addBut, i18n("Click this button to <b>add a calendar</b>. You can add an existing calendar file or you can add a new calendar and KO/Pi creates a new empty calendar file for you.") );
     lab = new QLabel ( " ", mw );
     mainLayout->addWidget( lab,0,++ii );
 
 
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     int row = 1;
@@ -428,17 +432,17 @@ int KOCalEditView::addCalendar( QString name, QString file, bool ask )
     }
     if (!fi.exists() ) {
         if ( ask )
             if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( KGlobal::formatMessage (absFile,0) ) )== KMessageBox::No )
                 return 0;
         QFile fileIn( absFile );
-        if (!fileIn.open( IO_WriteOnly ) ) {
+        if (!fileIn.open( QIODevice::WriteOnly ) ) {
             KMessageBox::sorry( this,  i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); 
             return 0;
         } 
-        QTextStream tsIn( &fileIn );
+        Q3TextStream tsIn( &fileIn );
         tsIn.setCodec( QTextCodec::codecForName("utf8") );
         tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n";
         fileIn.close();       
     }
     KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar();
     kkf->mName = name;
@@ -472,13 +476,13 @@ void KOCalEditView::enableAlarm()
     toggleList( mAlarmB );
 }
 void KOCalEditView::disableRO()
 {
     toggleList( mROB, false );
 }
-void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list , bool enable )
+void KOCalEditView::toggleList ( Q3PtrList<KOCalCheckButton> list , bool enable )
 {
     bool dis = !enable;
     KOCalCheckButton* it = list.first();
     while ( it ) {
         if ( !it->isChecked() == enable && it->isEnabled() ) {
             dis = !dis;
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 0dd423a..f1bbab4 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -23,41 +23,47 @@
 #ifndef KOFILTERVIEW_H
 #define KOFILTERVIEW_H
 
 #include <qstring.h>
 #include <qcheckbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qradiobutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 #include <kconfig.h>
 #include "kofilterview_base.h"
 
 #include <libkcal/calfilter.h>
 
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
-class QGridLayout;
+class Q3GridLayout;
 
 using namespace KCal;
 
 class KONewCalPrefs : public QDialog
 {
     Q_OBJECT 
   public:
     KONewCalPrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Add new Calendar") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab = new QLabel( i18n("<b>Name of new calendar:</b>"), this );
         lay->addWidget( lab ); 
         nameE = new KLineEdit( this );
         lay->addWidget( nameE ); 
@@ -107,13 +113,13 @@ class KOCalButton : public QPushButton
     KOCalButton( QWidget *parent=0, const char *name=0 ) :
       QPushButton( parent, name) 
     {
       connect( this, SIGNAL( clicked() ),
                SLOT( bottonClicked() )); 
       mNumber = -1;
-      setFocusPolicy(NoFocus); 
+      setFocusPolicy(Qt::NoFocus); 
     }
     void setNum ( int num ) {mNumber = num; }
     signals:
     void selectNum ( int );
 private: 
     int mNumber;
@@ -132,13 +138,13 @@ class KOCalCheckButton : public QCheckBox
     KOCalCheckButton( QWidget *parent=0, const char *name=0 ) :
       QCheckBox( parent, name) 
     {
       connect( this, SIGNAL( toggled ( bool ) ),
                SLOT( bottonClicked( bool ) )); 
       mNumber = -1;
-      setFocusPolicy(NoFocus); 
+      setFocusPolicy(Qt::NoFocus); 
       //setMaximumWidth( 10 );
 
     }
     void setNum ( int num ) {mNumber = num; }
     signals:
     void selectNum ( int, bool );
@@ -160,13 +166,13 @@ class KOCalRadioButton : public QRadioButton
     KOCalRadioButton( QWidget *parent=0, const char *name=0 ) :
       QRadioButton( parent, name) 
     {
       connect( this, SIGNAL( toggled ( bool ) ),
                SLOT( bottonClicked( bool ) )); 
       mNumber = -1;
-      setFocusPolicy(NoFocus); 
+      setFocusPolicy(Qt::NoFocus); 
       //setMaximumWidth( 10 );
 
     }
         int num() { return mNumber;}
     void setNum ( int num ) {mNumber = num; }
     signals:
@@ -185,13 +191,13 @@ private slots :
 
 
 class KOFilterView : public KOFilterView_base
 {
     Q_OBJECT
   public:
-    KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent=0,const char* name=0, WFlags fl=0);
+    KOFilterView(Q3PtrList<CalFilter> *filterList,QWidget* parent=0,const char* name=0, Qt::WFlags fl=0);
     ~KOFilterView();
 
     void updateFilters();
 
     bool filtersEnabled();
     void setFiltersEnabled(bool);
@@ -201,16 +207,16 @@ class KOFilterView : public KOFilterView_base
 
   signals:
     void filterChanged();
     void editFilters();
 
   private:
-    QPtrList<CalFilter> *mFilters;
+    Q3PtrList<CalFilter> *mFilters;
 };
 
-class KOCalEditView : public QScrollView
+class KOCalEditView : public Q3ScrollView
 {
     Q_OBJECT
   public:
     KOCalEditView( QWidget* parent=0,const char* name=0);
     ~KOCalEditView();
     int addCalendar( QString calName, QString fileName, bool ask = true );
@@ -241,17 +247,17 @@ class KOCalEditView : public QScrollView
     void needsUpdate();
     void checkCalendar();
     void requestCalendarInfo( int id );
 
   private:
     QWidget *mw;
-    void toggleList ( QPtrList<KOCalCheckButton> , bool b = true );
-    QPtrList<KOCalRadioButton> mStdandardB;
-    QPtrList<KOCalCheckButton> mEnabledB;
-    QPtrList<KOCalCheckButton> mAlarmB;
-    QPtrList<KOCalCheckButton> mROB;
-    QGridLayout* mainLayout; 
+    void toggleList ( Q3PtrList<KOCalCheckButton> , bool b = true );
+    Q3PtrList<KOCalRadioButton> mStdandardB;
+    Q3PtrList<KOCalCheckButton> mEnabledB;
+    Q3PtrList<KOCalCheckButton> mAlarmB;
+    Q3PtrList<KOCalCheckButton> mROB;
+    Q3GridLayout* mainLayout; 
 };
 
 
 
 #endif // KOFILTERVIEW_H
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 79b97e8..63d044c 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -19,26 +19,26 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
 #include <qlayout.h>
-#include <qprogressbar.h>
-#include <qprogressdialog.h>
-#include <qwidgetstack.h>
+#include <q3progressbar.h>
+#include <q3progressdialog.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qapplication.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qregexp.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qdatetime.h>
-#include <qlistview.h>
+#include <q3listview.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
@@ -67,34 +67,34 @@ QDateTime mDdate2Qdtr( DATE dt)
     odt = dt;
     odt.GetAsSystemTime(st);
     QDateTime qdt (QDate(st.wYear, st.wMonth,st.wDay ),QTime( st.wHour, st.wMinute,st.wSecond ) );
     return qdt;
 }
 
-class OLEListViewItem : public QCheckListItem
+class OLEListViewItem : public Q3CheckListItem
 {
   public:
-    OLEListViewItem( QListView *parent, QString text ) :
-      QCheckListItem( parent, text, QCheckListItem::CheckBox ) { mData = 0; };
-    OLEListViewItem(  QListViewItem *after, QString text ) :
-      QCheckListItem( after, text, QCheckListItem::CheckBox ) { mData = 0; };
+    OLEListViewItem( Q3ListView *parent, QString text ) :
+      Q3CheckListItem( parent, text, Q3CheckListItem::CheckBox ) { mData = 0; };
+    OLEListViewItem(  Q3ListViewItem *after, QString text ) :
+      Q3CheckListItem( after, text, Q3CheckListItem::CheckBox ) { mData = 0; };
     ~OLEListViewItem() {};
   void setData( DWORD data ) {mData= data; };
   DWORD data() { return mData ;};
   private:
      DWORD  mData;
 }; 
 
 KOImportOLdialog::KOImportOLdialog( const QString &caption, 
                                       Calendar *calendar, QWidget *parent ) :
     KDialogBase( Plain, caption, User1 | Close, Ok,
                parent, caption, true, false, i18n("Import!") )
 {
-  QHBox * mw = new  QHBox( this );
+  Q3HBox * mw = new  Q3HBox( this );
   setMainWidget( mw );
-  mListView = new QListView( mw );
+  mListView = new Q3ListView( mw );
   mListView->addColumn(i18n("Select Folder to import"));
   mListView->addColumn(i18n("Content Type"));
   mCalendar = calendar;
   connect( this, SIGNAL( user1Clicked() ),SLOT ( slotApply()));
   setupFolderView();
   resize( sizeHint().width()+50,  sizeHint().height()+50 );
@@ -209,13 +209,13 @@ void KOImportOLdialog::readCalendarData( DWORD folder )
   mf.m_lpDispatch->AddRef();
   _Items folderItems;
   _variant_t indx((long)0);
   LPDISPATCH itm;
   int i;
   folderItems = mf.GetItems(); 
-  QProgressDialog bar( i18n("Importing calendar data"),i18n("Abort"), folderItems.GetCount(),this );
+  Q3ProgressDialog bar( i18n("Importing calendar data"),i18n("Abort"), folderItems.GetCount(),this );
   bar.setCaption (i18n("Importing!") );
   int h = bar.sizeHint().height() ;
   int w = 300;
   int dw = QApplication::desktop()->width();
   int dh = QApplication::desktop()->height();
   //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
diff --git a/korganizer/koimportoldialog.h b/korganizer/koimportoldialog.h
index c8847c5..d66f099 100644
--- a/korganizer/koimportoldialog.h
+++ b/korganizer/koimportoldialog.h
@@ -28,13 +28,13 @@
 #include <afxdisp.h>  
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 
 
 class QDateTime;
-class QListView;
+class Q3ListView;
 class OLEListViewItem;
 class _AppointmentItem;
 namespace KPIM { class CategorySelectDialog; }
 
 using namespace KCal;
 
@@ -69,13 +69,13 @@ class KOImportOLdialog : public KDialogBase
     void setupFolderView();
     void addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent);
     void readCalendarData( DWORD folder );
     void ol2kopiCalendar( _AppointmentItem * , bool computeRecurrence = true );
 
     Calendar *mCalendar;
-    QListView * mListView;
+    Q3ListView * mListView;
     QString getUidByEmail( QString email );
 
   private:
     int importedItems;
 };
 
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 236f6f9..2060ea1 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -19,18 +19,20 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
 #include <qlayout.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
@@ -79,15 +81,15 @@ KOIncidenceEditor::~KOIncidenceEditor()
 {
     //delete mCategoryDialog;
 }
 
 void KOIncidenceEditor::setupAttendeesTab()
 {
-  QFrame *topFrame = addPage(i18n("Attendees"));
+  Q3Frame *topFrame = addPage(i18n("Attendees"));
 
-  QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+  Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
 
   mDetails = new KOEditorDetails(spacingHint()-2,topFrame);
   topLayout->addWidget(mDetails);
 }
 
 void KOIncidenceEditor::alarmWarning()
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 406df5a..51594ff 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -22,19 +22,25 @@
 */
 
 //
 // View of Journal entries
 
 #include <qlayout.h>
-#include <qscrollview.h>
-#include <qpopupmenu.h>
-#include <qhbox.h>
+#include <q3scrollview.h>
+#include <q3popupmenu.h>
+#include <q3hbox.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3PtrList>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include "koprefs.h"
 #include <kglobal.h>
 #include <ktextedit.h>
@@ -48,33 +54,33 @@ using namespace KOrg;
 
 KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
                        const char *name)
   : KOrg::BaseView(calendar, parent, name)
 {
     mCalendar = calendar;
-    QHBox * vb = new QHBox ( this );
+    Q3HBox * vb = new Q3HBox ( this );
     QPushButton * newJournal = new QPushButton( vb );
     QPixmap icon;
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("ko16old");
     else
         icon = SmallIcon("ko24old");
     newJournal->setPixmap (icon ) ;
     int size = newJournal->sizeHint().height();
     newJournal->setFixedSize(  size, size );
     mDateLabel = new QLabel ( vb );
     mDateLabel->setMargin(1);
-    mDateLabel->setAlignment(AlignCenter);
-    QScrollView * sv = new QScrollView( this );
-    QVBoxLayout * hbl = new QVBoxLayout( this );
+    mDateLabel->setAlignment(Qt::AlignCenter);
+    Q3ScrollView * sv = new Q3ScrollView( this );
+    Q3VBoxLayout * hbl = new Q3VBoxLayout( this );
     hbl->addWidget( vb );
     hbl->addWidget( sv );
     parWid = new QWidget( sv->viewport() );
     sv->addChild(parWid);
-    sv->setResizePolicy( QScrollView:: AutoOneFit );
-    mTopLayout = new QVBoxLayout(parWid);
+    sv->setResizePolicy( Q3ScrollView:: AutoOneFit );
+    mTopLayout = new Q3VBoxLayout(parWid);
     connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) );
     getNewEntry();
 }
 
 KOJournalView::~KOJournalView()
 {
@@ -93,15 +99,15 @@ JournalEntry* KOJournalView::getNewEntry()
     connect ( Entry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) )  ;
     connect ( Entry,SIGNAL(newJournal() ),this ,SLOT(newJournal() ) )  ;
     connect ( Entry,SIGNAL(showJournalOnly( Journal * ) ),this ,SLOT(showOnly ( Journal* ) ) )  ;
     return Entry;
 }
 
-QPtrList<Incidence> KOJournalView::selectedIncidences()
+Q3PtrList<Incidence> KOJournalView::selectedIncidences()
 {
-  QPtrList<Incidence> eventList;
+  Q3PtrList<Incidence> eventList;
 
   return eventList;
 }
 void KOJournalView::updateConfig()
 {
     JournalEntry* mEntry = jEntries.first();
@@ -159,19 +165,19 @@ void KOJournalView::showOnly ( Journal* j )
     //qDebug("showOnly %x ", j);
     flushView();
     if ( j == 0 ) {
         showDates( mDate, QDate() );
         return;
     }
-    QPtrList<Journal> jl;
+    Q3PtrList<Journal> jl;
     jl.append ( j );
     showList( jl );
     JournalEntry* mEntry = jEntries.first();
     mEntry->setShowOnly();
 }
-void KOJournalView::showList(QPtrList<Journal> jl)
+void KOJournalView::showList(Q3PtrList<Journal> jl)
 { 
     static bool ff = false;
     if ( ff ) return;
     ff = true;
     //qDebug("KOJournalView::showList %d",jl.count() );
     JournalEntry* mEntry = jEntries.first();
@@ -222,17 +228,17 @@ void KOJournalView::showList(QPtrList<Journal> jl)
 }
 
 void KOJournalView::showDates(const QDate &start, const QDate &)
 {
     mDate = start;
     mDateLabel->setText(KGlobal::locale()->formatDate(mDate));
-    QPtrList<Journal> jl = calendar()->journals4Date( start );
+    Q3PtrList<Journal> jl = calendar()->journals4Date( start );
     showList( jl );
 }
 
-void KOJournalView::showEvents(QPtrList<Event>)
+void KOJournalView::showEvents(Q3PtrList<Event>)
 {
   // After new creation of list view no events are selected.
 //  emit incidenceSelected( 0 );
 }
 
 void KOJournalView::changeEventDisplay(Event *, int /*action*/)
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 7fa94ae..22f26cd 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -22,12 +22,17 @@
 */
 #ifndef _KOJOURNALVIEW_H
 #define _KOJOURNALVIEW_H
 
 #include <korganizer/baseview.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3PtrList>
+#include <QLabel>
+#include <Q3BoxLayout>
 
 class JournalEntry;
 class QLabel;
 
 /**
  * This class provides a journal view.
@@ -43,13 +48,13 @@ class KOJournalView : public KOrg::BaseView
     KOJournalView(Calendar *calendar, QWidget *parent = 0, 
                const char *name = 0);
     ~KOJournalView();
 
     virtual int currentDateCount();
     void clearList();
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
     DateList selectedDates()
       {DateList q;
        return q;};
     void checkModified();
  signals:
      void deleteJournal(Journal *);
@@ -57,23 +62,23 @@ class KOJournalView : public KOrg::BaseView
      void showOnly ( Journal* );
      void newJournal();
     void updateView();
     void flushView();
     void updateConfig();
     void showDates( const QDate &start, const QDate &end );
-    void showEvents(QPtrList<Event> eventList);
+    void showEvents(Q3PtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
   
   private:
-    void showList(QPtrList<Journal> jl);
+    void showList(Q3PtrList<Journal> jl);
     Calendar *mCalendar;
     JournalEntry* getNewEntry();
-    QPtrList<JournalEntry> jEntries; 
+    Q3PtrList<JournalEntry> jEntries; 
     void keyPressEvent ( QKeyEvent * ) ;
-    QBoxLayout *mTopLayout;
+    Q3BoxLayout *mTopLayout;
     QWidget *parWid;
     QLabel * mDateLabel;
     QDate mDate;
     
 };
 
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 192f8c0..0ea1d50 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -19,26 +19,35 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qpopupmenu.h>
-#include <qprogressbar.h>
+#include <q3popupmenu.h>
+#include <q3progressbar.h>
 #include <qfileinfo.h>
 #include <qmessagebox.h>
 #include <qdialog.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qdir.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qregexp.h>
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <Q3PtrList>
+
+#include<QDesktopWidget>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 
@@ -67,16 +76,16 @@
 #include "kolistview.h"
 #include "koeventviewer.h"
 
 extern QPixmap* sgListViewCompletedPix[6];
 extern QPixmap* sgListViewJournalPix;
 
-class KOListViewWhatsThis :public QWhatsThis
+class KOListViewWhatsThis :public Q3WhatsThis
 {
 public:
-  KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
+  KOListViewWhatsThis( QWidget *wid, KOListView* view ) : Q3WhatsThis( wid ), _wid(wid),_view (view) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
     return _view->getWhatsThisText(p) ;
   }
@@ -271,69 +280,69 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mListView->addColumn(i18n("Recurs")); // recurs?
     mListView->addColumn(i18n("Cancelled"));
     mListView->addColumn(i18n("Categories"));
     mListView->addColumn(i18n("Calendar"));
     mListView->addColumn(i18n("Last Modified"));
 
-    mListView->setColumnAlignment(0,AlignLeft);
-    mListView->setColumnAlignment(1,AlignLeft);
-    mListView->setColumnAlignment(2,AlignHCenter);
-    mListView->setColumnAlignment(3,AlignLeft);
-    mListView->setColumnAlignment(4,AlignHCenter);
-    mListView->setColumnAlignment(5,AlignLeft);
-    mListView->setColumnAlignment(6,AlignLeft);
-    mListView->setColumnAlignment(7,AlignLeft);
-    mListView->setColumnAlignment(8,AlignLeft);
-    mListView->setColumnAlignment(9,AlignLeft);
-    mListView->setColumnAlignment(10,AlignLeft);
-    mListView->setColumnAlignment(11,AlignLeft);
+    mListView->setColumnAlignment(0,Qt::AlignLeft);
+    mListView->setColumnAlignment(1,Qt::AlignLeft);
+    mListView->setColumnAlignment(2,Qt::AlignHCenter);
+    mListView->setColumnAlignment(3,Qt::AlignLeft);
+    mListView->setColumnAlignment(4,Qt::AlignHCenter);
+    mListView->setColumnAlignment(5,Qt::AlignLeft);
+    mListView->setColumnAlignment(6,Qt::AlignLeft);
+    mListView->setColumnAlignment(7,Qt::AlignLeft);
+    mListView->setColumnAlignment(8,Qt::AlignLeft);
+    mListView->setColumnAlignment(9,Qt::AlignLeft);
+    mListView->setColumnAlignment(10,Qt::AlignLeft);
+    mListView->setColumnAlignment(11,Qt::AlignLeft);
     mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
 
     int iii = 0;
     for ( iii = 0; iii< 12 ; ++iii )
-        mListView->setColumnWidthMode( iii, QListView::Manual );
+        mListView->setColumnWidthMode( iii, Q3ListView::Manual );
 
-    QBoxLayout *layoutTop = new QVBoxLayout(this);
+    Q3BoxLayout *layoutTop = new Q3VBoxLayout(this);
     layoutTop->addWidget(mListView);
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mPopupMenu = eventPopup();
-    QPopupMenu* selPopup = new QPopupMenu ( this );
+    Q3PopupMenu* selPopup = new Q3PopupMenu ( this );
     mPopupMenu->insertSeparator();
     
     selPopup->insertItem(i18n("All"),this,
                                   SLOT(allSelection()));
     selPopup->insertItem(i18n("None"),this,
                                   SLOT(clearSelection()));
     selPopup->insertItem(i18n("Delete selected..."),this,
                                   SLOT(deleteAll()));
     mPopupMenu->insertItem(i18n("Selection"), selPopup );
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Hide all selected"),this,
                                   SLOT(hideAll()),true);
 
     selPopup->insertSeparator();
-    QPopupMenu * exportPO = new QPopupMenu ( this );
+    Q3PopupMenu * exportPO = new Q3PopupMenu ( this );
     selPopup->insertItem( i18n("Export"),  exportPO );
 #ifdef DESKTOP_VERSION
     mPopupMenu->insertSeparator();
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Print complete list..."),this,
                                   SLOT(printList()),true);
 #endif
-    mCalPopup = new QPopupMenu ( this );
+    mCalPopup = new Q3PopupMenu ( this );
     selPopup->insertItem( i18n("Set Calendar"),  mCalPopup );
 
     selPopup->insertItem(i18n("Set categories")+"...",this,
                          SLOT(setCat()) );
     selPopup->insertItem( i18n("Set alarm..."),this,
                           SLOT(setAlarm()));
 #if 0
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Set categories")+"...",this,
                                   SLOT(setCat()),true);
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Set alarm..."),this,
                                   SLOT(setAlarm()),true); 
 #endif
     QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this,
                      SLOT( populateCalPopup() ));
     QObject::connect(mCalPopup,SIGNAL(activated( int )),this,
@@ -353,13 +362,13 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     //mPopupMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
     selPopup->insertSeparator();
     selPopup->insertItem( i18n("Beam via IR..."),this,
                           SLOT(beamSelected()));
 #if 0
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Beam via IR"),this,
                                   SLOT(beamSelected()),true);
 #endif
 #endif
     /*
       mPopupMenu = new QPopupMenu;
@@ -372,19 +381,19 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
       SLOT(showDates()));
       mPopupMenu->insertItem(i18n("Hide Dates"), this,
       SLOT(hideDates()));
     */
     QObject::connect(mListView,SIGNAL( newEvent()),
                      this,SIGNAL(signalNewEvent()));
-    QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
-                     this,SLOT(defaultItemAction(QListViewItem *)));
-    QObject::connect(mListView,SIGNAL(rightButtonPressed( QListViewItem *,
+    QObject::connect(mListView,SIGNAL(doubleClicked(Q3ListViewItem *)),
+                     this,SLOT(defaultItemAction(Q3ListViewItem *)));
+    QObject::connect(mListView,SIGNAL(rightButtonPressed( Q3ListViewItem *,
                                                            const QPoint &, int )),
-                     this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
-    QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
-                     SLOT(processSelectionChange(QListViewItem *)));
+                     this,SLOT(popupMenu(Q3ListViewItem *,const QPoint &,int)));
+    QObject::connect(mListView,SIGNAL(currentChanged(Q3ListViewItem *)),
+                     SLOT(processSelectionChange(Q3ListViewItem *)));
     QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                      SIGNAL(showIncidenceSignal(Incidence *)) );
 
     readSettings(KOGlobals::config(),"KOListView Layout");
 }
 
@@ -425,13 +434,13 @@ void KOListView::setCalendar( int c )
                                        i18n("Continue"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result != 0 ) {
         return;
     }
     
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
     int icount = delSel.count();
     if ( icount ) {
         Incidence *incidence = delSel.first();
         while ( incidence ) {
             incidence->setCalID( c );
             KOListViewItem * item = getItemForEvent( incidence );
@@ -439,13 +448,13 @@ void KOListView::setCalendar( int c )
                 ListItemVisitor v(item, mStartDate );
                 incidence->accept(v);
             }
             incidence = delSel.next();
         }
     }
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     while ( cal ) {
         mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled );
         mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled );
         mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly );
         if ( cal->isStandard )
@@ -494,13 +503,13 @@ void KOListView::setCat()
 
 void  KOListView::setAlarm()
 {
     KOAlarmPrefs kap( this);
     if ( !kap.exec() )
         return;
-    QPtrList<Incidence> delSel = getSelectedIncidences( true, true, false, true ); // no journals, only due todos
+    Q3PtrList<Incidence> delSel = getSelectedIncidences( true, true, false, true ); // no journals, only due todos
     Incidence* inc = delSel.first();
     int count = 0;
     while ( inc ) {
         ++count;
         if (kap.mAlarmButton->isChecked()) {
             if (inc->alarms().count() == 0) 
@@ -519,13 +528,13 @@ void  KOListView::setAlarm()
             }
             else if (!kap.mAlarmSound.isEmpty() && kap.mAlarmSoundButton->isOn())
                 alarm->setAudioAlarm(kap.mAlarmSound);
             else
                 alarm->setType(Alarm::Invalid);
         } else {
-            QPtrList<Alarm> alarms = inc->alarms();
+            Q3PtrList<Alarm> alarms = inc->alarms();
             Alarm *alarm;
             for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
                 alarm->setEnabled(false);
                 alarm->setType(Alarm::Invalid);
             }
         }
@@ -549,13 +558,13 @@ void KOListView::setCategories( bool removeOld )
     if (! csd->exec()) { 
         delete csd;
         return;
     }
     QStringList catList = csd->selectedCategories();
     delete csd;
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
     Incidence* inc = delSel.first();
     while ( inc ) {
         if ( removeOld ) {
             inc->setCategories( catList, false );
         } else {
             inc->addCategories( catList, false );
@@ -569,13 +578,13 @@ void KOListView::setCategories( bool removeOld )
     }
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 
 void KOListView::beamSelected()
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
     if ( delSel.count() )
         emit beamIncidenceList( delSel );
 }
 
 void KOListView::saveDescriptionToFile()
 {
@@ -584,13 +593,13 @@ void KOListView::saveDescriptionToFile()
                                        i18n("This saves the text/details of selected\nJournals and Events/Todos\nto a text file."),
                                        i18n("Continue"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result != 0 ) {
         return;
     }
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
     int icount = delSel.count();
     if ( icount ) {
         QString fn =  KOPrefs::instance()->mLastSaveFile;
         fn =  KFileDialog::getSaveFileName( fn, i18n("Save filename"), this );
     
         if ( fn == "" )
@@ -642,17 +651,17 @@ void KOListView::saveDescriptionToFile()
 
                     }
                 }
                 incidence = delSel.next();
             }
             QFile file( fn );
-            if (!file.open( IO_WriteOnly ) ) {
+            if (!file.open( QIODevice::WriteOnly ) ) {
                 topLevelWidget()->setCaption(i18n("File open error - nothing saved!") ); 
                 return;
             }  
-            QTextStream ts( &file );
+            Q3TextStream ts( &file );
             ts << text;
             file.close();
             //qDebug("%s ", text.latin1());
             mes = i18n("KO/Pi:Saved %1 descriptions/journals").arg(icount );
             KOPrefs::instance()->mLastSaveFile = fn;
             topLevelWidget()->setCaption(mes); 
@@ -664,18 +673,18 @@ void KOListView::saveToFileVCS()
     writeToFile( false );
 }
 void KOListView::saveToFile()
 {
     writeToFile( true );
 }
-QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
+Q3PtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
 {
-    QPtrList<Incidence> delSel ;
+    Q3PtrList<Incidence> delSel ;
     bool addSubTodos = false;
     bool askSubTodos = true;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3ListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
             Incidence* inc = ((KOListViewItem *)item)->data();
             if ( ( addSubTodos && delSel.findRef( inc ) == -1) || !addSubTodos   ) {
                 if ( (inc->typeID() == todoID && includeTodos) || 
                      (inc->typeID() == eventID && includeEvents) || 
@@ -703,13 +712,13 @@ QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool
                         }
                         if (result == KMessageBox::Yes) 
                             addSubTodos = true;
                         askSubTodos = false;
                     }
                     if ( addSubTodos ) {
-                        QPtrList<Incidence> tempSel ;
+                        Q3PtrList<Incidence> tempSel ;
                         inc->addRelationsToList( &tempSel );
                         Incidence* tempinc = tempSel.first();
                         while ( tempinc ) {
                             if ( delSel.findRef( tempinc ) == -1 ) {
                                 if ( tempinc->typeID() == todoID && onlyDueTodos ) {
                                     if ( ((Todo*)tempinc)->hasDueDate() )
@@ -727,13 +736,13 @@ QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool
     }
     return delSel;
 }
 
 void KOListView::writeToFile( bool iCal )
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
     if ( !iCal ) {
         bool journal = false;
         Incidence *incidence = delSel.first();
         while ( incidence ) {
             if ( incidence->typeID() == journalID ) {
                 journal = true;
@@ -800,34 +809,34 @@ void KOListView::writeToFile( bool iCal )
         }
     }
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void  KOListView::hideAll()
 {
-    QPtrList<QListViewItem> delSel ;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3PtrList<Q3ListViewItem> delSel ;
+    Q3ListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
             delSel.append(item);
         }
         item = item->nextSibling();
     }
     item = delSel.first() ;
     while ( item ) {
-        QListViewItem * del = item;
+        Q3ListViewItem * del = item;
         item = delSel.next();
         delete del;
     }
 }
 void  KOListView::printList()
 {
     mListView->printList();
 }
 void KOListView::deleteAll()
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;;
     if ( delSel.count() ) {
         int icount = delSel.count();
         Incidence *incidence = delSel.first();
         Incidence *toDelete;   
         KOPrefs *p = KOPrefs::instance();
         bool confirm = p->mConfirm;
@@ -835,17 +844,17 @@ void KOListView::deleteAll()
         mess = mess.sprintf( i18n("You have %d item(s) selected.\n"), icount );
         if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, mess + i18n("All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n"), i18n("KO/Pi Confirmation"),i18n("Delete")) ) {
             p->mConfirm = false;
             int delCounter = 0;
             QDialog dia ( this, "p-dialog", true ); 
             QLabel lab (i18n("Close dialog to abort deletion!"), &dia ); 
-            QVBoxLayout lay( &dia );
+            Q3VBoxLayout lay( &dia );
             lay.setMargin(7); 
             lay.setSpacing(7); 
             lay.addWidget( &lab);
-            QProgressBar bar( icount, &dia );
+            Q3ProgressBar bar( icount, &dia );
             lay.addWidget( &bar);
             int w = 220;
             int h = 50;
             int dw = QApplication::desktop()->width();
             int dh = QApplication::desktop()->height();
             dia.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
@@ -881,16 +890,16 @@ int KOListView::maxDatesHint()
 
 int KOListView::currentDateCount()
 {
     return 0;
 }
 
-QPtrList<Incidence> KOListView::selectedIncidences()
+Q3PtrList<Incidence> KOListView::selectedIncidences()
 {
-    QPtrList<Incidence> eventList;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3PtrList<Incidence> eventList;
+    Q3ListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
             eventList.append(((KOListViewItem *)item)->data());
         }
 
         item = item->nextSibling();
@@ -984,35 +993,35 @@ void KOListView::showDates(const QDate &start, const QDate &end)
     }
     //emit incidenceSelected( 0 );
     updateView();
   
 }
 
-void KOListView::addEvents(QPtrList<Event> eventList)
+void KOListView::addEvents(Q3PtrList<Event> eventList)
 {
  
     Event *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
     }
     if ( !mListView->currentItem() ){
         updateView();
     }
 }
 
-void KOListView::addTodos(QPtrList<Todo> eventList)
+void KOListView::addTodos(Q3PtrList<Todo> eventList)
 {
     Todo *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
     }
     if ( !mListView->currentItem() ){
         updateView();
     }
 }
-void KOListView::addJournals(QPtrList<Journal> eventList)
+void KOListView::addJournals(Q3PtrList<Journal> eventList)
 {
     Journal *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
     }  
     if ( !mListView->currentItem() ){
@@ -1041,13 +1050,13 @@ void KOListView::addIncidence(Incidence *incidence)
     if (incidence->accept(v)) {
         return;
     }
     else delete item;
 }
 
-void KOListView::showEvents(QPtrList<Event> eventList)
+void KOListView::showEvents(Q3PtrList<Event> eventList)
 {
     clear();
 
     addEvents(eventList);
 
     // After new creation of list view no events are selected.
@@ -1092,20 +1101,20 @@ KOListViewItem *KOListView::getItemForEvent(Incidence *event)
         if (item->data() == event) return item;
         item = (KOListViewItem *)item->nextSibling();
     }
     return 0;
 }
 
-void KOListView::defaultItemAction(QListViewItem *i)
+void KOListView::defaultItemAction(Q3ListViewItem *i)
 {
     KOListViewItem *item = static_cast<KOListViewItem *>( i );
     if ( item ) defaultAction( item->data() );
       
 }
 
-void KOListView::popupMenu(QListViewItem *item,const QPoint &,int)
+void KOListView::popupMenu(Q3ListViewItem *item,const QPoint &,int)
 {
     mActiveItem = (KOListViewItem *)item;
     if (mActiveItem) {
         Incidence *incidence = mActiveItem->data();
         mPopupMenu->enableDefault( !mListView->hasMultiSelection( item ) );
         mPopupMenu->showIncidencePopup(incidence);
@@ -1128,13 +1137,13 @@ void KOListView::readSettings(KConfig *config, QString setting)
 void KOListView::writeSettings(KConfig *config, QString setting)
 {
     // qDebug("KOListView::writeSettings ");
     mListView->saveLayout(config, setting);
 }
 
-void KOListView::processSelectionChange(QListViewItem *)
+void KOListView::processSelectionChange(Q3ListViewItem *)
 {
   
     KOListViewItem *item =
         static_cast<KOListViewItem *>( mListView->currentItem() );
 
     if ( !item ) {
@@ -1177,30 +1186,30 @@ void KOListView::keyPressEvent ( QKeyEvent *e)
 }
 void KOListViewListView::keyPressEvent ( QKeyEvent *e) 
 {
   
     switch ( e->key() ) {
     case Qt::Key_Down:
-        if ( e->state() == ShiftButton ) {
-            QListViewItem* cn = currentItem();
+        if ( e->state() == Qt::ShiftButton ) {
+            Q3ListViewItem* cn = currentItem();
             if ( !cn ) 
                 cn = firstChild();
             if ( !cn ) 
                 return;
             while (  cn->nextSibling() )
                 cn = cn->nextSibling();
             setCurrentItem ( cn );
             ensureItemVisible ( cn );
         
             e->accept();
             return;
         }
-        if ( e->state() == ControlButton ) {
+        if ( e->state() == Qt::ControlButton ) {
             int count = childCount ();
             int jump = count / 5;
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
             cn = currentItem();
             if ( ! cn )
                 return;
             if ( jump  == 0 )
                 jump = 1;
             while ( jump && cn->nextSibling() ) {
@@ -1208,47 +1217,47 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
                 --jump;
             }
             setCurrentItem ( cn );
             ensureItemVisible ( cn );
             
         } else
-            QListView::keyPressEvent ( e ) ;
+            Q3ListView::keyPressEvent ( e ) ;
         e->accept();
         break;
               
     case Qt::Key_Up:
-        if ( e->state() == ShiftButton ) {
-            QListViewItem* cn = firstChild();
+        if ( e->state() == Qt::ShiftButton ) {
+            Q3ListViewItem* cn = firstChild();
             if ( cn ) {
                 setCurrentItem ( cn );
                 ensureItemVisible ( cn );
             }
             e->accept();
             return;
         }
-        if ( e->state() == ControlButton ) {
+        if ( e->state() == Qt::ControlButton ) {
             int count = childCount ();
             int jump = count / 5;
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
             cn = currentItem();
             if ( ! cn )
                 return;
             if ( jump  == 0 )
                 jump = 1;
             while ( jump && cn->itemAbove ()) {
                 cn = cn->itemAbove ();
                 --jump;
             }
             setCurrentItem ( cn );
             ensureItemVisible ( cn );
         } else
-            QListView::keyPressEvent ( e ) ;
+            Q3ListView::keyPressEvent ( e ) ;
         e->accept();
         break;   
     case Qt::Key_I: {
-        QListViewItem* cn;
+        Q3ListViewItem* cn;
         cn = currentItem();
         if ( cn ) {
             KOListViewItem* ci = (KOListViewItem*)( cn ); 
             if ( ci ){
                 //emit showIncidence( ci->data());
                 cn = cn->nextSibling();
@@ -1262,18 +1271,18 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
         e->accept();
     }
         break;          
     case Qt::Key_Return:
     case Qt::Key_Enter:
         {
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
             cn = currentItem();
             if ( cn ) {
                 KOListViewItem* ci = (KOListViewItem*)( cn ); 
                 if ( ci ){ 
-                    if ( e->state() == ShiftButton )
+                    if ( e->state() == Qt::ShiftButton )
                         ci->setSelected( false );
                     else
                         ci->setSelected( true );
                     cn = cn->nextSibling();
                     if ( cn ) {
                         setCurrentItem ( cn );
@@ -1297,43 +1306,43 @@ KOListViewListView::KOListViewListView(KOListView * lv )
     setAllColumnsShowFocus( true ); 
     mPopupTimer = new QTimer(this);
     connect(mPopupTimer , SIGNAL(timeout()), this, SLOT(popupMenu()));
 #ifndef DESKTOP_VERSION
     //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
-    setSelectionMode( QListView::Multi );   
+    setSelectionMode( Q3ListView::Multi );   
     setMultiSelection( true);
 }
-bool KOListViewListView::hasMultiSelection(QListViewItem* item)
+bool KOListViewListView::hasMultiSelection(Q3ListViewItem* item)
 {
-    QListViewItem *qitem  = firstChild ();
+    Q3ListViewItem *qitem  = firstChild ();
     while ( qitem ) {
         if ( qitem->isSelected() && item != qitem ) 
             return true;
         qitem = qitem->nextSibling();
     }
     return false;
 }
 void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
     if (!e) return;
     QPoint vp = contentsToViewport(e->pos());
-    QListViewItem *item = itemAt(vp);
+    Q3ListViewItem *item = itemAt(vp);
     if (!item) {
         emit newEvent();
         return;
     }
     KListView::contentsMouseDoubleClickEvent(e);
 }
 #if 0
 void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
 {
     //qDebug("contentsMousePressEvent++++ ");
     KListView::contentsMousePressEvent( e );
-    if (  e->button() == RightButton    ) {
-        QListViewItem* ci =  currentItem();
+    if (  e->button() == Qt::RightButton    ) {
+        Q3ListViewItem* ci =  currentItem();
         clearSelection () ;
         if ( ci )
             ci->setSelected( true );
     }
 }
 void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
@@ -1345,28 +1354,28 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
     KListView::contentsMouseMoveEvent(e);
 }
 #endif
 void KOListViewListView::popupMenu()
 {
     mPopupTimer->stop();
-    QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton );
+    QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, Qt::RightButton , Qt::RightButton );
     QApplication::postEvent( this->viewport(), e ); 
 
 }
 void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
 {
     //qDebug("contentsMousePressEvent++++ %d %d", e->pos().y(), e->globalPos().y());
     mYMousePos = mapToGlobal( (e->pos())).y();
-    if (  e->button() == LeftButton ) {
+    if (  e->button() == Qt::LeftButton ) {
         mPopupTimer->start( 600 ); 
         mEventPos = contentsToViewport(e->pos());
         mEventGlobalPos = e->globalPos();
     }
     KListView::contentsMousePressEvent( e );
-    if (  e->button() == RightButton    ) {
-        QListViewItem* ci =  currentItem();
+    if (  e->button() == Qt::RightButton    ) {
+        Q3ListViewItem* ci =  currentItem();
         //clearSelection();
         if ( ci )
             ci->setSelected( true );
     }
 }
 void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
@@ -1387,13 +1396,13 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
         mEventGlobalPos = e->globalPos();
     }
     KListView::contentsMouseMoveEvent(e);
 }
 
 #define protected public
-#include <qheader.h>
+#include <q3header.h>
 #undef protected 
 void  KOListViewListView::printList()
 {
 #ifdef DESKTOP_VERSION 
     KOPrintPrefs pp ( this );
     if (!pp.exec() )
@@ -1404,13 +1413,13 @@ void  KOListViewListView::printList()
     if (!printer.setup() )
         return;
     clearSelection (); 
     QPainter p;
     p.begin ( &printer  );
     p.setFont(font());
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
@@ -1440,13 +1449,13 @@ void  KOListViewListView::printList()
     int yOff = 0;
     while ( item ) {
       p.translate( 0, yOff );
       p.save();
       for ( iii = 0; iii < cou; ++iii ) {
         int align = columnAlignment( iii );
-        if ( align == AlignAuto ) align = AlignLeft;
+        if ( align == Qt::AlignLeft ) align = Qt::AlignLeft;
         p.restore();
         p.save();
         p.translate( header()->sectionPos( iii ), 0);
         item->paintCell( &p, cg, iii, header()->sectionSize (iii), align );
       }
       yOff = item->height();
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 99d0561..9fb0b00 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -21,15 +21,21 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOLISTVIEW_H
 #define _KOLISTVIEW_H
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qmap.h>
-#include <qdict.h>
+#include <q3dict.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 
 #include <klistview.h>
 
 #include <libkcal/incidence.h>
 
 #include "koeventview.h"
@@ -44,26 +50,26 @@ class KOListViewWhatsThis;
 #include <qdialog.h>
 #include <qtimer.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
 #include <qtooltip.h>
 #include <qcheckbox.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <kiconloader.h>
 #include "kfiledialog.h"
 #include "koprefs.h"
 class KOAlarmPrefs : public QDialog
 {
  Q_OBJECT
   public:
     KOAlarmPrefs( QWidget *par=0, const char *name=0 ) :
       QDialog( par, name, true ) 
     {
         setCaption( i18n("Alarm Options") );
-        QVBoxLayout* alarmLayout = new QVBoxLayout( this );
+        Q3VBoxLayout* alarmLayout = new Q3VBoxLayout( this );
         alarmLayout->setSpacing( 3 );
         alarmLayout->setMargin( 3 );
         QWidget *parent = this;
         mAlarmButton = new QCheckBox(i18n("Set reminder ON with offset to:"),parent);
         alarmLayout->addWidget(mAlarmButton);
         mAlarmTimeEdit = new QSpinBox ( 0, 9999, 1, parent, "mAlarmTimeEdit  "  ) ;
@@ -71,13 +77,13 @@ class KOAlarmPrefs : public QDialog
         alarmLayout->addWidget(mAlarmTimeEdit);
         mAlarmIncrCombo = new QComboBox(false, parent);
         mAlarmIncrCombo->insertItem(i18n("minute(s)"));
         mAlarmIncrCombo->insertItem(i18n("hour(s)"));
         mAlarmIncrCombo->insertItem(i18n("day(s)"));
         alarmLayout->addWidget(mAlarmIncrCombo);
-        QHBox * hb = new QHBox ( parent );
+        Q3HBox * hb = new Q3HBox ( parent );
         alarmLayout->addWidget(hb);
         mAlarmSoundButton = new QPushButton(hb);
         mAlarmSoundButton->setPixmap(SmallIcon("playsound"));
         mAlarmSoundButton->setToggleButton(true);
         connect(mAlarmSoundButton, SIGNAL(clicked()), SLOT(pickAlarmSound()));
         mAlarmProgramButton = new QPushButton(hb);
@@ -207,13 +213,13 @@ class KOListView;
 
 class KOListViewListView : public KListView
 {  
    Q_OBJECT
  public:
     KOListViewListView(KOListView * lv );
-    bool hasMultiSelection(QListViewItem*);
+    bool hasMultiSelection(Q3ListViewItem*);
     void printList();
  signals:
     void newEvent();
     void showIncidence( Incidence* );
   public slots:
     void popupMenu();
@@ -237,42 +243,42 @@ class KOListView : public KOEventView
     KOListView(Calendar *calendar, QWidget *parent = 0, 
                const char *name = 0);
     ~KOListView();
 
     virtual int maxDatesHint();
     virtual int currentDateCount();
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
     virtual DateList selectedDates();
     
     void showDates(bool show);
     Incidence* currentItem();
-    void addTodos(QPtrList<Todo> eventList);
-    void addJournals(QPtrList<Journal> eventList);
+    void addTodos(Q3PtrList<Todo> eventList);
+    void addJournals(Q3PtrList<Journal> eventList);
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     
     void readSettings(KConfig *config, QString setting = "KOListView Layout");
     void writeSettings(KConfig *config, QString setting = "KOListView Layout");
     void updateList();
     void clearList();
     void setStartDate(const QDate &start);
     int count();
     QString getWhatsThisText(QPoint p);
-    QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents = true, bool includeTodos = true , bool includeJournals = true, bool onlyDueTodos  = false );
+    Q3PtrList<Incidence> getSelectedIncidences( bool includeEvents = true, bool includeTodos = true , bool includeJournals = true, bool onlyDueTodos  = false );
     void showCompletedTodos();
  signals:
     void signalNewEvent();
-    void beamIncidenceList(QPtrList<Incidence>);
+    void beamIncidenceList(Q3PtrList<Incidence>);
 
   public slots:
     void hideAll();
     void printList();
     void resetFocus();
     virtual void updateView();
     virtual void showDates(const QDate &start, const QDate &end);
-    virtual void showEvents(QPtrList<Event> eventList);
+    virtual void showEvents(Q3PtrList<Event> eventList);
     void clearSelection();
     void allSelection();
 
     void clear();
     void showDates();
     void hideDates();
@@ -284,34 +290,34 @@ class KOListView : public KOEventView
     void updateConfig();
     void setCat();
     void setAlarm();
     void setCategories( bool removeOld );
     void changeEventDisplay(Event *, int);
   
-    void defaultItemAction(QListViewItem *item);
-    void popupMenu(QListViewItem *item,const QPoint &,int);
+    void defaultItemAction(Q3ListViewItem *item);
+    void popupMenu(Q3ListViewItem *item,const QPoint &,int);
     void setCalendar( int c );
     void populateCalPopup();
 
   protected slots:
-    void processSelectionChange(QListViewItem *);
+    void processSelectionChange(Q3ListViewItem *);
     void catChanged( Incidence* );
 
   protected:
     void writeToFile( bool iCal );
-    void addEvents(QPtrList<Event> eventList);
+    void addEvents(Q3PtrList<Event> eventList);
     void addIncidence(Incidence *);
     KOListViewItem *getItemForEvent(Incidence *event);
 
   private:
     bool mForceShowCompletedTodos;
-    QPopupMenu* mCalPopup;
+    Q3PopupMenu* mCalPopup;
     KOListViewWhatsThis *mKOListViewWhatsThis;
     KOListViewListView *mListView;
     KOEventPopupMenu *mPopupMenu;
     KOListViewItem *mActiveItem;
-    QDict<Incidence> mUidDict;
+    Q3Dict<Incidence> mUidDict;
     QDate mStartDate;
     void keyPressEvent ( QKeyEvent * ) ;
 };
 
 #endif
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 85e9166..ca55c43 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -14,28 +14,40 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qfont.h>
 #include <qfontmetrics.h>
-#include <qkeycode.h>
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qwidgetstack.h>
+#include <qnamespace.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
+#include <q3widgetstack.h>
 #include <qpushbutton.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qtimer.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
+#include <QPixmap>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3PointArray>
+#include <Q3PtrList>
 #endif
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
@@ -56,16 +68,16 @@
 #include "komonthview.h"
 
 #define PIXMAP_SIZE 5
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::mToolTipGroup = 0; 
 #endif
-class KNOWhatsThis :public QWhatsThis
+class KNOWhatsThis :public Q3WhatsThis
 {
 public:
-    KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { };
+    KNOWhatsThis( KNoScrollListBox* sbox ) : Q3WhatsThis( sbox ), _wid( sbox) { };
     //~KNOWhatsThis( ) {qDebug("~KNOWhatsThis( ) "); };
 
 protected:
     virtual QString text( const QPoint& p)
     {
         return _wid->getWhatsThisText(p) ;
@@ -74,22 +86,22 @@ private:
     KNoScrollListBox* _wid;
   
 };
  
 
 KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
-    : QListBox(parent, name, WRepaintNoErase)
+    : Q3ListBox(parent, name, Qt::WNoAutoErase)
 {
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
     mBlockDeselect = false;
     mWT = new KNOWhatsThis(this);
     resetOnFocusIn = true;
-    setVScrollBarMode(QScrollView::AlwaysOff);
-    setHScrollBarMode(QScrollView::AlwaysOff);
+    setVScrollBarMode(Q3ScrollView::AlwaysOff);
+    setHScrollBarMode(Q3ScrollView::AlwaysOff);
 }
 KNoScrollListBox::~KNoScrollListBox()
 {
 #if QT_VERSION >= 0x030000
 
 #else
@@ -97,94 +109,94 @@ KNoScrollListBox::~KNoScrollListBox()
 #endif 
 }
 
 
 void KNoScrollListBox::focusInEvent ( QFocusEvent * e )
 {
-    QListBox::focusInEvent ( e );
+    Q3ListBox::focusInEvent ( e );
     if ( count() ){
         int ci = currentItem();
         if ( ci < 0 ) ci = 0;
     
         setCurrentItem( ci );
         setSelected ( ci, true ); 
         emit highlighted( item ( ci ) );
  
         resetOnFocusIn = true;
 
         if (  KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) {
-            QListBoxItem *fi =  firstItem ();
+            Q3ListBoxItem *fi =  firstItem ();
             if (fi ) {
                 int ihei = fi->height( this );
                 int hei = numRows ()  * ihei;
                 if ( hei < height() - horizontalScrollBar()->height () ) {
-                    setVScrollBarMode(QScrollView::AlwaysOff);
+                    setVScrollBarMode(Q3ScrollView::AlwaysOff);
                 }
                 else 
-                    setVScrollBarMode(QScrollView::Auto);
+                    setVScrollBarMode(Q3ScrollView::Auto);
                 if ( ihei *3 > height() ) {
-                    setHScrollBarMode(QScrollView::AlwaysOff);
+                    setHScrollBarMode(Q3ScrollView::AlwaysOff);
                 }
                 else {
-                    setHScrollBarMode(QScrollView::Auto);
+                    setHScrollBarMode(Q3ScrollView::Auto);
                 }
             } else {
-                setVScrollBarMode(QScrollView::Auto);
-                setHScrollBarMode(QScrollView::Auto);
+                setVScrollBarMode(Q3ScrollView::Auto);
+                setHScrollBarMode(Q3ScrollView::Auto);
             }
         } 
     }
 }
 void KNoScrollListBox::focusOutEvent ( QFocusEvent * e )
 {
   if ( ! mBlockDeselect ) {
     int i =  currentItem ();
     if ( i >= 0 ) {
       setSelected ( i, false ); 
     }
-    QListBox::focusOutEvent ( e ); 
+    Q3ListBox::focusOutEvent ( e ); 
   }
-    setVScrollBarMode(QScrollView::AlwaysOff);
-    setHScrollBarMode(QScrollView::AlwaysOff);
+    setVScrollBarMode(Q3ScrollView::AlwaysOff);
+    setHScrollBarMode(Q3ScrollView::AlwaysOff);
     if ( ! mBlockDeselect )
       emit highlightIncidence( 0, (MonthViewCell*)this, 0 );
     mBlockDeselect = false;
 }
 
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
-    QListBoxItem* item = itemAt ( p );
+    Q3ListBoxItem* item = itemAt ( p );
     if ( ! item ) {
         return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
     //qDebug("KNoScrollListBox::keyPressEvent ");
     switch(e->key()) {
-    case Key_Right:
+        case Qt::Key_Right:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton  )
         {
             e->ignore();
             return;
         }
         scrollBy(10,0);
         break;
-    case Key_Left:
+        case Qt::Key_Left:
         if (e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
         {
             e->ignore();
             return;
         }
         scrollBy(-10,0);
         break;
-    case Key_Up:
+        case Qt::Key_Up:
         if( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
         if ( count() ) { 
             if ( currentItem() == 0 ) {
@@ -198,13 +210,13 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
                         setTopItem(topItem()-1);
                     }
                 }
             }
         }
         break;
-    case Key_Down:
+        case Qt::Key_Down:
         if(e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
         if ( count () ) { 
             if ( ((uint)currentItem()+1) == count () ) {
@@ -218,28 +230,28 @@ void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
                         setTopItem(topItem()+1);
                     }
                 }
             }
         }
         break;
-    case Key_I:
+        case Qt::Key_I:
         QTimer::singleShot( 1, this, SLOT ( oneDown() ) );
         e->ignore();
         break; 
-    case Key_Return:
-    case Key_Enter:
+        case Qt::Key_Return:
+        case Qt::Key_Enter:
         {
             if ( currentItem() >= 0 ) {
                 emit doubleClicked( item( currentItem() ) );
                 e->accept();
             } else {
                 e->ignore();
             }
         }
         break;
-    case Key_Shift:
+    case Qt::Key_Shift:
         emit shiftDown();
         break;
     default:
         e->ignore();
         break;
     }
@@ -263,31 +275,31 @@ void KNoScrollListBox::oneDown()
         }
     }
 }
 void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e)
 {
     switch(e->key()) {
-    case Key_Shift:
+    case Qt::Key_Shift:
         emit shiftUp();
         break;
     default:
         break;
     }
 }
 
 void KNoScrollListBox::mousePressEvent(QMouseEvent *e)
 {
-    QListBox::mousePressEvent(e);
+    Q3ListBox::mousePressEvent(e);
 
-    if(e->button() == RightButton) {
+    if(e->button() == Qt::RightButton) {
         emit rightClick();
     }
 }
 
 MonthViewItem::MonthViewItem( Incidence *incidence, const QString & s)
-    : QListBoxItem()
+    : Q3ListBoxItem()
 {
     mblockRepaint = true;
     isWeekItem = KOPrefs::instance()->mMonthViewWeek;
     recycle( incidence, s );
 }
 void MonthViewItem::recycle( Incidence *incidence,  const QString & s)
@@ -392,20 +404,20 @@ void MonthViewItem::paint(QPainter *p)
     if ( mMultiday ) { 
         int yyy = y+(size/2);
         int sizeM = size+2;
         p->setBrush( QBrush( textColor ) );
         p->drawLine ( x+1, yyy, x +sizeM +sizeM/2-1, yyy ) ;
         if ( mMultiday == 2 || mMultiday == 3 ) { 
-            QPointArray pa ( 3 );
+            Q3PointArray pa ( 3 );
             pa.setPoint (0,  x, yyy );
             pa.setPoint (1,  x+sizeM/2, yyy+sizeM/2 );
             pa.setPoint (2,  x+sizeM/2, yyy-sizeM/2 );
             p->drawPolygon( pa );
         }
         if ( mMultiday == 2 || mMultiday == 1 ) { 
-            QPointArray pa ( 3 );
+            Q3PointArray pa ( 3 );
             pa.setPoint (0,  x+sizeM +sizeM/2, yyy );
             pa.setPoint (1,  x+sizeM, yyy+sizeM/2 );
             pa.setPoint (2,  x+sizeM, yyy-sizeM/2 );
             p->drawPolygon( pa );
         }
         if ( mMultiday == 1 ) {  
@@ -459,21 +471,21 @@ void MonthViewItem::paint(QPainter *p)
             int wid = fm.width( pText );
             p->drawLine( x, heihei/2 ,x+wid, heihei/2 );
         }
     }  
 }
 
-int MonthViewItem::height(const QListBox *lb) const
+int MonthViewItem::height(const Q3ListBox *lb) const
 {
     int ret = 10;
     if ( lb )
         ret = lb->fontMetrics().lineSpacing()+1;
     return ret;
 }
 
-int MonthViewItem::width(const QListBox *lb) const
+int MonthViewItem::width(const Q3ListBox *lb) const
 { 
     if( KOPrefs::instance()->mEnableMonthScroll || isWeekItem ) {
         int size = PIXMAP_SIZE;
         if ( QApplication::desktop()->width() < 300 )
             size = 3;
         int x = 1; 
@@ -511,44 +523,44 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
     // mLabel = new QLabel( this );QPushButton 
     mLabel = new QPushButton( this );
     //mLabel->setFrameStyle( QFrame::Panel | QFrame::Plain );
     //mLabel->setLineWidth( 1 );
     //mLabel->setAlignment( AlignCenter );
     mLabel->setFlat( true );
-    mLabel->setFocusPolicy(NoFocus); 
+    mLabel->setFocusPolicy(Qt::NoFocus); 
     //mItemList = new KNoScrollListBox( this );
     setMinimumSize( 10, 10 );
-    setFrameStyle( QFrame::Panel | QFrame::Plain );
+    setFrameStyle( Q3Frame::Panel | Q3Frame::Plain );
     setLineWidth( 1 );
     //topLayout->addWidget( mItemList );
     mLabel->raise();
     // QColor( 0,0,255 )    QColor( 160,1600,255 )
     mStandardPalette = palette();
     mStandardPalette.setColor(QColorGroup::Base, mStandardPalette.color( QPalette::Normal, QColorGroup::Background ) );
 
     enableScrollBars( false );
     updateConfig();
     //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() ));
     connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() ));
-    connect( this , SIGNAL( doubleClicked( QListBoxItem *) ),
-             SLOT( defaultAction( QListBoxItem * ) ) );
-    connect( this, SIGNAL( rightButtonPressed( QListBoxItem *,
+    connect( this , SIGNAL( doubleClicked( Q3ListBoxItem *) ),
+             SLOT( defaultAction( Q3ListBoxItem * ) ) );
+    connect( this, SIGNAL( rightButtonPressed( Q3ListBoxItem *,
                                                     const QPoint &) ),
-             SLOT( contextMenu( QListBoxItem * ) ) );
-    connect( this, SIGNAL( highlighted( QListBoxItem *) ),
-             SLOT( selection( QListBoxItem * ) ) );
+             SLOT( contextMenu( Q3ListBoxItem * ) ) );
+    connect( this, SIGNAL( highlighted( Q3ListBoxItem *) ),
+             SLOT( selection( Q3ListBoxItem * ) ) );
    
     /* 
     connect( this, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( selection( QListBoxItem * ) ) ); 
     */
 }
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::toolTipGroup()
 {
-    if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
+    /* TODO:hacker: if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0); */
     return mToolTipGroup;
 }
 #endif
  
 void MonthViewCell::setDate( const QDate &date )
 {
@@ -634,13 +646,13 @@ void MonthViewCell::setHoliday( const QString &holiday )
 }
 
 void MonthViewCell::startUpdateCell()
 {
     blockSignals( true );
     mdayCount = 0;
-    setFocusPolicy(NoFocus); 
+    setFocusPolicy(Qt::NoFocus); 
     if ( !mMonthView->isUpdatePossible() )
         return;
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( true );
         mitem = (MonthViewItem *)mitem->next();
@@ -689,13 +701,13 @@ int MonthViewCell::insertEvent(Event *event)
 {
     bool useToolTips = true;
 #ifndef DESKTOP_VERSION
     useToolTips = false;
 #endif    
     QString mToolTipText;
-    setFocusPolicy(WheelFocus); 
+    setFocusPolicy(Qt::WheelFocus); 
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                 return mdayCount;
             else
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     return mdayCount;
@@ -831,13 +843,13 @@ int MonthViewCell::insertEvent(Event *event)
             if ( itcount > 1000 ) {
                 qDebug("KO: Bug in MonthViewCell::insertEvent %u ", itcount);
                 itcount = 0;
             }
             for ( i = pos; i < itcount;++i ) {
                 // qDebug("i %d mday %u count %d ",i,itcount,mdayCount );
-                QListBoxItem* it = this->item ( i );
+                Q3ListBoxItem* it = this->item ( i );
                 if ( it && text < it->text() ) {
                     pos = i;
                     break;
                 }
                 ++pos;
             }
@@ -847,13 +859,13 @@ int MonthViewCell::insertEvent(Event *event)
             mToolTip.append( mToolTipText );
         }
         return mdayCount;
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
-    setFocusPolicy(WheelFocus); 
+    setFocusPolicy(Qt::WheelFocus); 
       QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
@@ -919,13 +931,13 @@ void MonthViewCell::finishUpdateCell()
    
     
 
 #ifdef DESKTOP_VERSION
     if (mToolTip.count() > 0 ) {
         mToolTip.sort();
-        QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),"");
+        /* TODO: hacker: QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),""); */
     }
 #endif
     //sort();
     //setMyPalette(); 
     setMyPalette();
   
@@ -935,19 +947,19 @@ void MonthViewCell::finishUpdateCell()
 void MonthViewCell::updateCell()
 {
     if ( !mMonthView->isUpdatePossible() )
         return;
     startUpdateCell();
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
-    QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
+    Q3PtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
     for( event = events.first(); event; event = events.next() ) { // for event
         insertEvent(event);
     }
     // insert due todos
-    QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
+    Q3PtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         insertTodo( todo );
     }
     finishUpdateCell();
     // if ( isVisible())
@@ -989,34 +1001,34 @@ void MonthViewCell::updateConfig( bool bigFont ) // = false
 
 void MonthViewCell::enableScrollBars( bool enabled )
 {
     
     return;
     if ( enabled ) {
-        QListBoxItem *fi =  firstItem ();
+        Q3ListBoxItem *fi =  firstItem ();
         if (fi ) {
             int ihei = fi->height( this );
             int hei = numRows ()  * ihei;
             if ( hei < height() - horizontalScrollBar()->height () ) {
-                setVScrollBarMode(QScrollView::AlwaysOff);
+                setVScrollBarMode(Q3ScrollView::AlwaysOff);
             }
             else 
-                setVScrollBarMode(QScrollView::Auto);
+                setVScrollBarMode(Q3ScrollView::Auto);
             if ( ihei *3 > height() ) {
-                setHScrollBarMode(QScrollView::AlwaysOff);
+                setHScrollBarMode(Q3ScrollView::AlwaysOff);
             }
             else {
-                setHScrollBarMode(QScrollView::Auto);
+                setHScrollBarMode(Q3ScrollView::Auto);
             }
         } else {
-            setVScrollBarMode(QScrollView::Auto);
-            setHScrollBarMode(QScrollView::Auto);
+            setVScrollBarMode(Q3ScrollView::Auto);
+            setHScrollBarMode(Q3ScrollView::Auto);
         }
     } else {
-        setVScrollBarMode(QScrollView::AlwaysOff);
-        setHScrollBarMode(QScrollView::AlwaysOff);
+        setVScrollBarMode(Q3ScrollView::AlwaysOff);
+        setHScrollBarMode(Q3ScrollView::AlwaysOff);
     }
 }
 
 Incidence *MonthViewCell::selectedIncidence()
 {
     int index = currentItem();
@@ -1080,13 +1092,13 @@ void MonthViewCell::resizeEvent ( QResizeEvent * e )
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     // mItemList->resize ( width(), height () ); 
     if ( e )
         KNoScrollListBox::resizeEvent (  e );
 }
 
-void MonthViewCell::defaultAction( QListBoxItem *item )
+void MonthViewCell::defaultAction( Q3ListBoxItem *item )
 {
   
     if ( !item ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
@@ -1102,24 +1114,24 @@ void MonthViewCell::showDay()
 }
 void MonthViewCell::newEvent()
 {
     QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
     emit newEventSignal( dt );
 }
-void MonthViewCell::cellClicked( QListBoxItem *item )
+void MonthViewCell::cellClicked( Q3ListBoxItem *item )
 {
     mMonthView->setSelectedCell( this );
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
 
 }
 
-void MonthViewCell::contextMenu( QListBoxItem *item )
+void MonthViewCell::contextMenu( Q3ListBoxItem *item )
 {
     mMonthView->setPopupCell( this );
     if ( !item )  {
         mMonthView->showContextMenu( 0 );
         return;
     }
@@ -1130,13 +1142,13 @@ void MonthViewCell::contextMenu( QListBoxItem *item )
     if ( incidence ) {
       mBlockDeselect = true;
         mMonthView->showContextMenu( incidence );
     }
 }
 
-void MonthViewCell::selection( QListBoxItem *item )
+void MonthViewCell::selection( Q3ListBoxItem *item )
 {
     if ( !item ) {
         emit highlightIncidence( 0 , this, 0 );
         return;
     }
     MonthViewItem * it = (static_cast<MonthViewItem *>( item ));
@@ -1182,14 +1194,14 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     mShortDayLabelsM = false;
     mShortDayLabelsW = false;
     skipResize = false;
     clPending = true;
     mPopupCell = 0;
     mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
-    mWidStack = new QWidgetStack( this );
-    QVBoxLayout* hb = new QVBoxLayout( this );
+    mWidStack = new Q3WidgetStack( this );
+    Q3VBoxLayout* hb = new Q3VBoxLayout( this );
     mMonthView = new QWidget( mWidStack );
     mWeekView = new QWidget( mWidStack );
 #if QT_VERSION >= 0x030000
     mWidStack->addWidget(mMonthView );
     mWidStack->addWidget(mWeekView  );
 #else
@@ -1212,57 +1224,57 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     bfont.setBold( true );
     int i;
   
     for( i = 0; i < mDaysPerWeek; i++ ) {
         QLabel *label = new QLabel( mMonthView );
         label->setFont(bfont);
-        label->setFrameStyle(QFrame::Panel|QFrame::Raised);
+        label->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised);
         label->setLineWidth(1);
-        label->setAlignment(AlignCenter);
+        label->setAlignment(Qt::AlignCenter);
         mDayLabels.insert( i, label );
         label = new QLabel( mWeekView );
         label->setFont(bfont);
-        label->setFrameStyle(QFrame::Panel|QFrame::Raised);
+        label->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised);
         label->setLineWidth(1);
-        label->setAlignment(AlignCenter);
+        label->setAlignment(Qt::AlignCenter);
         mDayLabelsW.insert( i, label );
     }
 
     bfont.setBold( false );
     mWeekLabels.resize( mNumWeeks+1 );
     mWeekLabelsW.resize( 2 );
     for( i = 0; i < mNumWeeks+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mMonthView );
-        label->setFocusPolicy(NoFocus); 
+        label->setFocusPolicy(Qt::NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
-        QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
+        Q3WhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabels.insert( i, label );
     }
     mWeekLabels[mNumWeeks]->setText( i18n("W"));
-    mWeekLabels[mNumWeeks]->setFocusPolicy(WheelFocus);
-    QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
+    mWeekLabels[mNumWeeks]->setFocusPolicy(Qt::WheelFocus);
+    Q3WhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
     
     for( i = 0; i < 1+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mWeekView );
-        label->setFocusPolicy(NoFocus); 
+        label->setFocusPolicy(Qt::NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
-        QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
+        Q3WhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabelsW.insert( i, label );
     }
     mWeekLabelsW[1]->setText( i18n("W"));
-    mWeekLabelsW[1]->setFocusPolicy(WheelFocus); 
+    mWeekLabelsW[1]->setFocusPolicy(Qt::WheelFocus); 
 
 
     int row, col;
     mCells.resize( mNumCells );
     for( row = 0; row < mNumWeeks; ++row ) {
         for( col = 0; col < mDaysPerWeek; ++col ) {
@@ -1302,19 +1314,19 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
                  SLOT( incidenceHighlighted( Incidence *, MonthViewCell *, int ) ));
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
-    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mContextMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("New Event..."),this,
                                   SLOT(slotNewEvent()),false);
-    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mContextMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("New Todo..."),this,
                                   SLOT(slotNewTodo()),false);
-    mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mContextMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Journal"),this,
                                   SLOT(slotEditJournal()),false);
 
     connect (mContextMenu ,SIGNAL(categoryChanged( Incidence * )),this,
                      SLOT( catChanged( Incidence * ) ));
 
@@ -1322,13 +1334,13 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     QString pathString = "";
     if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
         if ( QApplication::desktop()->width() < 480 )
             pathString += "icons16/";
     } else
         pathString += "iconsmini/";
-    mNewItemMenu = new QPopupMenu( this );
+    mNewItemMenu = new Q3PopupMenu( this );
     mNewItemMenu->insertItem( SmallIcon( pathString +"newevent" ), i18n("New Event..."),this, SLOT(slotNewEvent()));
     mNewItemMenu->insertItem( SmallIcon( pathString +"newtodo" ),i18n("New Todo..."),this,SLOT(slotNewTodo()),false);
     mNewItemMenu->insertItem( SmallIcon( pathString +"journal" ),i18n("Journal"),this,SLOT(slotEditJournal()),false);
 
     // updateConfig(); //useless here...
     // ... but we need mWidthLongDayLabel computed
@@ -1394,13 +1406,13 @@ void KOMonthView::incidenceHighlighted( Incidence * inc , MonthViewCell* mc, int
         if ( mCellsW[i] == mc ) {
             weekview = true;
             index = i;
             break;
         }
     }
-    QPtrVector<MonthViewCell> *cells;
+    Q3PtrVector<MonthViewCell> *cells;
     if ( weekview ) 
         cells = &mCellsW;
     else {
         for (uint i = 0; i < mCells.count(); ++i) {
             if ( mCells[i] == mc ) {
                 index = i;
@@ -1492,15 +1504,15 @@ int KOMonthView::maxDatesHint()
 
 int KOMonthView::currentDateCount()
 {
     return mNumCells;
 }
 
-QPtrList<Incidence> KOMonthView::selectedIncidences()
+Q3PtrList<Incidence> KOMonthView::selectedIncidences()
 {
-    QPtrList<Incidence> selected;
+    Q3PtrList<Incidence> selected;
 
     if ( mSelectedCell ) {
         Incidence *incidence = mSelectedCell->selectedIncidence();
         if ( incidence ) selected.append( incidence );
     }
 
@@ -1558,21 +1570,21 @@ void KOMonthView::updateConfig()
     }
 
     for (uint i = 0; i < mCellsW.count(); ++i) {
         mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
     }
 #ifdef DESKTOP_VERSION
-    MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
+    /* TODO:hacker: MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips);  */
 #endif
     updateView();
 }
 
 void KOMonthView::updateDayLabels()
 {
   
-    QPtrVector<QLabel> *mDayLabelsT;
+    Q3PtrVector<QLabel> *mDayLabelsT;
 
     mDayLabelsT = &mDayLabelsW;
     for (int i = 0; i < 7; i++) {
        {
             bool show = mShortDayLabelsW;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
@@ -1607,15 +1619,15 @@ void KOMonthView::clearList()
     }
 }
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
     //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
-    QPtrVector<MonthViewCell> *cells;
-    QPtrVector<QLabel> *dayLabels;
-    QPtrVector<KOWeekButton> *weekLabels;
+    Q3PtrVector<MonthViewCell> *cells;
+    Q3PtrVector<QLabel> *dayLabels;
+    Q3PtrVector<KOWeekButton> *weekLabels;
     uint weekNum = 6;
     mStartDate = start;
     if ( mShowWeekView ) {
         weekNum = 1;
         cells = &mCellsW;
         dayLabels = &mDayLabelsW;
@@ -1665,13 +1677,13 @@ void KOMonthView::showDates(const QDate &start, const QDate &)
         (*weekLabels)[i]->setWeekNum( wno );
         date = date.addDays( 7 );
     }
     updateView();
 }
 
-void KOMonthView::showEvents(QPtrList<Event>)
+void KOMonthView::showEvents(Q3PtrList<Event>)
 {
     qDebug("KOMonthView::selectEvents is not implemented yet. ");
 }
 
 void KOMonthView::changeEventDisplay(Event *, int)
 {
@@ -1687,13 +1699,13 @@ void KOMonthView::updateView()
     if ( !updatePossible )
         return;
     //qDebug("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU ");
     //QTime ti;
     //ti.start();
     clearSelection();
-    QPtrVector<MonthViewCell> *cells;
+    Q3PtrVector<MonthViewCell> *cells;
     if ( mShowWeekView ) {
         cells = &mCellsW;
     } else {
         cells = &mCells;
     }
 #if 1
@@ -1702,13 +1714,13 @@ void KOMonthView::updateView()
     if ( KOPrefs::instance()->mMonthViewWeek )         
         timeSpan = 6;
     for( i = 0; i < timeSpan + 1; ++i ) {
         (*cells)[i]->startUpdateCell();
     }
  
-    QPtrList<Event> events = calendar()->events();
+    Q3PtrList<Event> events = calendar()->events();
     Event *event;
     QDateTime dt;
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         if ( event->doesRecur() ) {
             bool last;
@@ -1766,13 +1778,13 @@ void KOMonthView::updateView()
                         (*cells)[iii]->insertEvent( event );
                 }
             }
         }
     }
     // insert due todos
-    QPtrList<Todo> todos = calendar()->todos( );
+    Q3PtrList<Todo> todos = calendar()->todos( );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         //insertTodo( todo );
         if ( todo->hasDueDate() ) {
             int day = mStartDate.daysTo( todo->dtDue().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
@@ -2222,13 +2234,13 @@ void KOMonthView::setSelectedCell( MonthViewCell *cell )
     else 
         emit incidenceSelected( mSelectedCell->selectedIncidence() );
 }
 
 void KOMonthView::processSelectionChange()
 {
-    QPtrList<Incidence> incidences = selectedIncidences();
+    Q3PtrList<Incidence> incidences = selectedIncidences();
     if (incidences.count() > 0) {
         emit incidenceSelected( incidences.first() );
     } else {
         emit incidenceSelected( 0 );
         clearSelection();
     }
@@ -2258,43 +2270,43 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
         e->accept();
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     switch(e->key()) {
-    case Key_Up: 
+        case Qt::Key_Up: 
         {
             if ( mShowWeekView ) {
                 emit selectWeekNum ( currentWeek() - 1 );
             }
             else {
                 emit prevMonth();
             }
         }
         e->accept();
         break;
-    case Key_Down:
+        case Qt::Key_Down:
         {
             if ( mShowWeekView ) {
                 emit selectWeekNum ( currentWeek() +1);
             }
             else {
                 emit nextMonth();
             }
            
         }
         e->accept();
         break;
-    case Key_Return:
-    case Key_Enter:
+        case Qt::Key_Return:
+        case Qt::Key_Enter:
         {
             selectInternalWeekNum ( currentWeek() );
         }
         e->accept();
         break;
-    case Key_D:
+        case Qt::Key_D:
         if ( mSelectedCell ) {
             mSelectedCell->showDay();
             e->accept();
         } else {
             e->ignore();     
         }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 1a9d16d..bca76e5 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -18,23 +18,30 @@
 */
 
 #ifndef _KOMONTHVIEW_H
 #define _KOMONTHVIEW_H
 
 #include <qlabel.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qdatetime.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpoint.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qlayout.h>
 #include <qtimer.h>
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qpushbutton.h>
-#include <qvaluelist.h>
-#include <qptrvector.h>
+#include <q3valuelist.h>
+#include <q3ptrvector.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QKeyEvent>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 
 #include "koeventview.h"
 #include "navigatorbar.h"
@@ -69,13 +76,13 @@ private:
     }
 
 private slots :
     void bottonClicked() { if ( mNumber > 0 ) emit selectWeekNum ( mNumber ); }
 };
 
-class KNoScrollListBox: public QListBox
+class KNoScrollListBox: public Q3ListBox
 {
     Q_OBJECT
   public:
     KNoScrollListBox(QWidget *parent=0, const char *name=0);
     ~KNoScrollListBox();
     QString getWhatsThisText(QPoint p) ;
@@ -100,13 +107,13 @@ class KNoScrollListBox: public QListBox
  private:
     bool resetOnFocusIn;
     KNOWhatsThis * mWT;
 };
 
 
-class MonthViewItem: public QListBoxItem
+class MonthViewItem: public Q3ListBoxItem
 {
   public:
     MonthViewItem( Incidence *,const QString & title );
     void recycle( Incidence *incidence, const QString & s);
     void setRecur(bool on) { mRecur = on; }
     void setAlarm(bool on) { mAlarm = on; }
@@ -123,14 +130,14 @@ class MonthViewItem: public QListBoxItem
     QPalette palette() const { return mPalette; }
     bool setHighlightedFalse();
     Incidence *incidence() const { return mIncidence; }
 
   protected:
     virtual void paint(QPainter *);
-    virtual int height(const QListBox *) const;
-    virtual int width(const QListBox *) const;
+    virtual int height(const Q3ListBox *) const;
+    virtual int width(const Q3ListBox *) const;
 
   private:
     int mdayPos;
     bool isWeekItem;
     bool mblockRepaint;
     int mMultiday;
@@ -195,21 +202,21 @@ class MonthViewCell : public KNoScrollListBox
 
 public slots:
     void showDay();
     void deHighLight();
     void repaintfinishUpdateCell();
   protected slots: 
-    void defaultAction( QListBoxItem * );
-    void contextMenu( QListBoxItem * );
-    void selection( QListBoxItem * );
-    void cellClicked( QListBoxItem * );
+    void defaultAction( Q3ListBoxItem * );
+    void contextMenu( Q3ListBoxItem * );
+    void selection( Q3ListBoxItem * );
+    void cellClicked( Q3ListBoxItem * );
     void newEvent();
     
   private:
     int mdayCount;
-    QPtrList <MonthViewItem> mAvailItemList; 
+    Q3PtrList <MonthViewItem> mAvailItemList; 
     KOMonthView *mMonthView;
     int currentPalette; 
   
     QDate mDate;
     bool mPrimary;
     bool mHoliday;
@@ -244,13 +251,13 @@ class KOMonthView: public KOEventView
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
     virtual int currentDateCount();
 
     /** returns the currently selected events */
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
     virtual DateList selectedDates();
 #if 0
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
@@ -266,13 +273,13 @@ class KOMonthView: public KOEventView
     void incidenceHighlighted( Incidence *, MonthViewCell*, int );
     void nextCell();
     void prevCell();
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
-    virtual void showEvents(QPtrList<Event> eventList);
+    virtual void showEvents(Q3PtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
     void showContextMenu( Incidence * );
@@ -308,13 +315,13 @@ class KOMonthView: public KOEventView
   private:
     int mKBFcounter;
     QTimer* mComputeLayoutTimer;
     NavigatorBar* mNavigatorBar;
     int currentWeek();
     bool clPending;
-    QWidgetStack * mWidStack;
+    Q3WidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
@@ -322,30 +329,30 @@ class KOMonthView: public KOEventView
     //bool mWeekStartsMonday;
     bool mShowSatSunComp;
     void computeLayout();
     void computeLayoutWeek();
     void doComputeLayoutWeek();
 
-    QPtrVector<MonthViewCell> mCells;
-    QPtrVector<QLabel> mDayLabels;
-    QPtrVector<KOWeekButton> mWeekLabels;
-    QPtrVector<MonthViewCell> mCellsW;
-    QPtrVector<QLabel> mDayLabelsW;
-    QPtrVector<KOWeekButton> mWeekLabelsW;
+    Q3PtrVector<MonthViewCell> mCells;
+    Q3PtrVector<QLabel> mDayLabels;
+    Q3PtrVector<KOWeekButton> mWeekLabels;
+    Q3PtrVector<MonthViewCell> mCellsW;
+    Q3PtrVector<QLabel> mDayLabelsW;
+    Q3PtrVector<KOWeekButton> mWeekLabelsW;
 
     bool mShortDayLabelsM;
     bool mShortDayLabelsW;
     int mWidthLongDayLabel;
 
     QDate mStartDate;
 
     MonthViewCell *mSelectedCell;
     MonthViewCell *mPopupCell;
     bool mFlagKeyPressed;
     KOEventPopupMenu *mContextMenu;
-    QPopupMenu *mNewItemMenu;
+    Q3PopupMenu *mNewItemMenu;
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
 
 };
 
 #endif
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 5078c57..0bd46ea 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -23,13 +23,13 @@
 
 #include <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
@@ -302,19 +302,19 @@ KOPrefs::KOPrefs() :
 
   addItemBool("CompactDialogs",&mCompactDialogs,false);
   addItemBool("VerticalScreen",&mVerticalScreen,true);
 
   KPrefs::setCurrentGroup("KOrganizer Plugins");
 
-  addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
+  addItemStringList("SelectedPlugins",&mSelectedPlugins,QStringList("holidays"));
 
   KPrefs::setCurrentGroup("Group Scheduling");
 
   addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
   addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
-  addItemStringList("AdditionalMails",&mAdditionalMails,"");
+  addItemStringList("AdditionalMails",&mAdditionalMails,QStringList());
   addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
   addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
   addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
   addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
   addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
 
@@ -563,13 +563,13 @@ void KOPrefs::usrWriteConfig()
   
   config()->setGroup("Personal Settings");
   config()->writeEntry("user_name",mName);
   config()->writeEntry("user_email",mEmail);
 
   config()->setGroup("Category Colors");
-  QDictIterator<QColor> it(mCategoryColors);
+  Q3DictIterator<QColor> it(mCategoryColors);
   while (it.current()) {
     config()->writeEntry(it.currentKey(),*(it.current()));
     ++it;
   } 
   KConfig fc (locateLocal("config","kopicalendarrc")); 
   fc.setGroup("CC");
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 94bdd33..35c6110 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -22,15 +22,18 @@
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
 
 
 #include <libkdepim/kpimprefs.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qdir.h>
 #include <qobject.h>
+#include <QDateTime>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 
@@ -344,13 +347,13 @@ class KOPrefs : public KPimPrefs
     bool mEVshowChanged;
     bool mWTshowDetails;
     bool mWTshowCreated;
     bool mWTshowChanged;
 
     int mCurrentDisplayedView;
-    QPtrList<KopiCalendarFile> mCalendars;
+    Q3PtrList<KopiCalendarFile> mCalendars;
     int mNextAvailableCalendar;
     bool mGlobalUpdateDisabled;
 
 
     bool mDetectConflicts;
     bool mIncludeFree;
@@ -359,14 +362,14 @@ class KOPrefs : public KPimPrefs
     bool mCheckConflictsNonADAllDay;
     bool mCheckConflictsNonADNonAD;
     QString mFilterConflictEditItem;
     QString mFilterConflictAllItem;
 
   private:
-    QDict<QColor> mCategoryColors;
-    QArray<KopiCalendarFile*> mDefCalColors;
+    Q3Dict<QColor> mCategoryColors;
+    QVector<KopiCalendarFile*> mDefCalColors;
     QColor mDefaultCategoryColor;
 
     QFont mDefaultTimeBarFont;
     QFont mDefaultViewFont;
     QFont mDefaultMonthViewFont;
 
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index f1a6c3d..43c488f 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -20,30 +20,36 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
+#include <q3groupbox.h>
+#include <q3buttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qcombobox.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <QPixmap>
+#include <Q3Frame>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
@@ -113,14 +119,14 @@ void KOPrefsDialog::setupGlobalTab()
    
 
 } 
 void KOPrefsDialog::setupLocaleDateTab()
 {
 #if 0
-QFrame *topFrame = addPage(i18n("Date Format"),0,0);
-   QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
+Q3Frame *topFrame = addPage(i18n("Date Format"),0,0);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,3,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
 
    
    KPrefsDialogWidRadios *syncPrefsGroup =
@@ -169,14 +175,14 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
 #if 0
- QFrame *topFrame = addPage(i18n("Locale"),0,0);
-   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+ Q3Frame *topFrame = addPage(i18n("Locale"),0,0);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
  KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
@@ -208,13 +214,13 @@ void  KOPrefsDialog::setupLocaleTab()
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
    }
    else {
        QWidget * hb = new QWidget( topFrame );
-       QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
+       Q3HBoxLayout  *hbLayout = new Q3HBoxLayout(hb);
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
        hbLayout->addWidget(sb->checkBox()  );
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
@@ -233,16 +239,16 @@ void  KOPrefsDialog::setupLocaleTab()
 #endif
 #endif
 }
 
 void KOPrefsDialog::setupMainTab()
 {
-    QFrame *topFrame = addPage(i18n("General"),0,0);
+    Q3Frame *topFrame = addPage(i18n("General"),0,0);
     // DesktopIcon("identity",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
  //  KPrefsDialogWidBool *emailControlCenter =
 //       addWidBool(i18n("&Use email settings from Control Center"),
 //                  &(KOPrefs::instance()->mEmailControlCenter),topFrame);
@@ -284,18 +290,18 @@ void KOPrefsDialog::setupMainTab()
   widbool = addWidBool(i18n("Block popup until mouse button release"),
              &(KOPrefs::instance()->mBlockPopupMenu),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), iii,iii,0,1); 
   ++iii;
   if (  QApplication::desktop()->height() <= 240 ) {
       topFrame = addPage(i18n("General") +" 2",0,0);
-      topLayout = new QGridLayout(topFrame,4,2);
+      topLayout = new Q3GridLayout(topFrame,4,2);
       topLayout->setSpacing(2);
       topLayout->setMargin(3);
       iii = 0;
   }
-  QHBox *dummy = new QHBox(topFrame);
+  Q3HBox *dummy = new Q3HBox(topFrame);
   new QLabel(i18n("Days in Next-X-Days:"),dummy);
   mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
  
   topLayout->addMultiCellWidget(dummy,iii,iii,0,1);
 
   ++iii;
@@ -310,13 +316,13 @@ void KOPrefsDialog::setupMainTab()
   // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"),  topFrame);
   //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
 
   // addWidBool(i18n("Enable automatic saving of calendar"),
   //         &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
 
-  QHBox *intervalBox = new QHBox(topFrame);
+  Q3HBox *intervalBox = new Q3HBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
   topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1);
   ++iii;
   QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
   mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
   autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 
@@ -399,20 +405,20 @@ void KOPrefsDialog::setupMainTab()
   */
 }
 
 
 void KOPrefsDialog::setupTimeTab()
 {
-    QFrame *topFrame = addPage(i18n("Time"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Time"),0,0);
     // DesktopIcon("clock",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
  
-  QHBox *dummy = new QHBox(topFrame);
+  Q3HBox *dummy = new Q3HBox(topFrame);
   KPrefsDialogWidTime *dayBegins =
       addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
                dummy);
   //topLayout->addWidget(dayBegins->label(),2,0);
   
   //topLayout->addWidget(dayBegins->spinBox(),2,1);
@@ -438,34 +444,34 @@ void KOPrefsDialog::setupTimeTab()
   mAlarmTimeCombo = new QComboBox(topFrame);
   mAlarmTimeCombo->insertStringList(alarmList);
   topLayout->addWidget(mAlarmTimeCombo,3,1);
   int iii = 4;
   if (  QApplication::desktop()->height() <= 240 ) {
       topFrame = addPage(i18n("Time") +" 2",0,0);
-      topLayout = new QGridLayout(topFrame,1,2);
+      topLayout = new Q3GridLayout(topFrame,1,2);
       topLayout->setSpacing(2);
       topLayout->setMargin(3);
       iii = 0;
   }
 
-  QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
+  Q3GroupBox *workingHoursGroup = new Q3GroupBox(1,Qt::Horizontal,
                                                i18n("Working Hours"),
                                                topFrame);
   topLayout->addMultiCellWidget(workingHoursGroup,iii,iii,0,1);
   workingHoursGroup->layout()->setSpacing( 0 );
   workingHoursGroup->layout()->setMargin( 4 );
-  QHBox *workStartBox = new QHBox(workingHoursGroup);
+  Q3HBox *workStartBox = new Q3HBox(workingHoursGroup);
   // workStartBox->setMargin( 0 );
   addWidTime(i18n("Daily starting hour:"),
              &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
 
-  QHBox *workEndBox = new QHBox(workingHoursGroup);
+  Q3HBox *workEndBox = new Q3HBox(workingHoursGroup);
   //workEndBox->setMargin( 0 );
   addWidTime(i18n("Daily ending hour:"),
              &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
-  QVBox *excludeBox  = new QVBox(workingHoursGroup);
+  Q3VBox *excludeBox  = new Q3VBox(workingHoursGroup);
   //excludeBox->setMargin( 0 );
   addWidBool(i18n("Exclude holidays"),
              &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
 
   addWidBool(i18n("Exclude Saturdays"),
              &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
@@ -479,16 +485,16 @@ void KOPrefsDialog::setupTimeTab()
 }
 
 
 void KOPrefsDialog::setupViewsTab()
 {
 
-    QFrame *topFrame = addPage(i18n("Views"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Views"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
 //   QBoxLayout *dayBeginsLayout = new QHBoxLayout;
 //   topLayout->addLayout(dayBeginsLayout,0,0);
 
@@ -527,13 +533,13 @@ void KOPrefsDialog::setupViewsTab()
 
 #if 0
 
    topFrame = addPage(i18n("ViewChange"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,6,1);
+  topLayout = new Q3GridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 #endif
 
@@ -591,13 +597,13 @@ void KOPrefsDialog::setupViewsTab()
 #endif
   //  *********************************************************
 
   topFrame = addPage(i18n("Agenda View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,5,1);
+  topLayout = new Q3GridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
  dummy =
@@ -649,18 +655,18 @@ void KOPrefsDialog::setupViewsTab()
 
 
 
    topFrame = addPage(i18n("Month View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,5,1);
+  topLayout = new Q3GridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
   QLabel *lab;
-  QHBox *habo = new QHBox( topFrame );
+  Q3HBox *habo = new Q3HBox( topFrame );
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel ( i18n("Show events that recur "), topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
   } else {
       new QLabel ( i18n("Show events that recur "), habo );
@@ -674,13 +680,13 @@ void KOPrefsDialog::setupViewsTab()
     addWidBool(i18n("weekly"),
                &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 
 
-  habo = new QHBox( topFrame ); 
+  habo = new Q3HBox( topFrame ); 
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel (i18n("Show in every cell ") , topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
       
   } else {
@@ -727,13 +733,13 @@ void KOPrefsDialog::setupViewsTab()
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
   if (  QApplication::desktop()->height() <= 240 ) {
       topFrame = addPage(i18n("Month View") +" 2",0,0);
-      topLayout = new QGridLayout(topFrame,4,1);
+      topLayout = new Q3GridLayout(topFrame,4,1);
       topLayout->setSpacing(2);
       topLayout->setMargin(1);
       ii = 0;
   }
 
 
@@ -761,25 +767,25 @@ void KOPrefsDialog::setupViewsTab()
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
   // *********************** What'sNext View
   topFrame = addPage(i18n("What's Next View"),0,0);
   //  DesktopIcon("viewmag",KIcon::SizeMedium));
   
-  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout = new Q3GridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
-  QHBox* hdummy = new QHBox(topFrame);
+  Q3HBox* hdummy = new Q3HBox(topFrame);
   new QLabel(i18n("Days in What's Next:"),hdummy);
   mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
   
   topLayout->addWidget(hdummy,ii++,0);
 
-  QHBox *prioBox = new QHBox(topFrame);
+  Q3HBox *prioBox = new Q3HBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
   topLayout->addWidget(prioBox,ii++,0);
  
   QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox);
   mPrioSpin = new QSpinBox(0,5,1,prioBox);
   if ( QApplication::desktop()->width() <  300 )
@@ -815,13 +821,13 @@ void KOPrefsDialog::setupViewsTab()
 
   // *********************** Todo View
 
    topFrame = addPage(i18n("Todo View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout = new Q3GridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 dummy =
     addWidBool(i18n("Hide not running Todos in To-do view"),
                &(KOPrefs::instance()->mHideNonStartedTodos),topFrame);
@@ -852,31 +858,31 @@ dummy =
 
  QWidget* wid = new QWidget( topFrame );
   // Todo run today color
   KPrefsDialogWidColor *todoRunColor =
       addWidColor(i18n("Color for running todos:"),
                   &(KOPrefs::instance()->mTodoRunColor),wid);
-  QHBoxLayout *widLayout = new QHBoxLayout(wid);
+  Q3HBoxLayout *widLayout = new Q3HBoxLayout(wid);
   widLayout->addWidget( todoRunColor->label() );
   widLayout->addWidget( todoRunColor->button() );
   topLayout->addWidget(wid,ii++,0);
 
   wid = new QWidget( topFrame );
   // Todo due today color
   KPrefsDialogWidColor *todoDueTodayColor =
       addWidColor(i18n("Todo due today color:"),
                   &(KOPrefs::instance()->mTodoDueTodayColor),wid);
-  widLayout = new QHBoxLayout(wid);
+  widLayout = new Q3HBoxLayout(wid);
   widLayout->addWidget( todoDueTodayColor->label() );
   widLayout->addWidget( todoDueTodayColor->button() );
   topLayout->addWidget(wid,ii++,0);
   //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
 
   // Todo overdue color
   wid = new QWidget( topFrame );
-  widLayout = new QHBoxLayout(wid);
+  widLayout = new Q3HBoxLayout(wid);
   KPrefsDialogWidColor *todoOverdueColor =
       addWidColor(i18n("Todo overdue color:"),
                   &(KOPrefs::instance()->mTodoOverdueColor),wid);
   widLayout->addWidget(todoOverdueColor->label());
   widLayout->addWidget(todoOverdueColor->button());
   topLayout->addWidget(wid,ii++,0);
@@ -887,13 +893,13 @@ dummy =
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
    topFrame = addPage(i18n("View Options"),0,0);
 
-  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout = new Q3GridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;  
 
    dummy  =
       addWidBool(i18n("Show Sync Events"),
@@ -926,22 +932,22 @@ dummy =
   dummy = addWidBool(i18n("Last modified time"),
                &(KOPrefs::instance()->mWTshowChanged),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   topFrame = addPage(i18n("Conflict detection"),0,0);
 
-  topLayout = new QGridLayout(topFrame,2,1);
+  topLayout = new Q3GridLayout(topFrame,2,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;  
    dummy  = addWidBool(i18n("Enable conflict detection"),
                        &(KOPrefs::instance()->mDetectConflicts),topFrame);
   topLayout->addWidget(dummy->checkBox(), ii++,0);
-  topFrame = new QFrame( topFrame );
+  topFrame = new Q3Frame( topFrame );
   topLayout->addWidget(topFrame ,ii++,0);
-  topLayout = new QGridLayout(topFrame,4,1); 
+  topLayout = new Q3GridLayout(topFrame,4,1); 
   connect ( dummy->checkBox(), SIGNAL( toggled( bool ) ), topFrame, SLOT ( setEnabled( bool ) ) );
   dummy = addWidBool(i18n("Include events which \"show as free\""),
                            &(KOPrefs::instance()->mIncludeFree),topFrame);
   topLayout->addWidget(dummy->checkBox(), ii++,0);
   topLayout->addWidget( new QLabel ( i18n("Conflict detection checks an <b>edited event</b> with <b>other events</b> for overlapping."), topFrame ) , ii++,0); 
  
@@ -967,13 +973,13 @@ dummy =
 
 
 
    topFrame = addPage(i18n("Alarm"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,2,1);
+  topLayout = new Q3GridLayout(topFrame,2,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   int iii = 0;
 
  dummy =
     addWidBool(i18n("Use internal alarm notification"),
@@ -986,39 +992,39 @@ dummy =
       
       topLayout->addWidget(lab ,iii++,0);
   }
 #ifndef DESKTOP_VERSION
     lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 #else
-    lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
+    lab->setAlignment( Qt::AlignLeft|Qt::TextWrapAnywhere|Qt::TextWordWrap|Qt::AlignTop);
     lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 #endif
  
-    QHBox* dummyBox = new QHBox(topFrame);
+    Q3HBox* dummyBox = new Q3HBox(topFrame);
     new QLabel(i18n("Play beeps count:"),dummyBox);
     mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
     new QLabel(i18n("Beeps interval in sec:"),dummyBox);
     mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
     new QLabel(i18n("Default suspend time in min:"),dummyBox);
     mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
-    dummyBox = new QHBox(topFrame);
+    dummyBox = new Q3HBox(topFrame);
     new QLabel(i18n("Auto suspend count:"),dummyBox);
     mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
 
 
-    QHBox* hbo = new QHBox ( topFrame );
+    Q3HBox* hbo = new Q3HBox ( topFrame );
     mDefaultAlarmFile = new QLineEdit(hbo);
     QPushButton * loadTemplate = new QPushButton(hbo); 
     QPixmap icon;
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileimport16");
     else
@@ -1052,16 +1058,16 @@ void KOPrefsDialog::selectSoundFile()
      if ( fileName.length() > 0 )
          mDefaultAlarmFile->setText( fileName );
 }
 void KOPrefsDialog::setupFontsTab()
 {
  
-    QFrame *topFrame = addPage(i18n("Fonts"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Fonts"),0,0);
     //  DesktopIcon("fonts",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
   KPrefsDialogWidFont * tVFont;
   int i = 0;
   KPrefsDialogWidFont *timeLabelsFont =
       addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
@@ -1122,13 +1128,13 @@ void KOPrefsDialog::setupFontsTab()
 
 
   i = 0;
   topFrame = addPage(i18n("View Fonts"),0,
                              DesktopIcon("fonts",KIcon::SizeMedium));
 
-  topLayout = new QGridLayout(topFrame,7,3);
+  topLayout = new Q3GridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
 
   tVFont =
       addWidFont(i18n("Configure KO"),i18n("What's Next View:"),
                  &(KOPrefs::instance()->mWhatsNextFont),topFrame);
@@ -1190,26 +1196,26 @@ void KOPrefsDialog::setupFontsTab()
 
 
 }
 
 void KOPrefsDialog::setupColorsTab()
 {
-    QFrame *topFrame = addPage(i18n("Colors"),0,0);
+    Q3Frame *topFrame = addPage(i18n("Colors"),0,0);
     //  DesktopIcon("colorize",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,2);
   // topLayout->setSpacing(mSpacingHint);
   // topLayout->setMargin(mMarginHint);
 
   topLayout->setSpacing(2);
   topLayout->setMargin(3);
 
   int ii = 1;
-  QGroupBox *categoryGroup ;
+  Q3GroupBox *categoryGroup ;
 
-  categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
+  categoryGroup = new Q3GroupBox(1,Qt::Vertical,i18n("Categories"),
                                            topFrame);
   topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
 
   mCategoryCombo = new QComboBox(categoryGroup);
   mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
   connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor()));
@@ -1247,13 +1253,13 @@ void KOPrefsDialog::setupColorsTab()
   topLayout->addWidget(eventColor->button(),ii++,1);
 
   if (  QApplication::desktop()->height() <= 240 ) {
       topFrame = addPage(i18n("Colors") +" 2",0,0);
       //  DesktopIcon("colorize",KIcon::SizeMedium));
       
-      topLayout = new QGridLayout(topFrame,5,2);
+      topLayout = new Q3GridLayout(topFrame,5,2);
       // topLayout->setSpacing(mSpacingHint);
       // topLayout->setMargin(mMarginHint);
       
       topLayout->setSpacing(2);
       topLayout->setMargin(3);
   }
@@ -1314,26 +1320,26 @@ void KOPrefsDialog::updateCategoryColor()
 
 void KOPrefsDialog::setupPrinterTab()
 {
   mPrinterTab = addPage(i18n("Printing"),0,
                         DesktopIcon("fileprint",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(mPrinterTab,5,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
   topLayout->setRowStretch(4,1);
 }
 
 void KOPrefsDialog::setupGroupSchedulingTab()
 {
 #if 0
-  QFrame *topFrame  = addPage(i18n("Group Scheduling"),0,
+  Q3Frame *topFrame  = addPage(i18n("Group Scheduling"),0,
                               DesktopIcon("personal",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
 #if 0
   KPrefsDialogWidRadios *schedulerGroup =
       addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
@@ -1350,13 +1356,13 @@ void KOPrefsDialog::setupGroupSchedulingTab()
   sendGroup->addRadio(i18n("Send to outbox"));
   sendGroup->addRadio(i18n("Send directly"));
 
   topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1);
 
   topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
-  mAMails = new QListView(topFrame);
+  mAMails = new Q3ListView(topFrame);
   mAMails->addColumn(i18n("Email"),300);
   topLayout->addMultiCellWidget(mAMails,3,3,0,1);
 
   topLayout->addWidget(new QLabel(i18n("Additional email address:"),topFrame),4,0);
   aEmailsEdit = new QLineEdit(topFrame);
   aEmailsEdit->setEnabled(false);
@@ -1368,23 +1374,23 @@ void KOPrefsDialog::setupGroupSchedulingTab()
   topLayout->addWidget(del,5,1);
 
   //topLayout->setRowStretch(2,1);
   connect(add, SIGNAL( clicked() ), this, SLOT(addItem()) );
   connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) );
   connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem()));
-  connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput()));
+  connect(mAMails,SIGNAL(selectionChanged(Q3ListViewItem *)),SLOT(updateInput()));
 #endif
 }
 
 void KOPrefsDialog::setupGroupAutomationTab()
 {
     return;
-  QFrame *topFrame  = addPage(i18n("Group Automation"),0,
+  Q3Frame *topFrame  = addPage(i18n("Group Automation"),0,
                               DesktopIcon("personal",KIcon::SizeMedium));
 
-  QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
+  Q3GridLayout *topLayout = new Q3GridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
   KPrefsDialogWidRadios *autoRefreshGroup =
       addWidRadios(i18n("Auto Send Refresh"),
                    &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
@@ -1512,13 +1518,13 @@ void KOPrefsDialog::usrWriteConfig()
         while ( iii < cat.count() ) {
             if ( *KOPrefs::instance()->categoryColor( cat[ iii ] ) == mCatDefaultColor )
                 KOPrefs::instance()->setCategoryColor( cat[ iii ], KOPrefs::instance()->mEventColor );
             ++iii;
         }
     }
-    QDictIterator<QColor> it(mCategoryDict);
+    Q3DictIterator<QColor> it(mCategoryDict);
     while (it.current()) {
         KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
         ++it;
     }
     
     KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value();
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h
index ee7a7aa..ccc1726 100644
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@@ -20,16 +20,18 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOPREFSDIALOG_H
 #define _KOPREFSDIALOG_H
 
-#include <qframe.h>
-#include <qdict.h>
+#include <q3frame.h>
+#include <q3dict.h>
 #include <qcolor.h>
-#include <qlistview.h>
+#include <q3listview.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include <kdialogbase.h>
 
 #include <libkdepim/kprefsdialog.h>
 #include <libkdepim/kdateedit.h>
 #include <kcmconfigs/kdepimconfigwidget.h>
@@ -91,13 +93,13 @@ class KOPrefsDialog : public KPrefsDialog
 
   private:
     QColor mCatDefaultColor;
     KPrefsDialogWidBool *mEnableGroupScheduling;
     KPrefsDialogWidBool *mEnableProjectView;
 
-    QFrame *mPrinterTab;
+    Q3Frame *mPrinterTab;
 
     QLineEdit *nameEdit;
     QLineEdit *emailEdit;
 
     QComboBox *timeCombo;
     QComboBox *tzCombo;
@@ -118,13 +120,13 @@ class KOPrefsDialog : public KPrefsDialog
     QSpinBox     *mStartTimeSpin;
     QSpinBox     *mDefaultDurationSpin;
     QComboBox    *mAlarmTimeCombo;
 
     QComboBox     *mCategoryCombo;
     KColorButton  *mCategoryButton;
-    QDict<QColor> mCategoryDict;
+    Q3Dict<QColor> mCategoryDict;
 
     QSlider   *mHourSizeSlider;
 
     QSpinBox  *mNextXDaysSpin;
     QSpinBox  *mWhatsNextSpin;
 
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index df8f8d7..0f3b328 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,8 +1,8 @@
         TEMPLATE= app
-        CONFIG  = qt warn_on
+        CONFIG  += qt warn_on
         TARGET  = kopi
 OBJECTS_DIR = _obj/
 MOC_DIR = _moc
 DESTDIR= ../bin
 
 include( ../variables.pri )
@@ -14,48 +14,48 @@ DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #KORG_NOPRINTER KORG_NOKABC KORG_NODND 
 DEFINES += KORG_NOLVALTERNATION
 DEFINES +=  DESKTOP_VERSION
 unix : {
 staticlib: { 
         TARGET  = kopi_linux
-LIBS += ../bin/libmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
-LIBS += ../bin/libmicrokde.a
-LIBS += ../bin/libmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
-LIBS += ../bin/libmicrokde.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_dir.a
+LIBS += ../bin/libxmicrokdepim.a
+LIBS += ../bin/libxmicrokcal.a
+LIBS += ../bin/libxmicrokabc.a
+LIBS += ../bin/libxmicrokde.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_dir.a
+LIBS += ../bin/libxmicrokdepim.a
+LIBS += ../bin/libxmicrokcal.a
+LIBS += ../bin/libxmicrokabc.a
+LIBS += ../bin/libxmicrokde.a
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 } else {
-LIBS += ../bin/libmicrokdepim.so
-LIBS += ../bin/libmicrokcal.so
-LIBS += ../bin/libmicrokde.so
-LIBS += ../bin/libmicrokabc.so
+LIBS += ../bin/libxmicrokdepim.so
+LIBS += ../bin/libxmicrokcal.so
+LIBS += ../bin/libxmicrokde.so
+LIBS += ../bin/libxmicrokabc.so
 #LIBS += -lbluetooth
 #LIBS += -lsdp
 
 #LIBS += -lldap
 }
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_  
-LIBS += ../bin/microkdepim.lib
-LIBS += ../bin/microkcal.lib
-LIBS += ../bin/microkde.lib
-LIBS += ../bin/microkabc.lib
+LIBS += ../bin/xmicrokdepim.lib
+LIBS += ../bin/xmicrokcal.lib
+LIBS += ../bin/xmicrokde.lib
+LIBS += ../bin/xmicrokabc.lib
 LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
@@ -82,13 +82,14 @@ TARGET		= kopi_xp
         TARGET  = kopi_me
 }
 
 }
 
  
-INTERFACES = kofilterview_base.ui 
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3 = kofilterview_base.ui 
 #filteredit_base.ui
 
 # kdateedit.h \
 
 HEADERS += datenavigatorcontainer.h \
  filteredit_base.h \
@@ -207,12 +208,18 @@ filteredit_base.cpp \
  statusdialog.cpp \
  timeline.cpp \
  timespanview.cpp \
  ../kalarmd/alarmdialog.cpp
 
 HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
-INTERFACES += calprintdayconfig_base.ui \
+#The following line was changed from INTERFACES to FORMS3 by qt3to4
+FORMS3 += calprintdayconfig_base.ui \
               calprintmonthconfig_base.ui \
               calprinttodoconfig_base.ui \
               calprintweekconfig_base.ui
 SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+CONFIG += uic3
+
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 553c265..2c1cd42 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -8,15 +8,15 @@ DESTDIR=$(QPEDIR)/bin
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/libkdepim interfaces $(KDEPIMDIR)/kabc $(QPEDIR)/include
 
 DEFINES += KORG_NODND KORG_NOPLUGINS  KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 DEFINES += KORG_NOLVALTERNATION
 #KORG_NOKABC
-LIBS += -lmicrokdepim
-LIBS += -lmicrokcal
-LIBS += -lmicrokde
+LIBS += -lxmicrokdepim
+LIBS += -lxmicrokcal
+LIBS += -lxmicrokde
 LIBS += -lmicroqtcompat
 
 LIBS += $(GCC3EXTRALIB1)
 LIBS += $(GCC3EXTRALIB2)
 
 
diff --git a/korganizer/kotimespanview.cpp b/korganizer/kotimespanview.cpp
index 3265a3a..a214720 100644
--- a/korganizer/kotimespanview.cpp
+++ b/korganizer/kotimespanview.cpp
@@ -1,20 +1,24 @@
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 #include <kconfig.h>
 
 #include "timespanview.h"
 #include "koglobals.h"
 
 #include "kotimespanview.h"
 
 KOTimeSpanView::KOTimeSpanView(Calendar *calendar, QWidget *parent, 
                const char *name) :
   KOEventView( calendar, parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   
   mTimeSpanView = new TimeSpanView( this );
   topLayout->addWidget( mTimeSpanView );
 
   connect( mTimeSpanView, SIGNAL( dateRangeChanged() ), SLOT( updateView() ) );
 }
@@ -31,25 +35,25 @@ void KOTimeSpanView::readSettings()
 void KOTimeSpanView::readSettings(KConfig *config)
 {
 //  kdDebug() << "KOTimeSpanView::readSettings()" << endl;
 
   config->setGroup("Views");
 
-  QValueList<int> sizes = config->readIntListEntry("Separator TimeSpanView");
+  Q3ValueList<int> sizes = config->readIntListEntry("Separator TimeSpanView");
   if (sizes.count() == 2) {
     mTimeSpanView->setSplitterSizes(sizes);
   }
 }
 
 void KOTimeSpanView::writeSettings(KConfig *config)
 {
 //  kdDebug() << "KOTimeSpanView::writeSettings()" << endl;
 
   config->setGroup("Views");
 
-  QValueList<int> list = mTimeSpanView->splitterSizes();
+  Q3ValueList<int> list = mTimeSpanView->splitterSizes();
   config->writeEntry("Separator TimeSpanView",list);
 }
 
 int KOTimeSpanView::maxDatesHint()
 {
   return 0;
@@ -57,15 +61,15 @@ int KOTimeSpanView::maxDatesHint()
 
 int KOTimeSpanView::currentDateCount()
 {
   return 0;
 }
 
-QPtrList<Incidence> KOTimeSpanView::selectedIncidences()
+Q3PtrList<Incidence> KOTimeSpanView::selectedIncidences()
 {
-  QPtrList<Incidence> selected;
+  Q3PtrList<Incidence> selected;
   
   return selected;
 }
 
 void KOTimeSpanView::updateView()
 {
@@ -81,15 +85,15 @@ void KOTimeSpanView::showDates(const QDate &start, const QDate &end)
   insertItems( s, e );
 }
 
 void KOTimeSpanView::insertItems(const QDate &start, const QDate &end)
 {
   mTimeSpanView->clear();
-  mTimeSpanView->setDateRange( start, end );
+  mTimeSpanView->setDateRange( (QDateTime)start, (QDateTime)end );
 
-  QPtrList<Event> events = calendar()->events( start, end );
+  Q3PtrList<Event> events = calendar()->events( start, end );
   Event *event = events.first();
   while( event ) {
 //    kdDebug() << "KOTimeSpanView::showDates() add event: " << event->summary()
 //              << endl;
 
     mTimeSpanView->addItem( event );          
@@ -97,13 +101,13 @@ void KOTimeSpanView::insertItems(const QDate &start, const QDate &end)
     event = events.next();
   }
   
   mTimeSpanView->updateView();
 }
 
-void KOTimeSpanView::showEvents(QPtrList<Event> eventList)
+void KOTimeSpanView::showEvents(Q3PtrList<Event> eventList)
 {
 }
 
 void KOTimeSpanView::changeEventDisplay(Event *, int)
 {
 }
diff --git a/korganizer/kotimespanview.h b/korganizer/kotimespanview.h
index c682ed8..c3e4b41 100644
--- a/korganizer/kotimespanview.h
+++ b/korganizer/kotimespanview.h
@@ -1,10 +1,12 @@
 #ifndef KOTIMESPANVIEW_H
 #define KOTIMESPANVIEW_H
 
 #include "koeventview.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 class KConfig;
 class TimeSpanView;
 
 class KOTimeSpanView : public KOEventView
 {
@@ -13,25 +15,25 @@ class KOTimeSpanView : public KOEventView
     KOTimeSpanView(Calendar *calendar, QWidget *parent = 0, 
                    const char *name = 0);
     ~KOTimeSpanView();
 
     virtual int maxDatesHint();
     virtual int currentDateCount();
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
     DateList selectedDates() 
       {DateList q;
        return q;}
 
     void readSettings();
     void readSettings( KConfig * );
     void writeSettings( KConfig * );
 
   public slots:
     virtual void updateView();
     virtual void showDates(const QDate &start, const QDate &end);
-    virtual void showEvents(QPtrList<Event> eventList);
+    virtual void showEvents(Q3PtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
   private:
     void insertItems( const QDate &start, const QDate & end );
 
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 20a35d2..aeab92a 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -20,21 +20,26 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
 #include <qlayout.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qtimer.h>
 #include <qdir.h>
 #include <qdatetime.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qtabwidget.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
@@ -78,14 +83,14 @@ void KOTodoEditor::init()
   mRecurrence->setDateTimeStr( i18n("<i>The recurrence is computed from the start datetime!</i>")  );
   connect(mGeneral,SIGNAL(dateTimesChanged(QDateTime,QDateTime)),
           mRecurrence,SLOT(setDefaultsDates(QDateTime,QDateTime)));
 }
 void KOTodoEditor::setupRecurrence()
 {
-  QFrame *topFrame = addPage( i18n("Recurrence") );
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = addPage( i18n("Recurrence") );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
   mRecurrence = new KOEditorRecurrence( topFrame );
   topLayout->addWidget( mRecurrence );
 }
 
 void  KOTodoEditor::setCategories( QString s )
@@ -108,15 +113,15 @@ void KOTodoEditor::setupGeneral()
 
   // connect(mGeneral,SIGNAL(openCategoryDialog()),mCategoryDialog,SLOT(show()));
   //connect(mCategoryDialog, SIGNAL(categoriesSelected(const QString &)),
   //      mGeneral,SLOT(setCategories(const QString &)));
 
   if (KOPrefs::instance()->mCompactDialogs) {
-    QFrame *topFrame = addPage(i18n("General"));
+    Q3Frame *topFrame = addPage(i18n("General"));
 
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);  
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);  
     if ( QApplication::desktop()->width() < 480 ) {
         topLayout->setMargin(marginHintSmall());
         topLayout->setSpacing(spacingHintSmall());
     } else {
         topLayout->setMargin(marginHint());
         topLayout->setSpacing(spacingHint());
@@ -128,23 +133,23 @@ void KOTodoEditor::setupGeneral()
     topLayout->addStretch( 1 );
    mGeneral->initAlarm(topFrame,topLayout);
     topLayout->addStretch( 1 );
     mGeneral->enableAlarm( false );
     
   
-    QBoxLayout *priorityLayout;
+    Q3BoxLayout *priorityLayout;
     if ( QApplication::desktop()->width() < 500 ) 
-        priorityLayout = new QVBoxLayout( topLayout );
+        priorityLayout = new Q3VBoxLayout( topLayout );
     else
-        priorityLayout = new QHBoxLayout( topLayout );
+        priorityLayout = new Q3HBoxLayout( topLayout );
     QWidget* prioWidget = new QWidget (topFrame);
     priorityLayout->addWidget(  prioWidget );
-    QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget);
+    Q3HBoxLayout* priorityLayout2 = new Q3HBoxLayout( prioWidget);
 
 
-    QIconSet icon; 
+    QIcon icon; 
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileimport16");
     else
         icon = SmallIcon("fileimport");
     QPushButton * loadTemplate = new QPushButton(  prioWidget);
     loadTemplate->setIconSet (icon ) ;
@@ -161,19 +166,19 @@ void KOTodoEditor::setupGeneral()
     priorityLayout2->addWidget(loadTemplate);
     priorityLayout2->addWidget(saveTemplate);
     mGeneral->initPriority(prioWidget,priorityLayout2);
     mGeneral->initCategories( topFrame, priorityLayout );
     topLayout->addStretch(1);
 
-    QFrame *topFrame2 = addPage(i18n("Details"));
+    Q3Frame *topFrame2 = addPage(i18n("Details"));
 
-    QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2);
+    Q3BoxLayout *topLayout2 = new Q3VBoxLayout(topFrame2);
     topLayout2->setMargin(marginHint());
     topLayout2->setSpacing(spacingHint());
 
-    QHBoxLayout *completionLayout = new QHBoxLayout( topLayout2 );
+    Q3HBoxLayout *completionLayout = new Q3HBoxLayout( topLayout2 );
     mGeneral->initCompletion(topFrame2,completionLayout);
     
  
     mGeneral->initSecrecy( topFrame2, topLayout2 );
     mGeneral->initDescription(topFrame2,topLayout2); 
 
@@ -182,24 +187,24 @@ void KOTodoEditor::setupGeneral()
     // hb->setSpacing( 3 );
    
     connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
     connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
 
   } else {
-    QFrame *topFrame = addPage(i18n("General"));
+    Q3Frame *topFrame = addPage(i18n("General"));
     
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
     topLayout->setSpacing(spacingHint());
 
     mGeneral->initHeader(topFrame,topLayout);
     mGeneral->initTime(topFrame,topLayout);
     mGeneral->initStatus(topFrame,topLayout);    
-    QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *alarmLineLayout = new Q3HBoxLayout(topLayout);
     mGeneral->initAlarm(topFrame,alarmLineLayout); 
     mGeneral->initDescription(topFrame,topLayout);
-    QBoxLayout *detailsLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *detailsLayout = new Q3HBoxLayout(topLayout);
     mGeneral->initCategories( topFrame, detailsLayout );
     mGeneral->initSecrecy( topFrame, detailsLayout );
   }
   mGeneral->finishSetup();
   
 }
@@ -424,13 +429,13 @@ void KOTodoEditor::slotLoadTemplate()
     ICalFormat format;
     if ( !format.load( &cal, fileName ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return ;
     }
-    QPtrList<Todo> todos = cal.todos();
+    Q3PtrList<Todo> todos = cal.todos();
     Todo * todo = todos.first();
     if ( !todo ) {
         KMessageBox::error( this,
                             i18n("Template does not\ncontain a valid Todo."));
     } else {
         readTodo( todo );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index ba94057..2b8fbd3 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -18,23 +18,39 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
+#include <QDesktopWidget>
+
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qcursor.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 
 #include <qinputdialog.h>
 
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <QFocusEvent>
+#include <QDragLeaveEvent>
+#include <QMouseEvent>
+#include <QDragEnterEvent>
+#include <QKeyEvent>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <QDropEvent>
+#include <QDragMoveEvent>
+#include <QPaintEvent>
+#include <Q3PopupMenu>
+#include <Q3PtrList>
 #include <kdebug.h>
 #include "koprefs.h"
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdateedit.h>
 #include "ktimeedit.h"
@@ -65,18 +81,18 @@ using namespace KOrg;
 
 KOStartTodoPrefs::KOStartTodoPrefs( QString sum, QWidget *parent, const char *name ) :
     QDialog( parent, name, true ) 
 {
     mStopAll = true;
     setCaption( i18n("Start todo") );
-    QVBoxLayout* lay = new QVBoxLayout( this );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( this );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QLabel * lab = new QLabel( i18n("<b>%1\n</b>").arg( sum ), this );
     lay->addWidget( lab ); 
-    lab->setAlignment( AlignCenter );
+    lab->setAlignment( Qt::AlignCenter );
 
     QPushButton * ok = new QPushButton( i18n("Start this todo\nand stop all running"), this );
     lay->addWidget( ok );
     ok->setDefault( true );
     QPushButton * start = new QPushButton( i18n("Start todo"), this );
     lay->addWidget( start );
@@ -95,26 +111,26 @@ void KOStartTodoPrefs::doStop()
 }      
 KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name ) :
     QDialog( parent, name, true ) 
 {
     mTodo = todo;
     setCaption( i18n("Stop todo") );
-    QVBoxLayout* lay = new QVBoxLayout( this );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( this );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QLabel * lab = new QLabel( i18n("<b>%1\n</b>").arg( todo->summary() ), this );
     lay->addWidget( lab ); 
-    lab->setAlignment( AlignHCenter );
+    lab->setAlignment( Qt::AlignHCenter );
     lab = new QLabel( i18n("Additional Comment:"), this );
     lay->addWidget( lab ); 
     mComment = new QLineEdit( this );
     lay->addWidget( mComment );
-    QHBox * start = new QHBox ( this );
+    Q3HBox * start = new Q3HBox ( this );
     lay->addWidget( start ); 
     lab = new QLabel( i18n("Start:"), start );
-    QHBox * end = new QHBox ( this );
+    Q3HBox * end = new Q3HBox ( this );
     lay->addWidget( end ); 
     lab = new QLabel( i18n("End:"), end );
     sde = new KDateEdit( start );
     ste = new KOTimeEdit( start );
     connect ( sde,SIGNAL(setTimeTo( QTime ) ),ste , SLOT ( setTime(QTime  ) )  );
     ede = new KDateEdit( end );
@@ -170,16 +186,16 @@ void KOStopTodoPrefs::doNotSave()
     if (result != KMessageBox::Continue) return;
     mTodo->stopRunning();
     QDialog::accept();
 }
 
 
-class KOTodoViewWhatsThis :public QWhatsThis
+class KOTodoViewWhatsThis :public Q3WhatsThis
 {
 public:
-  KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
+  KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : Q3WhatsThis( wid ), _wid(wid),_view (view) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
     return _view->getWhatsThisText(p) ;
   }
@@ -211,13 +227,13 @@ KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent,
 
 void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl;
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   mOldCurrent = currentItem();
 #endif
@@ -227,13 +243,13 @@ void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
 void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragMoveEvent" << endl;
 
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   e->accept();
 #endif
@@ -252,13 +268,13 @@ void KOTodoListView::contentsDragLeaveEvent(QDragLeaveEvent *)
 void KOTodoListView::contentsDropEvent(QDropEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDropEvent" << endl;
 
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   DndFactory factory( mCalendar );
   Todo *todo = factory.createDropTodo(e);
@@ -297,13 +313,13 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
       if ( destinationEvent )
           reparentTodoSignal( destinationEvent, todo );
     }
   }
   else {
     QString text;
-    if (QTextDrag::decode(e,text)) {
+    if (Q3TextDrag::decode(e,text)) {
       //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) );
       KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) ));
       qDebug("Dropped : " + text);
       QStringList emails = QStringList::split(",",text);
       for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
         int pos = (*it).find("<");
@@ -320,20 +336,20 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
     }
   }
 #endif
 }
 void KOTodoListView::wheelEvent (QWheelEvent *e)
 {
-    QListView::wheelEvent (e);
+    Q3ListView::wheelEvent (e);
 }
 
 void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 {
 
     QPoint p(contentsToViewport(e->pos()));
-    QListViewItem *i = itemAt(p);
+    Q3ListViewItem *i = itemAt(p);
     bool rootClicked = true;
     if (i) {
         // if the user clicked into the root decoration of the item, don't
         // try to start a drag!
         int X = p.x();
         //qDebug("%d %d %d", X, header()->sectionPos(0), treeStepSize() );
@@ -345,41 +361,41 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
         }
     } else {
         rootClicked = false;
     }
 #ifndef KORG_NODND
     mMousePressed = false; 
-    if (! rootClicked && !( e->button() == RightButton)  ) {
+    if (! rootClicked && !( e->button() == Qt::RightButton)  ) {
         mPressPos = e->pos();
         mMousePressed = true;
     } else {
         mMousePressed = false;
     }
 #endif
     //qDebug("KOTodoListView::contentsMousePressEvent %d", rootClicked);
 #ifndef DESKTOP_VERSION
     if (!( e->button() == RightButton && rootClicked) )
-        QListView::contentsMousePressEvent(e);   
+        Q3ListView::contentsMousePressEvent(e);   
 #else
-    QListView::contentsMousePressEvent(e);   
+    Q3ListView::contentsMousePressEvent(e);   
 #endif
 }
 void KOTodoListView::paintEvent(QPaintEvent* e)
 {
     emit paintNeeded();
-    QListView::paintEvent( e);
+    Q3ListView::paintEvent( e);
 }
 void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
 {
 
 #ifndef KORG_NODND
     //QListView::contentsMouseMoveEvent(e);
   if (mMousePressed && (mPressPos - e->pos()).manhattanLength() >
       QApplication::startDragDistance()*3) {
     mMousePressed = false;
-    QListViewItem *item = itemAt(contentsToViewport(mPressPos));
+    Q3ListViewItem *item = itemAt(contentsToViewport(mPressPos));
     if (item) {
       DndFactory factory( mCalendar );
       ICalDrag *vd = factory.createDrag(
                           ((KOTodoViewItem *)item)->todo(),viewport());
       internalDrop = false;
       // we cannot do any senseful here, because the DnD is still broken in Qt
@@ -419,19 +435,19 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
         e->ignore();
         // qDebug("  ignore  %d",e->isAutoRepeat()  );
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
-    QListViewItem* cn;
+    Q3ListViewItem* cn;
     if ( (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) && mName != "todolistsmall") {
         cn = currentItem();
         if ( cn ) {
             KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
             if ( ci ){
-                if ( e->state() == ShiftButton )
+                if ( e->state() == Qt::ShiftButton )
                     ci->setOn( false );
                 else
                     ci->setOn( true );
                 cn = cn->itemBelow();
                 if ( cn ) {
                     setCurrentItem ( cn );
@@ -446,18 +462,18 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
     }
    
     if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall"  ) {
         switch ( e->key() ) {
         case Qt::Key_Down:
         case Qt::Key_Up:
-            QListView::keyPressEvent (  e );
+            Q3ListView::keyPressEvent (  e );
             e->accept();
             break; 
         case Qt::Key_Left:
         case Qt::Key_Right:
-            QListView::keyPressEvent (  e );
+            Q3ListView::keyPressEvent (  e );
             e->accept();
             return;
             break; 
         default:
             e->ignore();
             break;
@@ -465,23 +481,23 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
         return;
     }
     e->ignore();
 }
 void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
-  QListView::contentsMouseReleaseEvent(e);
+  Q3ListView::contentsMouseReleaseEvent(e);
   mMousePressed = false;
 }
 
 void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
   if (!e) return;
 
   QPoint vp = contentsToViewport(e->pos());
 
-  QListViewItem *item = itemAt(vp);
+  Q3ListViewItem *item = itemAt(vp);
 
   emit double_Clicked(item);
   if (!item) return;
 
   emit doubleClicked(item,vp,0);
 }
@@ -489,13 +505,13 @@ void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 /////////////////////////////////////////////////////////////////////////////
 
 KOQuickTodo::KOQuickTodo(QWidget *parent) :
   QLineEdit(parent)
 {
   setText(i18n("Click to add new Todo"));
-  setFocusPolicy ( QWidget::ClickFocus );
+  setFocusPolicy ( Qt::ClickFocus );
 }
 
 void KOQuickTodo::focusInEvent(QFocusEvent *ev)
 {
   if ( text()==i18n("Click to add new Todo") )
     setText("");
@@ -520,20 +536,20 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
     mCurItemAbove = 0; 
     mActiveItem = 0;
     mCategoryPopupMenu = 0;
     mPendingUpdateBeforeRepaint = false;
     isFlatDisplay = false;
   mNavigator = 0;
-  QBoxLayout *topLayout = new QVBoxLayout(this);
+  Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
   mName = QString ( name );
   mBlockUpdate = false;
   mQuickBar = new QWidget( this );
   topLayout->addWidget(mQuickBar);
   
   mQuickAdd = new KOQuickTodo(mQuickBar); 
-  QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar);
+  Q3BoxLayout *quickLayout = new Q3HBoxLayout(mQuickBar);
   quickLayout->addWidget( mQuickAdd );
   mNewSubBut =  new QPushButton( "sub",mQuickBar );
   QPushButton * s_done = new QPushButton( "D",mQuickBar );
   QPushButton * s_run = new QPushButton( "R",mQuickBar );
   QPushButton * allopen = new QPushButton( "O",mQuickBar );
   QPushButton * allclose = new QPushButton( "C",mQuickBar );
@@ -565,25 +581,25 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   s_done->setFixedHeight(fixhei );
   allopen->setFixedHeight(fixhei );
   allclose->setFixedHeight(fixhei );
   s_run->setFixedHeight(fixhei );
   mNewSubBut->setFixedHeight(fixhei );
 
-  flat->setFocusPolicy( NoFocus );
-  s_done->setFocusPolicy( NoFocus );
-  allopen->setFocusPolicy( NoFocus );
-  allclose->setFocusPolicy( NoFocus );
-  s_run->setFocusPolicy( NoFocus );
-  mNewSubBut->setFocusPolicy( NoFocus );
+  flat->setFocusPolicy( Qt::NoFocus );
+  s_done->setFocusPolicy( Qt::NoFocus );
+  allopen->setFocusPolicy( Qt::NoFocus );
+  allclose->setFocusPolicy( Qt::NoFocus );
+  s_run->setFocusPolicy( Qt::NoFocus );
+  mNewSubBut->setFocusPolicy( Qt::NoFocus );
   
-  QWhatsThis::add( flat, i18n("Click this button to display all todos in a <b>flat</b> hierarchy" ) );
-  QWhatsThis::add( allopen, i18n("Click this button to display all todos <b>openend</b>" ) );
-  QWhatsThis::add( allclose, i18n("Click this button to display all todos <b>closed</b>" ) );
-  QWhatsThis::add( s_run, i18n("Click this button to toggle show/hide <b>running</b> todos" ) );
-  QWhatsThis::add( mNewSubBut, i18n("Click this button to add a new subtodo to the currently selected todo" ) );
-  QWhatsThis::add( s_done, i18n("Click this button to toggle show/hide <b>completed</b> todos" ) );
+  Q3WhatsThis::add( flat, i18n("Click this button to display all todos in a <b>flat</b> hierarchy" ) );
+  Q3WhatsThis::add( allopen, i18n("Click this button to display all todos <b>openend</b>" ) );
+  Q3WhatsThis::add( allclose, i18n("Click this button to display all todos <b>closed</b>" ) );
+  Q3WhatsThis::add( s_run, i18n("Click this button to toggle show/hide <b>running</b> todos" ) );
+  Q3WhatsThis::add( mNewSubBut, i18n("Click this button to add a new subtodo to the currently selected todo" ) );
+  Q3WhatsThis::add( s_done, i18n("Click this button to toggle show/hide <b>completed</b> todos" ) );
 
   quickLayout->addWidget( mNewSubBut );
   quickLayout->addWidget( s_done );
   quickLayout->addWidget( s_run );
   quickLayout->addWidget( allopen );
   quickLayout->addWidget( allclose );
@@ -598,77 +614,77 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mTodoListView->setAllColumnsShowFocus(true);
 
   mTodoListView->setShowSortIndicator(true);
 
   mTodoListView->addColumn(i18n("Todo"));
   mTodoListView->addColumn(i18n("Prio"));
-  mTodoListView->setColumnAlignment(1,AlignHCenter);
+  mTodoListView->setColumnAlignment(1,Qt::AlignHCenter);
   mTodoListView->addColumn(i18n("Complete"));
-  mTodoListView->setColumnAlignment(2,AlignCenter);
+  mTodoListView->setColumnAlignment(2,Qt::AlignCenter);
 
   mTodoListView->addColumn(i18n("Due Date"));
-  mTodoListView->setColumnAlignment(3,AlignLeft);
+  mTodoListView->setColumnAlignment(3,Qt::AlignLeft);
   mTodoListView->addColumn(i18n("Due Time"));
-  mTodoListView->setColumnAlignment(4,AlignHCenter);
+  mTodoListView->setColumnAlignment(4,Qt::AlignHCenter);
 
   mTodoListView->addColumn(i18n("Start Date"));
-  mTodoListView->setColumnAlignment(5,AlignLeft);
+  mTodoListView->setColumnAlignment(5,Qt::AlignLeft);
   mTodoListView->addColumn(i18n("Start Time"));
-  mTodoListView->setColumnAlignment(6,AlignHCenter);
+  mTodoListView->setColumnAlignment(6,Qt::AlignHCenter);
 
   //mTodoListView->addColumn(i18n("Cancelled"));
   mTodoListView->addColumn(i18n("Categories"));
   mTodoListView->addColumn(i18n("Calendar"));
   mTodoListView->addColumn(i18n("Last Modified"));
   mTodoListView->addColumn(i18n("Created"));
   mTodoListView->addColumn(i18n("Last Modified Sub"));
 #if 0
   mTodoListView->addColumn(i18n("Sort Id"));
-  mTodoListView->setColumnAlignment(4,AlignHCenter);
+  mTodoListView->setColumnAlignment(4,Qt::AlignHCenter);
 #endif
 
   mTodoListView->setMinimumHeight( 60 );
   mTodoListView->setItemsRenameable( true );
   mTodoListView->setRenameable( 0 );
   mTodoListView->setColumnWidth( 0, 120 );
   int iii = 0;
   for ( iii = 0; iii< 12 ; ++iii )
-      mTodoListView->setColumnWidthMode( iii, QListView::Manual );
+      mTodoListView->setColumnWidthMode( iii, Q3ListView::Manual );
 
 
   mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this);
 
-  mPriorityPopupMenu = new QPopupMenu(this);
+  mPriorityPopupMenu = new Q3PopupMenu(this);
   for (int i = 1; i <= 5; i++) {
     QString label = QString ("%1").arg (i);
     mPriority[mPriorityPopupMenu->insertItem (label)] = i;
   }
   connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int)));
 
-  mPercentageCompletedPopupMenu = new QPopupMenu(this);
+  mPercentageCompletedPopupMenu = new Q3PopupMenu(this);
   for (int i = 0; i <= 100; i+=20) {
     QString label = QString ("%1 %").arg (i);
     mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
   }
   connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
 
 
-  mCategoryPopupMenu = new QPopupMenu (this);
+  mCategoryPopupMenu = new Q3PopupMenu (this);
   mCategoryPopupMenu->setCheckable (true);
   connect (mCategoryPopupMenu, SIGNAL (activated (int)), SLOT (changedCategories (int)));
   connect (mCategoryPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCategories ()));
 
-  mCalPopupMenu = new QPopupMenu (this);
+  mCalPopupMenu = new Q3PopupMenu (this);
   mCalPopupMenu->setCheckable (true);
   connect (mCalPopupMenu, SIGNAL (activated (int)), SLOT (changedCal (int)));
   connect (mCalPopupMenu, SIGNAL (aboutToShow ()), SLOT (fillCal ()));
 
 
 
   
-  mItemPopupMenu = new QPopupMenu(this); 
+  mItemPopupMenu = new Q3PopupMenu(this); 
   mItemPopupMenu->insertItem(i18n("Show"), this,
                              SLOT (showTodo()));
   mItemPopupMenu->insertItem(i18n("Edit..."), this,
                              SLOT (editTodo()));
   mItemPopupMenu->insertItem( i18n("Delete..."), this,
                              SLOT (deleteTodo()));
@@ -707,13 +723,13 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
                              this, SLOT( toggleQuickTodo() ),0, 34 );
   mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
                              this, SLOT( toggleRunning() ),0, 35 );
   
 #endif
-  mPopupMenu = new QPopupMenu(this);
+  mPopupMenu = new Q3PopupMenu(this);
   mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
                          SLOT (newTodo()),0,1);
   mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed..."),
                          this, SLOT(purgeCompleted()),0,2);
   mPopupMenu->insertItem(i18n("Show Completed"),
                              this, SLOT( toggleCompleted() ),0,3 );
@@ -743,44 +759,44 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
   mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
   mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
 
 
   // Double clicking conflicts with opening/closing the subtree
-  connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
-           SLOT( editItem( QListViewItem *) ) );
+  connect( mTodoListView, SIGNAL( doubleClicked( Q3ListViewItem *) ),
+           SLOT( editItem( Q3ListViewItem *) ) );
   /*
   connect( mTodoListView, SIGNAL(  rightButtonClicked ( QListViewItem *,
                                                         const QPoint &,int ) ),
            SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
   */ 
-  connect( mTodoListView, SIGNAL(  contextRequest ( QListViewItem *,
+  connect( mTodoListView, SIGNAL(  contextRequest ( Q3ListViewItem *,
                                                         const QPoint &,int ) ),
-           SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
-  connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ),
-           SLOT( itemClicked( QListViewItem * ) ) );
-  connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ),
-           SLOT( itemDoubleClicked( QListViewItem * ) ) );
+           SLOT( popupMenu( Q3ListViewItem *, const QPoint & ,int) ) );
+  connect( mTodoListView, SIGNAL( clicked( Q3ListViewItem * ) ),
+           SLOT( itemClicked( Q3ListViewItem * ) ) );
+  connect( mTodoListView, SIGNAL( double_Clicked( Q3ListViewItem * ) ),
+           SLOT( itemDoubleClicked( Q3ListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
            SLOT( updateView() ) );
   connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
            SLOT( todoModified(Todo *, int) ) );
-  connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ),
-           SLOT( itemStateChanged( QListViewItem * ) ) );
-  connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ),
-           SLOT( itemStateChanged( QListViewItem * ) ) );
+  connect( mTodoListView, SIGNAL( expanded( Q3ListViewItem * ) ),
+           SLOT( itemStateChanged( Q3ListViewItem * ) ) );
+  connect( mTodoListView, SIGNAL( collapsed( Q3ListViewItem * ) ),
+           SLOT( itemStateChanged( Q3ListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( paintNeeded() ),
            SLOT( paintNeeded()) );
 
 #if 0
-  connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
-  connect(mTodoListView,SIGNAL(clicked(QListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
-  connect(mTodoListView,SIGNAL(pressed(QListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
+  connect(mTodoListView,SIGNAL(selectionChanged(Q3ListViewItem *)),
+          SLOT(selectionChanged(Q3ListViewItem *)));
+  connect(mTodoListView,SIGNAL(clicked(Q3ListViewItem *)),
+          SLOT(selectionChanged(Q3ListViewItem *)));
+  connect(mTodoListView,SIGNAL(pressed(Q3ListViewItem *)),
+          SLOT(selectionChanged(Q3ListViewItem *)));
 #endif
 
   connect( mTodoListView, SIGNAL(reparentTodoSignal( Todo *,Todo * ) ), SIGNAL(reparentTodoSignal( Todo *,Todo * ) ));
   connect( mTodoListView, SIGNAL(unparentTodoSignal(Todo *)  ), SIGNAL(unparentTodoSignal(Todo *)  ));
   connect( mTodoListView, SIGNAL( deleteTodo(Todo *)  ), SIGNAL(deleteTodoSignal(Todo *)  ));
 
@@ -878,13 +894,13 @@ void KOTodoView::updateView()
         } 
     }
     
   mTodoListView->setFont( fo );
   // QFontMetrics fm ( KOPrefs::instance()->mTodoViewFont );
   //mTodoListView->header()->setMaximumHeight(fm.height());
-  QPtrList<Todo> todoList = calendar()->todos();
+  Q3PtrList<Todo> todoList = calendar()->todos();
 
 /*
   kdDebug() << "KOTodoView::updateView(): Todo List:" << endl;
   Event *t;
   for(t = todoList.first(); t; t = todoList.next()) {
     kdDebug() << "  " << t->getSummary() << endl;
@@ -1041,13 +1057,13 @@ bool KOTodoView::checkTodo( Todo * todo )
             if ( mNavigator->selectedDates().first() > todo->dtDue().date() )
                 return false;
     }
     return true;
 }
 
-void KOTodoView::restoreItemState( QListViewItem *item )
+void KOTodoView::restoreItemState( Q3ListViewItem *item )
 {
     pendingSubtodo = 0;
   while( item ) {
     KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
     todoItem->setOpen( mDocPrefs->readBoolEntry( todoItem->todo()->uid() ) );
     if( item->childCount() > 0 ) restoreItemState( item->firstChild() );
@@ -1093,26 +1109,26 @@ KOTodoView::insertTodoItem(Todo *todo)
 void KOTodoView::updateConfig()
 {
     updateView();
   mTodoListView->repaintContents();
 }
 
-QPtrList<Incidence> KOTodoView::selectedIncidences()
+Q3PtrList<Incidence> KOTodoView::selectedIncidences()
 {
-  QPtrList<Incidence> selected;
+  Q3PtrList<Incidence> selected;
 
   KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
 //  if (!item) item = mActiveItem;
   if (item) selected.append(item->todo());
 
   return selected;
 }
 
-QPtrList<Todo> KOTodoView::selectedTodos()
+Q3PtrList<Todo> KOTodoView::selectedTodos()
 {
-  QPtrList<Todo> selected;
+  Q3PtrList<Todo> selected;
 
   KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
 //  if (!item) item = mActiveItem;
   if (item) selected.append(item->todo());
 
   return selected;
@@ -1124,38 +1140,38 @@ void KOTodoView::changeEventDisplay(Event *, int)
 }
 
 void KOTodoView::showDates(const QDate &, const QDate &)
 {
 }
 
-void KOTodoView::showEvents(QPtrList<Event>)
+void KOTodoView::showEvents(Q3PtrList<Event>)
 {
   kdDebug() << "KOTodoView::selectEvents(): not yet implemented" << endl;
 }
 
 void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                               const QDate &td)
 {
 #ifndef KORG_NOPRINTER
   calPrinter->preview(CalPrinter::Todolist, fd, td);
 #endif
 }
 
-void KOTodoView::editItem(QListViewItem *item )
+void KOTodoView::editItem(Q3ListViewItem *item )
 {
     if ( item ) 
         emit editTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 
-void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
+void KOTodoView::showItem(Q3ListViewItem *item,const QPoint &,int)
 {
     if ( item ) 
         emit showTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 
-void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
+void KOTodoView::popupMenu(Q3ListViewItem *item,const QPoint &p,int column)
 {
     pendingSubtodo = 0;
   mActiveItem = (KOTodoViewItem *)item;
   if (item) {
     switch (column){
     case 1:
@@ -1358,13 +1374,13 @@ void KOTodoView::toggleRunningItemQuick()
     } else {
         t->setRunning( true );
         mActiveItem->construct();
         topLevelWidget()->setCaption(i18n("Todo started! Double click again to stop!"));
     }
 }
-void KOTodoView::itemDoubleClicked(QListViewItem *item)
+void KOTodoView::itemDoubleClicked(Q3ListViewItem *item)
 {
     if ( pendingSubtodo != 0 ) {
         topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
     }
     pendingSubtodo = 0;
     //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
@@ -1425,26 +1441,26 @@ void KOTodoView::toggleRunningItem()
             t->setRunning( true );
             updateTodo ( t, KOGlobals::EVENTEDITED );
         }
     }
 }
 
-void KOTodoView::itemClicked(QListViewItem *item)
+void KOTodoView::itemClicked(Q3ListViewItem *item)
 {
     //qDebug("KOTodoView::itemClicked %d", item);
   if (!item) {
       if ( pendingSubtodo != 0 ) {
           topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
       }
       pendingSubtodo = 0;
       return;
   }
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
   if ( pendingSubtodo != 0 ) {
       bool allowReparent = true;
-      QListViewItem *par = item;
+      Q3ListViewItem *par = item;
       while ( par ) {
           if ( par ==  pendingSubtodo ) {
               allowReparent = false;
               break;
           }
           par = par->parent();
@@ -1466,13 +1482,13 @@ void KOTodoView::itemClicked(QListViewItem *item)
 void KOTodoView::setDocumentId( const QString &id )
 {
 
   mDocPrefs->setDoc( id );
 }
 
-void KOTodoView::itemStateChanged( QListViewItem *item )
+void KOTodoView::itemStateChanged( Q3ListViewItem *item )
 {
   if (!item) return;
 
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
 
 //  kdDebug() << "KOTodoView::itemStateChanged(): " << todoItem->todo()->summary() << endl;
@@ -1539,13 +1555,13 @@ void  KOTodoView::setAllClose()
     } else {
         storeCurrentItem();
     }
     setOpen(mTodoListView->firstChild(), false);
     resetCurrentItem();
 }
-void  KOTodoView::setOpen( QListViewItem* item, bool setOpenI)
+void  KOTodoView::setOpen( Q3ListViewItem* item, bool setOpenI)
 {
 
     while ( item ) {
         setOpen( item->firstChild(), setOpenI );
         item->setOpen( setOpenI );
         item = item->nextSibling();
@@ -1560,13 +1576,13 @@ void KOTodoView::displayAllFlat()
     if ( mBlockUpdate ) {
         return;
     }
     clearList ();
     mPopupMenu->setItemChecked( 8,true );
     isFlatDisplay = true;
-    QPtrList<Todo> todoList = calendar()->todos();
+    Q3PtrList<Todo> todoList = calendar()->todos();
     Todo *todo;   
     for(todo = todoList.first(); todo; todo = todoList.next()) {
         if ( checkTodo( todo ) ) {
             KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this);
             mTodoMap.insert(todo,todoItem);
         }
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 0cbc087..a9e7f30 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -23,21 +23,31 @@
 #ifndef KOTODOVIEW_H
 #define KOTODOVIEW_H
 
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qlineedit.h>
-#include <qptrlist.h>
-#include <qstrlist.h>
-#include <qlistbox.h>
-#include <qpopupmenu.h>
+#include <q3ptrlist.h>
+#include <q3strlist.h>
+#include <q3listbox.h>
+#include <q3popupmenu.h>
 #include <qlabel.h>
 #include <qmap.h>
 #include <qdialog.h>
 #include <qlabel.h>
-#include <qlistview.h>
+#include <q3listview.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QWheelEvent>
+#include <QPaintEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QDragEnterEvent>
 #include <klistview.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/todo.h>
 
 #include <korganizer/baseview.h>
@@ -98,13 +108,13 @@ class KOTodoListView : public KListView
     KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0);
     virtual ~KOTodoListView() {}
 
   signals:
     void paintNeeded();
     void todoDropped(Todo *, int);  
-    void double_Clicked(QListViewItem *item);
+    void double_Clicked(Q3ListViewItem *item);
     void reparentTodoSignal( Todo *,Todo * );
     void unparentTodoSignal(Todo *);
     void deleteTodo( Todo * );
   protected:
     void wheelEvent (QWheelEvent *e);
     void contentsDragEnterEvent(QDragEnterEvent *);
@@ -121,13 +131,13 @@ class KOTodoListView : public KListView
     void paintEvent(QPaintEvent * pevent);
     bool internalDrop;
     QString mName;
     Calendar *mCalendar;
     QPoint mPressPos;
     bool mMousePressed;
-    QListViewItem *mOldCurrent;
+    Q3ListViewItem *mOldCurrent;
     bool  mFlagKeyPressed;
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
 };
 
 
@@ -154,14 +164,14 @@ class KOTodoView : public KOrg::BaseView
 {
     Q_OBJECT
   public:
     KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 );
     ~KOTodoView();
 
-    QPtrList<Incidence> selectedIncidences();
-    QPtrList<Todo> selectedTodos();
+    Q3PtrList<Incidence> selectedIncidences();
+    Q3PtrList<Todo> selectedTodos();
 
     DateList selectedDates()
       {DateList q;
        return q;}
 
     /** Return number of shown dates. TodoView does not show dates, */
@@ -181,20 +191,20 @@ class KOTodoView : public KOrg::BaseView
     void updateView();
     void updateConfig();
 
     void changeEventDisplay(Event *, int);
 
     void showDates(const QDate &start, const QDate &end);
-    void showEvents(QPtrList<Event> eventList);
+    void showEvents(Q3PtrList<Event> eventList);
 
     void clearSelection();
     void jumpToDate ();
 
-    void editItem(QListViewItem *item);
-    void showItem(QListViewItem *item,const QPoint &,int);
-    void popupMenu(QListViewItem *item,const QPoint &,int);
+    void editItem(Q3ListViewItem *item);
+    void showItem(Q3ListViewItem *item,const QPoint &,int);
+    void popupMenu(Q3ListViewItem *item,const QPoint &,int);
     void newTodo();
     void newSubTodo();
     void unparentTodo();
     void reparentTodo();
     void showTodo();
     void editTodo();
@@ -216,16 +226,16 @@ class KOTodoView : public KOrg::BaseView
     void purgeCompleted();
     void toggleCompleted();
     void toggleRunning();
     void toggleQuickTodo();
     void updateTodo( Todo *, int );
 
-    void itemClicked(QListViewItem *);
-    void itemStateChanged(QListViewItem *);
+    void itemClicked(Q3ListViewItem *);
+    void itemStateChanged(Q3ListViewItem *);
     void modified(bool);
-    void itemDoubleClicked(QListViewItem *item);
+    void itemDoubleClicked(Q3ListViewItem *item);
     void resetFocusToList();
     void fillCategories ();
     void fillCal ();
     void changedCal (int);
 
   signals:
@@ -270,24 +280,24 @@ class KOTodoView : public KOrg::BaseView
     KOTodoViewWhatsThis* mKOTodoViewWhatsThis;
     friend class KOTodoListView;
     void paintEvent(QPaintEvent * pevent);
     bool mPendingUpdateBeforeRepaint;
     friend class KOTodoViewItem;
     QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo);
-    void restoreItemState( QListViewItem * );
+    void restoreItemState( Q3ListViewItem * );
 
     bool checkTodo( Todo * );
     bool isFlatDisplay;
-    void  setOpen( QListViewItem*, bool setOpen);
+    void  setOpen( Q3ListViewItem*, bool setOpen);
     KOTodoListView *mTodoListView;
-    QPopupMenu *mItemPopupMenu;
-    QPopupMenu *mPopupMenu;
-    QPopupMenu *mPriorityPopupMenu;
-    QPopupMenu *mPercentageCompletedPopupMenu;
-    QPopupMenu *mCategoryPopupMenu;
-    QPopupMenu *mCalPopupMenu;
+    Q3PopupMenu *mItemPopupMenu;
+    Q3PopupMenu *mPopupMenu;
+    Q3PopupMenu *mPriorityPopupMenu;
+    Q3PopupMenu *mPercentageCompletedPopupMenu;
+    Q3PopupMenu *mCategoryPopupMenu;
+    Q3PopupMenu *mCalPopupMenu;
 
     QMap<int, int> mPercentage;
     QMap<int, int> mPriority;
     QMap<int, QString> mCategory;
     KOTodoViewItem *mActiveItem;
 
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 519bb16..c21816d 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -16,28 +16,32 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <qapp.h>
+#include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPixmap>
 #include <kglobal.h>
 
 #include <kiconloader.h>
 #include "kotodoviewitem.h"
 #include "kotodoview.h"
 #include "koprefs.h"
 
-KOTodoViewItem::KOTodoViewItem( QListView *parent, Todo *todo, KOTodoView *kotodo)
-  : QCheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
+KOTodoViewItem::KOTodoViewItem( Q3ListView *parent, Todo *todo, KOTodoView *kotodo)
+  : Q3CheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {
   construct();
 }
 
 KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo )
-  : QCheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
+  : Q3CheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {  
   construct();
 }
 
 QString KOTodoViewItem::key(int column,bool) const
 {
@@ -77,13 +81,13 @@ void KOTodoViewItem::setSortKey(int column,const QString &key)
 }
 
 #if QT_VERSION >= 0x030000
 void KOTodoViewItem::paintBranches(QPainter *p,const QColorGroup & cg,int w,
                                    int y,int h)
 {
-  QListViewItem::paintBranches(p,cg,w,y,h);
+  Q3ListViewItem::paintBranches(p,cg,w,y,h);
 }
 #else
 #endif
 
 void KOTodoViewItem::construct()
 {
@@ -313,22 +317,22 @@ void KOTodoViewItem::stateChange(bool state)
   }
   else {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(99));
   }
   if ( state ) {
-      QListViewItem * myChild = firstChild();
+      Q3ListViewItem * myChild = firstChild();
       KOTodoViewItem *item;
       while( myChild ) {
           //qDebug("stateCH ");
           item = static_cast<KOTodoViewItem*>(myChild);
           item->stateChange(state);
           myChild = myChild->nextSibling();
       }
   } else {
-      QListViewItem * myChild = parent();
+      Q3ListViewItem * myChild = parent();
       if ( myChild )
           (static_cast<KOTodoViewItem*>(myChild))->stateChange(state);
   }
   mTodoView->modified(true);
   setMyPixmap();
   mTodoView->setTodoModified( mTodo );
@@ -380,18 +384,18 @@ bool KOTodoViewItem::isAlternate()
        m_odd = above ? !above->m_odd : false;
     }
     else
     {
        KOTodoViewItem *item;
        bool previous = true;
-       if (QListViewItem::parent())
+       if (Q3ListViewItem::parent())
        {
-          item = static_cast<KOTodoViewItem *>(QListViewItem::parent());
+          item = static_cast<KOTodoViewItem *>(Q3ListViewItem::parent());
           if (item)
              previous = item->m_odd;
-          item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
+          item = static_cast<KOTodoViewItem *>(Q3ListViewItem::parent()->firstChild());
        }
        else
        {
            KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
           item = static_cast<KOTodoViewItem *>(lv->firstChild());
        }
@@ -473,36 +477,36 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
           
           p->fillRect( 0, 0, width, height(), _cg.base() ); // background
           // p->setPen(Qt::black );  //border
           // p->setBrush( KOPrefs::instance()->mHighlightColorKGlobalSettings::baseColor() );  //filling
           QColor fc = KOPrefs::instance()->mHighlightColor;
           if ( mTodo->percentComplete() == 100 )
-              fc = darkGreen;
+              fc = Qt::darkGreen;
           p->drawRect( 2, 2, width-4, height()-4);
           p->fillRect( 3, 3, progress, height()-6, 
                        fc );
           p->restore();
       } else {
-          QCheckListItem::paintCell(p, _cg, column, width, alignment);
+          Q3CheckListItem::paintCell(p, _cg, column, width, alignment);
       }
       return;
   }
 
   int align = alignment;
    
     if ( !p )
         return;
     
     p->fillRect( 0, 0, width, height(), _cg.brush( QColorGroup::Base ) );
 
-    QListView *lv = listView();
+    Q3ListView *lv = listView();
     if ( !lv )
         return;
     int marg = 2;//lv->itemMargin();
     int r = 0;
-    QCheckListItem::Type myType = QCheckListItem::CheckBox;
+    Q3CheckListItem::Type myType = Q3CheckListItem::CheckBox;
     int BoxSize = 20;
     int boxOffset = 2;
     int xOffset = 2;
     if (qApp->desktop()->width() < 300 ) {
          BoxSize = 14;
          boxOffset = -1;
@@ -519,13 +523,13 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
 
     int lineStart = 5;
     if ( myType == Controller ) {
         if ( !pixmap( 0 ) )
             r += BoxSize + 4;
     } else {
-        ASSERT( lv ); //###
+        Q_ASSERT( lv ); //###
                 //QFontMetrics fm( lv->font() );
                 //int d = fm.height();
         int x = 0;
         int y = (height() - BoxSize) / 2;
                 //p->setPen( QPen( _cg.text(), winStyle ? 2 : 1 ) );
         if ( myType == CheckBox ) {
@@ -536,13 +540,13 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
             p->drawRect( x+marg, y+2, BoxSize-4, BoxSize-4 );
             lineStart = x+marg;
             /////////////////////
                 x++;
                 y++;
                 if ( isOn() ) {
-                    QPointArray a( 7*2 );
+                    Q3PointArray a( 7*2 );
                     int i, xx, yy;
                     xx = x+xOffset+marg+(boxOffset/2);
                     yy = y+5+boxOffset;
                     for ( i=0; i<3; i++ ) {
                         a.setPoint( 2*i,   xx, yy );
                         a.setPoint( 2*i+1, xx, yy+2 );
@@ -552,25 +556,25 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
                     yy -= 2;
                     for ( i=3; i<7; i++ ) {
                         a.setPoint( 2*i,   xx, yy );
                         a.setPoint( 2*i+1, xx, yy+2 );
                         xx++; yy--;
                     }
-                    p->setPen( darkGreen );
+                    p->setPen( Qt::darkGreen );
                     p->drawLineSegments( a );
                 }
                 ////////////////////////
         } 
         r += BoxSize + 4;
     }
 
     p->translate( r, 0 );
     p->setPen( QPen( _cg.text() ) );
-    QListViewItem::paintCell( p, _cg, column, width - r, align );
+    Q3ListViewItem::paintCell( p, _cg, column, width - r, align );
     if ( mTodo->cancelled () ) {
-        p->setPen( black );
+        p->setPen( Qt::black );
         QRect br = p->boundingRect( 1,1,1,1,0,mTodo->summary() );
         int wid = br.width() +lineStart;
         if (  wid > width-3 )
             wid = width-3;
         p->drawLine( lineStart, height()/2+1, wid, height()/2+1  );
 
diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h
index bd024c8..62a635c 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -19,19 +19,19 @@
 #ifndef KOTODOVIEWITEM_H
 #define KOTODOVIEWITEM_H
 
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qlineedit.h>
-#include <qptrlist.h>
-#include <qstrlist.h>
-#include <qlistbox.h>
-#include <qpopupmenu.h>
+#include <q3ptrlist.h>
+#include <q3strlist.h>
+#include <q3listbox.h>
+#include <q3popupmenu.h>
 #include <qlabel.h>
 #include <qmap.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpainter.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/todo.h>
 
 using namespace KCal;
@@ -42,22 +42,22 @@ class KOTodoView;
   This class provides a way of displaying a single Event of Todo-Type in a
   KTodoView.
   
   @author Cornelius Schumacher <schumacher@kde.org>
   @see KOTodoView
 */
-class KOTodoViewItem : public QCheckListItem
+class KOTodoViewItem : public Q3CheckListItem
 {
   public:
     /**
       Constructor.
 
       @param parent is the list view to which this item belongs.
       @param ev is the event to have the item display information for.
     */
-    KOTodoViewItem(QListView *parent, Todo *todo, KOTodoView *kotodo);
+    KOTodoViewItem(Q3ListView *parent, Todo *todo, KOTodoView *kotodo);
     KOTodoViewItem(KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo);
     //~KOTodoViewItem() { qDebug("~KOTodoViewItem() %s ", text(0).latin1() );}
 
     void construct();
 
     Todo *todo() { return mTodo; }
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 4057ae0..07c4295 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -20,13 +20,15 @@
 
   As a special exception, permission is given to link this program
   with any edition of Qt, and distribute the resulting executable,
   without including the source code for Qt in the source distribution.
 */
 
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <kconfig.h>
 #include <kglobal.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
@@ -454,14 +456,14 @@ void KOViewManager::showListView()
         connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mListView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
-        connect( mListView, SIGNAL( beamIncidenceList( QPtrList<Incidence>  ) ),
-                 mMainView, SLOT ( beamIncidenceList( QPtrList<Incidence>  ) ) );
+        connect( mListView, SIGNAL( beamIncidenceList( Q3PtrList<Incidence>  ) ),
+                 mMainView, SLOT ( beamIncidenceList( Q3PtrList<Incidence>  ) ) );
     }
     // bool temp = mFlagShowNextxDays;
     //globalFlagBlockPainting = true;
     globalFlagBlockAgenda = 1;
     if ( KOPrefs::instance()->mListViewMonthTimespan ) {
         mMainView->setBlockShowDates( true );
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index f88403c..bfe930f 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -15,20 +15,26 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include <qlayout.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qtextcodec.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 
 #include <qapplication.h>
+#include <QDesktopWidget>
 #ifdef DESKTOP_VERSION 
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
+//Added by qt3to4:
+#include <Q3PtrList>
+#include <QHideEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 #endif
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -39,13 +45,13 @@
 #include "calprinter.h"
 #endif
 #include "koglobals.h"
 #include "koprefs.h"
 #include "koeventviewerdialog.h"
 #include "koeventviewer.h"
-#include <qstylesheet.h> 
+#include <q3stylesheet.h> 
 #include "kowhatsnextview.h"
 using namespace KOrg;
 
 void WhatsNextTextBrowser::setSource(const QString& n)
 {
 
@@ -53,13 +59,13 @@ void WhatsNextTextBrowser::setSource(const QString& n)
         emit showIncidence(n);
         return;
     } else if (n.startsWith("todo:")) {
         emit showIncidence(n);
         return;
     } else {
-        QTextBrowser::setSource(n);
+        Q3TextBrowser::setSource(n);
     }
 }
 void WhatsNextTextBrowser::printMe()
 {
 #ifdef DESKTOP_VERSION 
      KOPrintPrefs pp ( this );
@@ -69,13 +75,13 @@ void WhatsNextTextBrowser::printMe()
 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
@@ -100,25 +106,25 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
     //       new QLabel(KGlobal::locale()->formatDate(QDate::currentDate()),this);
     //   mDateLabel->setMargin(2);
     //   mDateLabel->setAlignment(AlignCenter);
     setFont( KOPrefs::instance()->mWhatsNextFont );
     mView = new WhatsNextTextBrowser(this);
     connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &)));
-    QStyleSheet* stsh = mView->styleSheet();
-    QStyleSheetItem * style ;
+    Q3StyleSheet* stsh = mView->styleSheet();
+    Q3StyleSheetItem * style ;
     style   = stsh->item ("h2" );
     if ( style ) {
-        style->setMargin(QStyleSheetItem::MarginAll,0);  
+        style->setMargin(Q3StyleSheetItem::MarginAll,0);  
     }
     style   = stsh->item ("h3" );
     if ( style ) {
-        style->setMargin(QStyleSheetItem::MarginAll,0);  
+        style->setMargin(Q3StyleSheetItem::MarginAll,0);  
     }
     mEventViewer = 0;
 
-    QBoxLayout *topLayout = new QVBoxLayout(this);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
     //  topLayout->addWidget(mDateLabel);
     topLayout->addWidget(mView);
     mTimer = new QTimer( this );
     connect(mTimer,SIGNAL( timeout() ),this, SLOT(updateView()));
 
     connect(mView->horizontalScrollBar (),SIGNAL( sliderReleased () ),this, SLOT(restartTimer()));
@@ -141,15 +147,15 @@ int KOWhatsNextView::currentDateCount()
 
 void KOWhatsNextView::clearList()
 {
     mTimer->stop();
     mView->setText(" ");
 }
-QPtrList<Incidence> KOWhatsNextView::selectedIncidences()
+Q3PtrList<Incidence> KOWhatsNextView::selectedIncidences()
 {
-    QPtrList<Incidence> eventList;
+    Q3PtrList<Incidence> eventList;
 
     return eventList;
 }
 
 void KOWhatsNextView::printMe()
 {
@@ -216,14 +222,14 @@ void KOWhatsNextView::updateView()
 #else
     mText += "<font color=\"#FFFFFF\"> <em>" +  KGlobal::locale()->formatDate( mEventDate , false )+"</em></font></h2>";
 #endif
     mText += "</td></tr>\n<tr  bgcolor=\"#EAF8FA\"><td>";
     int iii;
     mTodos.clear();
-    QPtrList<Event> events;  
-    QPtrList<Todo> todos = calendar()->todos(); 
+    Q3PtrList<Event> events;  
+    Q3PtrList<Todo> todos = calendar()->todos(); 
     Todo * todo;
     //mText += "<h2>" + i18n("Events: ") + "</h2>\n";
     int daysToShow = KOPrefs::instance()->mWhatsNextDays ;
     bool itemAdded = false;
     for ( iii = 0; iii <  daysToShow; ++iii ) {
         QString date;
@@ -451,13 +457,13 @@ void  KOWhatsNextView::appendDay( int i, QDate eventDate )
 
 void KOWhatsNextView::showDates(const QDate &, const QDate &)
 {
     updateView();
 }
 
-void KOWhatsNextView::showEvents(QPtrList<Event>)
+void KOWhatsNextView::showEvents(Q3PtrList<Event>)
 {
 }
 
 void KOWhatsNextView::changeEventDisplay(Event *, int action)
 {
     switch(action) {
@@ -738,13 +744,13 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
         mText += "</p>\n";
     }
     else {
         ind += "-";
         mText += "</li>\n";
     }
-    QPtrList<Incidence> Relations = ev->relations();
+    Q3PtrList<Incidence> Relations = ev->relations();
     Incidence *to;
     for (to=Relations.first();to;to=Relations.next()) {
         if (!((Todo*)to)->isCompleted() && ((Todo*)to)->priority() <= mCurrentMaxPrio )
             appendTodo( to, ind , true );
     } 
     
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 93574ef..49fc448 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -16,28 +16,34 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #ifndef KOWHATSNEXTVIEW_H
 #define KOWHATSNEXTVIEW_H
 
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <QShowEvent>
+#include <QHideEvent>
+#include <QLabel>
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 #include <korganizer/baseview.h>
 
-class QListView;
+class Q3ListView;
 class QLabel;
 
 class KOEventViewerDialog;
 
 #include <qpainter.h>
 #include <qwidget.h>
-class WhatsNextTextBrowser : public QTextBrowser {
+class WhatsNextTextBrowser : public Q3TextBrowser {
     Q_OBJECT
   public:
-    WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent) {};
+    WhatsNextTextBrowser(QWidget *parent) : Q3TextBrowser(parent) {};
 
     void setSource(const QString &);
     void printMe();
 
   signals:
     void showIncidence(const QString &uid);
@@ -55,25 +61,25 @@ class KOWhatsNextView : public KOrg::BaseView
                     const char *name = 0);
     ~KOWhatsNextView();
 
     virtual int maxDatesHint();
     virtual int currentDateCount();
     void setEventViewer(KOEventViewerDialog* v );
-    virtual QPtrList<Incidence> selectedIncidences();
+    virtual Q3PtrList<Incidence> selectedIncidences();
     void clearList();
     DateList selectedDates()
       {DateList q;
        return q;}    
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
   
   public slots:
     virtual void updateView();
     void printMe();
     virtual void showDates(const QDate &start, const QDate &end);
-    virtual void showEvents(QPtrList<Event> eventList);
+    virtual void showEvents(Q3PtrList<Event> eventList);
     void updateConfig();
     void changeEventDisplay(Event *, int);
   
   protected:
     bool appendEvent(Incidence *, bool reply=false, bool notRed = true, bool appendTable = false);
     bool appendTodo(Incidence *, QString ind = "", bool isSub = false );
@@ -93,10 +99,10 @@ class KOWhatsNextView : public KOrg::BaseView
     QTimer* mTimer;
     WhatsNextTextBrowser *mView;
     QString mText;
     // QLabel *mDateLabel;
     KOEventViewerDialog *mEventViewer;
     
-    QValueList<Incidence *> mTodos;
+    Q3ValueList<Incidence *> mTodos;
 };
 
 #endif
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index df9b2fc..e2ae4a6 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -18,18 +18,21 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qkeycode.h>
+#include <qnamespace.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qlineedit.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QKeyEvent>
 
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpimglobalprefs.h>
@@ -42,13 +45,13 @@
 // Mostly locale aware. Author: David Faure <faure@kde.org>
 
 // KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox.
 // Difficult to get all in one...
 // But Qt-3.2 will offer QLineEdit::setMask, so a "99:99" mask would help.
 KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
-  : QComboBox(TRUE, parent, name)
+  : Q3ComboBox(TRUE, parent, name)
 {
   setInsertionPolicy(NoInsertion);
     mFlagKeyPressed = false;
     if ( QApplication::desktop()->height() <= 480 ) {
         setSizeLimit ( 6 ); 
     } else {
@@ -61,18 +64,18 @@ KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
 
   // Fill combo box with selection of times in localized format.
   QTime timeEntry(0,0,0);
   do {
     insertItem(KGlobal::locale()->formatTime(timeEntry));
     timeEntry = timeEntry.addSecs(60*15);
-  } while (!timeEntry.isNull());
+  } while ( !( timeEntry.hour() || timeEntry.minute()  ) );
   // Add end of day.
   insertItem( KGlobal::locale()->formatTime( QTime( 23, 59, 59 ) ) );
 
   updateText();
-  setFocusPolicy(QWidget::StrongFocus);
+  setFocusPolicy(Qt::StrongFocus);
 
   connect(this, SIGNAL(activated(int)), this, SLOT(activ(int)));
   connect(this, SIGNAL(highlighted(int)), this, SLOT(hilit(int)));
   connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText()));
   QFontMetrics fm ( font() );
   QString timeString = "24:00";
@@ -205,30 +208,30 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
     return;
   }
   if (! e->isAutoRepeat() ) {
     mFlagKeyPressed = true;
   }
   // Tap -> Focus Next Widget
-  if ( e->key() == Key_Tab ) {
-    QComboBox::keyPressEvent(e);
+  if ( e->key() == Qt::Key_Tab ) {
+    Q3ComboBox::keyPressEvent(e);
     return;
   }
 
   // save Text from QLineEdit and CursorPosition
   QString text = lineEdit()->text();
   int cpos = lineEdit()->cursorPosition();
   // qDebug("cpos %d  ", cpos);
 
   // Switch for arrows, backspace and escape
   switch(e->key()) {
-  case Key_Escape:
+      case Qt::Key_Escape:
       lineEdit()->deselect();
-  case Key_Tab:
-      QComboBox::keyPressEvent(e);
+      case Qt::Key_Tab:
+      Q3ComboBox::keyPressEvent(e);
     break;
-  case Key_Up:
+      case Qt::Key_Up:
       if ( e->state () == Qt::ControlButton ) {
           addTime(QTime(0,15,0), false );
           lineEdit()->setCursorPosition(3);
           setSelect( 3 , 2 );
       }
       else
@@ -264,13 +267,13 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
                   case 0:
                       addTime(QTime(1,0,0), false );
                       setSelect ( 0, 2 );
                       break;
               }
       break;
-  case Key_Down:
+      case Qt::Key_Down:
       if ( e->state () == Qt::ControlButton ) {
           subTime(QTime(0,15,0), false );
           lineEdit()->setCursorPosition(3);
           setSelect( 3 , 2 );
       }
       else
@@ -307,55 +310,55 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
                       subTime(QTime(1,0,0), false );
                       setSelect ( 0 , 2 );
                       break;
               }
       break;
   // set cursor to correct place
-  case Key_Left:
+      case Qt::Key_Left:
     if ( cpos == 3 )
         --cpos;
     if ( cpos >  0) {
         lineEdit()->setCursorPosition(--cpos);
         setSelect ( cpos , 1 );
     }
     else
         setSelect ( 0 , 1 );
     break;
   // set cursor to correct place
-  case Key_Right:
+      case Qt::Key_Right:
     if ( cpos == 1 )
         ++cpos;
     if ( cpos < maxpos ) {
         lineEdit()->setCursorPosition(++cpos);
         setSelect ( cpos , 1 );
     }
     break;
   // rest
-  case Key_Prior:
+      case Qt::Key_Prior:
     subTime(QTime(1,0,0));
     break;
-  case Key_Next:
+      case Qt::Key_Next:
     addTime(QTime(1,0,0));
     break;
-  case Key_Backspace:
+      case Qt::Key_Backspace:
       if ( cpos >  0) {
           if ( cpos == 3 )
               --cpos;
           if ( cpos > 5)
               cpos = 5;
-          text.at( cpos-1 ) = '0';
+          text[ cpos-1 ] = '0';
           lineEdit()->setText( text );
           lineEdit()->setCursorPosition(--cpos);
           setSelect ( cpos , 1 );
       changedText();
       }
     break;
   } // switch arrows
 
   // if cursor at string end, alltext market and keyEvent don't ArrowLeft -> deselect and cpos
-  if( cpos > 4 && lineEdit()->markedText().length() == 5 && e->key() != Key_Left ) {
+  if( cpos > 4 && lineEdit()->markedText().length() == 5 && e->key() != Qt::Key_Left ) {
       lineEdit()->deselect();
       cpos = 0;
       lineEdit()->setCursorPosition(cpos);
       setSelect(cpos , 1);
   }
 
@@ -364,77 +367,77 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
   }
 
   // num keys when cursorPos preEnd
   if (  cpos  < 5  ) {
       // switch another keys
       switch(e->key()) {
-      case Key_Delete:
-          text.at( cpos ) = '0';
+          case Qt::Key_Delete:
+          text[ cpos ] = '0';
           lineEdit()->setText( text );
           lineEdit()->setCursorPosition(cpos);
           setSelect ( cpos , 1 );
           changedText();
           break;
-      case Key_9:
-      case Key_8:
-      case Key_7:
-      case Key_6:
+          case Qt::Key_9:
+          case Qt::Key_8:
+          case Qt::Key_7:
+          case Qt::Key_6:
           if ( !(cpos == 1 ||  cpos == 4)  )
               return;
           if ( cpos == 1  && text.at( 0 ) > '1')
-              text.at( 0 ) = '1';
-      case Key_5:
-      case Key_4:
-      case Key_3:
+              text[ 0 ] = '1';
+          case Qt::Key_5:
+          case Qt::Key_4:
+          case Qt::Key_3:
           if ( cpos < 1 )
               return;
           if ( hour12Format  && cpos == 1  )
               return;
-      case Key_2:
+          case Qt::Key_2:
           if ( hour12Format  && cpos == 0 )
               return;
           if ( cpos == 0  && text.at( 1 ) > '3')
-              text.at( 1 ) = '3';
-      case Key_1:
-      case Key_0:
+              text[ 1 ] = '3';
+          case Qt::Key_1:
+          case Qt::Key_0:
           if ( hour12Format ) {
-              if ( e->key() == Key_0  && cpos == 1 && text.at( 0 ) == '0' )
+              if ( e->key() == Qt::Key_0  && cpos == 1 && text.at( 0 ) == '0' )
                   return;
-              if ( e->key() == Key_0  && cpos == 0 && text.at( 1 ) == '0' )
-                 text.at( 1 ) = '1';
+              if ( e->key() == Qt::Key_0  && cpos == 0 && text.at( 1 ) == '0' )
+                 text[ 1 ] = '1';
           }
-          text.at( cpos ) = QChar ( e->key() );
+          text[ cpos ] = QChar ( e->key() );
           lineEdit()->setText( text );
           if ( cpos == 1 )
             ++cpos;
         if ( cpos <  5)
             lineEdit()->setCursorPosition(++cpos);
             setSelect( cpos , 1 );
             changedText();
         break;
-      case Key_Home:
+          case Qt::Key_Home:
             lineEdit()->setCursorPosition(0);
             setSelect( cpos , 1 );
         break;
-      case Key_End:
+          case Qt::Key_End:
             lineEdit()->setCursorPosition(5);
             lineEdit()->deselect();
         break;
       default:
 //          QComboBox::keyPressEvent(e);
         break;
       } // switch num keys
   } else if ( cpos == 5 ) {// if cpos < 5
       if ( hour12Format ) {
-          if ( e->key() == Key_A ) {
-              text.at( 5 ) = 'a';
+          if ( e->key() == Qt::Key_A ) {
+              text[ 5 ] = 'a';
               lineEdit()->setText( text );
               lineEdit()->setCursorPosition(5);
 
-          } else if ( e->key() == Key_P ) {
-              text.at( 5 ) = 'p';
+          } else if ( e->key() == Qt::Key_P ) {
+              text[ 5 ] = 'p';
               lineEdit()->setText( text );
               lineEdit()->setCursorPosition(5);
 
           }
       }
   }
diff --git a/korganizer/ktimeedit.h b/korganizer/ktimeedit.h
index b3d842d..1c7d18d 100644
--- a/korganizer/ktimeedit.h
+++ b/korganizer/ktimeedit.h
@@ -21,27 +21,30 @@
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KTIMEEDIT_H
 #define _KTIMEEDIT_H
 
 #include <qevent.h>
-#include <qkeycode.h>
+#include <qnamespace.h>
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qcombobox.h>
+#include <Q3ComboBox>
+//Added by qt3to4:
+#include <QKeyEvent>
 
 #include <kapplication.h>
 
 /**
   This is a class that provides an easy, user friendly way to edit times.
   up/down/ increase or decrease time, respectively.
 
   @short Provides a way to edit times in a user-friendly manner.
   @author Preston Brown, Ian Dawes
 */
-class KOTimeEdit : public QComboBox
+class KOTimeEdit : public Q3ComboBox
 {
     Q_OBJECT
   public:
     /** constructs a new time edit. */
     KOTimeEdit(QWidget *parent=0, QTime qt=QTime(12,0), const char *name=0);
 
diff --git a/korganizer/lineview.cpp b/korganizer/lineview.cpp
index e72e41c..012455e 100644
--- a/korganizer/lineview.cpp
+++ b/korganizer/lineview.cpp
@@ -4,13 +4,13 @@
 
 #include "koprefs.h"
 
 #include "lineview.h"
 
 LineView::LineView( QWidget *parent, const char *name ) :
-  QScrollView( parent, name )
+  Q3ScrollView( parent, name )
 {
   mPixelWidth = 1000;
 
   mLines.setAutoDelete( true );
 
   resizeContents( mPixelWidth, contentsHeight() );
diff --git a/korganizer/lineview.h b/korganizer/lineview.h
index aa34dbc..52ae9cf 100644
--- a/korganizer/lineview.h
+++ b/korganizer/lineview.h
@@ -1,13 +1,13 @@
 #ifndef LINEVIEW_H
 #define LINEVIEW_H
 
-#include <qscrollview.h>
-#include <qptrlist.h>
+#include <q3scrollview.h>
+#include <q3ptrlist.h>
 
-class LineView : public QScrollView
+class LineView : public Q3ScrollView
 {
     Q_OBJECT
   public:
     LineView( QWidget *parent = 0, const char *name = 0 );
     virtual ~LineView();
 
@@ -25,12 +25,12 @@ class LineView : public QScrollView
       Line( int c, int s, int e ) : column( c ), start( s ), end( e ) {}
       int column;
       int start;
       int end;
     };
 
-    QPtrList<Line> mLines;
+    Q3PtrList<Line> mLines;
     int mPixelWidth;
 };
 
 #endif
 
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 4a0e24f..211fde6 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -1,19 +1,19 @@
 
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qcopchannel_qws.h> 
 #include <qpe/global.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qstring.h>
 #include <qwindowsstyle.h> 
-#include <qplatinumstyle.h> 
-#include <qsgistyle.h> 
 #include <stdlib.h>
 #endif
 #include <qtextcodec.h> 
 
 #include <qdir.h>
 #include <kstandarddirs.h>
@@ -23,18 +23,18 @@
 #include <libkdepim/kpimglobalprefs.h>
 void dumpMissing();
 
 
 int main( int argc, char **argv )
 {
+    if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
 #ifndef DESKTOP_VERSION
   QPEApplication a( argc, argv );
   a.setKeepRunning ();
 #else
   QApplication a( argc, argv ); 
-  QApplication::setStyle( new QPlatinumStyle ());
 #ifdef _WIN32_
   QString hdir ( getenv( "HOME") );
   if ( hdir.isEmpty() ) {
     QString hd ("C:/" );
     //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd );
     if ( QDir::homeDirPath().lower() == hd.lower() ) {
@@ -86,22 +86,22 @@ int main( int argc, char **argv )
 
       QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont );
       KPimGlobalPrefs::instance()->setGlobalConfig();
       MainWindow m;
 #ifndef DESKTOP_VERSION
      
-      QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(receiveStart(  const QCString&, const QByteArray& )));
+      QObject::connect( &a, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )),&m, SLOT(receiveStart(  const Q3CString&, const QByteArray& )));
       a.showMainWidget(&m );
 #else
       a.setMainWidget(&m );
       m.show();
       //m.resize( 800, 600 );
       //QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
 #endif
       if ( argc > 1 ) {
-          QCString command = argv[1];
+          Q3CString command = argv[1];
           if ( argc > 2 )
               command += argv[2];
           m.recieve(command,  QByteArray() );
           
       }
      
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 69ccde1..2004939 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,38 +1,48 @@
 #include <stdlib.h>
 
 #include <qaction.h>
-#include <qpopupmenu.h>
+#include <Q3Action>
+#include <q3popupmenu.h>
 #include <qpainter.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qtextcodec.h>
 #include <qfile.h>
 #include <qdir.h>
-#include <qapp.h>
+#include <qapplication.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qmap.h>
-#include <qwmatrix.h>
-#include <qtextbrowser.h>
-#include <qtextstream.h>
+#include <qmatrix.h>
+#include <q3textbrowser.h>
+#include <q3textstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qtopia/alarmserver.h>
 #include <qtopia/qcopenvelope_qws.h>
 //#include <unistd.h> // for sleep
 #else
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QPixmap>
+#include <QCloseEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
+#include <QHideEvent>
+#include <Q3CString>
+#include <Q3PtrList>
 //#include <resource.h>
 
 #endif
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 #include <libkcal/phoneformat.h>
@@ -77,41 +87,41 @@ class KOex2phonePrefs : public QDialog
 {
   public:
     KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
-        lab->setAlignment (AlignHCenter  ); 
-        QHBox* temphb;
-        temphb = new QHBox( this );
+        lab->setAlignment (Qt::AlignHCenter  ); 
+        Q3HBox* temphb;
+        temphb = new Q3HBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
         new QLabel( i18n("Connection: "), temphb ); 
         mPhoneConnection = new QLineEdit( temphb);
         lay->addWidget( temphb );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
         new QLabel( i18n("Model(opt.): "), temphb ); 
         mPhoneModel = new QLineEdit( temphb);
         lay->addWidget( temphb );
         mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
         mWriteBackFuture->setChecked( true );
         lay->addWidget( mWriteBackFuture );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
         new QLabel( i18n("Max. weeks in future: ") , temphb );
         mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
         mWriteBackFutureWeeks->setValue( 8 );
         lay->addWidget( temphb );  
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );  
-        lab->setAlignment (AlignHCenter  ); 
+        lab->setAlignment (Qt::AlignHCenter  ); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
@@ -131,13 +141,13 @@ public:
 QPixmap* sgListViewCompletedPix[6];
 QPixmap* sgListViewJournalPix;
 
 
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name ) :
-    QMainWindow( parent, name )
+    Q3MainWindow( parent, name )
 {
     sgListViewCompletedPix[5] = &listviewPix;
     sgListViewCompletedPix[0] = &listviewPix0;
     sgListViewCompletedPix[1] = &listviewPix20;
     sgListViewCompletedPix[2] = &listviewPix40;
     sgListViewCompletedPix[3] = &listviewPix60;
@@ -182,24 +192,24 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
     //KPimGlobalPrefs::instance()->setGlobalConfig();
     p->mCurrentDisplayedView = 0;
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
-    QMainWindow::ToolBarDock tbd;
+    Qt::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
         if ( p->mToolBarUp )
-            tbd = Bottom;
+            tbd = Qt::Bottom;
         else
-            tbd = Top;
+            tbd = Qt::Top;
     }
     else {
         if ( p->mToolBarUp )
-            tbd = Right;
+            tbd = Qt::Right;
         else
-            tbd = Left;
+            tbd = Qt::Left;
     }
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     globalFlagBlockStartup = 1;
     iconToolBar = new QPEToolBar( this );
     addToolBar (iconToolBar , tbd );
@@ -210,30 +220,30 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
         if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) )
 #endif
 
 {
         if ( p->mToolBarHorF ) {
             if ( p->mToolBarUpF )
-                tbd = Bottom;
+                tbd = Qt::Bottom;
             else
-                tbd = Top;
+                tbd = Qt::Top;
         }
         else {
             if ( p->mToolBarUpF )
-            tbd = Right;
+            tbd = Qt::Right;
             else
-                tbd = Left;
+                tbd = Qt::Left;
         }
         filterToolBar = new QPEToolBar ( this );
         filterMenubar = new KMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
 #ifndef DESKTOP_VERSION    
         filterToolBar->setFocusPolicy( NoFocus );
         filterMenubar->setFocusPolicy( NoFocus );
 #endif     
-        filterPopupMenu = new QPopupMenu( this );
+        filterPopupMenu = new Q3PopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
         QString addTest = "A";  
         filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
 #ifdef DESKTOP_VERSION
         addTest = "AAAAAABBBCCCx"; 
 #else
@@ -256,35 +266,35 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     } else {
 #ifndef DESKTOP_VERSION
         setToolBarsMovable( false );
 #endif
         if ( p->mToolBarHorV ) {
             if ( p->mToolBarUpV )
-                tbd = Bottom;
+                tbd = Qt::Bottom;
             else
-                tbd = Top;
+                tbd = Qt::Top;
         }
         else {
             if ( p->mToolBarUpV )
-                tbd = Right;
+                tbd = Qt::Right;
             else
-                tbd = Left;
+                tbd = Qt::Left;
         }
         viewToolBar = new QPEToolBar( this );
         addToolBar (viewToolBar , tbd );
         if ( p->mToolBarHorN ) {
             if ( p->mToolBarUpN )
-                tbd = Bottom;
+                tbd = Qt::Bottom;
             else
-                tbd = Top;
+                tbd = Qt::Top;
         }
         else {
             if ( p->mToolBarUpN )
-                tbd = Right;
+                tbd = Qt::Right;
             else
-                tbd = Left;
+                tbd = Qt::Left;
         }
         navigatorToolBar = new QPEToolBar( this );
         addToolBar (navigatorToolBar , tbd );
     }
 
   
@@ -437,15 +447,15 @@ void  MainWindow::loadDataAfterStart()
     processIncidenceSelection( 0 );
     connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processIncidenceSelection( Incidence * ) ) );
     connect( mView, SIGNAL( modifiedChanged( bool ) ),
              SLOT( slotModifiedChanged( bool ) ) );
 #ifndef DESKTOP_VERSION
-    connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
-    connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve(  const QCString&, const QByteArray& )));
-    disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart(  const QCString&, const QByteArray& )));
+    connect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const Q3CString &, const QByteArray & )));
+    connect( qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT(recieve(  const Q3CString&, const QByteArray& )));
+    disconnect( qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT(receiveStart(  const Q3CString&, const QByteArray& )));
     if ( !mCStringMess.isEmpty() ) 
         recieve( mCStringMess, mByteData );
 #endif
     QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
 }
 
@@ -506,13 +516,13 @@ void MainWindow::toggleBeamReceive()
         brAction->setOn(false);
         return;
     } 
     qDebug("KO: Enable BeamReceive ");
     brAction->setOn(true);
     infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
-    QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
+    QObject::connect( infrared, SIGNAL (received ( const Q3CString &, const QByteArray & )),this, SLOT(recieve(  const Q3CString&, const QByteArray& )));
 #endif
 }
 void MainWindow::showMaximized () 
 {
 #ifndef DESKTOP_VERSION
     if ( ! globalFlagBlockStartup )
@@ -597,28 +607,28 @@ void MainWindow::closeEvent( QCloseEvent* ce )
     default:
         break;
     }
 
 
 }
-void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data )
+void MainWindow::receiveStart( const Q3CString& cmsg, const QByteArray& data )
 {
     qDebug("KO: QCOP start message received: %s ", cmsg.data()  );
     mCStringMess = cmsg;
     mByteData = data;
 }
-void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
+void MainWindow::recieve( const Q3CString& cmsg, const QByteArray& data )
 {
-    QDataStream stream( data, IO_ReadOnly );
+    QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
     // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
     //QString datamess;
     //qDebug("message ");
     qDebug("KO: QCOP message received: %s ", cmsg.data()  );
  
     if ( cmsg == "setDocument(QString)" ) {
-        QDataStream stream( data, IO_ReadOnly );
+        QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
         QString fileName;
         stream >> fileName;
         //qDebug("filename %s ", fileName.latin1());
         showMaximized();
         raise();
         KOPrefs::instance()->mLastSyncedLocalFile = fileName ;
@@ -741,27 +751,27 @@ void MainWindow::initActions()
 {
     //KOPrefs::instance()->mShowFullMenu
     iconToolBar->clear();
     KOPrefs *p = KOPrefs::instance();
     //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
 
-    QPopupMenu *viewMenu = new QPopupMenu( this );
-    QPopupMenu *actionMenu = new QPopupMenu( this );
-    mCurrentItemMenu = new QPopupMenu ( this );
-    QPopupMenu *nextConflictMenu = new QPopupMenu ( this );
-    QPopupMenu *importMenu = new QPopupMenu( this );
-    QPopupMenu *importMenu_X = new QPopupMenu( this );
-    QPopupMenu *exportMenu_X = new QPopupMenu( this );
-    QPopupMenu *beamMenu_X = new QPopupMenu( this );
-    selectFilterMenu = new QPopupMenu( this );
+    Q3PopupMenu *viewMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *actionMenu = new Q3PopupMenu( this );
+    mCurrentItemMenu = new Q3PopupMenu ( this );
+    Q3PopupMenu *nextConflictMenu = new Q3PopupMenu ( this );
+    Q3PopupMenu *importMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *importMenu_X = new Q3PopupMenu( this );
+    Q3PopupMenu *exportMenu_X = new Q3PopupMenu( this );
+    Q3PopupMenu *beamMenu_X = new Q3PopupMenu( this );
+    selectFilterMenu = new Q3PopupMenu( this );
     selectFilterMenu->setCheckable( true );
-    syncMenu = new QPopupMenu( this );
-    configureAgendaMenu = new QPopupMenu( this );
-    configureToolBarMenu = new QPopupMenu( this );
-    QPopupMenu *helpMenu = new QPopupMenu( this );
-    QIconSet icon;
+    syncMenu = new Q3PopupMenu( this );
+    configureAgendaMenu = new Q3PopupMenu( this );
+    configureToolBarMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *helpMenu = new Q3PopupMenu( this );
+    QIcon icon;
     int pixWid = 22, pixHei = 22;
     QString pathString = "";
     if ( !p->mToolBarMiniIcons ) {
         if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
             pathString += "icons16/";
             pixWid = 18; pixHei = 16;
@@ -788,13 +798,13 @@ void MainWindow::initActions()
 #endif
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
         menuBar1 = new KMenuBar( iconToolBar );
-        QPopupMenu *menuBar = new QPopupMenu( this );
+        Q3PopupMenu *menuBar = new Q3PopupMenu( this );
         icon = loadPixmap( pathString + "z_menu" );
         menuBar1->insertItem( icon.pixmap(), menuBar);
         //menuBar1->insertItem( i18n("ME"), menuBar);
         menuBar->insertItem( i18n("File"), importMenu );
         menuBar->insertItem( i18n("View"), viewMenu );
         menuBar->insertItem( i18n("Edit"), mCurrentItemMenu );
@@ -815,13 +825,13 @@ void MainWindow::initActions()
 
    
     mWeekBgColor = iconToolBar->backgroundColor();
     mWeekPixmap.resize( pixWid , pixHei );
     mWeekPixmap.fill( mWeekBgColor );
     icon = mWeekPixmap;
-    mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
+    mWeekAction = new Q3Action( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
     if ( p-> mShowIconWeekNum )
         mWeekAction->addTo( iconToolBar );
     mWeekFont = font();
 
     int fontPoint = mWeekFont.pointSize();
     QFontMetrics f( mWeekFont );
@@ -837,24 +847,24 @@ void MainWindow::initActions()
     connect( mWeekAction, SIGNAL( activated() ),
              this, SLOT( weekAction() ) );
 
     connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
     if ( p->mShowIconFilterview ) {
         icon = loadPixmap( pathString + "filter" );
-        actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
+        actionFilterMenuTB = new Q3Action( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
         connect( actionFilterMenuTB, SIGNAL( activated() ),
                  this, SLOT( fillFilterMenuTB() ) );
         actionFilterMenuTB->addTo( iconToolBar  );
-        selectFilterMenuTB = new QPopupMenu( this );
+        selectFilterMenuTB = new Q3PopupMenu( this );
         selectFilterMenuTB->setCheckable( true ); 
         connect ( selectFilterMenuTB, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     }
 
     //#endif
     // ******************
-    QAction *action;
+    Q3Action *action;
     // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
     configureToolBarMenu->setCheckable( true );
 
    
     configureAgendaMenu->setCheckable( true );
     int iii ;
@@ -863,58 +873,58 @@ void MainWindow::initActions()
     }
     //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
 
     connect( configureAgendaMenu, SIGNAL( aboutToShow()),
              this, SLOT( showConfigureAgenda( ) ) );
     icon = loadPixmap( pathString + "today" );
-    QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
+    Q3Action* today_action = new Q3Action( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
     today_action->addTo( actionMenu );
     connect( today_action, SIGNAL( activated() ),
              mView, SLOT( goToday() ) );
 
     icon = loadPixmap( pathString + "picker" );
-    QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
+    Q3Action* dPickerAction = new Q3Action( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
     dPickerAction->addTo( actionMenu );
     connect( dPickerAction, SIGNAL( activated() ),
              mView, SLOT( showDatePicker() ) );
 
     icon = loadPixmap( pathString + "search" );
-    QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
+    Q3Action* search_action = new Q3Action( i18n("Search"), icon, i18n("Search..."), 0, this );
     search_action->addTo( actionMenu );
     connect( search_action, SIGNAL( activated() ),
              mView->dialogManager(), SLOT( showSearchDialog() ) );
     actionMenu->insertItem( i18n("Show next conflict for"), nextConflictMenu );
 
-    action = new QAction( "Undo Delete", i18n("All events"), 0, this );
+    action = new Q3Action( "Undo Delete", i18n("All events"), 0, this );
     action->addTo( nextConflictMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( conflictAll() ) );
 
-    action = new QAction( "Undo Delete", i18n("Allday events"), 0, this );
+    action = new Q3Action( "Undo Delete", i18n("Allday events"), 0, this );
     action->addTo( nextConflictMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( conflictAllday() ) );
 
-    action = new QAction( "Undo Delete", i18n("Events with time"), 0, this );
+    action = new Q3Action( "Undo Delete", i18n("Events with time"), 0, this );
     action->addTo( nextConflictMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( conflictNotAll() ) );
     
     actionMenu->insertSeparator();
     
      icon = loadPixmap( pathString + "newevent" );
-    QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
+    Q3Action* ne_action = new Q3Action( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
     ne_action->addTo( mCurrentItemMenu );
     connect( ne_action, SIGNAL( activated() ),
              mView, SLOT( newEvent() ) );
     icon = loadPixmap( pathString + "newtodo" );
-    QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
+    Q3Action* nt_action = new Q3Action( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
     nt_action->addTo( mCurrentItemMenu );
     connect( nt_action, SIGNAL( activated() ),
              mView, SLOT( newTodo() ) );
-    mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
+    mNewSubTodoAction = new Q3Action( "new_subtodo", i18n("New Sub-Todo..."), 0,
                                      this );
     mNewSubTodoAction->addTo(  mCurrentItemMenu );
     connect( mNewSubTodoAction, SIGNAL( activated() ),
              mView, SLOT( newSubTodo() ) );
    
     mCurrentItemMenu->insertSeparator();
@@ -927,84 +937,84 @@ void MainWindow::initActions()
     configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
     icon = loadPixmap( pathString + "newtodo" );
     configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
 
     //actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
-    mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
+    mShowAction = new Q3Action( "show_incidence", i18n("Show"), 0, this );
     mShowAction->addTo( mCurrentItemMenu  );
     connect( mShowAction, SIGNAL( activated() ),
              mView, SLOT( showIncidence() ) );
 
-    mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
+    mEditAction = new Q3Action( "edit_incidence", i18n("Edit..."), 0, this );
     mEditAction->addTo( mCurrentItemMenu  );
     connect( mEditAction, SIGNAL( activated() ),
              mView, SLOT( editIncidence() ) );
 
-    mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
+    mDeleteAction = new Q3Action( "delete_incidence", i18n("Delete..."), 0, this );
     mDeleteAction->addTo(  mCurrentItemMenu );
     connect( mDeleteAction, SIGNAL( activated() ),
              mView, SLOT( deleteIncidence() ) );
 
 
-    mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
+    mCloneAction = new Q3Action( "clone_incidence", i18n("Clone..."), 0, this );
     mCloneAction->addTo( mCurrentItemMenu  );
     connect( mCloneAction, SIGNAL( activated() ),
              mView, SLOT( cloneIncidence() ) );
-    mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
+    mMoveAction = new Q3Action( "Move_incidence", i18n("Move..."), 0, this );
     mMoveAction->addTo( mCurrentItemMenu  );
     connect( mMoveAction, SIGNAL( activated() ),
              mView, SLOT( moveIncidence() ) );
 #ifndef DESKTOP_VERSION
-    mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
+    mBeamAction = new Q3Action( "Beam_incidence", i18n("Beam..."), 0, this );
     mBeamAction->addTo(mCurrentItemMenu  );
     connect( mBeamAction, SIGNAL( activated() ),
              mView, SLOT( beamIncidence() ) );
 #endif
-    mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
+    mCancelAction = new Q3Action( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
     mCancelAction->addTo( mCurrentItemMenu  );
     connect( mCancelAction, SIGNAL( activated() ),
              mView, SLOT( toggleCancelIncidence() ) );
 
   
    mCurrentItemMenu->insertSeparator();
-    action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
+    action = new Q3Action( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
     action->addTo( mCurrentItemMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( undo_delete() ) );
 
     // ***********************
     if ( KOPrefs::instance()->mVerticalScreen ) {
          icon = SmallIcon( "1updownarrow" );
     } else {
         icon = SmallIcon("1leftrightarrow" );
     }
     configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
-    QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
+    Q3Action* FSaction = new Q3Action( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
     FSaction->addTo( viewMenu );
     connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
 
    
     icon = loadPixmap( pathString + "filter" );
     configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
     icon = loadPixmap( pathString + "configure" );
-    action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
+    action = new Q3Action( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
     mToggleFilter = action;
     icon = loadPixmap( pathString + "navi" );
     configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
-    action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
+    action = new Q3Action( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleDateNavigatorWidget() ) );
     mToggleNav = action ;
     icon = loadPixmap( pathString + "allday" );
     configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
-    action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
+    action = new Q3Action( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleAllDaySize() ) );
     mToggleAllday = action;
 
 
@@ -1028,318 +1038,318 @@ void MainWindow::initActions()
     //********************
     if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
 
 
     icon = loadPixmap( pathString + "whatsnext" );
     configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
-    QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
+    Q3Action* whatsnext_action = new Q3Action( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
     whatsnext_action->addTo( viewMenu );
     connect( whatsnext_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWhatsNextView() ) );
 
     icon = loadPixmap( pathString + "xdays" );
     configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
-    QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
+    Q3Action* xdays_action = new Q3Action( i18n("Next days"), icon, i18n("Next days"), 0, this );
     xdays_action->addTo( viewMenu );
     connect( xdays_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showNextXView() ) );
    
 
     icon = loadPixmap( pathString + "journal" );
     configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
-    QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
+    Q3Action* viewjournal_action = new Q3Action( i18n("Journal"), icon, i18n("Journal"), 0, this );
     viewjournal_action->addTo( viewMenu );
     connect( viewjournal_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showJournalView() ) );
 
 
     icon = loadPixmap( pathString + "day" );
     configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
-    QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
+    Q3Action* day1_action = new Q3Action( i18n("Day View"), icon, i18n("Day View"), 0, this );
     day1_action->addTo( viewMenu );
     //  action->addTo( toolBar );
     connect( day1_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showDayView() ) );
 
     icon = loadPixmap( pathString + "workweek" );
     configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
-    QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
+    Q3Action* day5_action = new Q3Action( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
     day5_action->addTo( viewMenu );
     connect( day5_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWorkWeekView() ) );
 
     icon = loadPixmap( pathString + "week" );
     configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
-    QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
+    Q3Action* day7_action = new Q3Action( i18n("Week"), icon, i18n("Week"), 0, this );
     day7_action->addTo( viewMenu );
     connect( day7_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWeekView() ) );
     
     icon = loadPixmap( pathString + "workweek2" );
     configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
-    QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
+    Q3Action* day6_action = new Q3Action( i18n("List week"), icon, i18n("List week"), 0, this );
     day6_action->addTo( viewMenu );
     connect( day6_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthViewWeek() ) );
 
     icon = loadPixmap( pathString + "month" );
     configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
-    QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
+    Q3Action* month_action = new Q3Action( i18n("Month"), icon, i18n("Month"), 0, this );
     month_action->addTo( viewMenu );
     connect( month_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthView() ) );
 
      icon = loadPixmap( pathString + "list" );
     configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
-    QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
+    Q3Action* showlist_action = new Q3Action( i18n("List View"), icon, i18n("List View"), 0, this );
     showlist_action->addTo( viewMenu );
     connect( showlist_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showListView() ) );
 
     icon = loadPixmap( pathString + "todo" );
     configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
-    QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
+    Q3Action* todoview_action = new Q3Action( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
     todoview_action->addTo( viewMenu );
     connect( todoview_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTodoView() ) );
 
 
 
 #if 0
-    action = new QAction( "view_timespan", "Time Span", 0, this );
+    action = new Q3Action( "view_timespan", "Time Span", 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTimeSpanView() ) );
 #endif
 
  
 
-    action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
+    action = new Q3Action( "purge_completed", i18n("Purge Completed..."), 0,
                           this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
 
    
     icon = loadPixmap( pathString + "search" );
     configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
 
 
 
     actionMenu->insertSeparator();
-     action = new QAction( "manage cat", i18n("Edit category list..."), 0,
+     action = new Q3Action( "manage cat", i18n("Edit category list..."), 0,
                           this );
     action->addTo(  actionMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
 
-     action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
+     action = new Q3Action( "manage cat", i18n("Manage new categories..."), 0,
                           this );
     action->addTo(  actionMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
 
 
     actionMenu->insertSeparator();
     icon = loadPixmap( pathString + "configure" );
-    action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
+    action = new Q3Action( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_options() ) );  
-    action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
+    action = new Q3Action( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              this, SLOT( calHint() ) );  
-    action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
+    action = new Q3Action( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_global_options() ) );
     if ( KOPrefs::instance()->mShowFullMenu ) {
         actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
 
     }
     // actionMenu->insertSeparator();
-    action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
+    action = new Q3Action( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
-    action = new QAction( "import_quick", i18n("Import last file"), 0,
+    action = new Q3Action( "import_quick", i18n("Import last file"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
     importMenu_X->insertSeparator();
-    action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
+    action = new Q3Action( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
     //#ifndef DESKTOP_VERSION
     importMenu_X->insertSeparator();
-    action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
+    action = new Q3Action( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
     //#else
 #ifdef _OL_IMPORT_
     importMenu_X->insertSeparator();
-    action = new QAction( "import_ol", i18n("Import from OL"), 0,
+    action = new Q3Action( "import_ol", i18n("Import from OL"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
 #endif
     //#endif
 
     //importMenu->insertSeparator();
 #if 0
-    action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
+    action = new Q3Action( "load_cal", i18n("Load Calendar Backup"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
 #endif
-    action = new QAction( "save_cal", i18n("Save Backup..."), 0,
+    action = new Q3Action( "save_cal", i18n("Save Backup..."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
     importMenu->insertSeparator();
     importMenu->insertItem( i18n("Import"), importMenu_X );
     //importMenu->insertSeparator();
-    action = new QAction( "export ical", i18n("Export All Data"), 0,
+    action = new Q3Action( "export ical", i18n("Export All Data"), 0,
                           this );
     action->addTo( exportMenu_X );    
     connect( action, SIGNAL( activated() ), SLOT( exportICalendar() ) );
-    action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
+    action = new Q3Action( "import_qtopia", i18n("Export VCalendar"), 0,
                           this );
     action->addTo( exportMenu_X );    
     connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
 
 
     //LR
-    QPopupMenu *ex2phone = new QPopupMenu( this );
+    Q3PopupMenu *ex2phone = new Q3PopupMenu( this );
     ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
     exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
 
     importMenu->insertItem( i18n("Export"), exportMenu_X );
     mPrintSelAction = 0;
 #ifndef DESKTOP_VERSION
     //importMenu->insertSeparator();
-    brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
+    brAction = new Q3Action( "beam toggle", i18n("Beam receive enabled"), 0,
                           this );
     brAction->addTo( beamMenu_X ); 
     brAction->setToggleAction (true ) ;
     connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
 
-    action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
+    action = new Q3Action( "beam all", i18n("Beam complete calendar..."), 0,
                           this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
 
-    action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
+    action = new Q3Action( "beam all", i18n("Beam filtered calendar..."), 0,
                           this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
     importMenu->insertItem( i18n("Beam"), beamMenu_X );
 #else
     //importMenu->insertSeparator();
     icon = loadPixmap( pathString + "print" );
-    action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
+    action = new Q3Action( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printCal() ) );
 
     icon = loadPixmap( pathString + "week" );
-    action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
+    action = new Q3Action( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printSel() ) );  
     icon = loadPixmap( pathString + "whatsnext" );
-    action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
+    action = new Q3Action( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( slotprintWNV() ) );
 
  
     icon = loadPixmap( pathString + "list" );
-    action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
+    action = new Q3Action( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printListView() ) );
 
     icon = loadPixmap( pathString + "newevent" );
-   action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
+   action = new Q3Action( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( slotprintSelInc() ) );
     mPrintSelAction = action;
     importMenu->insertItem( i18n("Print"), beamMenu_X );
 #endif
     
     importMenu->insertSeparator();
-    action = new QAction( "beam all", i18n("Save"), 0,
+    action = new Q3Action( "beam all", i18n("Save"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
-    action = new QAction( "beam all", i18n("Exit (+save)"), 0,
+    action = new Q3Action( "beam all", i18n("Exit (+save)"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
 
     //menuBar->insertItem( "Configure",configureMenu );
     //configureMenu->insertItem( "Toolbar",configureToolBarMenu  );
     icon = loadPixmap( "korganizer/korganizer" );
 
-    action = new QAction( "Whats New", i18n("What's new?"), 0,this );
+    action = new Q3Action( "Whats New", i18n("What's new?"), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( whatsNew() ) );
-    action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
+    action = new Q3Action( "featureHowto", i18n("Features + hints..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( features() ) );
-    action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
+    action = new Q3Action( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( keyBindings() ) ); 
-    action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
+    action = new Q3Action( "Storage Howto", i18n("Storage HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( storagehowto() ) ); 
-    action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
+    action = new Q3Action( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( timetrackinghowto() ) );
-    action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
+    action = new Q3Action( "Sync Howto", i18n("Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( synchowto() ) );
-    action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
+    action = new Q3Action( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( kdesynchowto() ) );
-    action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
+    action = new Q3Action( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( multisynchowto() ) );
-    action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
+    action = new Q3Action( "Auto saving", i18n("Auto saving..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutAutoSaving() ) );
-    action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
+    action = new Q3Action( "Problemd", i18n("Known Problems..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutKnownBugs() ) );
-    action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
+    action = new Q3Action( "Translate Howto", i18n("User translation..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( usertrans() ) );
-    action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
+    action = new Q3Action( "Frequently asked questions", i18n("FAQ..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( faq() ) );
-    action = new QAction( "licence", i18n("Licence..."), 0, this );
+    action = new Q3Action( "licence", i18n("Licence..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( licence() ) );
-    action = new QAction( "about", i18n("About..."), 0, this );
+    action = new Q3Action( "about", i18n("About..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( about() ) );
     //menuBar->insertSeparator();
 
     // ******************************************************
@@ -1353,13 +1363,13 @@ void MainWindow::initActions()
         ne_action->addTo( iconToolBar  );
     if (p->mShowIconNewTodo )
         nt_action->addTo( iconToolBar  );
     if (p-> mShowIconSearch)
         search_action->addTo( iconToolBar  );
     if (p-> mShowIconWhatsThis)
-        QWhatsThis::whatsThisButton (  iconToolBar );
+        Q3WhatsThis::whatsThisButton (  iconToolBar );
     if (p-> mShowIconNext)
         whatsnext_action->addTo( viewToolBar  );
     if (p-> mShowIconNextDays)
         xdays_action->addTo( viewToolBar  );
     if (p-> mShowIconJournal)
         viewjournal_action->addTo( viewToolBar  );
@@ -1378,41 +1388,41 @@ void MainWindow::initActions()
     if (p-> mShowIconTodoview)
         todoview_action->addTo( viewToolBar  );   
    
     icon = loadPixmap( pathString + "2leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200);
     if (p-> mShowIconBackFast) {
-        action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
+        action = new Q3Action( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPreviousMonth() ) );
         action->addTo( navigatorToolBar  );
     }
     icon = loadPixmap( pathString + "1leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210);
     if (p-> mShowIconBack) {
-        action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
+        action = new Q3Action( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPrevious() ) );
         action->addTo( navigatorToolBar  );
     } 
     icon = loadPixmap( pathString + "today" );
     configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
     if (p-> mShowIconToday)
         today_action->addTo( navigatorToolBar  );
     icon = loadPixmap( pathString + "1rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);
     if (p-> mShowIconForward) {
-        action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
+        action = new Q3Action( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goNext() ) );
         action->addTo( navigatorToolBar  );
     }
     icon = loadPixmap( pathString + "2rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);
     if (p-> mShowIconForwardFast) {
-        action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
+        action = new Q3Action( i18n("Next month"), icon, i18n("Next month"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goNextMonth() ) );
         action->addTo( navigatorToolBar  );
     }
 
 
@@ -1521,13 +1531,13 @@ void MainWindow::exportToPhone( int mode )
     KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
     KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
 
     int inFuture = 0;
     if ( ex2phone.mWriteBackFuture->isChecked() )
         inFuture =  ex2phone.mWriteBackFutureWeeks->value();
-    QPtrList<Incidence> delSel;
+    Q3PtrList<Incidence> delSel;
     if ( mode == 1 )
         delSel  = mCalendar->rawIncidences(); 
     if ( mode == 2 )
         delSel  = mCalendar->incidences(); 
     CalendarLocal* cal = new CalendarLocal();
     cal->setLocalTime();
@@ -1592,16 +1602,16 @@ QString MainWindow::resourcePath()
 }
 
 void MainWindow::displayText( QString text ,QString cap  )
 {
     QDialog dia( this, "name", true ); ;
     dia.setCaption( cap );
-    QVBoxLayout* lay = new QVBoxLayout( &dia );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
-    QTextBrowser tb ( &dia );
+    Q3TextBrowser tb ( &dia );
     lay->addWidget( &tb );
     tb.setText( text );
 #ifdef DESKTOP_VERSION
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
@@ -1774,15 +1784,15 @@ QString MainWindow::syncFileName()
 void MainWindow::updateWeek(QDate seda)
 {
     int weekNum = KGlobal::locale()->weekNum ( seda );
     mWeekPixmap.fill( mWeekBgColor );
     QPainter p ( &mWeekPixmap );
     p.setFont( mWeekFont );
-    p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) );
+    p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),Qt::AlignCenter, QString::number( weekNum) );
     p.end();   
-    QIconSet icon3 ( mWeekPixmap );
+    QIcon icon3 ( mWeekPixmap );
     mWeekAction->setIconSet ( icon3 );
 
 }
 void MainWindow::updateWeekNum(const DateList &selectedDates)
 {
     updateWeek( selectedDates.first() );
@@ -1809,13 +1819,13 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
         } else {
             if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
             if ( incidence->isBirthday() || incidence->isAnniversary() ) {
                 bool ok;
-                QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
+                QDateTime noc = incidence->getNextOccurence( (QDateTime)mView->startDate().addDays(-1), &ok );
                 if ( ok ) {
                     int years = noc.date().year() - incidence->dtStart().date().year();
                     startString += i18n(" (%1 y.)"). arg( years );
                 }
             }
             else
@@ -1843,19 +1853,19 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
         mNewSubTodoAction->setEnabled( false );
     }
 #ifdef DESKTOP_VERSION
     static QPixmap jP = SmallIcon( "journal" );
     static QPixmap eP = SmallIcon( "newevent" );
     static QPixmap tP = SmallIcon( "newtodo" );
-    QIconSet icon;
+    QIcon icon;
     if ( incidence->typeID() == todoID )
-        icon = QIconSet ( tP );
+        icon = QIcon ( tP );
     else if ( incidence->typeID() == eventID )
-        icon =  QIconSet ( eP );
+        icon =  QIcon ( eP );
     else if ( incidence->typeID() == journalID )
-        icon =  QIconSet ( jP );
+        icon =  QIcon ( jP );
     mPrintSelAction->setIconSet ( icon );
 #endif
 }
 
 void MainWindow::enableIncidenceActions( bool enabled )
 {
@@ -2042,13 +2052,13 @@ void MainWindow::backupAllFiles()
         qDebug("KO: Backup cancelled. Will try again tomorrow ");
         // retval == 0 : backup skipped for today, try again tomorrow
         KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
     } else if ( retval == 1 ){
         qDebug("KO: Backup created.");
         // backup ok
-        QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+        Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
         KopiCalendarFile * cal = calendars.first();
         cal = calendars.next();
         while ( cal ) {
             if ( !cal->mErrorOnLoad ) {
                 KApplication::createBackup(  cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );  
             }
@@ -2338,13 +2348,13 @@ void MainWindow::fillFilterMenuTB()
     selectFilterMenuTB->clear();
     selectFilterMenuTB->insertItem(i18n ( "Edit Filters" ),  0 );
     selectFilterMenuTB->insertSeparator();
     selectFilterMenuTB->insertItem(i18n ( "No Filter" ),  1 );
    
     selectFilterMenuTB->insertSeparator();
-    QPtrList<CalFilter> fili = mView->filters();
+    Q3PtrList<CalFilter> fili = mView->filters();
     CalFilter *curfilter = mView->filterView()->selectedFilter();
     CalFilter *filter = fili.first();
     int iii = 2;
     bool checkitem = mView->filterView()->filtersEnabled();
     while(filter) {
         selectFilterMenuTB->insertItem( filter->name(),  iii );
@@ -2383,13 +2393,13 @@ void MainWindow::fillFilterMenu()
     selectFilterMenu->clear();
     selectFilterMenu->insertItem(i18n ( "Edit Filters" ),  0 );
     selectFilterMenu->insertSeparator();
     selectFilterMenu->insertItem(i18n ( "No Filter" ),  1 );
    
     selectFilterMenu->insertSeparator();
-    QPtrList<CalFilter> fili = mView->filters();
+    Q3PtrList<CalFilter> fili = mView->filters();
     CalFilter *curfilter = mView->filterView()->selectedFilter();
     CalFilter *filter = fili.first();
     int iii = 2;
     bool checkitem = mView->filterView()->filtersEnabled();
     while(filter) {
         selectFilterMenu->insertItem( filter->name(),  iii );
@@ -2404,13 +2414,13 @@ void MainWindow::fillFilterMenu()
 void MainWindow::fillFilterMenuPopup()
 {
     filterPopupMenu->clear();
     filterPopupMenu->insertItem(i18n ( "No Filter" ),  0 );
    
     filterPopupMenu->insertSeparator();
-    QPtrList<CalFilter> fili = mView->filters();
+    Q3PtrList<CalFilter> fili = mView->filters();
     CalFilter *curfilter = mView->filterView()->selectedFilter();
     CalFilter *filter = fili.first();
     int iii = 1;
     bool checkitem = mView->filterView()->filtersEnabled();
     while(filter) {
         filterPopupMenu->insertItem( filter->name(),  iii );
@@ -2816,8 +2826,8 @@ void MainWindow::resizeEvent( QResizeEvent* e)
                 filterToolBar->hide();
             else
                 filterToolBar->show();
         }
     }
 #endif
-    QMainWindow::resizeEvent( e);
+    Q3MainWindow::resizeEvent( e);
 }
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a533d8b..6756216 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,40 +1,48 @@
 #ifndef KORGE_MAINWINDOW_H
 #define KORGE_MAINWINDOW_H
 
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 #include <qtimer.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qfile.h>
 #include <qmenubar.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QCloseEvent>
+#include <QResizeEvent>
+#include <QPixmap>
+#include <Q3PopupMenu>
+#include <QHideEvent>
+#include <QKeyEvent>
 
 #include <libkcal/incidence.h>
 #include <ksyncmanager.h>
 #include <kpopupmenu.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
-class QAction;
+class Q3Action;
 class CalendarView;
 class KSyncProfile;
 #ifdef DESKTOP_VERSION
 
-#define QPEToolBar QToolBar
+#define QPEToolBar Q3ToolBar
 #endif
 class QPEToolBar;
 
 
 namespace KCal {
 class CalendarLocal;
 }
 
 using namespace KCal;
 
-class MainWindow : public QMainWindow
+class MainWindow : public Q3MainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0 );
     ~MainWindow();
     bool beamReceiveEnabled();
@@ -46,14 +54,14 @@ class MainWindow : public QMainWindow
     void setCaption ( const QString & );
     void updateWeekNum(const KCal::DateList &);
     void updateWeek(QDate);
     void updateFilterToolbar();
     virtual void showMaximized (); 
      void configureAgenda( int );
-    void recieve( const QCString& msg, const QByteArray& data );
-    void receiveStart( const QCString& msg, const QByteArray& data );
+    void recieve( const Q3CString& msg, const QByteArray& data );
+    void receiveStart( const Q3CString& msg, const QByteArray& data );
  protected slots: 
     void autoSaveWarning();
     void loadDataAfterStart();
     void calHint(); 
     void startMultiSync();
     void setCaptionToDates();
@@ -121,64 +129,64 @@ class MainWindow : public QMainWindow
     void enableIncidenceActions( bool );
     bool askForQuitOnSaveError();
     
   private:
     bool mAutoSaveDisabled;
     bool checkAutosave();
-    QCString mCStringMess;
+    Q3CString mCStringMess;
     QByteArray mByteData;
 
     //void setMenuBar( QMenuBar * );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
-    QAction* brAction; 
+    Q3Action* brAction; 
     KSyncManager* mSyncManager;
     bool mClosed;
     void saveOnClose();
     bool  mFlagKeyPressed;
     bool  mBlockAtStartup;
     KMenuBar *menuBar1;
     QPEToolBar *iconToolBar;
     QPEToolBar *viewToolBar;
     QPEToolBar *navigatorToolBar;
     QPEToolBar *filterToolBar;
     KMenuBar *filterMenubar;
-    QPopupMenu * filterPopupMenu;
-    QPopupMenu * mCurrentItemMenu;
+    Q3PopupMenu * filterPopupMenu;
+    Q3PopupMenu * mCurrentItemMenu;
     void initActions();
     void setDefaultPreferences(); 
     void resizeEvent( QResizeEvent* e);
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
-    QPopupMenu *configureToolBarMenu;
-    QPopupMenu *selectFilterMenu;
-    QPopupMenu *selectFilterMenuTB;
-    QPopupMenu *configureAgendaMenu, *syncMenu;
+    Q3PopupMenu *configureToolBarMenu;
+    Q3PopupMenu *selectFilterMenu;
+    Q3PopupMenu *selectFilterMenuTB;
+    Q3PopupMenu *configureAgendaMenu, *syncMenu;
     CalendarLocal *mCalendar;
     CalendarView *mView;
-    QAction *mNewSubTodoAction;
-    QAction *mWeekAction;
+    Q3Action *mNewSubTodoAction;
+    Q3Action *mWeekAction;
     QFont mWeekFont;
     QPixmap mWeekPixmap;
     QColor mWeekBgColor;
     
-    QAction *mShowAction;
-    QAction *mEditAction;
-    QAction *mDeleteAction;
-    QAction *mCloneAction;
-    QAction *mMoveAction;
-    QAction *mBeamAction;
-    QAction *mCancelAction;
-    QAction *mPrintSelAction;
+    Q3Action *mShowAction;
+    Q3Action *mEditAction;
+    Q3Action *mDeleteAction;
+    Q3Action *mCloneAction;
+    Q3Action *mMoveAction;
+    Q3Action *mBeamAction;
+    Q3Action *mCancelAction;
+    Q3Action *mPrintSelAction;
 
-    QAction *mToggleNav;
-    QAction *mToggleFilter;
-    QAction *mToggleAllday;
-    QAction *actionFilterMenuTB;
+    Q3Action *mToggleNav;
+    Q3Action *mToggleFilter;
+    Q3Action *mToggleAllday;
+    Q3Action *actionFilterMenuTB;
 
     void closeEvent( QCloseEvent* ce );
     QTimer mSaveTimer;
     QDateTime mSaveTimerStart;
     int mSaveDelay;
     //bool mBlockSaveFlag;
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f6a1a6a..59c3e45 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -23,16 +23,19 @@
 */
 
 #include <qstring.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include "libkdepim/kdatepicker.h"
@@ -50,17 +53,17 @@
 
 #include "navigatorbar.h"
 
 NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3HBoxLayout( this );
 
   // Set up the control buttons and date label
-  mCtrlFrame = new QFrame( this );
-  mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised);
+  mCtrlFrame = new Q3Frame( this );
+  mCtrlFrame->setFrameStyle(Q3Frame::Panel|Q3Frame::Raised);
   mCtrlFrame->setLineWidth(1);
 
   topLayout->addWidget( mCtrlFrame );
 
  
 
@@ -126,13 +129,13 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   }
 
   resetFont( font() );
 
   
   // set up control frame layout
-  QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 );
+  Q3BoxLayout *ctrlLayout = new Q3HBoxLayout( mCtrlFrame, 1 );
   ctrlLayout->addWidget( mPrevYear, 3 );
   ctrlLayout->addWidget( mPrevMonth, 3 );
   ctrlLayout->addWidget( mPrevWeek, 3 );
   //ctrlLayout->addStretch( 1 );
   // ctrlLayout->addSpacing( 1 );
   // ctrlLayout->addWidget( mDateLabel );
@@ -147,19 +150,19 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
   connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) );
   connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) );
   connect( mPrevWeek, SIGNAL( clicked() ), SIGNAL( goPrevWeek() ) );
   connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) );
   connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) );
   connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) );
-  mPrevYear->setFocusPolicy(NoFocus);
-  mPrevMonth->setFocusPolicy(NoFocus);
-  mNextMonth->setFocusPolicy(NoFocus);
-  mPrevWeek->setFocusPolicy(NoFocus);
-  mNextWeek->setFocusPolicy(NoFocus);
-  mNextYear->setFocusPolicy(NoFocus);
-  mSelectMonth->setFocusPolicy(NoFocus);
+  mPrevYear->setFocusPolicy(Qt::NoFocus);
+  mPrevMonth->setFocusPolicy(Qt::NoFocus);
+  mNextMonth->setFocusPolicy(Qt::NoFocus);
+  mPrevWeek->setFocusPolicy(Qt::NoFocus);
+  mNextWeek->setFocusPolicy(Qt::NoFocus);
+  mNextYear->setFocusPolicy(Qt::NoFocus);
+  mSelectMonth->setFocusPolicy(Qt::NoFocus);
   setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
    
 }
 
 NavigatorBar::~NavigatorBar()
 {
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index 9ccef14..a1880f5 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -24,15 +24,18 @@
 #ifndef NAVIGATORBAR_H
 #define NAVIGATORBAR_H
 
 #include <libkcal/incidencebase.h>
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3Frame>
+#include <QLabel>
 
 class QPushButton;
-class QFrame;
+class Q3Frame;
 class QLabel;
 
 class NavigatorBar: public QWidget
 {
     Q_OBJECT
   public:
@@ -57,13 +60,13 @@ class NavigatorBar: public QWidget
     void monthSelected( int );
 
   private:
     int mCurrentHei;
     int mCurrentMinWid;
     int mCurrentButtonMinWid;
-    QFrame *mCtrlFrame;
+    Q3Frame *mCtrlFrame;
 
     QPushButton *mPrevYear;
     QPushButton *mPrevMonth;
     QPushButton *mNextMonth;
     QPushButton *mPrevWeek;
     QPushButton *mNextWeek;
diff --git a/korganizer/outgoingdialog.cpp b/korganizer/outgoingdialog.cpp
index 7253c8e..ab31274 100644
--- a/korganizer/outgoingdialog.cpp
+++ b/korganizer/outgoingdialog.cpp
@@ -18,13 +18,13 @@
 */
 
 #include <kdebug.h>
 
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kstandarddirs.h>
 
@@ -41,16 +41,16 @@
 
 #include "koprefs.h"
 #include "outgoingdialog.h"
 #include "koeventviewerdialog.h"
 #include "docprefs.h"
 
-ScheduleItemOut::ScheduleItemOut(QListView *parent,IncidenceBase *ev,
+ScheduleItemOut::ScheduleItemOut(Q3ListView *parent,IncidenceBase *ev,
                                  Scheduler::Method method,
                                  const QString &recipients)
-  : QListViewItem(parent)
+  : Q3ListViewItem(parent)
 {
   mIncidence = ev;
   mMethod = method;
   mRecipients = recipients;
 
 //  kdDebug() << "ScheduleItemOut: setting the summary" << endl;
@@ -120,13 +120,13 @@ ScheduleItemOut::ScheduleItemOut(QListView *parent,IncidenceBase *ev,
   //Set the Method
   setText(5,Scheduler::translatedMethodName(mMethod));
 }
 
 OutgoingDialog::OutgoingDialog(Calendar *calendar,QWidget* parent,
                                const char* name,bool modal,
-                               WFlags fl)
+                               Qt::WFlags fl)
     : OutgoingDialog_base(parent,name,modal,fl)
 {
   mCalendar = calendar;
 
   mFormat = new ICalFormat;
 
@@ -136,18 +136,18 @@ OutgoingDialog::OutgoingDialog(Calendar *calendar,QWidget* parent,
 #ifndef KORG_NOMAIL
     mScheduler = new MailScheduler(mCalendar);
 #else
     mScheduler = new DummyScheduler(mCalendar);
 #endif
   }
-  mMessageListView->setColumnAlignment(1,AlignHCenter);
-  mMessageListView->setColumnAlignment(2,AlignHCenter);
-  mMessageListView->setColumnAlignment(3,AlignHCenter);
-  mMessageListView->setColumnAlignment(4,AlignHCenter);
-  QObject::connect(mMessageListView,SIGNAL(doubleClicked(QListViewItem *)),
-                   this,SLOT(showEvent(QListViewItem *)));
+  mMessageListView->setColumnAlignment(1,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(2,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(3,Qt::AlignHCenter);
+  mMessageListView->setColumnAlignment(4,Qt::AlignHCenter);
+  QObject::connect(mMessageListView,SIGNAL(doubleClicked(Q3ListViewItem *)),
+                   this,SLOT(showEvent(Q3ListViewItem *)));
   mDocPrefs = new DocPrefs("groupschedule");
   loadMessages();
 }
 
 OutgoingDialog::~OutgoingDialog()
 {
@@ -233,13 +233,13 @@ void OutgoingDialog::deleteItem()
   deleteMessage(item->event());
   delete(item->event());
   mMessageListView->takeItem(item);
   emit numMessagesChanged(mMessageListView->childCount());
 }
 
-void OutgoingDialog::showEvent(QListViewItem *qitem)
+void OutgoingDialog::showEvent(Q3ListViewItem *qitem)
 {
   ScheduleItemOut *item = (ScheduleItemOut *)qitem;
   Event *event = 0;
   Todo *todo = 0;
   if ( item->event()->typeID() == eventID ) {
     event = static_cast<Event *>(item->event());
@@ -291,13 +291,13 @@ void OutgoingDialog::showEvent(QListViewItem *qitem)
 
 bool OutgoingDialog::saveMessage(IncidenceBase *incidence,Scheduler::Method method,
           const QString &recipients)
 {
   KTempFile ktfile(locateLocal("data","korganizer/outgoing/"),"ics");
   QString messageText = mFormat->createScheduleMessage(incidence,method);
-  QTextStream *qts = ktfile.textStream();
+  Q3TextStream *qts = ktfile.textStream();
   *qts << messageText;
   *qts << "METHOD-BEGIN:" << endl << method << endl << ":METHOD-END" << endl;
   *qts << "RECIPIENTS-BEGIN:" << endl << recipients << endl << ":RECIPIENTS-END" << endl;
   mMessageMap[incidence]=ktfile.name();
 
   return true;
@@ -327,17 +327,17 @@ void OutgoingDialog::loadMessages()
     bool inserted = false;
     QMap<IncidenceBase*, QString>::Iterator iter;
     for ( iter = mMessageMap.begin(); iter != mMessageMap.end(); ++iter ) {
       if (iter.data() == outgoingDirName + "/" + (*it)) inserted = true;
     }
     if (!inserted) {
-    if (!f.open(IO_ReadOnly)) {
+    if (!f.open(QIODevice::ReadOnly)) {
       kdDebug() << "OutgoingDialog::loadMessage(): Can't open file'"
                 << (*it) << "'" << endl;
     } else {
-      QTextStream t(&f);
+      Q3TextStream t(&f);
       QString messageString = t.read();
       ScheduleMessage *message = mFormat->parseScheduleMessage(mCalendar,
                                                                messageString);
       int begin_pos = messageString.find("METHOD-BEGIN:");
       begin_pos = messageString.find('\n',begin_pos)+1;
       QString meth = messageString.mid(begin_pos,1);
diff --git a/korganizer/outgoingdialog.h b/korganizer/outgoingdialog.h
index a3d561a..e727087 100644
--- a/korganizer/outgoingdialog.h
+++ b/korganizer/outgoingdialog.h
@@ -20,27 +20,27 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef OUTGOINGDIALOG_H
 #define OUTGOINGDIALOG_H
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qmap.h>
 #include <qstring.h>
 
 #include <libkcal/scheduler.h>
 
 #include "docprefs.h"
 #include "outgoingdialog_base.h"
 
 using namespace KCal;
 
-class ScheduleItemOut : public QListViewItem
+class ScheduleItemOut : public Q3ListViewItem
 {
   public:
-    ScheduleItemOut(QListView *parent,IncidenceBase *ev,
+    ScheduleItemOut(Q3ListView *parent,IncidenceBase *ev,
         Scheduler::Method method, const QString &recipients=QString::null);
     virtual ~ScheduleItemOut() {}
 
     IncidenceBase *event() { return mIncidence; }
     Scheduler::Method method() { return mMethod; }
     QString recipients() { return mRecipients; }
@@ -53,13 +53,13 @@ class ScheduleItemOut : public QListViewItem
 
 class OutgoingDialog : public OutgoingDialog_base
 {
     Q_OBJECT
   public:
     OutgoingDialog(Calendar *,QWidget* parent=0,const char* name=0,
-                   bool modal=false,WFlags fl=0);
+                   bool modal=false,Qt::WFlags fl=0);
     ~OutgoingDialog();
 
     bool addMessage(IncidenceBase *,Scheduler::Method);
     bool addMessage(IncidenceBase *,Scheduler::Method,const QString &recipients);
     void setDocumentId( const QString &id );
 
@@ -69,13 +69,13 @@ class OutgoingDialog : public OutgoingDialog_base
   signals:
     void numMessagesChanged(int);
 
   protected slots:
     void send();
     void deleteItem();
-    void showEvent(QListViewItem *);
+    void showEvent(Q3ListViewItem *);
 
   private:
     bool saveMessage(IncidenceBase *,Scheduler::Method,const QString &recipients=0);
     bool deleteMessage(IncidenceBase *);
 
     Calendar *mCalendar;
diff --git a/korganizer/outgoingdialog_base.cpp b/korganizer/outgoingdialog_base.cpp
index 1873b44..be8a870 100644
--- a/korganizer/outgoingdialog_base.cpp
+++ b/korganizer/outgoingdialog_base.cpp
@@ -8,43 +8,45 @@
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 
 #include "outgoingdialog_base.h"
 
 #include <qvariant.h>
-#include <qheader.h>
-#include <qlistview.h>
+#include <q3header.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 /* 
  *  Constructs a OutgoingDialog_base as a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-OutgoingDialog_base::OutgoingDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
+OutgoingDialog_base::OutgoingDialog_base( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
     : QDialog( parent, name, modal, fl )
 
 {
     if ( !name )
         setName( "OutgoingDialog_base" );
-    OutgoingDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "OutgoingDialog_baseLayout"); 
+    OutgoingDialog_baseLayout = new Q3GridLayout( this, 1, 1, 11, 6, "OutgoingDialog_baseLayout"); 
 
-    mMessageListView = new QListView( this, "mMessageListView" );
+    mMessageListView = new Q3ListView( this, "mMessageListView" );
     mMessageListView->addColumn( tr2i18n( "Summary" ) );
     mMessageListView->addColumn( tr2i18n( "Start Date" ) );
     mMessageListView->addColumn( tr2i18n( "Start Time" ) );
     mMessageListView->addColumn( tr2i18n( "End Date" ) );
     mMessageListView->addColumn( tr2i18n( "End Time" ) );
     mMessageListView->addColumn( tr2i18n( "Method" ) );
-    mMessageListView->setFrameShape( QListView::StyledPanel );
-    mMessageListView->setFrameShadow( QListView::Sunken );
+    mMessageListView->setFrameShape( Q3ListView::StyledPanel );
+    mMessageListView->setFrameShadow( Q3ListView::Sunken );
     mMessageListView->setAllColumnsShowFocus( TRUE );
 
     OutgoingDialog_baseLayout->addMultiCellWidget( mMessageListView, 0, 3, 0, 0 );
 
     PushButton5 = new QPushButton( this, "PushButton5" );
     PushButton5->setDefault( FALSE );
diff --git a/korganizer/outgoingdialog_base.h b/korganizer/outgoingdialog_base.h
index af71bb1..5e81725 100644
--- a/korganizer/outgoingdialog_base.h
+++ b/korganizer/outgoingdialog_base.h
@@ -9,35 +9,39 @@
 
 #ifndef OUTGOINGDIALOG_BASE_H
 #define OUTGOINGDIALOG_BASE_H
 
 #include <qvariant.h>
 #include <qdialog.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QListView;
-class QListViewItem;
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
+class Q3ListView;
+class Q3ListViewItem;
 class QPushButton;
 
 class OutgoingDialog_base : public QDialog
 {
     Q_OBJECT
 
 public:
-    OutgoingDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    OutgoingDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
     ~OutgoingDialog_base();
 
-    QListView* mMessageListView;
+    Q3ListView* mMessageListView;
     QPushButton* PushButton5;
     QPushButton* PushButton7;
     QPushButton* PushButton6;
 
 protected:
-    QGridLayout* OutgoingDialog_baseLayout;
+    Q3GridLayout* OutgoingDialog_baseLayout;
 
 protected slots:
     virtual void languageChange();
 
     virtual void send();
     virtual void deleteItem();
diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp
index 2ae6720..ede9840 100644
--- a/korganizer/publishdialog.cpp
+++ b/korganizer/publishdialog.cpp
@@ -32,40 +32,40 @@
 #endif
 
 #include "koprefs.h"
 #include "publishdialog.h"
 
 PublishDialog::PublishDialog(QWidget* parent, const char* name,
-                               bool modal, WFlags fl)
+                               bool modal, Qt::WFlags fl)
     : PublishDialog_base(parent,name,modal,fl)
 {
   setCaption(i18n("Select Addresses"));
   mNameLineEdit->setEnabled(false);
   mEmailLineEdit->setEnabled(false);
-  connect(mAddressListView,SIGNAL(selectionChanged(QListViewItem *)),
+  connect(mAddressListView,SIGNAL(selectionChanged(Q3ListViewItem *)),
           SLOT(updateInput()));
 }
 
 PublishDialog::~PublishDialog()
 {
 }
 
 void PublishDialog::addAttendee(Attendee *attendee)
 {
   mNameLineEdit->setEnabled(true);
   mEmailLineEdit->setEnabled(true);
-  QListViewItem *item = new QListViewItem(mAddressListView);
+  Q3ListViewItem *item = new Q3ListViewItem(mAddressListView);
   item->setText(0,attendee->name());
   item->setText(1,attendee->email());
   mAddressListView->insertItem(item);
 }
 
 QString PublishDialog::addresses()
 {
   QString to = "";
-  QListViewItem *item;
+  Q3ListViewItem *item;
   int i, count;
   count = mAddressListView->childCount();
   for (i=0;i<count;i++) {
     item = mAddressListView->firstChild();
     mAddressListView->takeItem(item);
     to += item->text(1);
@@ -77,22 +77,22 @@ QString PublishDialog::addresses()
 }
 
 void PublishDialog::addItem()
 {
   mNameLineEdit->setEnabled(true);
   mEmailLineEdit->setEnabled(true);
-  QListViewItem *item = new QListViewItem(mAddressListView);
+  Q3ListViewItem *item = new Q3ListViewItem(mAddressListView);
   mAddressListView->insertItem(item);
   mAddressListView->setSelected(item,true);
   mNameLineEdit->setText(i18n("(EmptyName)"));
   mEmailLineEdit->setText(i18n("(EmptyEmail)"));
 }
 
 void PublishDialog::removeItem()
 {
-  QListViewItem *item;
+  Q3ListViewItem *item;
   item = mAddressListView->selectedItem();
   if (!item) return;
   mAddressListView->takeItem(item);
   item = mAddressListView->selectedItem();
   if (!item) {
     mNameLineEdit->setText("");
@@ -116,34 +116,34 @@ void PublishDialog::openAddressbook()
   if (!a.isEmpty()) {
     uint i;
     for (i=0;i<addressList.count();i++) {
       a = addressList[i];
       mNameLineEdit->setEnabled(true);
       mEmailLineEdit->setEnabled(true);
-      QListViewItem *item = new QListViewItem(mAddressListView);
+      Q3ListViewItem *item = new Q3ListViewItem(mAddressListView);
       mAddressListView->setSelected(item,true);
       mNameLineEdit->setText(a.realName());
       mEmailLineEdit->setText(a.preferredEmail());
       mAddressListView->insertItem(item);
     }
   }
 #endif
 }
 
 void PublishDialog::updateItem()
 {
-  QListViewItem *item;
+  Q3ListViewItem *item;
   item = mAddressListView->selectedItem();
   if (!item) return;
   item->setText(0,mNameLineEdit->text());
   item->setText(1,mEmailLineEdit->text());
 }
 
 void PublishDialog::updateInput()
 {
-  QListViewItem *item;
+  Q3ListViewItem *item;
   item = mAddressListView->selectedItem();
   if (!item) return;
   mNameLineEdit->setEnabled(true);
   mEmailLineEdit->setEnabled(true);
   QString mail = item->text(1);
   mNameLineEdit->setText(item->text(0));
diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h
index 338603c..3ffeec4 100644
--- a/korganizer/publishdialog.h
+++ b/korganizer/publishdialog.h
@@ -20,25 +20,25 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef PUBLISHDIALOG_H
 #define PUBLISHDIALOG_H
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <libkcal/attendee.h>
 
 #include "publishdialog_base.h"
 
 using namespace KCal;
 
 class PublishDialog : public PublishDialog_base
 {
     Q_OBJECT
   public:
     PublishDialog(QWidget* parent=0,const char* name=0,
-                   bool modal=true,WFlags fl=0);
+                   bool modal=true,Qt::WFlags fl=0);
     ~PublishDialog();
 
     void addAttendee(Attendee *attendee);
     QString addresses();
 
   signals:
diff --git a/korganizer/publishdialog_base.cpp b/korganizer/publishdialog_base.cpp
index 683f7e9..ce5c542 100644
--- a/korganizer/publishdialog_base.cpp
+++ b/korganizer/publishdialog_base.cpp
@@ -8,38 +8,41 @@
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 
 #include "publishdialog_base.h"
 
 #include <qvariant.h>
-#include <qframe.h>
-#include <qheader.h>
+#include <q3frame.h>
+#include <q3header.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
 
 /* 
  *  Constructs a PublishDialog_base as a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-PublishDialog_base::PublishDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
+PublishDialog_base::PublishDialog_base( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
     : QDialog( parent, name, modal, fl )
 
 {
     if ( !name )
         setName( "PublishDialog_base" );
-    PublishDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "PublishDialog_baseLayout"); 
+    PublishDialog_baseLayout = new Q3GridLayout( this, 1, 1, 11, 6, "PublishDialog_baseLayout"); 
 
-    mAddressListView = new QListView( this, "mAddressListView" );
+    mAddressListView = new Q3ListView( this, "mAddressListView" );
     mAddressListView->addColumn( tr2i18n( "Name" ) );
     mAddressListView->addColumn( tr2i18n( "Email" ) );
 
     PublishDialog_baseLayout->addMultiCellWidget( mAddressListView, 0, 3, 0, 1 );
 
     TextLabel1 = new QLabel( this, "TextLabel1" );
@@ -69,20 +72,20 @@ PublishDialog_base::PublishDialog_base( QWidget* parent, const char* name, bool
     PushButton11 = new QPushButton( this, "PushButton11" );
 
     PublishDialog_baseLayout->addWidget( PushButton11, 1, 2 );
     QSpacerItem* spacer = new QSpacerItem( 20, 241, QSizePolicy::Minimum, QSizePolicy::Expanding );
     PublishDialog_baseLayout->addMultiCell( spacer, 3, 5, 2, 2 );
 
-    Line2 = new QFrame( this, "Line2" );
-    Line2->setFrameShape( QFrame::HLine );
-    Line2->setFrameShadow( QFrame::Sunken );
-    Line2->setFrameShape( QFrame::HLine );
+    Line2 = new Q3Frame( this, "Line2" );
+    Line2->setFrameShape( Q3Frame::HLine );
+    Line2->setFrameShadow( Q3Frame::Sunken );
+    Line2->setFrameShape( Q3Frame::HLine );
 
     PublishDialog_baseLayout->addMultiCellWidget( Line2, 6, 6, 0, 2 );
 
-    layout95 = new QHBoxLayout( 0, 0, 6, "layout95"); 
+    layout95 = new Q3HBoxLayout( 0, 0, 6, "layout95"); 
     QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
     layout95->addItem( spacer_2 );
 
     PushButton9 = new QPushButton( this, "PushButton9" );
     PushButton9->setDefault( TRUE );
     layout95->addWidget( PushButton9 );
diff --git a/korganizer/publishdialog_base.h b/korganizer/publishdialog_base.h
index 932474e..d1b40ae 100644
--- a/korganizer/publishdialog_base.h
+++ b/korganizer/publishdialog_base.h
@@ -9,46 +9,52 @@
 
 #ifndef PUBLISHDIALOG_BASE_H
 #define PUBLISHDIALOG_BASE_H
 
 #include <qvariant.h>
 #include <qdialog.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QFrame;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
+class Q3Frame;
 class QLabel;
 class QLineEdit;
-class QListView;
-class QListViewItem;
+class Q3ListView;
+class Q3ListViewItem;
 class QPushButton;
 
 class PublishDialog_base : public QDialog
 {
     Q_OBJECT
 
 public:
-    PublishDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    PublishDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
     ~PublishDialog_base();
 
-    QListView* mAddressListView;
+    Q3ListView* mAddressListView;
     QLabel* TextLabel1;
     QLabel* TextLabel2;
     QLineEdit* mEmailLineEdit;
     QLineEdit* mNameLineEdit;
     QPushButton* PushButton10;
     QPushButton* PushButton12;
     QPushButton* PushButton11;
-    QFrame* Line2;
+    Q3Frame* Line2;
     QPushButton* PushButton9;
     QPushButton* PushButton8;
 
 protected:
-    QGridLayout* PublishDialog_baseLayout;
-    QHBoxLayout* layout95;
+    Q3GridLayout* PublishDialog_baseLayout;
+    Q3HBoxLayout* layout95;
 
 protected slots:
     virtual void languageChange();
 
     virtual void addItem();
     virtual void removeItem();
diff --git a/korganizer/savetemplatedialog.cpp b/korganizer/savetemplatedialog.cpp
index 3544081..35bedba 100644
--- a/korganizer/savetemplatedialog.cpp
+++ b/korganizer/savetemplatedialog.cpp
@@ -19,12 +19,15 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
 
 #include <keditlistbox.h>
 #include <klocale.h>
 
 #include "koprefs.h"
 
@@ -32,14 +35,14 @@
 
 SaveTemplateDialog::SaveTemplateDialog( IncidenceType type, QWidget *parent )
   : KDialogBase( Plain, i18n("Save Template"), Ok | Cancel, Ok, parent, 0,
                  true, false ),
     mType( type )
 {
-  QFrame *topFrame = plainPage();
-  QVBoxLayout *topLayout = new QVBoxLayout( topFrame, 0, spacingHint() );
+  Q3Frame *topFrame = plainPage();
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( topFrame, 0, spacingHint() );
 
   mEditListBox = new KEditListBox( i18n("Select Template Name"), topFrame,
                                    0, false, KEditListBox::Add |
                                    KEditListBox::Remove );
   topLayout->addWidget( mEditListBox );
   connect( mEditListBox, SIGNAL( changed() ), SLOT( slotChanged() ) );
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 9cfdc35..105b844 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -21,20 +21,27 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
-#include <qlistview.h>
-#include <qwhatsthis.h>
+#include <q3listview.h>
+#include <q3whatsthis.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
-#include <qhbuttongroup.h>
+//#include <qhbuttongroup.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3Frame>
+#include <Q3PtrList>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 #include <libkdepim/kdateedit.h>
 
 #include "koglobals.h"
@@ -43,21 +50,21 @@
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "searchdialog.h"
 
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
-    : QVBox( 0  )
+    : Q3VBox( 0  )
 
 {
     mCalendar = calendar;
-    QFrame *topFrame = new QFrame( this ) ;//plainPage();
-    QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
+    Q3Frame *topFrame = new Q3Frame( this ) ;//plainPage();
+    Q3VBoxLayout *layout = new Q3VBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
 
     // Search expression
-    QHBoxLayout *subLayout = new QHBoxLayout();
+    Q3HBoxLayout *subLayout = new Q3HBoxLayout();
     layout->addLayout(subLayout);
     /*
     searchLabel = new QLabel(topFrame);
     searchLabel->setText(i18n("Search for:"));
     subLayout->addWidget(searchLabel);
     */
@@ -95,50 +102,50 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
     connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
     // Subjects to search
     // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
     //                                        topFrame);
 
-    incidenceGroup = new QHBox( topFrame );
+    incidenceGroup = new Q3HBox( topFrame );
     layout->addWidget(incidenceGroup);
 
     mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
     //mSearchEvent->setChecked(true);
     mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
     mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
 
-    subjectGroup = new QHBox( topFrame );
+    subjectGroup = new Q3HBox( topFrame );
     layout->addWidget(subjectGroup);
 
     mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
     mSummaryCheck->setChecked(true);
     mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
     mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
 
-    attendeeGroup = new QHBox( topFrame );
+    attendeeGroup = new Q3HBox( topFrame );
     layout->addWidget(attendeeGroup );
     new QLabel( i18n("Attendee:"),attendeeGroup );
     mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup  );
     mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup );
     // Date range
     // QGroupBox *rangeGroup = new QGroupBox(1,Horizontal,i18n("Date Range"),
     //                                    topFrame);
     // layout->addWidget(rangeGroup);
 
     QWidget *rangeWidget = new QWidget(topFrame);
     int space = KDialog::spacingHint();
     if ( QApplication::desktop()->width() <= 240 ) space = 1;
-    QHBoxLayout *rangeLayout = new QHBoxLayout(rangeWidget,0,space);
+    Q3HBoxLayout *rangeLayout = new Q3HBoxLayout(rangeWidget,0,space);
     rangeLayout->addWidget(new QLabel(i18n("From:"),rangeWidget));
     mStartDate = new KDateEdit(rangeWidget);
     rangeLayout->addWidget(mStartDate);
     rangeLayout->addWidget(new QLabel(i18n("To:"),rangeWidget));
     mEndDate = new KDateEdit(rangeWidget);
     mEndDate->setDate(QDate::currentDate().addDays(365));
     rangeLayout->addWidget(mEndDate);
-    QToolButton *wt = QWhatsThis::whatsThisButton (  rangeWidget );
+    QToolButton *wt = Q3WhatsThis::whatsThisButton (  rangeWidget );
     rangeLayout->addWidget( (QWidget*)wt );
     layout->addWidget(rangeWidget);
     // Results list view
     listView = new KOListView(mCalendar,topFrame);
     layout->addWidget(listView);
     listView->showCompletedTodos();
@@ -338,13 +345,13 @@ void SearchDialog::updateView()
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
 }
 
 void SearchDialog::search(const QRegExp &re)
 {
-    QPtrList<Event> events;
+    Q3PtrList<Event> events;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) events = mMatchedEvents;
         mMatchedEvents.clear();
     } 
     if ( mSearchEvent->isChecked() ) {
         if ( !mRefineItems->isChecked() )
@@ -416,13 +423,13 @@ void SearchDialog::search(const QRegExp &re)
                                     mMatchedEvents.append(ev);
                             }
                             continue;
                         }
             }
             if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
-                QPtrList<Attendee> tmpAList = ev->attendees();
+                Q3PtrList<Attendee> tmpAList = ev->attendees();
                 Attendee *a;
                 for (a = tmpAList.first(); a; a = tmpAList.next()) {
                     if (mSearchAName->isChecked()) {
 #if QT_VERSION >= 0x030000
                         if (re.search(a->name()) != -1) 
 #else
@@ -455,13 +462,13 @@ void SearchDialog::search(const QRegExp &re)
                                 }
                     }
                 }
             }
         }
     }
-    QPtrList<Todo> todos;
+    Q3PtrList<Todo> todos;
 
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) todos = mMatchedTodos ;
         mMatchedTodos.clear();
     } 
 
@@ -509,13 +516,13 @@ void SearchDialog::search(const QRegExp &re)
                             else if (!mMatchedTodos.contains( tod )) 
                                 mMatchedTodos.append(tod);                              
                             continue;
                         }
             }
             if ( mSearchAName->isChecked() || mSearchAEmail->isChecked() ) {
-                QPtrList<Attendee> tmpAList = tod->attendees();
+                Q3PtrList<Attendee> tmpAList = tod->attendees();
                 Attendee *a;
                 for (a = tmpAList.first(); a; a = tmpAList.next()) {
                     if (mSearchAName->isChecked()) {
 #if QT_VERSION >= 0x030000
                         if (re.search(a->name()) != -1) 
 #else
@@ -545,13 +552,13 @@ void SearchDialog::search(const QRegExp &re)
                     }
                 }
             }
         }
     }
 
-    QPtrList<Journal> journals;
+    Q3PtrList<Journal> journals;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) journals = mMatchedJournals ;
         mMatchedJournals.clear();
     } 
     if (mSearchJournal->isChecked() ) {
         if ( ! mRefineItems->isChecked() ) journals = mCalendar->journals();
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 945ff65..5df6116 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -23,14 +23,18 @@
 */
 #ifndef SEARCHDIALOG_H
 #define SEARCHDIALOG_H
 
 #include <qregexp.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <QKeyEvent>
+#include <Q3PtrList>
 #include <kdialogbase.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 
 #include <libkcal/calendar.h>
 
 #include "kolistview.h"
 
 class KDateEdit;
@@ -38,13 +42,13 @@ class QCheckBox;
 class QLineEdit;
 class KLineEdit;
 class QLabel;
 class CalendarView;
 
 using namespace KCal;
-class SearchDialog : public  QVBox 
+class SearchDialog : public  Q3VBox 
 {
     Q_OBJECT
   public:
     SearchDialog(Calendar *calendar,CalendarView *parent=0);
     virtual ~SearchDialog();
     KOListView *listview(){ return listView;}
@@ -69,20 +73,20 @@ class SearchDialog : public  QVBox
     void showEventSignal(Event *);
     void editEventSignal(Event *);
     void deleteEventSignal(Event *);
 
   private:
 
-    QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
+    Q3HBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
     void search(const QRegExp &);
 
     Calendar *mCalendar;
     
-    QPtrList<Event> mMatchedEvents;
-    QPtrList<Todo> mMatchedTodos;
-    QPtrList<Journal> mMatchedJournals;
+    Q3PtrList<Event> mMatchedEvents;
+    Q3PtrList<Todo> mMatchedTodos;
+    Q3PtrList<Journal> mMatchedJournals;
     
     QLabel *searchLabel;
     KLineEdit *searchEdit;
     KOListView *listView;
     
     KDateEdit *mStartDate;
diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp
index 7137c49..8186ebb 100644
--- a/korganizer/statusdialog.cpp
+++ b/korganizer/statusdialog.cpp
@@ -18,37 +18,40 @@
 */
 
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qstringlist.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3HBoxLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 
 #include "statusdialog.h"
 
 StatusDialog::StatusDialog(QWidget* parent, const char* name) :
   KDialog(parent,name,true)
 {
   setCaption(i18n("Set Your Status"));
 
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( spacingHint() );
   topLayout->setMargin( marginHint() );
 
-  QBoxLayout *statusLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *statusLayout = new Q3HBoxLayout( topLayout );
 
   QLabel *text = new QLabel(i18n("Set your status"),this);
   statusLayout->addWidget( text );
 
   mStatus = new QComboBox(false,this);
   mStatus->insertStringList(Attendee::statusList());
   statusLayout->addWidget( mStatus );
 
-  QBoxLayout *buttonLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *buttonLayout = new Q3HBoxLayout( topLayout );
 
   QPushButton *ok = new QPushButton(i18n("&OK"), this);
   connect ( ok,SIGNAL(clicked()), this,SLOT(accept()) );
   buttonLayout->addWidget( ok );
 
   QPushButton *cancel = new QPushButton(i18n("&Cancel"), this);
diff --git a/korganizer/timeline.cpp b/korganizer/timeline.cpp
index 11be432..a6c3cdc 100644
--- a/korganizer/timeline.cpp
+++ b/korganizer/timeline.cpp
@@ -2,19 +2,19 @@
 
 #include <kdebug.h>
 
 #include "timeline.h"
 
 TimeLine::TimeLine( QWidget *parent, const char *name ) :
-  QScrollView( parent, name )
+  Q3ScrollView( parent, name )
 {
   mPixelWidth = 1000;
   
   resizeContents( mPixelWidth, 20 );
 
-  viewport()->setBackgroundMode( PaletteBackground );
+  viewport()->setBackgroundMode( Qt::PaletteBackground );
 
   setHScrollBarMode(AlwaysOff);
   setVScrollBarMode(AlwaysOff);
 }
 
 TimeLine::~TimeLine()
@@ -55,8 +55,8 @@ void TimeLine::setDateRange( const QDateTime &start, const QDateTime &end )
   kdDebug() << "TimeLines::setDateRange(): mDaySpacing: " << mDaySpacing << "  mDayOffset: "
             << mDayOffset << "  mSecsPerPixel: " << mSecsPerPixel << endl;
 }
 
 void TimeLine::setContentsPos( int pos )
 {
-  QScrollView::setContentsPos ( pos, 0 );
+  Q3ScrollView::setContentsPos ( pos, 0 );
 }
diff --git a/korganizer/timeline.h b/korganizer/timeline.h
index ab3e5d3..bf301fa 100644
--- a/korganizer/timeline.h
+++ b/korganizer/timeline.h
@@ -1,13 +1,13 @@
 #ifndef TIMELINE_H
 #define TIMELINE_H
 
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qdatetime.h>
 
-class TimeLine : public QScrollView
+class TimeLine : public Q3ScrollView
 {
     Q_OBJECT
   public:
     TimeLine( QWidget *parent = 0, const char *name = 0 );
     virtual ~TimeLine();
 
diff --git a/korganizer/timespanview.cpp b/korganizer/timespanview.cpp
index df8ff88..0908056 100644
--- a/korganizer/timespanview.cpp
+++ b/korganizer/timespanview.cpp
@@ -1,16 +1,20 @@
 
 #ifndef DESKTOP_VERSION
 #include <qksplitter.h>
 #else
 #include <qsplitter.h>
 #endif
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <Q3ValueList>
 
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "lineview.h"
 #include "timeline.h"
@@ -18,34 +22,34 @@
 #include "timespanview.h"
 
 
 TimeSpanView::TimeSpanView( QWidget *parent, const char *name ) :
   QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 #ifndef DESKTOP_VERSION
   mSplitter = new QKSplitter( this );
 #else
   mSplitter = new QSplitter( this );
 #endif
   topLayout->addWidget( mSplitter );
 
-  mList = new QListView( mSplitter );
+  mList = new Q3ListView( mSplitter );
   mList->addColumn( i18n("Summary") );
   
   QWidget *rightPane = new QWidget( mSplitter );
-  QBoxLayout *rightPaneLayout = new QVBoxLayout( rightPane );
+  Q3BoxLayout *rightPaneLayout = new Q3VBoxLayout( rightPane );
 
   mTimeLine = new TimeLine( rightPane );
   mTimeLine->setFixedHeight( mList->header()->height() );
   rightPaneLayout->addWidget( mTimeLine );
   
   mLineView = new LineView( rightPane );
   rightPaneLayout->addWidget( mLineView );
 
-  QBoxLayout *buttonLayout = new QHBoxLayout( rightPaneLayout );
+  Q3BoxLayout *buttonLayout = new Q3HBoxLayout( rightPaneLayout );
   
   QPushButton *zoomInButton = new QPushButton( i18n("Zoom In"), rightPane );
   connect( zoomInButton, SIGNAL( clicked() ), SLOT( zoomIn() ) );
   buttonLayout->addWidget( zoomInButton );
   
   QPushButton *zoomOutButton = new QPushButton( i18n("Zoom Out"), rightPane );
@@ -61,25 +65,25 @@ TimeSpanView::TimeSpanView( QWidget *parent, const char *name ) :
 }
 
 TimeSpanView::~TimeSpanView()
 {
 }
 
-QValueList<int> TimeSpanView::splitterSizes()
+Q3ValueList<int> TimeSpanView::splitterSizes()
 {
   return mSplitter->sizes();
 }
 
-void TimeSpanView::setSplitterSizes( QValueList<int> sizes )
+void TimeSpanView::setSplitterSizes( Q3ValueList<int> sizes )
 {
   mSplitter->setSizes( sizes );
 }
 
 void TimeSpanView::addItem( KCal::Event *event )
 {
-  new QListViewItem( mList, event->summary() );
+  new Q3ListViewItem( mList, event->summary() );
   
   QDateTime startDt = event->dtStart();
   QDateTime endDt = event->dtEnd();
 
 //  kdDebug() << "TimeSpanView::addItem(): start: " << startDt.toString()
 //            << "  end: " << endDt.toString() << endl;
diff --git a/korganizer/timespanview.h b/korganizer/timespanview.h
index 34cb1f7..f652374 100644
--- a/korganizer/timespanview.h
+++ b/korganizer/timespanview.h
@@ -1,21 +1,23 @@
 #ifndef TIMESPANVIEW_H
 #define TIMESPANVIEW_H
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <libkcal/event.h>
 
 //class QSplitter;
 #ifndef DESKTOP_VERSION
 class QKSplitter;
 #else
 class QSplitter;
 #define QKSplitter QSplitter
 #endif
-class QListView;
+class Q3ListView;
 class LineView;
 class TimeLine;
 
 
 class TimeSpanView : public QWidget
 {
@@ -23,14 +25,14 @@ class TimeSpanView : public QWidget
   public:
     TimeSpanView( QWidget *parent=0, const char *name=0 );
     virtual ~TimeSpanView();
     
     void addItem( KCal::Event * );
 
-    QValueList<int> splitterSizes();
-    void setSplitterSizes( QValueList<int> );
+    Q3ValueList<int> splitterSizes();
+    void setSplitterSizes( Q3ValueList<int> );
     
     void clear();
     
     void setDateRange( const QDateTime &start, const QDateTime &end );
     
     QDateTime startDateTime();
@@ -45,13 +47,13 @@ class TimeSpanView : public QWidget
     
   signals:
     void dateRangeChanged();
     
   private:
     QKSplitter *mSplitter;
-    QListView *mList;
+    Q3ListView *mList;
     TimeLine *mTimeLine;
     LineView *mLineView;
     
     QDateTime mStartDate;
     QDateTime mEndDate;
     int mSecsPerPixel;
diff --git a/libetpan/libetpan.pro b/libetpan/libetpan.pro
index 10f51da..909d064 100644
--- a/libetpan/libetpan.pro
+++ b/libetpan/libetpan.pro
@@ -1,12 +1,13 @@
+include( ../variables.pri )
 ######################################################################
 # Automatically generated by qmake (1.07a) Fri Mar 18 19:27:39 2005
 ######################################################################
 
 TEMPLATE = lib
-        TARGET  = microlibetpan
+        TARGET  = xmicrolibetpan
 OBJECTS_DIR = obj
 MOC_DIR = moc
 DESTDIR=../bin
 DEPENDPATH += include/libetpan \
               src/data-types \
               src/engine \
@@ -445,6 +446,8 @@ SOURCES += src/data-types/base64.c \
            src/driver/implementation/pop3/pop3driver.c \
            src/driver/implementation/pop3/pop3driver_cached.c \
            src/driver/implementation/pop3/pop3driver_cached_message.c \
            src/driver/implementation/pop3/pop3driver_message.c \
            src/driver/implementation/pop3/pop3driver_tools.c \
            src/driver/implementation/pop3/pop3storage.c
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/libetpan/libetpanE.pro b/libetpan/libetpanE.pro
index 4b82196..9ba1a6d 100644
--- a/libetpan/libetpanE.pro
+++ b/libetpan/libetpanE.pro
@@ -1,12 +1,12 @@
 ######################################################################
 # Automatically generated by qmake (1.07a) Fri Mar 18 19:27:39 2005
 ######################################################################
 
 TEMPLATE = lib
-        TARGET  = microlibetpan
+        TARGET  = xmicrolibetpan
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/lib
 DEPENDPATH += include/libetpan \
               src/data-types \
               src/engine \
diff --git a/libical/src/libical/libical.pro b/libical/src/libical/libical.pro
index b794f04..24f02af 100644
--- a/libical/src/libical/libical.pro
+++ b/libical/src/libical/libical.pro
@@ -66,6 +66,8 @@ SOURCES += caldate.c \
            icalvalue.c \
            pvl.c \
            sspm.c 
 
 
 #           vsnprintf.c
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/libical/src/libicalss/libicalss.pro b/libical/src/libicalss/libicalss.pro
index 7fb8a64..27170bf 100644
--- a/libical/src/libicalss/libicalss.pro
+++ b/libical/src/libicalss/libicalss.pro
@@ -39,6 +39,8 @@ SOURCES += icalcalendar.c \
            icalgauge.c \
            icalmessage.c \
            icalset.c \
            icalspanlist.c \
            icalsslexer.c \
            icalssyacc.c
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index 3157214..3c4a81c 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -23,12 +23,14 @@
 #include <klocale.h>
 
 #include "incidence.h"
 #include "todo.h"
 
 #include "alarm.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace KCal;
 #include <qwidget.h>
 Alarm::Alarm(Incidence *parent)
  : mParent(parent),
    mType(Audio),
@@ -209,13 +211,13 @@ void Alarm::setProgramArguments(const QString &arguments)
 QString Alarm::programArguments() const
 {
   return (mType == Procedure) ? mDescription : QString::null;
 }
 
 void Alarm::setEmailAlarm(const QString &subject, const QString &text,
-                          const QValueList<Person> &addressees, const QStringList &attachments)
+                          const Q3ValueList<Person> &addressees, const QStringList &attachments)
 {
   mType = Email;
   mMailSubject = subject;
   mDescription = text;
   mMailAddresses = addressees;
   mMailAttachFiles = attachments;
@@ -228,13 +230,13 @@ void Alarm::setMailAddress(const Person &mailAddress)
     mMailAddresses.clear();
     mMailAddresses += mailAddress;
     mParent->updated();
   }
 }
 
-void Alarm::setMailAddresses(const QValueList<Person> &mailAddresses)
+void Alarm::setMailAddresses(const Q3ValueList<Person> &mailAddresses)
 {
   if (mType == Email) {
     mMailAddresses = mailAddresses;
     mParent->updated();
   }
 }
@@ -244,15 +246,15 @@ void Alarm::addMailAddress(const Person &mailAddress)
   if (mType == Email) {
     mMailAddresses += mailAddress;
     mParent->updated();
   }
 }
 
-QValueList<Person> Alarm::mailAddresses() const
+Q3ValueList<Person> Alarm::mailAddresses() const
 {
-  return (mType == Email) ? mMailAddresses : QValueList<Person>();
+  return (mType == Email) ? mMailAddresses : Q3ValueList<Person>();
 }
 
 void Alarm::setMailSubject(const QString &mailAlarmSubject)
 {
   if (mType == Email) {
     mMailSubject = mailAlarmSubject;
diff --git a/libkcal/alarm.h b/libkcal/alarm.h
index ac6ea0d..b24f0f7 100644
--- a/libkcal/alarm.h
+++ b/libkcal/alarm.h
@@ -19,13 +19,13 @@
 */
 
 #ifndef KCAL_ALARM_H
 #define KCAL_ALARM_H
 
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "customproperties.h"
 #include "duration.h"
 #include "person.h"
 
 namespace KCal {
@@ -36,13 +36,13 @@ class Incidence;
   This class represents an alarm notification.
 */
 class Alarm : public CustomProperties
 {
   public:
     enum Type { Invalid, Display, Procedure, Email, Audio };
-    typedef QValueList<Alarm *> List;
+    typedef Q3ValueList<Alarm *> List;
 
     /** Construct a new alarm with variables initialized to "sane" values. */
     explicit Alarm(Incidence *parent);
     /** Destruct Alarm object. */
     ~Alarm();
 
@@ -109,29 +109,29 @@ class Alarm : public CustomProperties
     /** Set the alarm to be an email alarm.
         @param subject subject line of email.
         @param text body of email.
         @param addressees email addresses of recipient(s).
         @param attachments optional names of files to attach to the email.
      */
-    void setEmailAlarm(const QString &subject, const QString &text, const QValueList<Person> &addressees,
+    void setEmailAlarm(const QString &subject, const QString &text, const Q3ValueList<Person> &addressees,
                        const QStringList &attachments = QStringList());
 
     /** Send mail to this address when the alarm is triggered.
         Ignored if the alarm is not an email alarm.
      */
     void setMailAddress(const Person &mailAlarmAddress);
     /** Send mail to these addresses when the alarm is triggered.
         Ignored if the alarm is not an email alarm.
      */
-    void setMailAddresses(const QValueList<Person> &mailAlarmAddresses);
+    void setMailAddresses(const Q3ValueList<Person> &mailAlarmAddresses);
     /** Add this address to the list of addresses to send mail to when the alarm is triggered.
         Ignored if the alarm is not an email alarm.
      */
     void addMailAddress(const Person &mailAlarmAddress);
     /** return the addresses to send mail to when an alarm goes off */
-    QValueList<Person> mailAddresses() const;
+    Q3ValueList<Person> mailAddresses() const;
 
     /** Set the subject line of the mail.
         Ignored if the alarm is not an email alarm.
      */
     void setMailSubject(const QString &mailAlarmSubject);
     /** return the subject line of the mail  */
@@ -223,13 +223,13 @@ class Alarm : public CustomProperties
   private:
     Incidence *mParent;          // the incidence which this alarm belongs to
     Type mType;                  // type of alarm
     QString mDescription;        // text to display/email body/procedure arguments
     QString mFile;               // procedure program to run/optional audio file to play
     QStringList mMailAttachFiles;      // filenames to attach to email
-    QValueList<Person> mMailAddresses; // who to mail for reminder
+    Q3ValueList<Person> mMailAddresses; // who to mail for reminder
     QString mMailSubject;        // subject of email
 
     int mAlarmSnoozeTime;        // number of minutes after alarm to
                                  // snooze before ringing again
     int mAlarmRepeatCount;       // number of times for alarm to repeat
                                  // after the initial time
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 9b38d3f..bf095cf 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -27,12 +27,14 @@
 
 #include "exceptions.h"
 #include "calfilter.h"
 
 #include "calendar.h"
 #include "syncdefines.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
 
 Calendar::Calendar()
 {
   
@@ -268,111 +270,111 @@ void Calendar::setFilter(CalFilter *filter)
 
 CalFilter *Calendar::filter()
 {
   return mFilter;
 }
 
-QPtrList<Incidence> Calendar::incidences()
+Q3PtrList<Incidence> Calendar::incidences()
 {
-  QPtrList<Incidence> incidences;
+  Q3PtrList<Incidence> incidences;
   
   Incidence *i;
 
-  QPtrList<Event> e = events();
+  Q3PtrList<Event> e = events();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
-  QPtrList<Todo> t = todos();
+  Q3PtrList<Todo> t = todos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
-  QPtrList<Journal> j = journals();
+  Q3PtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
   return incidences;
 }
 
 void Calendar::resetPilotStat(int id )
 {
- QPtrList<Incidence> incidences;
+ Q3PtrList<Incidence> incidences;
   
   Incidence *i;
 
-  QPtrList<Event> e = rawEvents();
+  Q3PtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setPilotId( id );
 
-  QPtrList<Todo> t = rawTodos();
+  Q3PtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setPilotId( id );
 
-  QPtrList<Journal> j = journals();
+  Q3PtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setPilotId( id );
 }
 void Calendar::resetTempSyncStat()
 {
- QPtrList<Incidence> incidences;
+ Q3PtrList<Incidence> incidences;
   
   Incidence *i;
 
-  QPtrList<Event> e = rawEvents();
+  Q3PtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
-  QPtrList<Todo> t = rawTodos();
+  Q3PtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 
-  QPtrList<Journal> j = journals();
+  Q3PtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) i->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
 }
-QPtrList<Incidence> Calendar::rawIncidences()
+Q3PtrList<Incidence> Calendar::rawIncidences()
 {
-  QPtrList<Incidence> incidences;
+  Q3PtrList<Incidence> incidences;
   
   Incidence *i;
 
-  QPtrList<Event> e = rawEvents();
+  Q3PtrList<Event> e = rawEvents();
   for( i = e.first(); i; i = e.next() ) incidences.append( i );
 
-  QPtrList<Todo> t = rawTodos();
+  Q3PtrList<Todo> t = rawTodos();
   for( i = t.first(); i; i = t.next() ) incidences.append( i );
 
-  QPtrList<Journal> j = journals();
+  Q3PtrList<Journal> j = journals();
   for( i = j.first(); i; i = j.next() ) incidences.append( i );
 
   return incidences;
 }
 
-QPtrList<Event> Calendar::events( const QDate &date, bool sorted )
+Q3PtrList<Event> Calendar::events( const QDate &date, bool sorted )
 {
-  QPtrList<Event> el = rawEventsForDate(date,sorted);
+  Q3PtrList<Event> el = rawEventsForDate(date,sorted);
   mFilter->apply(&el);
   return el;
 }
 
-QPtrList<Event> Calendar::events( const QDateTime &qdt )
+Q3PtrList<Event> Calendar::events( const QDateTime &qdt )
 {
-  QPtrList<Event> el = rawEventsForDate(qdt);
+  Q3PtrList<Event> el = rawEventsForDate(qdt);
   mFilter->apply(&el);
   return el;
 }
 
-QPtrList<Event> Calendar::events( const QDate &start, const QDate &end,
+Q3PtrList<Event> Calendar::events( const QDate &start, const QDate &end,
                                   bool inclusive)
 {
-  QPtrList<Event> el = rawEvents(start,end,inclusive);
+  Q3PtrList<Event> el = rawEvents(start,end,inclusive);
   mFilter->apply(&el);
   return el;
 }
 
-QPtrList<Event> Calendar::events()
+Q3PtrList<Event> Calendar::events()
 {
-  QPtrList<Event> el = rawEvents();
+  Q3PtrList<Event> el = rawEvents();
   mFilter->apply(&el);
   return el;
 }
 void Calendar::addIncidenceBranch(Incidence *i)
 {
     addIncidence( i );
     Incidence * inc;
-    QPtrList<Incidence> Relations = i->relations();
+    Q3PtrList<Incidence> Relations = i->relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
        addIncidenceBranch( inc );
     } 
 }
 
 bool Calendar::addIncidence(Incidence *i)
@@ -404,15 +406,15 @@ Incidence* Calendar::incidence( const QString& uid )
   if( (i = journal( uid )) != 0 )
       return i;
 
   return 0;
 }
 
-QPtrList<Todo> Calendar::todos()
+Q3PtrList<Todo> Calendar::todos()
 {
-  QPtrList<Todo> tl = rawTodos();
+  Q3PtrList<Todo> tl = rawTodos();
   mFilter->apply( &tl );
   return tl;
 }
 
 // When this is called, the todo have already been added to the calendar.
 // This method is only about linking related todos
@@ -452,13 +454,13 @@ void Calendar::setupRelations( Incidence *incidence )
 // If a task with subtasks is deleted, move it's subtasks to the orphans list
 void Calendar::removeRelations( Incidence *incidence )
 {
     // qDebug("Calendar::removeRelations ");
     QString uid = incidence->uid();
 
-    QPtrList<Incidence> relations = incidence->relations();
+    Q3PtrList<Incidence> relations = incidence->relations();
     for( Incidence* i = relations.first(); i; i = relations.next() )
         if( !mOrphanUids.find( i->uid() ) ) {
             mOrphans.insert( uid, i );
             mOrphanUids.insert( i->uid(), i );
             i->setRelatedTo( 0 );
             i->setRelatedToUid( uid );
@@ -468,13 +470,13 @@ void Calendar::removeRelations( Incidence *incidence )
     if( incidence->relatedTo() )
         incidence->relatedTo()->removeRelation( incidence );
 
     // Remove this one from the orphans list
     if( mOrphanUids.remove( uid ) ) {
         QString r2uid = incidence->relatedToUid();
-        QPtrList<Incidence> tempList;
+        Q3PtrList<Incidence> tempList;
         while( Incidence* i = mOrphans[ r2uid ] ) {
             mOrphans.remove( r2uid );
             if ( i != incidence ) tempList.append( i );
         }
         Incidence* inc = tempList.first();
         while ( inc ) {
@@ -484,13 +486,13 @@ void Calendar::removeRelations( Incidence *incidence )
     }
     // LR: and another big bad bug found
 #if 0
         // This incidence is located in the orphans list - it should be removed
         if( !( incidence->relatedTo() != 0 && mOrphans.remove( incidence->relatedTo()->uid() ) ) ) {
             // Removing wasn't that easy
-            for( QDictIterator<Incidence> it( mOrphans ); it.current(); ++it ) {
+            for( Q3DictIterator<Incidence> it( mOrphans ); it.current(); ++it ) {
                 if( it.current()->uid() == uid ) {
                     mOrphans.remove( it.currentKey() );
                     break;
                 }
             }
         }
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index fbc40ad..5845f44 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -22,14 +22,14 @@
 #ifndef CALENDAR_H
 #define CALENDAR_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qdatetime.h>
-#include <qptrlist.h>
-#include <qdict.h>
+#include <q3ptrlist.h>
+#include <q3dict.h>
 
 #include "customproperties.h"
 #include "event.h"
 #include "todo.h"
 #include "journal.h"
 #include "calfilter.h"
@@ -85,13 +85,13 @@ public:
     virtual void clearUndo( Incidence * newUndo );
   
     /**
       Sync changes in memory to persistant storage.
     */
     virtual void save() = 0;
-    virtual QPtrList<Event> getExternLastSyncEvents() = 0;
+    virtual Q3PtrList<Event> getExternLastSyncEvents() = 0;
     virtual void removeSyncInfo( QString syncProfile) = 0; 
     virtual bool isSaving() { return false; }
 
     /**
       Return the owner of the calendar's full name.
     */
@@ -152,18 +152,18 @@ public:
 
     // Adds an incidence and all relatedto incidences to the cal 
     void addIncidenceBranch( Incidence * );  
     /**
       Return filtered list of all incidences of this calendar.
     */
-    virtual QPtrList<Incidence> incidences();
+    virtual Q3PtrList<Incidence> incidences();
 
     /**
       Return unfiltered list of all incidences of this calendar.
     */
-    virtual QPtrList<Incidence> rawIncidences();
+    virtual Q3PtrList<Incidence> rawIncidences();
 
     /**
       Adds a Event to this calendar object.
       @param anEvent a pointer to the event to add
       
       @return true on success, false on error.
@@ -182,33 +182,33 @@ public:
     virtual Event *event( QString, QString ) = 0;
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
       The calendar filter is applied.
     */
-    QPtrList<Event> events( const QDate &date, bool sorted = false);
+    Q3PtrList<Event> events( const QDate &date, bool sorted = false);
     /**
       Get events, which occur on the given date.
       The calendar filter is applied.
     */
-    QPtrList<Event> events( const QDateTime &qdt );
+    Q3PtrList<Event> events( const QDateTime &qdt );
     /**
       Get events in a range of dates. If inclusive is set to true, only events
       are returned, which are completely included in the range.
       The calendar filter is applied.
     */
-    QPtrList<Event> events( const QDate &start, const QDate &end,
+    Q3PtrList<Event> events( const QDate &start, const QDate &end,
                             bool inclusive = false);
     /**
       Return filtered list of all events in calendar.
     */
-    virtual QPtrList<Event> events();
+    virtual Q3PtrList<Event> events();
     /**
       Return unfiltered list of all events in calendar.
     */
-    virtual QPtrList<Event> rawEvents() = 0;
+    virtual Q3PtrList<Event> rawEvents() = 0;
 
     /**
       Add a todo to the todolist.
       
       @return true on success, false on error.
     */
@@ -219,47 +219,47 @@ public:
     */
     virtual void deleteTodo( Todo * ) = 0;
     virtual void deleteJournal( Journal * ) = 0;
     /**
       Return filterd list of todos.
     */
-    virtual QPtrList<Todo> todos();
+    virtual Q3PtrList<Todo> todos();
     /**
       Searches todolist for an event with this unique string identifier,
       returns a pointer or null.
     */
     virtual Todo *todo( const QString &uid ) = 0;
     virtual Todo *todo( QString, QString ) = 0;
     /**
       Returns list of todos due on the specified date.
     */
-    virtual QPtrList<Todo> todos( const QDate &date ) = 0;
+    virtual Q3PtrList<Todo> todos( const QDate &date ) = 0;
     /**
       Return unfiltered list of todos.
     */
-    virtual QPtrList<Todo> rawTodos() = 0;
+    virtual Q3PtrList<Todo> rawTodos() = 0;
 
     /**
       Add a Journal entry to calendar.
       
       @return true on success, false on error.
     */
     virtual bool addJournal( Journal * ) = 0;
     /**
       Return Journal for given date.
     */
     virtual Journal *journal( const QDate & ) = 0;
-    virtual  QPtrList<Journal> journals4Date( const QDate & ) = 0;
+    virtual  Q3PtrList<Journal> journals4Date( const QDate & ) = 0;
     /**
       Return Journal with given UID.
     */
     virtual Journal *journal( const QString &UID ) = 0;
     /**
       Return list of all Journal entries.
     */
-    virtual QPtrList<Journal> journals() = 0;
+    virtual Q3PtrList<Journal> journals() = 0;
 
     /**
       Searches all incidence types for an incidence with this unique
       string identifier, returns a pointer or null.
     */
     Incidence* incidence( const QString&UID );
@@ -332,23 +332,23 @@ public:
     void removeAlarm(const QDateTime &qdt, const QString &noti  );
 
   protected:
     /**
       Get unfiltered events, which occur on the given date.
     */
-    virtual QPtrList<Event> rawEventsForDate( const QDateTime &qdt ) = 0;
+    virtual Q3PtrList<Event> rawEventsForDate( const QDateTime &qdt ) = 0;
     /**
       Get unfiltered events, which occur on the given date.
     */
-    virtual QPtrList<Event> rawEventsForDate( const QDate &date,
+    virtual Q3PtrList<Event> rawEventsForDate( const QDate &date,
                                               bool sorted = false ) = 0;  
     /**
       Get events in a range of dates. If inclusive is set to true, only events
       are returned, which are completely included in the range.
     */
-    virtual QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
+    virtual Q3PtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                        bool inclusive = false ) = 0; 
 
     Incidence *mNextAlarmIncidence;
     Incidence *mUndoIncidence;
     int mDefaultCalendar;
     bool mDeleteIncidencesOnClose;
@@ -373,13 +373,13 @@ private:
     
     bool mModified;
 
     QString mLoadedProductId;
 
     // This list is used to put together related todos
-    QDict<Incidence> mOrphans;
-    QDict<Incidence> mOrphanUids;
+    Q3Dict<Incidence> mOrphans;
+    Q3Dict<Incidence> mOrphanUids;
 };
   
 }
 
 #endif
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index ce3cd09..cb52b7c 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -19,13 +19,13 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 
@@ -189,21 +189,21 @@ bool CalendarLocal::mergeCalendar( Calendar* remote  )
 {
     // 1 look for raw inc in local
     //   if inc not in remote, delete in local
     // 2 look for raw inc in remote
     //   if inc in local, replace it
     //   if not in local, add it to default calendar
-    QPtrList<Incidence> localInc = rawIncidences(); 
+    Q3PtrList<Incidence> localInc = rawIncidences(); 
     Incidence* inL = localInc.first(); 
     while ( inL ) {
         if ( ! inL->isReadOnly () )
             if ( !remote->incidenceForUid( inL->uid(), true ))
                 deleteIncidence( inL );
         inL = localInc.next();
     }
-    QPtrList<Incidence> er = remote->rawIncidences(); 
+    Q3PtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     while ( inR ) {
         inL = incidenceForUid( inR->uid(),false );
         if ( inL ) {
             if ( ! inL->isReadOnly () || inL->uid().left(15) == QString("last-syncEvent-") ) {
                 int calID = inL->calID();
@@ -256,15 +256,15 @@ void CalendarLocal::setSyncEventsReadOnly()
 }
 
 void CalendarLocal::addCalendar( Calendar* cal )
 {
     cal->setDontDeleteIncidencesOnClose();
     setSyncEventsEnabled();
-    QPtrList<Incidence> incList;
+    Q3PtrList<Incidence> incList;
     {
-        QPtrList<Event> EventList = cal->rawEvents();
+        Q3PtrList<Event> EventList = cal->rawEvents();
         Event * ev = EventList.first();
         while ( ev ) {
             if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) {   
                 ev->setCalID_block( 1 );
             }
             Event * se = event( ev->uid() );
@@ -276,13 +276,13 @@ void CalendarLocal::addCalendar( Calendar* cal )
             ev = EventList.next();
         }
          
     }
     {
 
-        QPtrList<Todo> TodoList = cal->rawTodos();
+        Q3PtrList<Todo> TodoList = cal->rawTodos();
         Todo * ev = TodoList.first();
         while ( ev ) {
             ev->resetRelatedTo();
             Todo * se = todo( ev->uid() );
             if ( se )
                 deleteTodo( se ); 
@@ -296,13 +296,13 @@ void CalendarLocal::addCalendar( Calendar* cal )
             mTodoList.append( ev );
             setupRelations( ev );
             ev = TodoList.next();
         }
     }
     {
-        QPtrList<Journal> JournalList = cal->journals();
+        Q3PtrList<Journal> JournalList = cal->journals();
         Journal * ev = JournalList.first();
         while ( ev ) {
             Journal * se = journal( ev->uid() );
             if ( se )
                 incList.append( se );    
             ev->unRegisterObserver( cal );
@@ -478,15 +478,15 @@ void CalendarLocal::deleteTodo( Todo *todo )
   }
    Todo* dup = todoForUid(  uid );
    if ( dup )
        setupRelations( dup );
 }
 
-QPtrList<Todo> CalendarLocal::rawTodos()
+Q3PtrList<Todo> CalendarLocal::rawTodos()
 {
-    QPtrList<Todo> el;
+    Q3PtrList<Todo> el;
     for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 Todo *CalendarLocal::todo( QString syncProf, QString id )
 {
@@ -496,19 +496,19 @@ Todo *CalendarLocal::todo( QString syncProf, QString id )
   }
 
   return 0;
 }
 void CalendarLocal::removeSyncInfo( QString syncProfile)
 {
-    QPtrList<Incidence> all = rawIncidences() ;
+    Q3PtrList<Incidence> all = rawIncidences() ;
     Incidence *inc;
     for ( inc = all.first(); inc; inc = all.next() ) {
         inc->removeID( syncProfile );
     }
     if ( syncProfile.isEmpty() ) {
-        QPtrList<Event> el;
+        Q3PtrList<Event> el;
         Event *todo;
         for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
             if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
                     el.append( todo );
         }
         for ( todo = el.first(); todo; todo = el.next() ) {
@@ -517,15 +517,15 @@ void CalendarLocal::removeSyncInfo( QString syncProfile)
     } else {
         Event *lse = event( "last-syncEvent-"+ syncProfile);
         if ( lse )
             deleteIncidence ( lse );
     }
 }
-QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
+Q3PtrList<Event> CalendarLocal::getExternLastSyncEvents()
 {
-    QPtrList<Event> el;
+    Q3PtrList<Event> el;
     Event *todo;
     for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
         if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
             if ( todo->summary().left(3) == "E: " )
                 el.append( todo );
     }
@@ -682,15 +682,15 @@ void CalendarLocal::deRegisterAlarm()
     mNextAlarmEventDateTime = QDateTime();
 // #ifndef DESKTOP_VERSION
 //     AlarmServer::deleteAlarm (mNextAlarmDateTime ,"koalarm" ,mLastAlarmNotificationString.latin1() );
 // #endif     
 }
 
-QPtrList<Todo> CalendarLocal::todos( const QDate &date )
+Q3PtrList<Todo> CalendarLocal::todos( const QDate &date )
 {
-  QPtrList<Todo> todos;
+  Q3PtrList<Todo> todos;
 
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
       if ( !todo->calEnabled() ) continue; 
     if ( todo->hasDueDate() && todo->dtDue().date() == date ) {
       todos.append( todo );
@@ -783,13 +783,13 @@ Alarm::List CalendarLocal::alarms( const QDateTime &from, const QDateTime &to )
   return alarms;
 }
 
 void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence,
                                   const QDateTime &from, const QDateTime &to )
 {
-  QPtrList<Alarm> alarmList = incidence->alarms();
+  Q3PtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
 //    kdDebug(5800) << "CalendarLocal::appendAlarms() '" << alarm->text()
 //                  << "': " << alarm->time().toString() << " - " << alarm->enabled() << endl;
     if ( alarm->enabled() ) {
       if ( alarm->time() >= from && alarm->time() <= to ) {
@@ -802,13 +802,13 @@ void CalendarLocal::appendAlarms( Alarm::List &alarms, Incidence *incidence,
 void CalendarLocal::appendRecurringAlarms( Alarm::List &alarms,
                                            Incidence *incidence,
                                            const QDateTime &from,
                                            const QDateTime &to )
 {
  
-  QPtrList<Alarm> alarmList = incidence->alarms();
+  Q3PtrList<Alarm> alarmList = incidence->alarms();
   Alarm *alarm;
   QDateTime qdt;
   for( alarm = alarmList.first(); alarm; alarm = alarmList.next() ) {
     if (incidence->recursOn(from.date())) {
       qdt.setTime(alarm->time().time());
       qdt.setDate(from.date());
@@ -841,15 +841,15 @@ void CalendarLocal::update( IncidenceBase *incidence )
 void CalendarLocal::insertEvent( Event *event )
 {
   if ( mEventList.findRef( event ) < 0 ) mEventList.append( event );
 }
 
 
-QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
+Q3PtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
 {
-  QPtrList<Event> eventList;
+  Q3PtrList<Event> eventList;
 
   Event *event;
   for( event = mEventList.first(); event; event = mEventList.next() ) {
       if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       if ( event->isMultiDay() ) {
@@ -875,13 +875,13 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
   if ( !sorted ) {
     return eventList;
   }
 
   //  kdDebug(5800) << "Sorting events for date\n" << endl;
   // now, we have to sort it based on dtStart.time()
-  QPtrList<Event> eventListSorted;
+  Q3PtrList<Event> eventListSorted;
   Event *sortEvent;
   for ( event = eventList.first(); event; event = eventList.next() ) {
     sortEvent = eventListSorted.first();
     int i = 0;
     while ( sortEvent && event->dtStart().time()>=sortEvent->dtStart().time() )
     {
@@ -891,18 +891,18 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
     eventListSorted.insert( i, event );
   }
   return eventListSorted;
 }
 
 
-QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
+Q3PtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
                                           bool inclusive )
 {
   Event *event = 0;
 
-  QPtrList<Event> eventList;
+  Q3PtrList<Event> eventList;
 
   // Get non-recurring events
   for( event = mEventList.first(); event; event = mEventList.next() ) {
       if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       QDate rStart = event->dtStart().date();
@@ -920,13 +920,13 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
             // TODO: Calculate end date from duration. Should be done in Event
             // For now exclude all events with a duration.
           }
         }
       } else {
           bool founOne;
-          QDate next = event->getNextOccurence( start, &founOne ).date();
+          QDate next = event->getNextOccurence( (QDateTime)start, &founOne ).date();
           if ( founOne ) {
               if ( next <= end ) {
                   found = true;
               }
           }
           
@@ -969,20 +969,20 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
     }
   }
 
   return eventList;
 }
 
-QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
+Q3PtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 {
   return rawEventsForDate( qdt.date() );
 }
 
-QPtrList<Event> CalendarLocal::rawEvents()
+Q3PtrList<Event> CalendarLocal::rawEvents()
 {
-    QPtrList<Event> el;
+    Q3PtrList<Event> el;
     for ( Event *it = mEventList.first(); it; it = mEventList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 
 bool CalendarLocal::addJournal(Journal *journal)
@@ -1003,15 +1003,15 @@ void CalendarLocal::deleteJournal( Journal *journal )
     clearUndo(journal);
   if ( mJournalList.removeRef(journal) ) {
     setModified( true );
   }
 }
 
-QPtrList<Journal> CalendarLocal::journals4Date( const QDate & date )
+Q3PtrList<Journal> CalendarLocal::journals4Date( const QDate & date )
 {
-    QPtrList<Journal> el;
+    Q3PtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() && it->dtStart().date() == date) el.append( it );
     return el;
 }
 Journal *CalendarLocal::journal( const QDate &date )
 {
@@ -1037,43 +1037,43 @@ Journal *CalendarLocal::journal( const QString &uid )
                 retVal = it;
             }
         }
     return retVal;
 }
 
-QPtrList<Journal> CalendarLocal::journals()
+Q3PtrList<Journal> CalendarLocal::journals()
 {
-    QPtrList<Journal> el;
+    Q3PtrList<Journal> el;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->calEnabled() ) el.append( it );
     return el;
 }
 void CalendarLocal::setCalendarRemove( int id )
 {
    
     {
-        QPtrList<Event> EventList = mEventList;
+        Q3PtrList<Event> EventList = mEventList;
         Event * ev = EventList.first();
         while ( ev ) {
             if ( ev->calID() == id && ev->uid().left( 15 ) != QString("last-syncEvent-") )
                 deleteEvent( ev );
             ev = EventList.next();
         }
     }
     {
 
-        QPtrList<Todo> TodoList = mTodoList;
+        Q3PtrList<Todo> TodoList = mTodoList;
         Todo * ev = TodoList.first();
         while ( ev ) {
             if ( ev->calID() == id )
                 deleteTodo( ev );
             ev = TodoList.next();
         }
     }
     {
-        QPtrList<Journal> JournalList = mJournalList;
+        Q3PtrList<Journal> JournalList = mJournalList;
         Journal * ev = JournalList.first();
         while ( ev ) {
             if ( ev->calID() == id )
                 deleteJournal( ev );
             ev = JournalList.next();
         }
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 1ceabce..1df65c7 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -20,12 +20,14 @@
     Boston, MA 02111-1307, USA.
 */
 #ifndef KCAL_CALENDARLOCAL_H
 #define KCAL_CALENDARLOCAL_H
 
 #include "calendar.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 namespace KCal {
 
 class CalFormat;
 
 /**
@@ -90,14 +92,14 @@ class CalendarLocal : public Calendar
       Retrieves an event on the basis of the unique string ID.
     */
     Event *event( const QString &uid );
     /**
       Return unfiltered list of all events in calendar.
     */
-    QPtrList<Event> rawEvents();
-    QPtrList<Event> getExternLastSyncEvents();
+    Q3PtrList<Event> rawEvents();
+    Q3PtrList<Event> getExternLastSyncEvents();
     /**
       Add a todo to the todolist.
     */
     bool addTodo( Todo *todo );
     bool addTodoNoDup( Todo *todo );
     /**
@@ -109,23 +111,23 @@ class CalendarLocal : public Calendar
       returns a pointer or null.
     */
     Todo *todo( const QString &uid );
     /**
       Return list of all todos.
     */
-    QPtrList<Todo> rawTodos();
+    Q3PtrList<Todo> rawTodos();
     /**
       Returns list of todos due on the specified date.
     */
-    QPtrList<Todo> todos( const QDate &date );
+    Q3PtrList<Todo> todos( const QDate &date );
     /**
       Return list of all todos.
       
       Workaround because compiler does not recognize function of base class.
     */
-    QPtrList<Todo> todos() { return Calendar::todos(); }
+    Q3PtrList<Todo> todos() { return Calendar::todos(); }
 
     /**
       Add a Journal entry to calendar.
     */
     bool addJournal( Journal * );
     /**
@@ -133,21 +135,21 @@ class CalendarLocal : public Calendar
     */
     void deleteJournal( Journal * );
     /**
       Return Journal for given date.
     */
     Journal *journal( const QDate & );
-    QPtrList<Journal> journals4Date( const QDate & );
+    Q3PtrList<Journal> journals4Date( const QDate & );
     /**
       Return Journal with given UID.
     */
     Journal *journal( const QString &uid );
     /**
       Return list of all Journals stored in calendar.
     */
-    QPtrList<Journal> journals();
+    Q3PtrList<Journal> journals();
 
     /**
       Return all alarms, which ocur in the given time interval.
     */
     Alarm::List alarms( const QDateTime &from, const QDateTime &to );
 
@@ -171,22 +173,22 @@ class CalendarLocal : public Calendar
     void update( IncidenceBase *incidence );
  
     /**
       Builds and then returns a list of all events that match for the
       date specified. useful for dayView, etc. etc.
     */
-    QPtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false );
+    Q3PtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false );
     /**
       Get unfiltered events for date \a qdt.
     */
-    QPtrList<Event> rawEventsForDate( const QDateTime &qdt );
+    Q3PtrList<Event> rawEventsForDate( const QDateTime &qdt );
     /**
       Get unfiltered events in a range of dates. If inclusive is set to true,
       only events are returned, which are completely included in the range.
     */
-    QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
+    Q3PtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                bool inclusive = false );
     Todo *todo( QString, QString );
     Event *event( QString, QString );
     void getIncidenceCount( int calId, int& events, int & todos, int & journals);
  
 public slots:
@@ -221,14 +223,14 @@ public slots:
     void appendRecurringAlarms( Alarm::List &alarms, Incidence *incidence,
                        const QDateTime &from, const QDateTime &to );
 
   private:
     void init();
 
-    QPtrList<Event> mEventList;
-    QPtrList<Todo> mTodoList;
-    QPtrList<Journal> mJournalList;
+    Q3PtrList<Event> mEventList;
+    Q3PtrList<Todo> mTodoList;
+    Q3PtrList<Journal> mJournalList;
 };
 
 }
 
 #endif
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index 72f70c2..fa1dbd5 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -18,12 +18,14 @@
     Boston, MA 02111-1307, USA.
 */
 
 #include <kdebug.h>
 
 #include "calfilter.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
 
 CalFilter::CalFilter()
 {
   mEnabled = true;
@@ -38,13 +40,13 @@ CalFilter::CalFilter(const QString &name)
 }
 
 CalFilter::~CalFilter()
 {
 }
 
-void CalFilter::apply(QPtrList<Event> *eventlist)
+void CalFilter::apply(Q3PtrList<Event> *eventlist)
 {
   if (!mEnabled) return;
 
 //  kdDebug(5800) << "CalFilter::apply()" << endl;
 
   Event *event = eventlist->first();
@@ -58,13 +60,13 @@ void CalFilter::apply(QPtrList<Event> *eventlist)
   }
 
 //  kdDebug(5800) << "CalFilter::apply() done" << endl;
 }
 
 // TODO: avoid duplicating apply() code
-void CalFilter::apply(QPtrList<Todo> *eventlist)
+void CalFilter::apply(Q3PtrList<Todo> *eventlist)
 {
   if (!mEnabled) return;
   Todo *event = eventlist->first();
   while(event) {
     if (!filterTodo(event)) {
       eventlist->remove();
diff --git a/libkcal/calfilter.h b/libkcal/calfilter.h
index e349770..821149f 100644
--- a/libkcal/calfilter.h
+++ b/libkcal/calfilter.h
@@ -19,13 +19,13 @@
 */
 
 #ifndef _CALFILTER_H
 #define _CALFILTER_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "event.h"
 #include "todo.h"
 #include "journal.h"
 
 namespace KCal {
@@ -52,21 +52,21 @@ class CalFilter {
     QString name() const { return mName; }
     
     /**
       Apply filter to eventlist, all events not matching filter criterias are
       removed from the list.
     */
-    void apply(QPtrList<Event> *eventlist);
+    void apply(Q3PtrList<Event> *eventlist);
     
     /**
       Apply filter to todolist, all todos not matching filter criterias are
       removed from the list.
     */
-    void apply(QPtrList<Todo> *todolist);
-    bool CalFilter::filterCalendarItem(Incidence *in);
-    bool CalFilter::filterJournal(Journal *in);
+    void apply(Q3PtrList<Todo> *todolist);
+    bool filterCalendarItem(Incidence *in);
+    bool filterJournal(Journal *in);
     /**
       Apply filter criteria on the specified event. Return true, if event passes
       criteria, otherwise return false.
     */
     bool filterEvent(Event *);
     
diff --git a/libkcal/customproperties.cpp b/libkcal/customproperties.cpp
index adc1710..16f4a28 100644
--- a/libkcal/customproperties.cpp
+++ b/libkcal/customproperties.cpp
@@ -16,12 +16,14 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include "customproperties.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace KCal;
 
 CustomProperties::CustomProperties()
 {
 }
@@ -32,71 +34,71 @@ CustomProperties::CustomProperties(const CustomProperties &cp)
 }
 
 CustomProperties::~CustomProperties()
 {
 }
 
-void CustomProperties::setCustomProperty(const QCString &app, const QCString &key,
+void CustomProperties::setCustomProperty(const Q3CString &app, const Q3CString &key,
                                          const QString &value)
 {
   if (value.isNull() || key.isEmpty() || app.isEmpty())
     return;
-  QCString property = "X-KDE-" + app + "-" + key;
+  Q3CString property = "X-KDE-" + app + "-" + key;
   if (!checkName(property))
     return;
   mProperties[property] = value;
 }
 
-void CustomProperties::removeCustomProperty(const QCString &app, const QCString &key)
+void CustomProperties::removeCustomProperty(const Q3CString &app, const Q3CString &key)
 {
-  removeNonKDECustomProperty(QCString("X-KDE-" + app + "-" + key));
+  removeNonKDECustomProperty(Q3CString("X-KDE-" + app + "-" + key));
 }
 
-QString CustomProperties::customProperty(const QCString &app, const QCString &key) const
+QString CustomProperties::customProperty(const Q3CString &app, const Q3CString &key) const
 {
-  return nonKDECustomProperty(QCString("X-KDE-" + app + "-" + key));
+  return nonKDECustomProperty(Q3CString("X-KDE-" + app + "-" + key));
 }
 
-void CustomProperties::setNonKDECustomProperty(const QCString &name, const QString &value)
+void CustomProperties::setNonKDECustomProperty(const Q3CString &name, const QString &value)
 {
   if (value.isNull() || !checkName(name))
     return;
   mProperties[name] = value;
 }
 
-void CustomProperties::removeNonKDECustomProperty(const QCString &name)
+void CustomProperties::removeNonKDECustomProperty(const Q3CString &name)
 {
-  QMap<QCString, QString>::Iterator it = mProperties.find(name);
+  QMap<Q3CString, QString>::Iterator it = mProperties.find(name);
   if (it != mProperties.end())
     mProperties.remove(it);
 }
 
-QString CustomProperties::nonKDECustomProperty(const QCString &name) const
+QString CustomProperties::nonKDECustomProperty(const Q3CString &name) const
 {
-  QMap<QCString, QString>::ConstIterator it = mProperties.find(name);
+  QMap<Q3CString, QString>::ConstIterator it = mProperties.find(name);
   if (it == mProperties.end())
     return QString::null;
   return it.data();
 }
 
-void CustomProperties::setCustomProperties(const QMap<QCString, QString> &properties)
+void CustomProperties::setCustomProperties(const QMap<Q3CString, QString> &properties)
 {
-  for (QMap<QCString, QString>::ConstIterator it = properties.begin();  it != properties.end();  ++it) {
+  for (QMap<Q3CString, QString>::ConstIterator it = properties.begin();  it != properties.end();  ++it) {
     // Validate the property name and convert any null string to empty string
     if (checkName(it.key())) {
       mProperties[it.key()] = it.data().isNull() ? QString("") : it.data();
     }
   }
 }
 
-QMap<QCString, QString> CustomProperties::customProperties() const
+QMap<Q3CString, QString> CustomProperties::customProperties() const
 {
   return mProperties;
 }
 
-bool CustomProperties::checkName(const QCString &name)
+bool CustomProperties::checkName(const Q3CString &name)
 {
   // Check that the property name starts with 'X-' and contains
   // only the permitted characters
   const char* n = name;
   int len = name.length();
   if (len < 2 ||  n[0] != 'X' || n[1] != '-')
diff --git a/libkcal/customproperties.h b/libkcal/customproperties.h
index 0cbfdcd..75eb3ad 100644
--- a/libkcal/customproperties.h
+++ b/libkcal/customproperties.h
@@ -20,12 +20,14 @@
 
 #ifndef KCAL_CUSTOM_PROPERTIES_H
 #define KCAL_CUSTOM_PROPERTIES_H
 
 #include <qstring.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace KCal {
 
 /**
   This class represents custom calendar properties.
   It is used as a base class for classes which represent calendar components.
@@ -46,52 +48,52 @@ class CustomProperties
     /** Create or modify a custom calendar property.
       @param app Application name as it appears in the custom property name.
       @param key Property identifier specific to the application.
       @param value The property's value. A call with a value of QString::null
       will be ignored.
      */
-    void setCustomProperty(const QCString &app, const QCString &key,
+    void setCustomProperty(const Q3CString &app, const Q3CString &key,
                            const QString &value);
     /** Delete a custom calendar property.
       @param app Application name as it appears in the custom property name.
       @param key Property identifier specific to the application.
      */
-    void removeCustomProperty(const QCString &app, const QCString &key);
+    void removeCustomProperty(const Q3CString &app, const Q3CString &key);
     /** Return the value of a custom calendar property.
       @param app Application name as it appears in the custom property name.
       @param key Property identifier specific to the application.
       @return Property value, or QString::null if (and only if) the property does not exist.
      */
-    QString customProperty(const QCString &app, const QCString &key) const;
+    QString customProperty(const Q3CString &app, const Q3CString &key) const;
 
     /** Create or modify a non-KDE or non-standard custom calendar property.
       @param name Full property name
       @param value The property's value. A call with a value of QString::null
       will be ignored.
      */
-    void setNonKDECustomProperty(const QCString &name, const QString &value);
+    void setNonKDECustomProperty(const Q3CString &name, const QString &value);
     /** Delete a non-KDE or non-standard custom calendar property.
       @param name Full property name
      */
-    void removeNonKDECustomProperty(const QCString &name);
+    void removeNonKDECustomProperty(const Q3CString &name);
     /** Return the value of a non-KDE or non-standard custom calendar property.
       @param name Full property name
       @return Property value, or QString::null if (and only if) the property does not exist.
      */
-    QString nonKDECustomProperty(const QCString& name) const;
+    QString nonKDECustomProperty(const Q3CString& name) const;
 
     /** Initialise the alarm's custom calendar properties to the specified
         key/value pairs.
      */
-    void setCustomProperties(const QMap<QCString, QString> &properties);
+    void setCustomProperties(const QMap<Q3CString, QString> &properties);
     /** Return all custom calendar property key/value pairs. */
-    QMap<QCString, QString> customProperties() const;
+    QMap<Q3CString, QString> customProperties() const;
 
   private:
-    static bool checkName(const QCString& name);
+    static bool checkName(const Q3CString& name);
 
-    QMap<QCString, QString> mProperties;   // custom calendar properties
+    QMap<Q3CString, QString> mProperties;   // custom calendar properties
 };
 
 }
 
 #endif
diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp
index cdcfae4..ca7e212 100644
--- a/libkcal/dndfactory.cpp
+++ b/libkcal/dndfactory.cpp
@@ -19,12 +19,15 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qapplication.h>
 #include <qclipboard.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <Q3PtrList>
 
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 
@@ -65,13 +68,13 @@ Event *DndFactory::createDrop(QDropEvent *de)
 
   CalendarLocal cal( mCalendar->timeZoneId() );
 
   if ( ICalDrag::decode( de, &cal ) || VCalDrag::decode( de, &cal ) ) {
     de->accept();
 
-    QPtrList<Event> events = cal.events();
+    Q3PtrList<Event> events = cal.events();
     if ( !events.isEmpty() ) {
       Event *event = new Event( *events.first() );
       return event;
     }
   }
 
@@ -84,13 +87,13 @@ Todo *DndFactory::createDropTodo(QDropEvent *de)
 
   CalendarLocal cal( mCalendar->timeZoneId() );
 
   if ( ICalDrag::decode( de, &cal ) || VCalDrag::decode( de, &cal ) ) {
     de->accept();
 
-    QPtrList<Todo> todos = cal.todos();
+    Q3PtrList<Todo> todos = cal.todos();
     if ( !todos.isEmpty() ) {
       Todo *todo = new Todo( *todos.first() );
       return todo;
     }
   }
 
@@ -130,13 +133,13 @@ Incidence *DndFactory::pasteIncidence(const QDate &newDate, const QTime *newTime
   if ( !ICalDrag::decode( cb->data(), &cal ) &&
        !VCalDrag::decode( cb->data(), &cal ) ) {
     kdDebug(5800) << "Can't parse clipboard" << endl;
     return 0;
   }
 
-  QPtrList<Incidence> incList = cal.incidences();
+  Q3PtrList<Incidence> incList = cal.incidences();
   Incidence *inc = incList.first();
 
   if ( !incList.isEmpty() && inc ) {
     inc = inc->clone();
 
     inc->recreate();
diff --git a/libkcal/dndfactory.h b/libkcal/dndfactory.h
index 2df5259..a873c37 100644
--- a/libkcal/dndfactory.h
+++ b/libkcal/dndfactory.h
@@ -1,6 +1,8 @@
+//Added by qt3to4:
+#include <QDropEvent>
 /*
     This file is part of libkcal.
 
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001,2002,2003 Cornelius Schumacher <schumacher@kde.org>
     Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
diff --git a/libkcal/dndfactory_dummy.h b/libkcal/dndfactory_dummy.h
index 44cc114..3ab6adf 100644
--- a/libkcal/dndfactory_dummy.h
+++ b/libkcal/dndfactory_dummy.h
@@ -22,12 +22,14 @@
 // $Id$
 
 #ifndef KCAL_DNDFACTORY_H
 #define KCAL_DNDFACTORY_H
 
 #include "vcalformat.h"
+//Added by qt3to4:
+#include <QDropEvent>
 
 class QDropEvent;
 
 namespace KCal {
 
 /**
diff --git a/libkcal/dummyscheduler.cpp b/libkcal/dummyscheduler.cpp
index ae40e6d..73eb3d0 100644
--- a/libkcal/dummyscheduler.cpp
+++ b/libkcal/dummyscheduler.cpp
@@ -20,13 +20,15 @@
 
 //
 // DummyScheduler - iMIP implementation of iTIP methods
 //
 
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <kdebug.h>
 
 #include "event.h"
 #include "icalformat.h"
 
@@ -65,32 +67,32 @@ bool DummyScheduler::performTransaction(IncidenceBase *incidence,Method method)
   return saveMessage(messageText);
 }
 
 bool DummyScheduler::saveMessage(const QString &message)
 {
   QFile f("dummyscheduler.store");
-  if (f.open(IO_WriteOnly | IO_Append)) {
-    QTextStream t(&f);
+  if (f.open(QIODevice::WriteOnly | QIODevice::Append)) {
+    Q3TextStream t(&f);
     t << message << endl;
     f.close();
     return true;
   } else {
     return false;
   }
 }
 
-QPtrList<ScheduleMessage> DummyScheduler::retrieveTransactions()
+Q3PtrList<ScheduleMessage> DummyScheduler::retrieveTransactions()
 {
-  QPtrList<ScheduleMessage> messageList;
+  Q3PtrList<ScheduleMessage> messageList;
 
   QFile f("dummyscheduler.store");
-  if (!f.open(IO_ReadOnly)) {
+  if (!f.open(QIODevice::ReadOnly)) {
     kdDebug(5800) << "DummyScheduler::retrieveTransactions(): Can't open file"
               << endl;
   } else {
-    QTextStream t(&f);
+    Q3TextStream t(&f);
     QString messageString;
     QString messageLine = t.readLine();
     while (!messageLine.isNull()) {
 //      kdDebug(5800) << "++++++++" << messageLine << endl;
       messageString += messageLine + "\n";
       if (messageLine.find("END:VCALENDAR") >= 0) {
diff --git a/libkcal/dummyscheduler.h b/libkcal/dummyscheduler.h
index df42153..f86d583 100644
--- a/libkcal/dummyscheduler.h
+++ b/libkcal/dummyscheduler.h
@@ -21,12 +21,14 @@
 #define DUMMYSCHEDULER_H
 //
 // Dummy implementation of iTIP methods
 //
 
 #include "scheduler.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 namespace KCal {
 
 /**
   This class implements the iTIP interface as a primitive local version for
   testing. It uses a file dummyscheduler.store as inbox/outbox.
@@ -36,13 +38,13 @@ class DummyScheduler : public Scheduler {
     DummyScheduler(Calendar *);
     virtual ~DummyScheduler();
     
     bool publish (IncidenceBase *incidence,const QString &recipients);
     bool performTransaction(IncidenceBase *incidence,Method method);
     bool performTransaction(IncidenceBase *incidence,Method method,const QString &recipients);
-    QPtrList<ScheduleMessage> retrieveTransactions();
+    Q3PtrList<ScheduleMessage> retrieveTransactions();
 
   protected:
     bool saveMessage(const QString &);
 };
 
 }
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index fdf5657..060df81 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -381,13 +381,13 @@ QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_
      int off = 0;
      QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );;
     //  if ( QDateTime::currentDateTime() > incidenceStart ){
 //          *ok = false;
 //          return incidenceStart;
 //      }
-     for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
+     for (Q3PtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
          if (alarm->enabled()) {
              if ( alarm->hasTime () ) {
                  if ( alarm->time() < alarmStart ) {
                      alarmStart = alarm->time();
                      enabled = true;
                      off = alarmStart.secsTo( incidenceStart );
diff --git a/libkcal/event.h b/libkcal/event.h
index 6a58618..da44f81 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -22,12 +22,14 @@
 #define EVENT_H
 //
 // Event component, representing a VEVENT object
 //
 
 #include "incidence.h"
+//Added by qt3to4:
+#include <Q3CString>
 namespace KCal {
 
 /**
   This class provides an Event in the sense of RFC2445.
 */
 class Event : public Incidence
@@ -37,13 +39,13 @@ class Event : public Incidence
     typedef ListBase<Event> List;
     Event();
     Event(const Event &);
     ~Event();
     bool matchTime(QDateTime*startDT, QDateTime* endDT);
 
-    QCString type() const { return "Event"; }
+    Q3CString type() const { return "Event"; }
     IncTypeID typeID() const { return eventID; }
 
     Incidence *clone();
     QDateTime getNextAlarmDateTime( bool * ok, int * offset ,QDateTime start_dt  ) const;
 
     /** for setting an event's ending date/time with a QDateTime. */
diff --git a/libkcal/filestorage.cpp b/libkcal/filestorage.cpp
index a139124..3d1309f 100644
--- a/libkcal/filestorage.cpp
+++ b/libkcal/filestorage.cpp
@@ -19,13 +19,13 @@
 */
 
 #include <stdlib.h>
 
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kdebug.h>
 
 #include "calendar.h"
 #include "vcaldrag.h"
 #include "vcalformat.h"
diff --git a/libkcal/freebusy.cpp b/libkcal/freebusy.cpp
index ba15d6d..e4e9ec9 100644
--- a/libkcal/freebusy.cpp
+++ b/libkcal/freebusy.cpp
@@ -18,12 +18,15 @@
     Boston, MA 02111-1307, USA.
 */
 
 #include <kdebug.h>
 
 #include "freebusy.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 using namespace KCal;
 
 FreeBusy::FreeBusy()
 {
 }
@@ -40,13 +43,13 @@ FreeBusy::FreeBusy( Calendar *calendar, const QDateTime &start, const QDateTime
   mCalendar = calendar;
 
   setDtStart(start);
   setDtEnd(end);
 
   //Gets all the events in the calendar
-  QPtrList<Event> eventList = mCalendar->events();
+  Q3PtrList<Event> eventList = mCalendar->events();
   Event *event;
 
   int extraDays, i, x, duration;
   duration = start.daysTo(end);
   QDate day;
   QDateTime tmpStart;
@@ -110,13 +113,13 @@ bool FreeBusy::setDtEnd( const QDateTime &end )
 
 QDateTime FreeBusy::dtEnd() const
 {
   return mDtEnd;
 }
 
-QValueList<Period> FreeBusy::busyPeriods() const
+Q3ValueList<Period> FreeBusy::busyPeriods() const
 {
   return mBusyPeriods;
 }
 
 bool FreeBusy::addLocalPeriod(const QDateTime &eventStart, const QDateTime &eventEnd ) {
   QDateTime tmpStart;
@@ -143,20 +146,20 @@ bool FreeBusy::addLocalPeriod(const QDateTime &eventStart, const QDateTime &even
   Period p(tmpStart, tmpEnd);  
   mBusyPeriods.append( p );
 
   return true;
 }
 
-FreeBusy::FreeBusy(QValueList<Period> busyPeriods)
+FreeBusy::FreeBusy(Q3ValueList<Period> busyPeriods)
 {
   mBusyPeriods = busyPeriods;
 }
 
 void FreeBusy::sortList()
 {
-  typedef QValueList<Period> PeriodList;
+  typedef Q3ValueList<Period> PeriodList;
 
   PeriodList::Iterator tmpPeriod, earlyPeriod;
   PeriodList sortedList;
   QDateTime earlyTime;
 
   while( mBusyPeriods.count() > 0 ) {
diff --git a/libkcal/freebusy.h b/libkcal/freebusy.h
index d741c72..bd14cb7 100644
--- a/libkcal/freebusy.h
+++ b/libkcal/freebusy.h
@@ -21,14 +21,16 @@
 #define KCAL_FREEBUSY_H
 //
 // FreeBusy - information about free/busy times
 //
 
 #include <qdatetime.h>
-#include <qvaluelist.h>
-#include <qptrlist.h>
+#include <q3valuelist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "period.h"
 #include "calendar.h"
 
 #include "incidencebase.h"
 
@@ -40,34 +42,34 @@ namespace KCal {
 class FreeBusy : public IncidenceBase
 {
   public:
     FreeBusy();
     FreeBusy(const QDateTime &start, const QDateTime &end);
     FreeBusy(Calendar *calendar, const QDateTime &start, const QDateTime &end);
-    FreeBusy(QValueList<Period> busyPeriods);
+    FreeBusy(Q3ValueList<Period> busyPeriods);
 
     ~FreeBusy();
     
-    QCString type() const { return "FreeBusy"; }
+    Q3CString type() const { return "FreeBusy"; }
     IncTypeID typeID() const { return freebusyID; }
 
     virtual QDateTime dtEnd() const;
     bool setDtEnd( const QDateTime &end );
 
-    QValueList<Period> busyPeriods() const;
+    Q3ValueList<Period> busyPeriods() const;
 
     void addPeriod(const QDateTime &start, const QDateTime &end);
     void sortList();
     
   private:
 
     //This is used for creating a freebusy object for the current user
     bool addLocalPeriod(const QDateTime &start, const QDateTime &end);
 
     QDateTime mDtEnd;
-    QValueList<Period> mBusyPeriods;
+    Q3ValueList<Period> mBusyPeriods;
     Calendar *mCalendar;
 };
 
 }
 
 #endif
diff --git a/libkcal/icaldrag.cpp b/libkcal/icaldrag.cpp
index 446a115..7f5a796 100644
--- a/libkcal/icaldrag.cpp
+++ b/libkcal/icaldrag.cpp
@@ -25,13 +25,13 @@
 
 #include <kdebug.h>
 
 using namespace KCal;
 
 ICalDrag::ICalDrag( Calendar *cal, QWidget *parent, const char *name )
-  : QStoredDrag( "text/calendar", parent, name )
+  : Q3StoredDrag( "text/calendar", parent, name )
 {
   ICalFormat icf;
   QString scal = icf.toString( cal );
   
   setEncodedData( scal.utf8() );
 }
diff --git a/libkcal/icaldrag.h b/libkcal/icaldrag.h
index fdf32b7..c1f73f4 100644
--- a/libkcal/icaldrag.h
+++ b/libkcal/icaldrag.h
@@ -19,19 +19,19 @@
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef ICALDRAG_H
 #define ICALDRAG_H
 
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include "calendar.h"
 
 namespace KCal {
 
 /** iCalendar drag&drop class. */
-class ICalDrag : public QStoredDrag
+class ICalDrag : public Q3StoredDrag
 {
   public:
     /** Create a drag&drop object for iCalendar component \a ical. */
     ICalDrag( Calendar *cal, QWidget *parent = 0, const char *name = 0 );
     ~ICalDrag() {};
 
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index 6f3a799..3829bc1 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -17,17 +17,17 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <stdlib.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
@@ -67,20 +67,20 @@ ICalFormat::~ICalFormat()
 bool ICalFormat::load( Calendar *calendar, const QString &fileName)
 {
 
   clearException();
 
   QFile file( fileName );  
-  if (!file.open( IO_ReadOnly ) ) {
+  if (!file.open( QIODevice::ReadOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::LoadError));
     return false;
   } 
-  QTextStream ts( &file );
+  Q3TextStream ts( &file );
   QString text; 
 
-  ts.setEncoding( QTextStream::Latin1 );
+  ts.setEncoding( Q3TextStream::Latin1 );
   text = ts.read(); 
   file.close();
 
   return fromString( calendar, text );
 }
 
@@ -95,20 +95,20 @@ bool ICalFormat::save( Calendar *calendar, const QString &fileName )
   // qDebug("to string takes ms: %d ",is.elapsed() );
   if ( text.isNull() ) return false;
 
   // TODO: write backup file
   //is.restart();
   QFile file( fileName );
-  if (!file.open( IO_WriteOnly ) ) {
+  if (!file.open( QIODevice::WriteOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::SaveError,
                  i18n("Could not open file '%1'").arg(fileName)));
     return false;
   }
-  QTextStream ts( &file );
+  Q3TextStream ts( &file );
 
-  ts.setEncoding( QTextStream::Latin1 );
+  ts.setEncoding( Q3TextStream::Latin1 );
   ts << text;
   file.close();
   //qDebug("saving file takes ms: %d ", is.elapsed() );
   return true;
 }
 
@@ -153,64 +153,64 @@ bool ICalFormat::fromString( Calendar *cal, const QString &text )
 Incidence *ICalFormat::fromString( const QString &text )
 {
   CalendarLocal cal( mTimeZoneId );
   fromString(&cal, text);
   
   Incidence *ical = 0;
-  QPtrList<Event> elist = cal.events();
+  Q3PtrList<Event> elist = cal.events();
   if ( elist.count() > 0 ) {
     ical = elist.first();
   } else {
-    QPtrList<Todo> tlist = cal.todos();
+    Q3PtrList<Todo> tlist = cal.todos();
     if ( tlist.count() > 0 ) {
       ical = tlist.first();
     } else {
-      QPtrList<Journal> jlist = cal.journals();
+      Q3PtrList<Journal> jlist = cal.journals();
       if ( jlist.count() > 0 ) {
         ical = jlist.first();
       }
     }
   }
   return ical;
 }
-#include <qapp.h>
+#include <qapplication.h>
 
 QString ICalFormat::toString( Calendar *cal )
 {
  
   setTimeZone( cal->timeZoneId(), !cal->isLocalTime() );
  
   icalcomponent *calendar = mImpl->createCalendarComponent(cal);
 
   icalcomponent *component;
  
   // todos 
-  QPtrList<Todo> todoList = cal->rawTodos();
-  QPtrListIterator<Todo> qlt(todoList);
+  Q3PtrList<Todo> todoList = cal->rawTodos();
+  Q3PtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
     component = mImpl->writeTodo(qlt.current());
     icalcomponent_add_component(calendar,component);
     //qDebug(" todos ");
     if ( mProcessEvents ) {
         //qDebug("mProcessEvents ");
         qApp->processEvents();
     }
   }
   // events
-  QPtrList<Event> events = cal->rawEvents();
+  Q3PtrList<Event> events = cal->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
     component = mImpl->writeEvent(ev);
     icalcomponent_add_component(calendar,component);
     //qDebug("events ");
     if ( mProcessEvents )
         qApp->processEvents();
   }
  
   // journals
-  QPtrList<Journal> journals = cal->journals();
+  Q3PtrList<Journal> journals = cal->journals();
   Journal *j;
   for(j=journals.first();j;j=journals.next()) {
     component = mImpl->writeJournal(j);
     icalcomponent_add_component(calendar,component);
     //qDebug("journals ");
     if ( mProcessEvents )
diff --git a/libkcal/icalformat.h b/libkcal/icalformat.h
index a770dbb..a454b35 100644
--- a/libkcal/icalformat.h
+++ b/libkcal/icalformat.h
@@ -18,12 +18,14 @@
     Boston, MA 02111-1307, USA.
 */
 #ifndef ICALFORMAT_H
 #define ICALFORMAT_H
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "scheduler.h"
 
 #include "calformat.h"
 
 namespace KCal {
@@ -103,13 +105,13 @@ class ICalFormat : public CalFormat {
     bool utc() const;
 
   private:
     bool mProcessEvents;
     ICalFormatImpl *mImpl;
     QString mTimeZoneId;
-    QCString mTzString;
+    Q3CString mTzString;
     int tzOffsetMin;
     bool mUtc;
 };
 
 }
 
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 65eabc8..ea144ee 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -17,14 +17,17 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3CString>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 extern "C" {
@@ -218,14 +221,14 @@ icalcomponent *ICalFormatImpl::writeFreeBusy(FreeBusy *freebusy,
   if (method == Scheduler::Request) {
     icalcomponent_add_property(vfreebusy,icalproperty_new_uid(
        freebusy->uid().utf8()));
   }
 
   //Loops through all the periods in the freebusy object
-  QValueList<Period> list = freebusy->busyPeriods();
-  QValueList<Period>::Iterator it;
+  Q3ValueList<Period> list = freebusy->busyPeriods();
+  Q3ValueList<Period>::Iterator it;
   icalperiodtype period;
   for (it = list.begin(); it!= list.end(); ++it) {
     period.start = writeICalDateTime((*it).start());
     period.end = writeICalDateTime((*it).end());
     icalcomponent_add_property(vfreebusy, icalproperty_new_freebusy(period) );
   }
@@ -381,18 +384,18 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
           icalcomponent_add_property(parent,icalproperty_new_exdate(
                                                                     writeICalDate(*exIt)));
       }
   }
   
   // attachments
-  QPtrList<Attachment> attachments = incidence->attachments();
+  Q3PtrList<Attachment> attachments = incidence->attachments();
   for (Attachment *at = attachments.first(); at; at = attachments.next())
     icalcomponent_add_property(parent,writeAttachment(at));
 
   // alarms
-  QPtrList<Alarm> alarms = incidence->alarms();
+  Q3PtrList<Alarm> alarms = incidence->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
       kdDebug(5800) << "Write alarm for " << incidence->summary() << endl;
       icalcomponent_add_component(parent,writeAlarm(alarm));
     }
@@ -420,27 +423,27 @@ void ICalFormatImpl::writeIncidenceBase(icalcomponent *parent,IncidenceBase *inc
   // organizer stuff
   icalcomponent_add_property(parent,icalproperty_new_organizer(
       ("MAILTO:" + incidenceBase->organizer()).utf8()));
 
   // attendees
   if (incidenceBase->attendeeCount() != 0) {
-    QPtrList<Attendee> al = incidenceBase->attendees();
-    QPtrListIterator<Attendee> ai(al);
+    Q3PtrList<Attendee> al = incidenceBase->attendees();
+    Q3PtrListIterator<Attendee> ai(al);
     for (; ai.current(); ++ai) {
       icalcomponent_add_property(parent,writeAttendee(ai.current()));
     }
   }
 
   // custom properties
   writeCustomProperties(parent, incidenceBase);
 }
 
 void ICalFormatImpl::writeCustomProperties(icalcomponent *parent,CustomProperties *properties)
 {
-  QMap<QCString, QString> custom = properties->customProperties();
-  for (QMap<QCString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
+  QMap<Q3CString, QString> custom = properties->customProperties();
+  for (QMap<Q3CString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
     icalproperty *p = icalproperty_new_x(c.data().utf8());
     icalproperty_set_x_name(p,c.key());
     icalcomponent_add_property(parent,p);
   }
 }
 
@@ -543,14 +546,14 @@ icalproperty *ICalFormatImpl::writeRecurrenceRule(Recurrence *recur)
 
   icalrecurrencetype_clear(&r);
 
   int index = 0;
   int index2 = 0;
 
-  QPtrList<Recurrence::rMonthPos> tmpPositions;
-  QPtrList<int> tmpDays;
+  Q3PtrList<Recurrence::rMonthPos> tmpPositions;
+  Q3PtrList<int> tmpDays;
   int *tmpDay;
   Recurrence::rMonthPos *tmpPos;
   bool datetime = false;
   int day;
   int i;
 
@@ -701,14 +704,14 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
           icalcomponent_add_property(a,icalproperty_new_attach(attach));
           icalattach_unref( attach );
       }
       break;
     case Alarm::Email: {
       action = ICAL_ACTION_EMAIL;
-      QValueList<Person> addresses = alarm->mailAddresses();
-      for (QValueList<Person>::Iterator ad = addresses.begin();  ad != addresses.end();  ++ad) {
+      Q3ValueList<Person> addresses = alarm->mailAddresses();
+      for (Q3ValueList<Person>::Iterator ad = addresses.begin();  ad != addresses.end();  ++ad) {
         icalproperty *p = icalproperty_new_attendee("MAILTO:" + (*ad).email().utf8());
         if (!(*ad).name().isEmpty()) {
           icalproperty_add_parameter(p,icalparameter_new_cn((*ad).name().utf8()));
         }
         icalcomponent_add_property(a,p);
       }
@@ -760,14 +763,14 @@ icalcomponent *ICalFormatImpl::writeAlarm(Alarm *alarm)
     icalcomponent_add_property(a,icalproperty_new_repeat(alarm->repeatCount()));
     icalcomponent_add_property(a,icalproperty_new_duration(
                              icaldurationtype_from_int(alarm->snoozeTime()*60)));
   }
 
   // Custom properties
-  QMap<QCString, QString> custom = alarm->customProperties();
-  for (QMap<QCString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
+  QMap<Q3CString, QString> custom = alarm->customProperties();
+  for (QMap<Q3CString, QString>::Iterator c = custom.begin();  c != custom.end();  ++c) {
     icalproperty *p = icalproperty_new_x(c.data().utf8());
     icalproperty_set_x_name(p,c.key());
     icalcomponent_add_property(a,p);
   }
 
   return a;
@@ -1336,13 +1339,13 @@ void ICalFormatImpl::readIncidenceBase(icalcomponent *parent,IncidenceBase *inci
   // custom properties
   readCustomProperties(parent, incidenceBase);
 }
 
 void ICalFormatImpl::readCustomProperties(icalcomponent *parent,CustomProperties *properties)
 {
-  QMap<QCString, QString> customProperties;
+  QMap<Q3CString, QString> customProperties;
 
   icalproperty *p = icalcomponent_get_first_property(parent,ICAL_X_PROPERTY);
 
   while (p) {
     QString value = QString::fromUtf8(icalproperty_get_x(p));
     customProperties[icalproperty_get_x_name(p)] = value;
diff --git a/libkcal/icalformatimpl.h b/libkcal/icalformatimpl.h
index 203c302..3a35b4c 100644
--- a/libkcal/icalformatimpl.h
+++ b/libkcal/icalformatimpl.h
@@ -18,12 +18,14 @@
     Boston, MA 02111-1307, USA.
 */
 #ifndef ICALFORMATIMPL_H
 #define ICALFORMATIMPL_H
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include "scheduler.h"
 #include "freebusy.h"
 
 extern "C" {
   #include <ical.h>
@@ -90,14 +92,14 @@ class ICalFormatImpl {
     ICalFormat *mParent;
     Calendar *mCalendar;
 
     QString mLoadedProductId;         // PRODID string loaded from calendar file
     int mCalendarVersion;             // determines backward compatibility mode on read
 
-    QPtrList<Event> mEventsRelate;           // events with relations
-    QPtrList<Todo> mTodosRelate;             // todos with relations
+    Q3PtrList<Event> mEventsRelate;           // events with relations
+    Q3PtrList<Todo> mTodosRelate;             // todos with relations
 
     static const int mSecondsPerWeek;
     static const int mSecondsPerDay;
     static const int mSecondsPerHour;
     static const int mSecondsPerMinute;
 
diff --git a/libkcal/imipscheduler.cpp b/libkcal/imipscheduler.cpp
index e186f8e..e6d56a6 100644
--- a/libkcal/imipscheduler.cpp
+++ b/libkcal/imipscheduler.cpp
@@ -23,12 +23,14 @@
 //
 
 #include "event.h"
 #include "icalformat.h"
 
 #include "imipscheduler.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
 
 IMIPScheduler::IMIPScheduler(Calendar *calendar)
   : Scheduler(calendar)
 {
@@ -47,12 +49,12 @@ bool IMIPScheduler::performTransaction(IncidenceBase *incidence,Method method)
 {
   mFormat->createScheduleMessage(incidence,method);
 
   return false;
 }
 
-QPtrList<ScheduleMessage> IMIPScheduler::retrieveTransactions()
+Q3PtrList<ScheduleMessage> IMIPScheduler::retrieveTransactions()
 {
-  QPtrList<ScheduleMessage> messageList;
+  Q3PtrList<ScheduleMessage> messageList;
 
   return messageList;
 }
diff --git a/libkcal/imipscheduler.h b/libkcal/imipscheduler.h
index f142060..5a2d38e 100644
--- a/libkcal/imipscheduler.h
+++ b/libkcal/imipscheduler.h
@@ -20,13 +20,13 @@
 #ifndef IMIPSCHEDULER_H
 #define IMIPSCHEDULER_H
 //
 // iMIP implementation of iTIP methods
 //
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "scheduler.h"
 
 namespace KCal {
 
 /*
@@ -37,13 +37,13 @@ class IMIPScheduler : public Scheduler {
   public:
     IMIPScheduler(Calendar *);
     virtual ~IMIPScheduler();
     
     bool publish (IncidenceBase *incidence,const QString &recipients);
     bool performTransaction(IncidenceBase *incidence,Method method);
-    QPtrList<ScheduleMessage> retrieveTransactions();
+    Q3PtrList<ScheduleMessage> retrieveTransactions();
 };
 
 }
 
 #endif  // IMIPSCHEDULER_H
 
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 7dd9bd2..8fcdc69 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -23,12 +23,14 @@
 #include <kdebug.h>
 
 #include "calformat.h"
 
 #include "incidence.h"
 #include "todo.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
 
 Incidence::Incidence() :
   IncidenceBase(),
   mRelatedTo(0), mSecrecy(SecrecyPublic), mPriority(3)
@@ -56,13 +58,13 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
   mCategories = i.mCategories;
 //  Incidence *mRelatedTo;          Incidence *mRelatedTo;
   mRelatedTo = 0;
   mRelatedToUid = i.mRelatedToUid; 
 //  QPtrList<Incidence> mRelations;    QPtrList<Incidence> mRelations;
   mExDates = i.mExDates;
-  QPtrListIterator<Attachment> itat( i.mAttachments );
+  Q3PtrListIterator<Attachment> itat( i.mAttachments );
   Attachment *at;
   while( (at = itat.current()) ) {
       Attachment *a = new Attachment( *at );
       mAttachments.append( a );
       ++itat;
   }
@@ -70,13 +72,13 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
   mResources = i.mResources;
   mSecrecy = i.mSecrecy;
   mPriority = i.mPriority;
   mLocation = i.mLocation;
   mCancelled = i.mCancelled;
   mHasStartDate = i.mHasStartDate;
-  QPtrListIterator<Alarm> it( i.mAlarms );
+  Q3PtrListIterator<Alarm> it( i.mAlarms );
   const Alarm *a;
   while( (a = it.current()) ) {
     Alarm *b = new Alarm( *a );
     b->setParent( this );
     mAlarms.append( b );
 
@@ -95,13 +97,13 @@ Incidence::Incidence( const Incidence &i ) : IncidenceBase( i )
 }
 
 Incidence::~Incidence()
 {
    
   Incidence *ev;
-   QPtrList<Incidence> Relations = relations();
+   Q3PtrList<Incidence> Relations = relations();
   for (ev=Relations.first();ev;ev=Relations.next()) {
     if (ev->relatedTo() == this) ev->setRelatedTo(0);
   } 
   if (relatedTo()) relatedTo()->removeRelation(this);
   if ( mRecurrence ) 
       delete mRecurrence; 
@@ -213,14 +215,14 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
             {
             qDebug("alarm not equal ");
             return false;
         }
     }
 #if 0
-    QPtrListIterator<Alarm> a1( i1.alarms() );
-    QPtrListIterator<Alarm> a2( i2.alarms() );
+    Q3PtrListIterator<Alarm> a1( i1.alarms() );
+    Q3PtrListIterator<Alarm> a2( i2.alarms() );
     for( ; a1.current() && a2.current(); ++a1, ++a2 ) {
         if( *a1.current() == *a2.current() ) {
             continue;
         }
         else {
             return false;
@@ -319,13 +321,13 @@ void Incidence::recreate()
 }
 void Incidence::cloneRelations( Incidence * newInc )
 {
     // newInc is already a clone of this incidence
     Incidence * inc;
     Incidence * cloneInc;
-    QPtrList<Incidence> Relations = relations();
+    Q3PtrList<Incidence> Relations = relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
         cloneInc = inc->clone();
         cloneInc->recreate();
         cloneInc->setRelatedTo( newInc );
         inc->cloneRelations( cloneInc );
     } 
@@ -353,13 +355,13 @@ QDateTime Incidence::lastModifiedSub()
     if ( !mRelations.count() )
         return lastModified();
     if ( mLastModifiedSub.isValid() )
         return mLastModifiedSub;
     mLastModifiedSub = lastModified();
     Incidence * inc;
-    QPtrList<Incidence> Relations = relations();
+    Q3PtrList<Incidence> Relations = relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
         if ( inc->lastModifiedSub() > mLastModifiedSub )
             mLastModifiedSub = inc->lastModifiedSub();
     }
     mLastModifiedSubSortKey.sprintf("%04d%02d%02d%02d%02d%02d",
                                     mLastModifiedSub.date().year(),
@@ -444,13 +446,13 @@ void Incidence::addCategories(const QStringList &categories, bool addToRelations
             mCategories.append( categories[i] );
     }
     checkCategories();
     updated();
     if ( addToRelations ) {
         Incidence * inc;
-        QPtrList<Incidence> Relations = relations();
+        Q3PtrList<Incidence> Relations = relations();
         for (inc=Relations.first();inc;inc=Relations.next()) {
             inc->addCategories( categories, true );
         } 
     }
 }
 
@@ -459,13 +461,13 @@ void Incidence::setCategories(const QStringList &categories, bool setForRelation
   if (mReadOnly) return;
   mCategories = categories;
   checkCategories();
   updated();
   if ( setForRelations ) {
       Incidence * inc;
-      QPtrList<Incidence> Relations = relations();
+      Q3PtrList<Incidence> Relations = relations();
       for (inc=Relations.first();inc;inc=Relations.next()) {
           inc->setCategories( categories, true );
       } 
   }
 }
 
@@ -547,21 +549,21 @@ void Incidence::setRelatedTo(Incidence *relatedTo)
 
 Incidence *Incidence::relatedTo() const
 {
   return mRelatedTo;
 }
 
-QPtrList<Incidence> Incidence::relations() const
+Q3PtrList<Incidence> Incidence::relations() const
 {
   return mRelations;
 }
 
-void Incidence::addRelationsToList(QPtrList<Incidence> *rel)
+void Incidence::addRelationsToList(Q3PtrList<Incidence> *rel)
 {
     Incidence* inc;
-    QPtrList<Incidence> Relations = relations();
+    Q3PtrList<Incidence> Relations = relations();
     for (inc=Relations.first();inc;inc=Relations.next()) {
         inc->addRelationsToList( rel );
     } 
     if ( rel->findRef( this ) == -1 ) 
         rel->append( this );
 }
@@ -644,21 +646,21 @@ void Incidence::deleteAttachments(const QString& mime)
       mAttachments.remove();
     else
       at = mAttachments.next();
   }
 }
 
-QPtrList<Attachment> Incidence::attachments() const
+Q3PtrList<Attachment> Incidence::attachments() const
 {
   return mAttachments;
 }
 
-QPtrList<Attachment> Incidence::attachments(const QString& mime) const
+Q3PtrList<Attachment> Incidence::attachments(const QString& mime) const
 {
-  QPtrList<Attachment> attachments;
-  QPtrListIterator<Attachment> it( mAttachments );
+  Q3PtrList<Attachment> attachments;
+  Q3PtrListIterator<Attachment> it( mAttachments );
   Attachment *at;
   while ( (at = it.current()) ) {
     if (at->mimeType() == mime)
       attachments.append(at);
     ++it;
   }
@@ -734,13 +736,13 @@ QStringList Incidence::secrecyList()
   list << secrecyName(SecrecyConfidential);
 
   return list;
 }
 
 
-QPtrList<Alarm> Incidence::alarms() const
+Q3PtrList<Alarm> Incidence::alarms() const
 {
   return mAlarms;
 }
 
 Alarm* Incidence::newAlarm()
 {
@@ -768,13 +770,13 @@ void Incidence::clearAlarms()
   updated();
 }
 
 bool Incidence::isAlarmEnabled() const
 {
   Alarm* alarm;
-  for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
+  for (Q3PtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
     if (alarm->enabled())
       return true;
   }
   return false;
 }
 #include <stdlib.h>
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index f89942f..2940129 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -22,13 +22,15 @@
 //
 // Incidence - base class of calendaring components
 //
 
 #include <qdatetime.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include "recurrence.h"
 #include "alarm.h"
 #include "attachment.h"
 #include "listbase.h"
 #include "incidencebase.h"
@@ -110,13 +112,13 @@ class Incidence : public IncidenceBase
       </pre>
     */
     virtual bool accept(Visitor &) { return false; }
 
     virtual Incidence *clone() = 0;
     virtual void cloneRelations( Incidence * );
-    void addRelationsToList(QPtrList<Incidence> *rel);
+    void addRelationsToList(Q3PtrList<Incidence> *rel);
     void clearRelations();
     virtual QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const = 0;
     void setReadOnly( bool );
 
     /**
       Recreate event. The event is made a new unique event, but already stored
@@ -174,13 +176,13 @@ class Incidence : public IncidenceBase
     /** point at some other event to which the event relates */
     void setRelatedTo(Incidence *relatedTo);
     void resetRelatedTo();
     /** what event does this one relate to? */
     Incidence *relatedTo() const;
     /** All events that are related to this event */
-    QPtrList<Incidence> relations() const;
+    Q3PtrList<Incidence> relations() const;
     /** Add an event which is related to this event */
     void addRelation(Incidence *);
     /** Remove event that is related to this event */
     void removeRelation(Incidence *);
 
     /** returns the list of dates which are exceptions to the recurrence rule */
@@ -199,15 +201,15 @@ class Incidence : public IncidenceBase
     void addAttachment(Attachment *attachment);
     /** remove and delete a specific attachment */
     void deleteAttachment(Attachment *attachment);
     /** remove and delete all attachments with this mime type */
     void deleteAttachments(const QString& mime);
     /** return list of all associated attachments */
-    QPtrList<Attachment> attachments() const;
+    Q3PtrList<Attachment> attachments() const;
     /** find a list of attachments with this mime type */
-    QPtrList<Attachment> attachments(const QString& mime) const;
+    Q3PtrList<Attachment> attachments(const QString& mime) const;
 
     /** sets the event's status the value specified.  See the enumeration
      * above for possible values. */
     void setSecrecy(int);
     /** return the event's secrecy. */
     int secrecy() const;
@@ -232,13 +234,13 @@ class Incidence : public IncidenceBase
     /** set the event's priority, 0 is undefined, 1 highest (decreasing order) */
     void setPriority(int priority);
     /** get the event's priority */
     int priority() const;
 
     /** All alarms that are associated with this incidence */
-    QPtrList<Alarm> alarms() const;
+    Q3PtrList<Alarm> alarms() const;
     /** Create a new alarm which is associated with this incidence */
     Alarm* newAlarm();
     /** Add an alarm which is associated with this incidence */
     void addAlarm(Alarm*);
     /** Remove an alarm that is associated with this incidence */
     void removeAlarm(Alarm*);
@@ -285,14 +287,14 @@ class Incidence : public IncidenceBase
     void setLastModifiedSubInvalid();
     
     virtual QString durationText();
     QString durationText4Time( int secs );
     Recurrence *mRecurrence;
 protected:
-    QPtrList<Alarm> mAlarms;
-    QPtrList<Incidence> mRelations;
+    Q3PtrList<Alarm> mAlarms;
+    Q3PtrList<Incidence> mRelations;
     QDateTime mRecurrenceID;
     bool mHasRecurrenceID;
   private:
     void checkCategories();
     QString mLastModifiedSubSortKey;
     bool mHoliday, mBirthday, mAnniversary;
@@ -305,13 +307,13 @@ protected:
     QString mDescription;
     QString mSummary;
     QStringList mCategories;
     Incidence *mRelatedTo;
     QString mRelatedToUid;
     DateList mExDates;
-    QPtrList<Attachment> mAttachments;
+    Q3PtrList<Attachment> mAttachments;
     QStringList mResources;
     bool mHasStartDate;                  // if todo has associated start date
 
     int mSecrecy;
     int mPriority;                        // 1 = highest, 2 = less, etc.
 
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 56c0560..f11ec54 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -24,12 +24,14 @@
 #include <kidmanager.h>
 
 #include "calformat.h"
 #include "syncdefines.h"
 
 #include "incidencebase.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 using namespace KCal;
 
 IncidenceBase::IncidenceBase() :
   mReadOnly(false), mFloats(true), mDuration(0), mHasDuration(false),
   mPilotId(0), mSyncStatus(SYNCMOD)
@@ -61,13 +63,13 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   mHasDuration = i.mHasDuration;
   mOrganizer = i.mOrganizer;
   mUid = i.mUid;
   mCalEnabled = i.mCalEnabled;
   mAlarmEnabled = i.mAlarmEnabled;
   mCalID = i.mCalID;
-  QPtrList<Attendee> attendees = i.attendees();
+  Q3PtrList<Attendee> attendees = i.attendees();
   for( Attendee *a = attendees.first(); a; a = attendees.next() ) {
     mAttendees.append( new Attendee( *a ) );
   }
   mFloats = i.mFloats;
   mLastModified = i.mLastModified;
   mPilotId = i.mPilotId;
@@ -297,13 +299,13 @@ void IncidenceBase::setFloats(bool f)
 bool IncidenceBase::addAttendee(Attendee *a, bool doupdate)
 {
   if (mReadOnly) return false;
   if (a->name().left(7).upper() == "MAILTO:")
     a->setName(a->name().remove(0,7));
 
-  QPtrListIterator<Attendee> qli(mAttendees);
+  Q3PtrListIterator<Attendee> qli(mAttendees);
   
   qli.toFirst();
   while (qli) {
       if (*qli.current() == *a)
           return false;
       ++qli;
@@ -340,13 +342,13 @@ void IncidenceBase::clearAttendees()
   mAttendees.clear();
 }
 
 #if 0
 Attendee *IncidenceBase::getAttendee(const char *n) const
 {
-  QPtrListIterator<Attendee> qli(mAttendees);
+  Q3PtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
     if (qli.current()->getName() == n)
       return qli.current();
     ++qli;
@@ -354,26 +356,26 @@ Attendee *IncidenceBase::getAttendee(const char *n) const
   return 0L;
 }
 #endif
 
 Attendee *IncidenceBase::attendeeByMail(const QString &email)
 {
-  QPtrListIterator<Attendee> qli(mAttendees);
+  Q3PtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
       if (qli.current()->email().lower() == email.lower())
       return qli.current();
     ++qli;
   }
   return 0L;
 }
 
 Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QString& email)
 {
-  QPtrListIterator<Attendee> qli(mAttendees);
+  Q3PtrListIterator<Attendee> qli(mAttendees);
 
   QStringList mails = emails;
   if (!email.isEmpty()) {
     mails.append(email);
   }
   qli.toFirst();
@@ -488,13 +490,13 @@ void IncidenceBase::unRegisterObserver( IncidenceBase::Observer *observer )
 {
   mObservers.remove( observer );
 }
 
 void IncidenceBase::updated()
 {
-  QPtrListIterator<Observer> it(mObservers);
+  Q3PtrListIterator<Observer> it(mObservers);
   while( it.current() ) {
     Observer *o = it.current();
     ++it;
     o->incidenceUpdated( this );
   }
 }
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 3edc03b..d97f524 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -22,21 +22,23 @@
 //
 // Incidence - base class of calendaring components
 //
 
 #include <qdatetime.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qptrlist.h>
+#include <q3valuelist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "customproperties.h"
 #include "attendee.h"
 
 namespace KCal {
 
-typedef QValueList<QDate> DateList;
+typedef Q3ValueList<QDate> DateList;
  enum IncTypeID { eventID,todoID,journalID,freebusyID };
 
 /**
   This class provides the base class common to all calendar components.
 */
 class IncidenceBase : public CustomProperties
@@ -48,13 +50,13 @@ class IncidenceBase : public CustomProperties
     };
 
     IncidenceBase();
     IncidenceBase(const IncidenceBase &);
     virtual ~IncidenceBase();
 
-    virtual QCString type() const = 0;
+    virtual Q3CString type() const = 0;
     virtual  IncTypeID typeID() const = 0;
 
     /** Set the unique id for the event */
     void setUid(const QString &);
     /** Return the unique id for the event */
     QString uid() const;
@@ -106,13 +108,13 @@ class IncidenceBase : public CustomProperties
     bool addAttendee(Attendee *a, bool doupdate=true );
 //    void removeAttendee(Attendee *a);
 //    void removeAttendee(const char *n);
     /** Remove all Attendees. */
     void clearAttendees();
     /** Return list of attendees. */
-    QPtrList<Attendee> attendees() const { return mAttendees; };
+    Q3PtrList<Attendee> attendees() const { return mAttendees; };
     /** Return number of attendees. */
     int attendeeCount() const { return mAttendees.count(); };
     /** Return the Attendee with this email */
     Attendee* attendeeByMail(const QString &);
     /** Return first Attendee with one of this emails */
     Attendee* attendeeByMails(const QStringList &, const QString& email = QString::null);
@@ -165,26 +167,26 @@ class IncidenceBase : public CustomProperties
     QString mLastModifiedKey;
     QString mUid;
     int mCalID;
     bool mCalEnabled;
     bool mAlarmEnabled;
     QDateTime mLastModified;
-    QPtrList<Attendee> mAttendees;
+    Q3PtrList<Attendee> mAttendees;
 
     bool mFloats;
 
     int mDuration;
     bool mHasDuration;
     QString  mExternalId;
     int mTempSyncStat;
 
     // PILOT SYNCHRONIZATION STUFF
     int mPilotId;                         // unique id for pilot sync
     int mSyncStatus;                      // status (for sync)
 
-    QPtrList<Observer> mObservers;
+    Q3PtrList<Observer> mObservers;
 };
 
 bool operator==( const IncidenceBase&, const IncidenceBase& );
 }
 
 #endif
diff --git a/libkcal/journal.h b/libkcal/journal.h
index 1cd0a22..c83356f 100644
--- a/libkcal/journal.h
+++ b/libkcal/journal.h
@@ -21,25 +21,27 @@
 #define JOURNAL_H
 //
 // Journal component, representing a VJOURNAL object
 //
 
 #include "incidence.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace KCal {
 
 /**
   This class provides a Journal in the sense of RFC2445.
 */
 class Journal : public Incidence
 {
   public:
     Journal();
     ~Journal();
 
-    QCString type() const { return "Journal"; }
+    Q3CString type() const { return "Journal"; }
     IncTypeID typeID() const { return journalID; }
     
     Incidence *clone();  
     QDateTime getNextAlarmDateTime( bool * ok, int * offset ,QDateTime start_dt ) const;
 private:
     bool accept(Visitor &v) { return v.visit(this); }
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 733b897..bce68b0 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -1,12 +1,14 @@
 #include "kincidenceformatter.h"
 #include <kstaticdeleter.h>
 #include <kglobal.h>
 #include <klocale.h>
 #ifdef DEKTOP_VERSION
 #include <kabc/stdaddressbook.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #define size count
 #endif
 
 KIncidenceFormatter* KIncidenceFormatter::mInstance = 0;
 static KStaticDeleter<KIncidenceFormatter> insd;
 
@@ -307,13 +309,13 @@ void KIncidenceFormatter::formatCategories(Incidence *event)
      addTag("p",i18n("<b>Categories: </b>")+event->categoriesStrWithSpace() );
      //mText.append(event->categoriesStr());
  }
 }
 void KIncidenceFormatter::addTag(const QString & tag,const QString & text)
 {
-  int number=text.contains("\n");
+  int number=text.count("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1) 
         {
             if (number > 0) {
@@ -336,13 +338,13 @@ void KIncidenceFormatter::addTag(const QString & tag,const QString & text)
             mText.append(str);
         }
 }
 
 void KIncidenceFormatter::formatAttendees(Incidence *event)
 {
- QPtrList<Attendee> attendees = event->attendees();
+ Q3PtrList<Attendee> attendees = event->attendees();
     if (attendees.count()) {
         QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small);
         QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small);
         addTag("h3",i18n("Organizer"));
         mText.append("<ul><li>");
 #if 0
@@ -359,13 +361,13 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
         } else {
             mText.append(event->organizer());
         }
 #else
         mText.append(event->organizer());
 #endif
-        if (iconPath) {
+        if (!iconPath.isEmpty()) {
             mText += " <a href=\"mailto:" + event->organizer() + "\">";
             mText += "<IMG src=\"" + iconPath + "\">";
             mText += "</a>\n";
         }
         mText.append("</li></ul>");
 
@@ -399,13 +401,13 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
             if (!a->name().isEmpty()) mText += a->name();
             else mText += a->email();
             mText += "</a>\n";
 #endif
 
             if (!a->email().isEmpty()) {
-                if (iconPath) {
+                if (!iconPath.isEmpty()) {
                     mText += "<a href=\"mailto:" + a->name() +" "+ "<" + a->email() + ">" + "\">"; 
                     if ( a->RSVP() )
                         mText += "<IMG src=\"" + iconPath + "\">";
                     else
                         mText += "<IMG src=\"" + NOiconPath + "\">";
                     mText += "</a>\n";
diff --git a/libkcal/libkcal.pro b/libkcal/libkcal.pro
index 33c63c3..1f43b10 100644
--- a/libkcal/libkcal.pro
+++ b/libkcal/libkcal.pro
@@ -1,9 +1,9 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on
-        TARGET  = microkcal
+        TARGET  = xmicrokcal
 
 include( ../variables.pri )
 
 INCLUDEPATH += ../libkdepim ../microkde  versit ../microkde/kdecore
 #../qtcompat
 INCLUDEPATH += ../libical/src/libical
@@ -103,6 +103,10 @@ dndfactory.cpp \
  vcaldrag.cpp \
  vcalformat.cpp \
  versit/vcc.c \
  versit/vobject.c \
  phoneformat.cpp \
 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+QT +=  
diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro
index 737be53..fe46656 100644
--- a/libkcal/libkcalE.pro
+++ b/libkcal/libkcalE.pro
@@ -1,9 +1,9 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on
-        TARGET  = microkcal
+        TARGET  = xmicrokcal
 
 INCLUDEPATH += ../libkdepim ../microkde ../qtcompat versit ../microkde/kdecore $(QPEDIR)/include
 INCLUDEPATH += ../libical/src/libical
 INCLUDEPATH += ../libical/src/libicalss
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
diff --git a/libkcal/listbase.h b/libkcal/listbase.h
index 085b13d..6c942ef 100644
--- a/libkcal/listbase.h
+++ b/libkcal/listbase.h
@@ -18,70 +18,72 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef KCAL_LISTBASE_H
 #define KCAL_LISTBASE_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 namespace KCal {
     class Event;
     class Todo;
 /**
   This class provides a template for lists of pointers. It extends QValueList<T
   *> by auto delete funtionality known from QPtrList.
 */
 template<class T> 
-class ListBase : public QValueList<T *>
+class ListBase : public Q3ValueList<T *>
 {
   public:
     ListBase()
-      : QValueList<T *>(), mAutoDelete( false )
+      : Q3ValueList<T *>(), mAutoDelete( false )
     {
     }
 
     ListBase( const ListBase &l )
-      : QValueList<T *>( l ), mAutoDelete( false )
+      : Q3ValueList<T *>( l ), mAutoDelete( false )
     {
     }
 
     ~ListBase()
     {
       if ( mAutoDelete ) {
-        QValueListIterator<T *> it;
-        for( it = QValueList<T*>::begin(); it != QValueList<T*>::end(); ++it ) {
+        Q3ValueListIterator<T *> it;
+        for( it = Q3ValueList<T*>::begin(); it != Q3ValueList<T*>::end(); ++it ) {
           delete *it;
         }
       }
     }
 
     ListBase &operator=( const ListBase &l )
     {
       if ( this == &l ) return *this;
-      QValueList<T *>::operator=( l );
+      Q3ValueList<T *>::operator=( l );
       return *this;
     }
 
     void setAutoDelete( bool autoDelete )
     {
       mAutoDelete = autoDelete;
     }
 
     bool removeRef( T *t )
     {
-      QValueListIterator<T *> it = find( t );
-      if ( it == QValueList<T*>::end() ) {
+      Q3ValueListIterator<T *> it = find( t );
+      if ( it == Q3ValueList<T*>::end() ) {
         return false;
       } else {
         if ( mAutoDelete ) delete t;
         remove( it );
         return true;
       }
     }
-    void fill ( QPtrList<T> list ) {
-        QPtrListIterator<T> it (list);
+    void fill ( Q3PtrList<T> list ) {
+        Q3PtrListIterator<T> it (list);
         T *item;
         while ( (item = it.current()) != 0 ) {
             append( item );
             ++it;
         }
         
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 900fc04..794e4b4 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -19,21 +19,22 @@
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qapplication.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qdir.h>
 #include <qlabel.h>
+#include <QDesktopWidget>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <phoneaccess.h>
@@ -198,13 +199,13 @@ ulong PhoneFormat::getCsumEvent( Event* event )
             list.append( "2" );
             list.append( QString::number( rec->frequency()) );//12
            
             writeEndDate = true; 
             {
                 int count = 1;
-                QPtrList<Recurrence::rMonthPos> rmp;
+                Q3PtrList<Recurrence::rMonthPos> rmp;
                 rmp = rec->monthPositions();
                 if ( rmp.first()->negative )
                     count = 5 - rmp.first()->rPos - 1;
                 else
                     count = rmp.first()->rPos - 1;
                 list.append( QString::number( count ) );
@@ -238,13 +239,13 @@ ulong PhoneFormat::getCsumEvent( Event* event )
             break;
         }
     if  ( writeEndDate ) {
         
         if ( rec->endDate().isValid() ) { // 15 + 16
             list.append( "1" );
-            list.append( PhoneParser::dtToString( rec->endDate()) );
+            list.append( PhoneParser::dtToString( (QDateTime)rec->endDate()) );
         } else {
             list.append( "0" );
             list.append( "20991231T000000" );
         }
         
     }
@@ -302,13 +303,13 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
     VCalFormat vfload;
     vfload.setLocalTime ( true ); 
     qDebug("loading file ..."); 
 
     if ( ! vfload.load( calendar, fileName ) )
         return false;
-    QPtrList<Event> er = calendar->rawEvents();
+    Q3PtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     qDebug("reading events... "); 
     while ( ev ) {
         QStringList cat = ev->categories();
         if ( cat.contains( "MeetingDEF" )) {
             ev->setCategories( QStringList() );
@@ -337,13 +338,13 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
         event->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
         event->setID( mProfileName,QString::number( id ) );
         ev =  er.next();
     }
     {
         qDebug("reading todos... "); 
-        QPtrList<Todo> tr = calendar->rawTodos();
+        Q3PtrList<Todo> tr = calendar->rawTodos();
         Todo* ev = tr.first();  
         while ( ev ) {
 
             QStringList cat = ev->categories();
             if ( cat.contains( "MeetingDEF" )) {
                 ev->setCategories( QStringList() );
@@ -462,13 +463,13 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
     else if (to->priority() == 4 && from->priority() == 5 )
         ;
     else
         to->setPriority(from->priority());
 
 }
-#include <qcstring.h>
+#include <q3cstring.h>
 
 void PhoneFormat::afterSave( Incidence* inc,const QString& id ,const QString& csum)
 {
     inc->setID( mProfileName, id );
     inc->setCsum( mProfileName, csum);
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
@@ -494,24 +495,24 @@ bool PhoneFormat::writeToPhone( Calendar *  calendar)
 }
 bool PhoneFormat::save( Calendar *calendar)
 {
    
 
     // 1 remove events which should be deleted
-    QPtrList<Event> er = calendar->rawEvents();
+    Q3PtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     while ( ev ) {
         if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { 
             calendar->deleteEvent( ev );
         } else {
 
         }
         ev =  er.next();
     }
     //  2 remove todos which should be deleted
-    QPtrList<Todo> tl = calendar->rawTodos(); 
+    Q3PtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     while ( to ) {
         if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
             calendar->deleteTodo( to );   
         } else {
             if ( to->isCompleted()) {
@@ -549,13 +550,13 @@ bool PhoneFormat::save( Calendar *calendar)
     // 6 compare data
 
 //algo 6 compare event
     er = calendar->rawEvents();
     ev = er.first(); 
     message = i18n(" Comparing event # ");
-    QPtrList<Event> er1 = calendarTemp->rawEvents();
+    Q3PtrList<Event> er1 = calendarTemp->rawEvents();
     Event* ev1; 
     int procCount = 0;
     while ( ev ) {
         //qDebug("event new ID %s",ev->summary().latin1()); 
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
@@ -577,13 +578,13 @@ bool PhoneFormat::save( Calendar *calendar)
         ev =  er.next();
     }
     //algo 6 compare todo
     tl = calendar->rawTodos(); 
     to = tl.first();
     procCount = 0;
-    QPtrList<Todo> tl1 = calendarTemp->rawTodos(); 
+    Q3PtrList<Todo> tl1 = calendarTemp->rawTodos(); 
     Todo* to1 ;
     message = i18n(" Comparing todo # ");
     while ( to  ) {
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             Todo* to1 = tl1.first(); 
diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp
index 0a4a031..2dfe1a4 100644
--- a/libkcal/qtopiaformat.cpp
+++ b/libkcal/qtopiaformat.cpp
@@ -18,17 +18,17 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qxml.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 
 #include "calendar.h"
@@ -306,18 +306,18 @@ bool QtopiaFormat::save( Calendar *calendar, const QString &fileName )
 
   if ( text.isNull() ) return false;
 
   // TODO: write backup file
 
   QFile file( fileName );
-  if (!file.open( IO_WriteOnly ) ) {
+  if (!file.open( QIODevice::WriteOnly ) ) {
     setException(new ErrorFormat(ErrorFormat::SaveError,
                  i18n("Could not open file '%1'").arg(fileName)));
     return false;
   }
-  QTextStream ts( &file );
+  Q3TextStream ts( &file );
   ts << text;
   file.close();
 
   return true;
 }
 
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 6ee5499..9a4e540 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -26,12 +26,15 @@
 #include <kglobal.h>
 #include <klocale.h>
 
 #include "incidence.h"
 
 #include "recurrence.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 using namespace KCal;
 
 Recurrence::Feb29Type Recurrence::mFeb29YearlyDefaultType = Recurrence::rMar1;
 
 
@@ -53,13 +56,13 @@ Recurrence::Recurrence(Incidence *parent, int compatVersion)
   rYearNums.setAutoDelete( true );
 }
 
 Recurrence::Recurrence(const Recurrence &r, Incidence *parent)
 : recurs(r.recurs),
   rWeekStart(r.rWeekStart),
-  rDays(r.rDays.copy()),
+  rDays(r.rDays),
   rFreq(r.rFreq),
   rDuration(r.rDuration),
   rEndDateTime(r.rEndDateTime),
   mRecurStart(r.mRecurStart),
   mFloats(r.mFloats),
   mRecurReadOnly(r.mRecurReadOnly),
@@ -67,25 +70,25 @@ Recurrence::Recurrence(const Recurrence &r, Incidence *parent)
   mFeb29YearlyType(r.mFeb29YearlyType),
   mCompatVersion(r.mCompatVersion),
   mCompatRecurs(r.mCompatRecurs),
   mCompatDuration(r.mCompatDuration),
   mParent(parent)
 {
-  for (QPtrListIterator<rMonthPos> mp(r.rMonthPositions);  mp.current();  ++mp) {
+  for (Q3PtrListIterator<rMonthPos> mp(r.rMonthPositions);  mp.current();  ++mp) {
     rMonthPos *tmp = new rMonthPos;
     tmp->rPos     = mp.current()->rPos;
     tmp->negative = mp.current()->negative;
-    tmp->rDays    = mp.current()->rDays.copy();
+    tmp->rDays    = mp.current()->rDays;
     rMonthPositions.append(tmp);
   }
-  for (QPtrListIterator<int> md(r.rMonthDays);  md.current();  ++md) {
+  for (Q3PtrListIterator<int> md(r.rMonthDays);  md.current();  ++md) {
     int *tmp = new int;
     *tmp = *md.current();
     rMonthDays.append(tmp);
   }
-  for (QPtrListIterator<int> yn(r.rYearNums);  yn.current();  ++yn) {
+  for (Q3PtrListIterator<int> yn(r.rYearNums);  yn.current();  ++yn) {
     int *tmp = new int;
     *tmp = *yn.current();
     rYearNums.append(tmp);
   }
   rMonthDays.setAutoDelete( true );
   rMonthPositions.setAutoDelete( true );
@@ -121,52 +124,52 @@ bool Recurrence::operator==( const Recurrence& r2 ) const
   switch ( recurs )
   {
     case rWeekly:
       return rDays == r2.rDays
       &&     rWeekStart == r2.rWeekStart;
   case rMonthlyPos: {
-      QPtrList<rMonthPos> MonthPositions = rMonthPositions;
-      QPtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
+      Q3PtrList<rMonthPos> MonthPositions = rMonthPositions;
+      Q3PtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
       if ( !MonthPositions.count() )
           return false;
       if ( !MonthPositions2.count() )
           return false;
       return MonthPositions.first()->rPos == MonthPositions2.first()->rPos;
   }
   case rMonthlyDay: {
-      QPtrList<int> MonthDays = rMonthDays ; 
-      QPtrList<int> MonthDays2 = r2.rMonthDays ;  
+      Q3PtrList<int> MonthDays = rMonthDays ; 
+      Q3PtrList<int> MonthDays2 = r2.rMonthDays ;  
       if ( !MonthDays.count() )
           return false;
       if ( !MonthDays2.count() )
           return false; 
       return *MonthDays.first() == *MonthDays2.first() ;
   }
   case rYearlyPos: {
 
-      QPtrList<int> YearNums = rYearNums;
-      QPtrList<int> YearNums2 = r2.rYearNums;
+      Q3PtrList<int> YearNums = rYearNums;
+      Q3PtrList<int> YearNums2 = r2.rYearNums;
       if ( *YearNums.first() != *YearNums2.first() )
           return false;
-      QPtrList<rMonthPos> MonthPositions = rMonthPositions;
-      QPtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
+      Q3PtrList<rMonthPos> MonthPositions = rMonthPositions;
+      Q3PtrList<rMonthPos> MonthPositions2 = r2.rMonthPositions;
       if ( !MonthPositions.count() )
           return false;
       if ( !MonthPositions2.count() )
           return false;
       return MonthPositions.first()->rPos == MonthPositions2.first()->rPos;
      
   }
   case rYearlyMonth: {
-      QPtrList<int> YearNums = rYearNums;
-      QPtrList<int> YearNums2 = r2.rYearNums;
+      Q3PtrList<int> YearNums = rYearNums;
+      Q3PtrList<int> YearNums2 = r2.rYearNums;
       return ( *YearNums.first() == *YearNums2.first()  && mFeb29YearlyType == r2.mFeb29YearlyType);
   }
       case rYearlyDay: {
-      QPtrList<int> YearNums = rYearNums;
-      QPtrList<int> YearNums2 = r2.rYearNums;
+      Q3PtrList<int> YearNums = rYearNums;
+      Q3PtrList<int> YearNums2 = r2.rYearNums;
       return ( *YearNums.first() == *YearNums2.first() );
       }
     case rNone:
     case rMinutely:
     case rHourly:
     case rDaily:
@@ -354,13 +357,13 @@ QDateTime Recurrence::endDateTime() const
     {
     case rMinutely:
       return mRecurStart.addSecs((rDuration-1+mRecurExDatesCount)*rFreq*60);
     case rHourly:
       return mRecurStart.addSecs((rDuration-1+mRecurExDatesCount)*rFreq*3600);
     case rDaily:
-      return dStart.addDays((rDuration-1+mRecurExDatesCount)*rFreq);
+      return (QDateTime)dStart.addDays((rDuration-1+mRecurExDatesCount)*rFreq);
 
     case rWeekly:
       count = weeklyCalc(END_DATE_AND_COUNT, end);
       break;
     case rMonthlyPos:
     case rMonthlyDay:
@@ -503,23 +506,23 @@ QString Recurrence::endDateStr(bool shortfmt) const
 
 const QBitArray &Recurrence::days() const
 {
   return rDays;
 }
 
-const QPtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const
+const Q3PtrList<Recurrence::rMonthPos> &Recurrence::monthPositions() const
 {
   return rMonthPositions;
 }
 
-const QPtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const
+const Q3PtrList<Recurrence::rMonthPos> &Recurrence::yearMonthPositions() const
 {
   return rMonthPositions;
 }
 
-const QPtrList<int> &Recurrence::monthDays() const
+const Q3PtrList<int> &Recurrence::monthDays() const
 {
   return rMonthDays;
 }
 
 void Recurrence::setMinutely(int _rFreq, int _rDuration)
 {
@@ -756,13 +759,13 @@ void Recurrence::setYearlyByDate(Feb29Type type, int _rFreq, const QDate &_rEndD
 void Recurrence::addYearlyMonthPos(short _rPos, const QBitArray &_rDays)
 {
   if (recurs == rYearlyPos)
     addMonthlyPos_(_rPos, _rDays);
 }
 
-const QPtrList<int> &Recurrence::yearNums() const
+const Q3PtrList<int> &Recurrence::yearNums() const
 {
   return rYearNums;
 }
 void Recurrence::addYearlyMonth(short _rPos )
 { 
     if (mRecurReadOnly  ||  recurs != rYearlyMonth)    // invalid day/month number
@@ -1044,19 +1047,19 @@ bool Recurrence::recursMonthly(const QDate &qd) const
     // The date is in a month which recurs
     if (qd >= dStart
     &&  ((rDuration > 0 && qd <= endDate()) ||
          (rDuration == 0 && qd <= rEndDateTime.date()) ||
          rDuration == -1)) {
       // The date queried falls within the range of the event.
-      QValueList<int> days;
+      Q3ValueList<int> days;
       int daysInMonth = qd.daysInMonth();
       if (recurs == rMonthlyDay)
         getMonthlyDayDays(days, daysInMonth);
       else if (recurs == rMonthlyPos)
         getMonthlyPosDays(days, daysInMonth, QDate(year, month, 1).dayOfWeek());
-      for (QValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
+      for (Q3ValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
         if (*it == day)
           return true;
       }
       // no dates matched
     }
   }
@@ -1098,13 +1101,13 @@ bool Recurrence::recursYearlyByMonth(const QDate &qd) const
       if (qd >= dStart
       &&  ((rDuration > 0 && qd <= endDate()) ||
            (rDuration == 0 && qd <= rEndDateTime.date()) ||
            rDuration == -1)) {
         // The date queried falls within the range of the event.
         int i = qmonth;
-        for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
+        for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
           if (i == *qlin.current())
             return true;
         }
       }
     }
   }
@@ -1124,18 +1127,18 @@ bool Recurrence::recursYearlyByPos(const QDate &qd) const
     // The date is in a year which recurs
     if (qd >= dStart
     &&  ((rDuration > 0 && qd <= endDate()) ||
          (rDuration == 0 && qd <= rEndDateTime.date()) ||
          rDuration == -1)) {
       // The date queried falls within the range of the event.
-      for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
+      for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
         if (month == *qlin.current()) {
           // The month recurs
-          QValueList<int> days;
+          Q3ValueList<int> days;
           getMonthlyPosDays(days, qd.daysInMonth(), QDate(year, month, 1).dayOfWeek());
-          for (QValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
+          for (Q3ValueList<int>::Iterator it = days.begin();  it != days.end();  ++it) {
             if (*it == day)
               return true;
           }
         }
       }
     }
@@ -1154,13 +1157,13 @@ bool Recurrence::recursYearlyByDay(const QDate &qd) const
     if (qd >= dStart
     &&  ((rDuration > 0 && qd <= endDate()) ||
          (rDuration == 0 && qd <= rEndDateTime.date()) ||
          rDuration == -1)) {
       // The date queried falls within the range of the event.
       int i = qd.dayOfYear();
-      for (QPtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
+      for (Q3PtrListIterator<int> qlin(rYearNums); qlin.current(); ++qlin) {
         if (i == *qlin.current())
           return true;
       }
     }
   }
   return false;
@@ -1546,13 +1549,13 @@ int Recurrence::recurCalc(PeriodFunc func, QDate &enddate) const
   }
 
   switch (func) {
     case END_DATE_AND_COUNT:
     case NEXT_AFTER_DATE:
       if (count == 0)
-        endtime = QDate();
+        endtime = QDateTime();
       else if (timed)
         enddate = endtime.date();
       break;
     case COUNT_TO_DATE:
       break;
   }
@@ -1790,30 +1793,30 @@ struct Recurrence::MonthlyData {
     const Recurrence *recurrence;
     int               year;          // current year
     int               month;         // current month 0..11
     int               day;           // current day of month 1..31
     bool              varies;        // true if recurring days vary between different months
   private:
-    QValueList<int>   days28, days29, days30, days31;   // recurring days in months of each length
-    QValueList<int>  *recurDays[4];
+    Q3ValueList<int>   days28, days29, days30, days31;   // recurring days in months of each length
+    Q3ValueList<int>  *recurDays[4];
   public:
     MonthlyData(const Recurrence* r, const QDate &date)
              : recurrence(r), year(date.year()), month(date.month()-1), day(date.day())
              { recurDays[0] = &days28;
                recurDays[1] = &days29;
                recurDays[2] = &days30;
                recurDays[3] = &days31;
                varies = (recurrence->recurs == rMonthlyPos)
                         ? true : recurrence->getMonthlyDayDays(days31, 31);
              }
-    const QValueList<int>* dayList() const {
+    const Q3ValueList<int>* dayList() const {
             if (!varies)
               return &days31;
             QDate startOfMonth(year, month + 1, 1);
             int daysInMonth = startOfMonth.daysInMonth();
-            QValueList<int>* days = recurDays[daysInMonth - 28];
+            Q3ValueList<int>* days = recurDays[daysInMonth - 28];
             if (recurrence->recurs == rMonthlyPos)
               recurrence->getMonthlyPosDays(*days, daysInMonth, startOfMonth.dayOfWeek());
             else if (days->isEmpty())
               recurrence->getMonthlyDayDays(*days, daysInMonth);
             return days;
     }
@@ -1841,14 +1844,14 @@ int Recurrence::monthlyCalc(PeriodFunc func, QDate &enddate) const
 }
 
 int Recurrence::monthlyCalcEndDate(QDate &enddate, MonthlyData &data) const
 {
   uint countTogo = rDuration + mRecurExDatesCount;
   int  countGone = 0;
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* days = data.dayList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* days = data.dayList();
 
   if (data.day > 1) {
     // Check what remains of the start month
     for (it = days->begin();  it != days->end();  ++it) {
       if (*it >= data.day) {
         ++countGone;
@@ -1907,14 +1910,14 @@ int Recurrence::monthlyCalcToDate(const QDate &enddate, MonthlyData &data) const
   int countGone = 0;
   int countMax  = (rDuration > 0) ? rDuration + mRecurExDatesCount : INT_MAX;
   int endYear  = enddate.year();
   int endMonth = enddate.month() - 1;     // zero-based
   int endDay   = enddate.day();
   int endYearMonth = endYear*12 + endMonth;
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* days = data.dayList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* days = data.dayList();
 
   if (data.day > 1) {
     // Check what remains of the start month
     for (it = days->begin();  it != days->end();  ++it) {
       if (*it >= data.day) {
         if (data.yearMonth() == endYearMonth && *it > endDay)
@@ -1966,14 +1969,14 @@ int Recurrence::monthlyCalcNextAfter(QDate &enddate, MonthlyData &data) const
 {
   uint countTogo = (rDuration > 0) ? rDuration + mRecurExDatesCount : UINT_MAX;
   int countGone = 0;
   int endYear = enddate.year();
   int endDay  = enddate.day();
   int endYearMonth = endYear*12 + enddate.month() - 1;
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* days = data.dayList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* days = data.dayList();
 
   if (data.day > 1) {
     // Check what remains of the start month
     for (it = days->begin();  it != days->end();  ++it) {
       if (*it >= data.day) {
         ++countGone;
@@ -2049,23 +2052,23 @@ struct Recurrence::YearlyMonthData {
     int               year;          // current year
     int               month;         // current month 1..12
     int               day;           // current day of month 1..31
     bool              leapyear;      // true if February 29th recurs and current year is a leap year
     bool              feb29;         // true if February 29th recurs
   private:
-    QValueList<int>   months;        // recurring months in non-leap years  1..12
-    QValueList<int>   leapMonths;    // recurring months in leap years  1..12
+    Q3ValueList<int>   months;        // recurring months in non-leap years  1..12
+    Q3ValueList<int>   leapMonths;    // recurring months in leap years  1..12
   public:
     YearlyMonthData(const Recurrence* r, const QDate &date)
           : recurrence(r), year(date.year()), month(date.month()), day(date.day())
           { feb29 = recurrence->getYearlyMonthMonths(day, months, leapMonths);
             leapyear = feb29 && QDate::leapYear(year);
           }
-    const QValueList<int>* monthList() const
+    const Q3ValueList<int>* monthList() const
                          { return leapyear ? &leapMonths : &months; }
-    const QValueList<int>* leapMonthList() const  { return &leapMonths; }
+    const Q3ValueList<int>* leapMonthList() const  { return &leapMonths; }
     QDate            date() const  { return QDate(year, month, day); }
 };
 
 int Recurrence::yearlyMonthCalc(PeriodFunc func, QDate &enddate) const
 {
   if (rYearNums.isEmpty())
@@ -2085,14 +2088,14 @@ int Recurrence::yearlyMonthCalc(PeriodFunc func, QDate &enddate) const
 // Find total count and end date of an annual recurrence by date.
 // Reply = total number of occurrences.
 int Recurrence::yearlyMonthCalcEndDate(QDate &enddate, YearlyMonthData &data) const
 {
   uint countTogo = rDuration + mRecurExDatesCount;
   int  countGone = 0;
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* mons = data.monthList();   // get recurring months for this year
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* mons = data.monthList();   // get recurring months for this year
 
   if (data.month > 1) {
     // Check what remains of the start year
     for (it = mons->begin();  it != mons->end();  ++it) {
       if (*it >= data.month) {
         ++countGone;
@@ -2196,14 +2199,14 @@ int Recurrence::yearlyMonthCalcToDate(const QDate &enddate, YearlyMonthData &dat
     }
     else if (--endMonth == 0) {
       endMonth = 12;
       --endYear;
     }
   }
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* mons = data.monthList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* mons = data.monthList();
 
   if (data.month > 1) {
     // Check what remains of the start year
     for (it = mons->begin();  it != mons->end();  ++it) {
       if (*it >= data.month) {
         if (data.year == endYear && *it > endMonth)
@@ -2267,14 +2270,14 @@ int Recurrence::yearlyMonthCalcNextAfter(QDate &enddate, YearlyMonthData &data)
       feb28ok = true;
     else if (--endMonth == 0) {
       endMonth = 12;
       --endYear;
     }
   }
-  QValueList<int>::ConstIterator it;
-  const QValueList<int>* mons = data.monthList();
+  Q3ValueList<int>::ConstIterator it;
+  const Q3ValueList<int>* mons = data.monthList();
 
   if (data.month > 1) {
     // Check what remains of the start year
     for (it = mons->begin();  it != mons->end();  ++it) {
       if (*it >= data.month) {
         ++countGone;
@@ -2387,21 +2390,21 @@ struct Recurrence::YearlyPosData {
     int               month;         // current month 1..12
     int               day;           // current day of month 1..31
     int               daysPerMonth;  // number of days which recur each month, or -1 if variable
     int               count;         // number of days which recur each year, or -1 if variable
     bool              varies;        // true if number of days varies from year to year
   private:
-    mutable QValueList<int> days;
+    mutable Q3ValueList<int> days;
   public:
     YearlyPosData(const Recurrence* r, const QDate &date)
           : recurrence(r), year(date.year()), month(date.month()), day(date.day()), count(-1)
             { if ((daysPerMonth = r->countMonthlyPosDays()) > 0)
                 count = daysPerMonth * r->rYearNums.count();
               varies = (daysPerMonth < 0);
             }
-    const QValueList<int>* dayList() const {
+    const Q3ValueList<int>* dayList() const {
             QDate startOfMonth(year, month, 1);
             recurrence->getMonthlyPosDays(days, startOfMonth.daysInMonth(), startOfMonth.dayOfWeek());
             return &days;
     }
     int    yearMonth() const    { return year*12 + month - 1; }
     void   addMonths(int diff)  { month += diff - 1;  year += month / 12;  month = month % 12 + 1; }
@@ -2425,18 +2428,18 @@ int Recurrence::yearlyPosCalc(PeriodFunc func, QDate &enddate) const
 }
 
 int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const
 {
   uint countTogo = rDuration + mRecurExDatesCount;
   int  countGone = 0;
-  QValueList<int>::ConstIterator id;
-  const QValueList<int>* days;
+  Q3ValueList<int>::ConstIterator id;
+  const Q3ValueList<int>* days;
 
   if (data.month > 1 || data.day > 1) {
     // Check what remains of the start year
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       if (*im.current() >= data.month) {
         // Check what remains of the start month
         if (data.day > 1 || data.varies
         ||  static_cast<uint>(data.daysPerMonth) >= countTogo) {
           data.month = *im.current();
           days = data.dayList();
@@ -2463,13 +2466,13 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const
     data.year += rFreq;
   }
 
   if (data.varies) {
     // The number of recurrences varies from year to year.
     for ( ; ; ) {
-      for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+      for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
         data.month = *im.current();
         days = data.dayList();
         int n = days->count();
         if (static_cast<uint>(n) >= countTogo) {
           // Check the last month in the recurrence
           for (id = days->begin();  id != days->end();  ++id) {
@@ -2493,13 +2496,13 @@ int Recurrence::yearlyPosCalcEndDate(QDate &enddate, YearlyPosData &data) const
     int wholeYears = (countTogo - 1) / data.count;
     data.year += wholeYears * rFreq;
     countGone += wholeYears * data.count;
     countTogo -= wholeYears * data.count;
 
     // Check the last year in the recurrence.
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       if (static_cast<uint>(data.daysPerMonth) >= countTogo) {
         // Check the last month in the recurrence
         data.month = *im.current();
         days = data.dayList();
         for (id = days->begin();  id != days->end();  ++id) {
           ++countGone;
@@ -2528,18 +2531,18 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c
   int endDay   = enddate.day();
   if (endDay < data.day && --endMonth == 0) {
     endMonth = 12;
     --endYear;
   }
   int endYearMonth = endYear*12 + endMonth;
-  QValueList<int>::ConstIterator id;
-  const QValueList<int>* days;
+  Q3ValueList<int>::ConstIterator id;
+  const Q3ValueList<int>* days;
 
   if (data.month > 1 || data.day > 1) {
     // Check what remains of the start year
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       if (*im.current() >= data.month) {
         data.month = *im.current();
         if (data.yearMonth() > endYearMonth)
           return countGone;
         // Check what remains of the start month
         bool lastMonth = (data.yearMonth() == endYearMonth);
@@ -2573,13 +2576,13 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c
     data.year += rFreq;
   }
 
   if (data.varies) {
     // The number of recurrences varies from year to year.
     for ( ; ; ) {
-      for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+      for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
         data.month = *im.current();
         days = data.dayList();
         if (data.yearMonth() >= endYearMonth) {
           if (data.yearMonth() > endYearMonth)
             return countGone;
           // Check the last month in the recurrence
@@ -2608,13 +2611,13 @@ int Recurrence::yearlyPosCalcToDate(const QDate &enddate, YearlyPosData &data) c
       return countMax;
     if (wholeYears % rFreq)
       return countGone;      // end year isn't a recurrence year
     data.year = endYear;
 
     // Check the last year in the recurrence.
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       data.month = *im.current();
       if (data.month >= endMonth) {
         if (data.month > endMonth)
           return countGone;
         // Check the last month in the recurrence
         days = data.dayList();
@@ -2643,20 +2646,20 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons
   int endDay   = enddate.day();
   if (endDay < data.day && --endMonth == 0) {
     endMonth = 12;
     --endYear;
   }
   int endYearMonth = endYear*12 + endMonth;
-  QValueList<int>::ConstIterator id;
-  const QValueList<int>* days;
+  Q3ValueList<int>::ConstIterator id;
+  const Q3ValueList<int>* days;
 
   if (data.varies) {
     // The number of recurrences varies from year to year.
     for ( ; ; ) {
       // Check the next year
-      for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+      for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
         if (*im.current() >= data.month) {
           // Check the next month
           data.month = *im.current();
           int ended = data.yearMonth() - endYearMonth;
           days = data.dayList();
           if (ended >= 0 || data.day > 1) {
@@ -2686,13 +2689,13 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons
       data.year += rFreq;
     }
   } else {
     // The number of recurrences is the same every year.
     if (data.month > 1 || data.day > 1) {
       // Check what remains of the start year
-      for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+      for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
         if (*im.current() >= data.month) {
           // Check what remains of the start month
           data.month = *im.current();
           int ended = data.yearMonth() - endYearMonth;
           if (ended >= 0 || data.day > 1) {
             // This is the start or end month, so check each day
@@ -2731,13 +2734,13 @@ int Recurrence::yearlyPosCalcNextAfter(QDate &enddate, YearlyPosData &data) cons
       countTogo -= n;
       countGone += n;
       data.year += recurYears * rFreq;
     }
 
     // Check the last year in the recurrence
-    for (QPtrListIterator<int> im(rYearNums); im.current(); ++im) {
+    for (Q3PtrListIterator<int> im(rYearNums); im.current(); ++im) {
       data.month = *im.current();
       int ended = data.yearMonth() - endYearMonth;
       if (ended >= 0) {
         // This is the end month, so check each day
         days = data.dayList();
         for (id = days->begin();  id != days->end();  ++id) {
@@ -2805,13 +2808,13 @@ int Recurrence::yearlyDayCalcEndDate(QDate &enddate, YearlyDayData &data) const
   uint countTogo = rDuration + mRecurExDatesCount;
   int countGone = 0;
 
   if (data.day > 1) {
     // Check what remains of the start year
     bool leapOK = data.isMaxDayCount();
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       int d = *it.current();
       if (d >= data.day && (leapOK || d < 366)) {
         ++countGone;
         if (--countTogo == 0) {
           data.day = d;
           goto ex;
@@ -2843,13 +2846,13 @@ int Recurrence::yearlyDayCalcEndDate(QDate &enddate, YearlyDayData &data) const
     data.year += wholeYears * rFreq;
     countGone += wholeYears * daysPerYear;
     countTogo -= wholeYears * daysPerYear;
   }
   if (countTogo) {
     // Check the last year in the recurrence
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       ++countGone;
       if (--countTogo == 0) {
         data.day = *it.current();
         break;
       }
     }
@@ -2866,13 +2869,13 @@ int Recurrence::yearlyDayCalcToDate(const QDate &enddate, YearlyDayData &data) c
   int endYear = enddate.year();
   int endDay  = enddate.dayOfYear();
 
   if (data.day > 1) {
     // Check what remains of the start year
     bool leapOK = data.isMaxDayCount();
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       int d = *it.current();
       if (d >= data.day && (leapOK || d < 366)) {
         if (data.year == endYear && d > endDay)
           return countGone;
         if (++countGone >= countMax)
           return countMax;
@@ -2905,13 +2908,13 @@ int Recurrence::yearlyDayCalcToDate(const QDate &enddate, YearlyDayData &data) c
       return countGone;      // end year isn't a recurrence year
     data.year = endYear;
   }
 
   if (data.year <= endYear) {
     // Check the last year in the recurrence
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       if (*it.current() > endDay)
         return countGone;
       if (++countGone >= countMax)
         return countMax;
     }
   }
@@ -2925,13 +2928,13 @@ int Recurrence::yearlyDayCalcNextAfter(QDate &enddate, YearlyDayData &data) cons
   int  endYear = enddate.year();
   int  endDay  = enddate.dayOfYear();
 
   if (data.day > 1) {
     // Check what remains of the start year
     bool leapOK = data.isMaxDayCount();
-    for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+    for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
       int d = *it.current();
       if (d >= data.day && (leapOK || d < 366)) {
         ++countGone;
         if (data.year == endYear && d > endDay) {
           data.day = d;
           goto ex;
@@ -2974,13 +2977,13 @@ int Recurrence::yearlyDayCalcNextAfter(QDate &enddate, YearlyDayData &data) cons
       countGone += n;
       data.year += recurYears * rFreq;
     }
   }
 
   // Check the last year in the recurrence
-  for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+  for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
     ++countGone;
     int d = *it.current();
     if (data.year > endYear || d > endDay) {
       data.day = d;
       break;
     }
@@ -2992,19 +2995,19 @@ ex:
   return countGone;
 }
 
 // Get the days in this month which recur, in numerical order.
 // Parameters: daysInMonth = number of days in this month
 //             startDayOfWeek = day of week for first day of month.
-void Recurrence::getMonthlyPosDays(QValueList<int> &list, int daysInMonth, int startDayOfWeek) const
+void Recurrence::getMonthlyPosDays(Q3ValueList<int> &list, int daysInMonth, int startDayOfWeek) const
 {
   list.clear();
   int endDayOfWeek = (startDayOfWeek + daysInMonth - 2) % 7 + 1;
   // Go through the list, compiling a bit list of actual day numbers
   Q_UINT32 days = 0;
-  for (QPtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) {
+  for (Q3PtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) {
     int weeknum = pos.current()->rPos - 1;   // get 0-based week number
     QBitArray &rdays = pos.current()->rDays;
     if (pos.current()->negative) {
       // nth days before the end of the month
       for (uint i = 1; i <= 7; ++i) {
         if (rdays.testBit(i - 1)) {
@@ -3036,13 +3039,13 @@ void Recurrence::getMonthlyPosDays(QValueList<int> &list, int daysInMonth, int s
 // Reply = -1 if the number varies from month to month.
 int Recurrence::countMonthlyPosDays() const
 {
   int count = 0;
   Q_UINT8 positive[5] = { 0, 0, 0, 0, 0 };
   Q_UINT8 negative[4] = { 0, 0, 0, 0 };
-  for (QPtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) {
+  for (Q3PtrListIterator<rMonthPos> pos(rMonthPositions); pos.current(); ++pos) {
     int weeknum = pos.current()->rPos;
     Q_UINT8* wk;
     if (pos.current()->negative) {
       // nth days before the end of the month
       if (weeknum > 4)
         return -1;       // days in 5th week are often missing
@@ -3069,18 +3072,18 @@ int Recurrence::countMonthlyPosDays() const
   }
   return count;
 }
 
 // Get the days in this month which recur, in numerical order.
 // Reply = true if day numbers varies from month to month.
-bool Recurrence::getMonthlyDayDays(QValueList<int> &list, int daysInMonth) const
+bool Recurrence::getMonthlyDayDays(Q3ValueList<int> &list, int daysInMonth) const
 {
   list.clear();
   bool variable = false;
   Q_UINT32 days = 0;
-  for (QPtrListIterator<int> it(rMonthDays); it.current(); ++it) {
+  for (Q3PtrListIterator<int> it(rMonthDays); it.current(); ++it) {
     int day = *it.current();
     if (day > 0) {
       // date in the month
       if (day <= daysInMonth)
         days |= 1 << (day - 1);
       if (day > 28 && day <= 31)
@@ -3103,18 +3106,18 @@ bool Recurrence::getMonthlyDayDays(QValueList<int> &list, int daysInMonth) const
 }
 
 // Get the months which recur, in numerical order, for both leap years and non-leap years.
 // N.B. If February 29th recurs on March 1st in non-leap years, February (not March) is
 // included in the non-leap year month list.
 // Reply = true if February 29th also recurs.
-bool Recurrence::getYearlyMonthMonths(int day, QValueList<int> &list, QValueList<int> &leaplist) const
+bool Recurrence::getYearlyMonthMonths(int day, Q3ValueList<int> &list, Q3ValueList<int> &leaplist) const
 {
   list.clear();
   leaplist.clear();
   bool feb29 = false;
-  for (QPtrListIterator<int> it(rYearNums); it.current(); ++it) {
+  for (Q3PtrListIterator<int> it(rYearNums); it.current(); ++it) {
     int month = *it.current();
     if (month == 2) {
       if (day <= 28) {
         list.append(month);     // date appears in February
         leaplist.append(month);
       }
@@ -3184,13 +3187,13 @@ QDate Recurrence::getFirstDateInMonth(const QDate &earliestDate) const
 {
   int earliestDay = earliestDate.day();
   int daysInMonth = earliestDate.daysInMonth();
   switch (recurs) {
     case rMonthlyDay: {
       int minday = daysInMonth + 1;
-      for (QPtrListIterator<int> it(rMonthDays);  it.current();  ++it) {
+      for (Q3PtrListIterator<int> it(rMonthDays);  it.current();  ++it) {
         int day = *it.current();
         if (day < 0)
           day = daysInMonth + day + 1;
         if (day >= earliestDay  &&  day < minday)
           minday = day;
       }
@@ -3198,15 +3201,15 @@ QDate Recurrence::getFirstDateInMonth(const QDate &earliestDate) const
         return earliestDate.addDays(minday - earliestDay);
       break;
     }
     case rMonthlyPos:
     case rYearlyPos: {
       QDate monthBegin(earliestDate.addDays(1 - earliestDay));
-      QValueList<int> dayList;
+      Q3ValueList<int> dayList;
       getMonthlyPosDays(dayList, daysInMonth, monthBegin.dayOfWeek());
-      for (QValueList<int>::ConstIterator id = dayList.begin();  id != dayList.end();  ++id) {
+      for (Q3ValueList<int>::ConstIterator id = dayList.begin();  id != dayList.end();  ++id) {
         if (*id >= earliestDay)
           return monthBegin.addDays(*id - 1);
       }
       break;
     }
   }
@@ -3221,13 +3224,13 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const
 {
   int latestDay = latestDate.day();
   int daysInMonth = latestDate.daysInMonth();
   switch (recurs) {
     case rMonthlyDay: {
       int maxday = -1;
-      for (QPtrListIterator<int> it(rMonthDays);  it.current();  ++it) {
+      for (Q3PtrListIterator<int> it(rMonthDays);  it.current();  ++it) {
         int day = *it.current();
         if (day < 0)
           day = daysInMonth + day + 1;
         if (day <= latestDay  &&  day > maxday)
           maxday = day;
       }
@@ -3235,15 +3238,15 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const
         return QDate(latestDate.year(), latestDate.month(), maxday);
       break;
     }
     case rMonthlyPos:
     case rYearlyPos: {
       QDate monthBegin(latestDate.addDays(1 - latestDay));
-      QValueList<int> dayList;
+      Q3ValueList<int> dayList;
       getMonthlyPosDays(dayList, daysInMonth, monthBegin.dayOfWeek());
-      for (QValueList<int>::ConstIterator id = dayList.fromLast();  id != dayList.end();  --id) {
+      for (Q3ValueList<int>::ConstIterator id = dayList.fromLast();  id != dayList.end();  --id) {
         if (*id <= latestDay)
           return monthBegin.addDays(*id - 1);
       }
       break;
     }
   }
@@ -3253,13 +3256,13 @@ QDate Recurrence::getLastDateInMonth(const QDate &latestDate) const
 /* From the recurrence yearly month list or yearly day list, get the earliest
  * month or day in the specified year which is >= the earliestDate.
  * Note that rYearNums is sorted in numerical order.
  */
 QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const
 {
-  QPtrListIterator<int> it(rYearNums);
+  Q3PtrListIterator<int> it(rYearNums);
   switch (recurs) {
     case rYearlyMonth: {
       int day = recurStart().date().day();
       int earliestYear  = earliestDate.year();
       int earliestMonth = earliestDate.month();
       int earliestDay   = earliestDate.day();
@@ -3289,22 +3292,22 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const
           }
         }
       }
       break;
     }
     case rYearlyPos: {
-      QValueList<int> dayList;
+      Q3ValueList<int> dayList;
       int earliestYear  = earliestDate.year();
       int earliestMonth = earliestDate.month();
       int earliestDay   = earliestDate.day();
       for ( ;  it.current();  ++it) {
         int month = *it.current();
         if (month >= earliestMonth) {
           QDate monthBegin(earliestYear, month, 1);
           getMonthlyPosDays(dayList, monthBegin.daysInMonth(), monthBegin.dayOfWeek());
-          for (QValueList<int>::ConstIterator id = dayList.begin();  id != dayList.end();  ++id) {
+          for (Q3ValueList<int>::ConstIterator id = dayList.begin();  id != dayList.end();  ++id) {
             if (*id >= earliestDay)
               return monthBegin.addDays(*id - 1);
           }
           earliestDay = 1;
         }
       }
@@ -3326,13 +3329,13 @@ QDate Recurrence::getFirstDateInYear(const QDate &earliestDate) const
 /* From the recurrence yearly month list or yearly day list, get the latest
  * month or day in the specified year which is <= the latestDate.
  * Note that rYearNums is sorted in numerical order.
  */
 QDate Recurrence::getLastDateInYear(const QDate &latestDate) const
 {
-  QPtrListIterator<int> it(rYearNums);
+  Q3PtrListIterator<int> it(rYearNums);
   switch (recurs) {
     case rYearlyMonth: {
       int day = recurStart().date().day();
       int latestYear  = latestDate.year();
       int latestMonth = latestDate.month();
       if (latestDate.day() > day) {
@@ -3361,22 +3364,22 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const
           }
         }
       }
       break;
     }
     case rYearlyPos: {
-      QValueList<int> dayList;
+      Q3ValueList<int> dayList;
       int latestYear  = latestDate.year();
       int latestMonth = latestDate.month();
       int latestDay   = latestDate.day();
       for (it.toLast();  it.current();  --it) {
         int month = *it.current();
         if (month <= latestMonth) {
           QDate monthBegin(latestYear, month, 1);
           getMonthlyPosDays(dayList, monthBegin.daysInMonth(), monthBegin.dayOfWeek());
-          for (QValueList<int>::ConstIterator id = dayList.fromLast();  id != dayList.end();  --id) {
+          for (Q3ValueList<int>::ConstIterator id = dayList.fromLast();  id != dayList.end();  --id) {
             if (*id <= latestDay)
               return monthBegin.addDays(*id - 1);
           }
           latestDay = 31;
         }
       }
diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h
index b13d14f..5b5aab1 100644
--- a/libkcal/recurrence.h
+++ b/libkcal/recurrence.h
@@ -21,13 +21,15 @@
 */
 #ifndef KCAL_RECURRENCE_H
 #define KCAL_RECURRENCE_H
 
 #include <qstring.h>
 #include <qbitarray.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 namespace KCal {
 
 class Incidence;
 
 /**
@@ -245,15 +247,15 @@ class Recurrence
     void addMonthlyPos(short _rPos, const QBitArray &_rDays);
     /** Adds a position the the recursMonthlyDay list.
      * @var _rDay the date in the month to recur.
      */
     void addMonthlyDay(short _rDay);
     /** Returns list of day positions in months. */
-    const QPtrList<rMonthPos> &monthPositions() const;
+    const Q3PtrList<rMonthPos> &monthPositions() const;
     /** Returns list of day numbers of a  month. */
-    const QPtrList<int> &monthDays() const;
+    const Q3PtrList<int> &monthDays() const;
 
     /** Sets an event to recur yearly.
      * @var type rYearlyMonth, rYearlyPos or rYearlyDay
      * @var freq the frequency to recur, e.g. 3 for every third year.
      * @var duration the number of times the event is to occur, or -1 to recur indefinitely.
      */
@@ -276,29 +278,29 @@ class Recurrence
     /** Adds a position to the recursYearlyPos recurrence rule, if it is set.
      * N.B. addYearlyNum() must also be called to add recurrence months.
      * Parameters are the same as for addMonthlyPos().
      */
     void addYearlyMonthPos(short _rPos, const QBitArray &_rDays);
     /** Returns positions of days or months in year. */
-    const QPtrList<int> &yearNums() const;
+    const Q3PtrList<int> &yearNums() const;
     /** Returns list of day positions in months, for a recursYearlyPos recurrence rule. */
-    const QPtrList<rMonthPos> &yearMonthPositions() const;
+    const Q3PtrList<rMonthPos> &yearMonthPositions() const;
     /** Returns how yearly recurrences of February 29th are handled. */
     Feb29Type feb29YearlyType() const  { return mFeb29YearlyType; }
     /** Sets the default method for handling yearly recurrences of February 29th. */
     static void setFeb29YearlyTypeDefault(Feb29Type t)  { mFeb29YearlyDefaultType = t; }
     /** Returns the default method for handling yearly recurrences of February 29th. */
     static Feb29Type setFeb29YearlyTypeDefault()  { return mFeb29YearlyDefaultType; }
     void addYearlyMonth(short _rPos ); // added LR
     /**
       Debug output.
     */
     void dump() const;
     QString recurrenceText() const;
-    bool getYearlyMonthMonths(int day, QValueList<int>&,
-                              QValueList<int> &leaplist) const;
+    bool getYearlyMonthMonths(int day, Q3ValueList<int>&,
+                              Q3ValueList<int> &leaplist) const;
 
   protected:
     enum PeriodFunc { END_DATE_AND_COUNT, COUNT_TO_DATE, NEXT_AFTER_DATE };
     struct MonthlyData;     friend struct MonthlyData;
     struct YearlyMonthData; friend struct YearlyMonthData;
     struct YearlyPosData;   friend struct YearlyPosData;
@@ -342,15 +344,15 @@ class Recurrence
     int  yearlyDayCalc(PeriodFunc, QDate &enddate) const;
     int  yearlyDayCalcEndDate(QDate& enddate, YearlyDayData&) const;
     int  yearlyDayCalcToDate(const QDate& enddate, YearlyDayData&) const;
     int  yearlyDayCalcNextAfter(QDate& enddate, YearlyDayData&) const;
 
     int  countMonthlyPosDays() const;
-    void getMonthlyPosDays(QValueList<int>&, int daysInMonth,
+    void getMonthlyPosDays(Q3ValueList<int>&, int daysInMonth,
                            int startDayOfWeek) const;
-    bool getMonthlyDayDays(QValueList<int>&, int daysInMonth) const;
+    bool getMonthlyDayDays(Q3ValueList<int>&, int daysInMonth) const;
 
     int   getFirstDayInWeek(int startDay, bool useWeekStart = true) const;
     int   getLastDayInWeek(int endDay, bool useWeekStart = true) const;
     QDate getFirstDateInMonth(const QDate& earliestDate) const;
     QDate getLastDateInMonth(const QDate& latestDate) const;
     QDate getFirstDateInYear(const QDate& earliestDate) const;
@@ -363,19 +365,19 @@ class Recurrence
 
     short recurs;                        // should be one of the enums.
 
     int rWeekStart;                      // day which starts the week, Monday=1 .. Sunday=7
     QBitArray rDays;                     // array of days during week it recurs
 
-    QPtrList<rMonthPos> rMonthPositions; // list of positions during a month
+    Q3PtrList<rMonthPos> rMonthPositions; // list of positions during a month
                                          // on which an event recurs
 
-    QPtrList<int> rMonthDays;            // list of days during a month on
+    Q3PtrList<int> rMonthDays;            // list of days during a month on
                                          // which the event recurs
 
-    QPtrList<int> rYearNums;             // either months/days to recur on for rYearly,
+    Q3PtrList<int> rYearNums;             // either months/days to recur on for rYearly,
                                          // sorted in numerical order
 
     int rFreq;                           // frequency of period
 
     // one of the following must be specified
     int rDuration;                       // num times to recur (inc. first occurrence), -1 = infinite
diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp
index 253d8b7..234cfcf 100644
--- a/libkcal/scheduler.cpp
+++ b/libkcal/scheduler.cpp
@@ -17,13 +17,15 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdir.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
 #include "event.h"
@@ -261,14 +263,14 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status sta
   bool ret = false;
   Event *ev = mCalendar->event(incidence->uid());
   Todo *to = mCalendar->todo(incidence->uid());
   if (ev || to) {
     //get matching attendee in calendar
     kdDebug(5800) << "Scheduler::acceptTransaction match found!" << endl;
-    QPtrList<Attendee> attendeesIn = incidence->attendees();
-    QPtrList<Attendee> attendeesEv;
+    Q3PtrList<Attendee> attendeesIn = incidence->attendees();
+    Q3PtrList<Attendee> attendeesEv;
     if (ev) attendeesEv = ev->attendees();
     if (to) attendeesEv = to->attendees();
     Attendee *attIn;
     Attendee *attEv;
     for ( attIn = attendeesIn.first(); attIn; attIn = attendeesIn.next() ) {
       for ( attEv = attendeesEv.first(); attEv; attEv = attendeesEv.next() ) {
@@ -339,17 +341,17 @@ bool Scheduler::acceptFreeBusy(IncidenceBase *incidence, Method method)
 
   freebusy->clearAttendees();
   freebusy->setOrganizer(from);
 
   QString messageText = mFormat->createScheduleMessage(freebusy, Publish);
 
-  if (!f.open(IO_ReadWrite)) {
+  if (!f.open(QIODevice::ReadWrite)) {
    kdDebug() << "acceptFreeBusy: Can't open:" << filename << " for writing" << endl;
    return false;
   }
-  QTextStream t(&f);
+  Q3TextStream t(&f);
   t << messageText;
   f.close();
 
   deleteTransaction(incidence);
   return true;
 }
diff --git a/libkcal/scheduler.h b/libkcal/scheduler.h
index a9f43b9..357e98e 100644
--- a/libkcal/scheduler.h
+++ b/libkcal/scheduler.h
@@ -20,13 +20,13 @@
 #ifndef SCHEDULER_H
 #define SCHEDULER_H
 
 // iTIP transactions base class
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 namespace KCal {
 
 class IncidenceBase;
 class Event;
 class Calendar;
@@ -92,13 +92,13 @@ class Scheduler {
     virtual bool performTransaction(IncidenceBase *incidence,Method method) = 0;
     /** Perform iTIP transaction on incidence to specified recipient(s). The 
     method is specified as the method argumanet and can be any valid iTIP 
     method. */
     virtual bool performTransaction(IncidenceBase *incidence,Method method,const QString &recipients) = 0;
     /** Retrieve incoming iTIP transactions */
-    virtual QPtrList<ScheduleMessage> retrieveTransactions() = 0;
+    virtual Q3PtrList<ScheduleMessage> retrieveTransactions() = 0;
 
     /**
       Accept transaction. The incidence argument specifies the iCal compoennt
       on which the transaction acts. The status is the result of processing a
       iTIP message with the current calendar and specifies the action to be
       taken for this incidence.
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 9b757f7..b8c2aa7 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -19,18 +19,18 @@
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qapplication.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qxml.h>
 #include <qlabel.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -363,17 +363,17 @@ bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
         system (  command.latin1() );
     } else {
         fileName = "/tmp/events.txt";
         
     }  
     QFile file( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return false;
         
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
     text = ts.read();
     file.close();  
     status.setText(  i18n("Processing events ...") );
     status.raise();
     qApp->processEvents();
@@ -385,13 +385,13 @@ bool SharpFormat::load( Calendar *calendar, Calendar *existngCal )
         QString command = "db2file todo -r -c " + codec+ " > " + fileName;
         system (  command.latin1() );
     } else {
         fileName = "/tmp/todo.txt";
     } 
     file.setName( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return false;
         
     } 
     ts.setDevice( &file );
     text = ts.read();
     file.close();  
@@ -472,13 +472,13 @@ bool SharpFormat::save( Calendar *calendar)
     bool debug = DEBUGMODE;
     QString codec = "utf8";
     QString answer;
     QString ePrefix = "CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY\n";
     QString tPrefix = "CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1\n";
     QString command;
-    QPtrList<Event> er = calendar->rawEvents(); 
+    Q3PtrList<Event> er = calendar->rawEvents(); 
     Event* ev = er.first();
     QString  fileName = "/tmp/kopitempout";
     int i = 0;
     QString changeString = ePrefix;
     QString  deleteString = ePrefix;
     bool deleteEnt = false;
@@ -500,31 +500,31 @@ bool SharpFormat::save( Calendar *calendar)
                 deleteEnt = true;
                 changeEnt = true;
                 }
             else  if ( ev->getID("Sharp_DTM").isEmpty()  ) {       // add new 
                 QString fileNameIn = "/tmp/kopitempin";
                 QFile fileIn( fileNameIn );
-                if (!fileIn.open( IO_WriteOnly ) ) {
+                if (!fileIn.open( QIODevice::WriteOnly ) ) {
                     return false;
                 } 
-                QTextStream tsIn( &fileIn );
+                Q3TextStream tsIn( &fileIn );
                 tsIn.setCodec( QTextCodec::codecForName("utf8") );
                 tsIn << ePrefix << eString ;
                 fileIn.close();  
                 //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
                 command = "(cat /tmp/kopitempin | db2file datebook -w -g -c " + codec+ ") > "+ fileName;
                 //qDebug("command ++++++++ ");
                 //qDebug("%s ",command.latin1());
                 //qDebug("command -------- ");
                 system (  command.utf8() );
                 QFile file( fileName );
-                if (!file.open( IO_ReadOnly ) ) {
+                if (!file.open( QIODevice::ReadOnly ) ) {
                     return false;
                     
                 } 
-                QTextStream ts( &file );
+                Q3TextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
                 file.close();  
                 //qDebug("answer \n%s ", answer.latin1());
                 getNumFromRecord( answer, ev  ) ;
 
@@ -541,17 +541,17 @@ bool SharpFormat::save( Calendar *calendar)
     }
     status.setText ( i18n("Changing events ...") );
     qApp->processEvents();
     //qDebug("changing... ");
     if ( changeEnt ) {
         QFile file( fileName );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             return false;
             
         } 
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << changeString ;
         file.close();
         command = "db2file datebook -w -g -c " + codec+ " < "+ fileName;
         system (  command.latin1() );
         //qDebug("command %s file :\n%s ", command.latin1(), changeString.latin1());
@@ -559,17 +559,17 @@ bool SharpFormat::save( Calendar *calendar)
     }
     status.setText ( i18n("Deleting events ...") );
     qApp->processEvents();
     //qDebug("deleting... ");
     if ( deleteEnt  ) {
         QFile file( fileName );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             return false;
             
         } 
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << deleteString;
         file.close();
         command = "db2file datebook -d -c " + codec+ " < "+ fileName;
         system ( command.latin1() );
         // qDebug("command %s file :\n%s ", command.latin1(), deleteString.latin1());
@@ -577,13 +577,13 @@ bool SharpFormat::save( Calendar *calendar)
 
 
     changeString = tPrefix;
     deleteString = tPrefix;
     status.setText ( i18n("Processing todos ...") );
     qApp->processEvents();
-    QPtrList<Todo> tl = calendar->rawTodos(); 
+    Q3PtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     i = 0;
     message = i18n("Processing todo # ");
     procCount = 0;
     while ( to ) {
        if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
@@ -602,26 +602,26 @@ bool SharpFormat::save( Calendar *calendar)
             else  if ( to->getID("Sharp_DTM").isEmpty() ) {       // add new 
 
 
 
                 QString fileNameIn = "/tmp/kopitempin";
                 QFile fileIn( fileNameIn );
-                if (!fileIn.open( IO_WriteOnly ) ) {
+                if (!fileIn.open( QIODevice::WriteOnly ) ) {
                     return false;
                 } 
-                QTextStream tsIn( &fileIn );
+                Q3TextStream tsIn( &fileIn );
                 tsIn.setCodec( QTextCodec::codecForName("utf8") );
                 tsIn << tPrefix << eString ;
                 fileIn.close();  
                 command = "(cat /tmp/kopitempin | db2file todo -w -g -c " + codec+ ") > "+ fileName;
                 system (  command.utf8() );
                 QFile file( fileName );
-                if (!file.open( IO_ReadOnly ) ) {
+                if (!file.open( QIODevice::ReadOnly ) ) {
                     return false;
                 } 
-                QTextStream ts( &file );
+                Q3TextStream ts( &file );
                 ts.setCodec( QTextCodec::codecForName("utf8") );
                 answer = ts.read();
                 file.close();  
                 //qDebug("answer \n%s ", answer.latin1());
                 getNumFromRecord( answer, to  ) ;
 
@@ -639,17 +639,17 @@ bool SharpFormat::save( Calendar *calendar)
     }
     status.setText ( i18n("Changing todos ...") );
     qApp->processEvents();
     //qDebug("changing... ");
     if ( changeEnt ) {
         QFile file( fileName );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             return false;
             
         } 
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << changeString ;
         file.close();
         command = "db2file todo -w -g -c " + codec+ " < "+ fileName;
         system (  command.latin1() );
         //qDebug("command %s file :\n%s ", command.latin1(), changeString.latin1());
@@ -657,17 +657,17 @@ bool SharpFormat::save( Calendar *calendar)
     }
     status.setText ( i18n("Deleting todos ...") );
     qApp->processEvents();
     //qDebug("deleting... ");
     if ( deleteEnt  ) {
         QFile file( fileName );
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             return false;
             
         } 
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts.setCodec( QTextCodec::codecForName("utf8") );
         ts << deleteString;
         file.close();
         command = "db2file todo -d -c " + codec+ " < "+ fileName;
         system ( command.latin1() );
         // qDebug("command %s file :\n%s ", command.latin1(), deleteString.latin1());
@@ -780,13 +780,13 @@ QString SharpFormat::getEventString( Event* event )
             list.append( "2" );
             list.append( QString::number( rec->frequency()) );//12
            
             writeEndDate = true; 
             {
                 int count = 1;
-                QPtrList<Recurrence::rMonthPos> rmp;
+                Q3PtrList<Recurrence::rMonthPos> rmp;
                 rmp = rec->monthPositions();
                 if ( rmp.first()->negative )
                     count = 5 - rmp.first()->rPos - 1;
                 else
                     count = rmp.first()->rPos - 1;
                 list.append( QString::number( count ) );
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index cc1c5ae..5a0c32e 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -620,13 +620,13 @@ QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_d
      int off = 0;
      QDateTime alarmStart = QDateTime::currentDateTime().addDays( 3650 );;
     //  if ( QDateTime::currentDateTime() > incidenceStart ){
 //          *ok = false;
 //          return incidenceStart;
 //      }
-     for (QPtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
+     for (Q3PtrListIterator<Alarm> it(mAlarms); (alarm = it.current()) != 0; ++it) {
          if (alarm->enabled()) {
              if ( alarm->hasTime () ) {
                  if ( alarm->time() < alarmStart ) {
                      alarmStart = alarm->time();
                      enabled = true;
                      off = alarmStart.secsTo( incidenceStart );
diff --git a/libkcal/todo.h b/libkcal/todo.h
index 2131732..cea976c 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -23,12 +23,14 @@
 // Todo component, representing a VTODO object
 //
 
 #include "incidence.h"
 
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace KCal {
 
 /**
   This class provides a Todo in the sense of RFC2445.
 */
@@ -37,13 +39,13 @@ namespace KCal {
  Q_OBJECT
   public:
     Todo();
     Todo(const Todo &);
     ~Todo();
     typedef ListBase<Todo> List;
-    QCString type() const { return "Todo"; }
+    Q3CString type() const { return "Todo"; }
     IncTypeID typeID() const { return todoID; }
 
     /** Return an exact copy of this todo. */
     Incidence *clone();
     QDateTime getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const;
 
diff --git a/libkcal/vcaldrag.cpp b/libkcal/vcaldrag.cpp
index f01f332..324981e 100644
--- a/libkcal/vcaldrag.cpp
+++ b/libkcal/vcaldrag.cpp
@@ -23,13 +23,13 @@
 
 #include "vcalformat.h"
 
 using namespace KCal;
 
 VCalDrag::VCalDrag( Calendar *cal, QWidget *parent, const char *name )
-  : QStoredDrag( "text/x-vCalendar", parent, name )
+  : Q3StoredDrag( "text/x-vCalendar", parent, name )
 {
   VCalFormat format;
   setEncodedData( format.toString( cal ).utf8() );
 }
 
 bool VCalDrag::canDecode( QMimeSource *me )
diff --git a/libkcal/vcaldrag.h b/libkcal/vcaldrag.h
index 3048124..68a320d 100644
--- a/libkcal/vcaldrag.h
+++ b/libkcal/vcaldrag.h
@@ -19,21 +19,21 @@
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef VCALDRAG_H
 #define VCALDRAG_H
 
-#include <qdragobject.h>
+#include <q3dragobject.h>
 
 
 namespace KCal {
 
 class Calendar;
 
 /** vCalendar drag&drop class. */
-class VCalDrag : public QStoredDrag {
+class VCalDrag : public Q3StoredDrag {
   public:
     /** Create a drag&drop object for vCalendar component \a vcal. */
     VCalDrag( Calendar *vcal, QWidget *parent = 0, const char *name = 0 );
     ~VCalDrag() {};
 
     /** Return, if drag&drop object can be decode to vCalendar. */
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 2e19740..9cbaf16 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -19,17 +19,19 @@
     Boston, MA 02111-1307, USA.
 */
 
 #include <qapplication.h>
 #include <qdatetime.h>
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qdialog.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <klocale.h>
@@ -105,21 +107,21 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName)
   tmpStr = mCalendar->getTimeZoneStr();
   //qDebug("mCalendar->getTimeZoneStr() %s",tmpStr.latin1() );
   addPropValue(vcal,VCTimeZoneProp, tmpStr.local8Bit());
   addPropValue(vcal,VCVersionProp, _VCAL_VERSION);
 
   // TODO STUFF
-  QPtrList<Todo> todoList = mCalendar->rawTodos();
-  QPtrListIterator<Todo> qlt(todoList);
+  Q3PtrList<Todo> todoList = mCalendar->rawTodos();
+  Q3PtrListIterator<Todo> qlt(todoList);
   for (; qlt.current(); ++qlt) {
     vo = eventToVTodo(qlt.current());
     addVObjectProp(vcal, vo);
   }
 
   // EVENT STUFF
-  QPtrList<Event> events = mCalendar->rawEvents();
+  Q3PtrList<Event> events = mCalendar->rawEvents();
   Event *ev;
   for(ev=events.first();ev;ev=events.next()) {
     vo = eventToVEvent(ev);
     addVObjectProp(vcal, vo);
   }
 
@@ -135,13 +137,13 @@ bool VCalFormat::save(Calendar *calendar, const QString &fileName)
 }
 
 bool VCalFormat::fromString( Calendar *calendar, const QString &text )
 {
   // TODO: Factor out VCalFormat::fromString()
 
-  QCString data = text.utf8();
+  Q3CString data = text.utf8();
 
   if ( !data.size() ) return false;
 
   VObject *vcal = Parse_MIME( data.data(), data.size());
   if ( !vcal ) return false;
 
@@ -207,13 +209,13 @@ QString VCalFormat::toString( Calendar *calendar )
   addPropValue( vcal, VCProdIdProp, CalFormat::productId() );
   QString tmpStr = mCalendar->getTimeZoneStr();
   addPropValue( vcal, VCTimeZoneProp, tmpStr.local8Bit() );
   addPropValue( vcal, VCVersionProp, _VCAL_VERSION );
 
   // TODO: Use all data.
-  QPtrList<Event> events = calendar->events();
+  Q3PtrList<Event> events = calendar->events();
   Event *event = events.first();
   if ( !event ) return QString::null;
 
   VObject *vevent = eventToVEvent( event );
 
   addVObjectProp( vcal, vevent );
@@ -268,14 +270,14 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   // organizer stuff
   tmpStr = "MAILTO:" + anEvent->organizer();
   addPropValue(vtodo, ICOrganizerProp, tmpStr.local8Bit());
 
   // attendees
   if (anEvent->attendeeCount() != 0) {
-    QPtrList<Attendee> al = anEvent->attendees();
-    QPtrListIterator<Attendee> ai(al);
+    Q3PtrList<Attendee> al = anEvent->attendees();
+    Q3PtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
 
     for (; ai.current(); ++ai) {
       curAttendee = ai.current();
       if (!curAttendee->email().isEmpty() &&
           !curAttendee->name().isEmpty())
@@ -323,13 +325,13 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
 
   // priority
   tmpStr.sprintf("%i",anEvent->priority());
   addPropValue(vtodo, VCPriorityProp, tmpStr.local8Bit());
 
   // related event
-  if (anEvent->relatedToUid()) {
+  if (!anEvent->relatedToUid().isEmpty()) {
     addPropValue(vtodo, VCRelatedToProp,
                  anEvent->relatedToUid().local8Bit());
   }
 
   // categories
   QStringList tmpStrList = anEvent->categories();
@@ -352,13 +354,13 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
     tmpStr.truncate(tmpStr.length()-1);
     addPropValue(vtodo, VCCategoriesProp, tmpStr.local8Bit());
   }
 
   // alarm stuff
   kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl;
-  QPtrList<Alarm> alarms = anEvent->alarms();
+  Q3PtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
         VObject *a;
             tmpStr = qDateTimeToISO(alarm->time());
         if (alarm->type() == Alarm::Audio) {
@@ -430,14 +432,14 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
 
   // attendee and organizer stuff
   tmpStr = "MAILTO:" + anEvent->organizer();
   addPropValue(vevent, ICOrganizerProp, tmpStr.local8Bit());
 
   if (anEvent->attendeeCount() != 0) {
-    QPtrList<Attendee> al = anEvent->attendees();
-    QPtrListIterator<Attendee> ai(al);
+    Q3PtrList<Attendee> al = anEvent->attendees();
+    Q3PtrListIterator<Attendee> ai(al);
     Attendee *curAttendee;
 
     // TODO: Put this functionality into Attendee class
     for (; ai.current(); ++ai) {
       curAttendee = ai.current();
       if (!curAttendee->email().isEmpty() &&
@@ -458,14 +460,14 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
     }
   }
 
   // recurrence rule stuff
   if (anEvent->doesRecur()) {
     // some more variables
-    QPtrList<Recurrence::rMonthPos> tmpPositions;
-    QPtrList<int> tmpDays;
+    Q3PtrList<Recurrence::rMonthPos> tmpPositions;
+    Q3PtrList<int> tmpDays;
     int *tmpDay;
     Recurrence::rMonthPos *tmpPos;
     QString tmpStr2;
     int i;
 
     switch(anEvent->recurrence()->doesRecur()) {
@@ -542,13 +544,13 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
     if (anEvent->recurrence()->duration() > 0) {
       tmpStr2.sprintf("#%i",anEvent->recurrence()->duration());
       tmpStr += tmpStr2;
     } else if (anEvent->recurrence()->duration() == -1) {
       tmpStr += "#0"; // defined as repeat forever
     } else {
-      tmpStr += qDateTimeToISO(anEvent->recurrence()->endDate(), FALSE);
+      tmpStr += qDateTimeToISO((QDateTime)anEvent->recurrence()->endDate(), FALSE);
     }
     addPropValue(vevent,VCRRuleProp, tmpStr.local8Bit());
 
   } // event repeats
 
   // exceptions to recurrence
@@ -622,24 +624,24 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
     tmpStr.truncate(tmpStr.length()-1);
     addPropValue(vevent, VCCategoriesProp, tmpStr.local8Bit());
   }
 
   // attachments 
   // TODO: handle binary attachments!
-  QPtrList<Attachment> attachments = anEvent->attachments();
+  Q3PtrList<Attachment> attachments = anEvent->attachments();
   for ( Attachment *at = attachments.first(); at; at = attachments.next() )
     addPropValue(vevent, VCAttachProp, at->uri().local8Bit());
 
   // resources
   tmpStrList = anEvent->resources();
   tmpStr = tmpStrList.join(";");
   if (!tmpStr.isEmpty())
     addPropValue(vevent, VCResourcesProp, tmpStr.local8Bit());
 
   // alarm stuff
-  QPtrList<Alarm> alarms = anEvent->alarms();
+  Q3PtrList<Alarm> alarms = anEvent->alarms();
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
       if (alarm->enabled()) {
           VObject *a ;
           tmpStr = qDateTimeToISO(alarm->time());
           if (alarm->type() == Alarm::Audio) {
@@ -669,13 +671,13 @@ VObject* VCalFormat::eventToVEvent(Event *anEvent)
 
   // transparency
   tmpStr.sprintf("%i",anEvent->transparency());
   addPropValue(vevent, VCTranspProp, tmpStr.local8Bit());
 
   // related event
-  if (anEvent->relatedToUid()) {
+  if (!anEvent->relatedToUid().isEmpty()) {
     addPropValue(vevent, VCRelatedToProp,
                  anEvent->relatedToUid().local8Bit());
   }
 
   if (anEvent->pilotId()) {
     // pilot sync stuff
@@ -1405,26 +1407,26 @@ Event* VCalFormat::VEventToEvent(VObject *vevent)
 
 
 QString VCalFormat::qDateToISO(const QDate &qd)
 {
   QString tmpStr;
 
-  ASSERT(qd.isValid());
+  Q_ASSERT(qd.isValid());
 
   tmpStr.sprintf("%.2d%.2d%.2d",
                  qd.year(), qd.month(), qd.day());
   return tmpStr;
 
 }
 
 QString VCalFormat::qDateTimeToISO(const QDateTime &qdt, bool zulu)
 {
   QString tmpStr;
 
-  ASSERT(qdt.date().isValid());
-  ASSERT(qdt.time().isValid());
+  Q_ASSERT(qdt.date().isValid());
+  Q_ASSERT(qdt.time().isValid());
   if (zulu && !useLocalTime ) {
     QDateTime tmpDT = qdt.addSecs ( -KGlobal::locale()->localTimeOffset( qdt )*60);
     tmpStr.sprintf("%.2d%.2d%.2dT%.2d%.2d%.2dZ",
                    tmpDT.date().year(), tmpDT.date().month(),
                    tmpDT.date().day(), tmpDT.time().hour(),
                    tmpDT.time().minute(), tmpDT.time().second());
@@ -1451,14 +1453,14 @@ QDateTime VCalFormat::ISOToQDateTime(const QString & dtStr)
   hour = tmpStr.mid(9,2).toInt();
   minute = tmpStr.mid(11,2).toInt();
   second = tmpStr.mid(13,2).toInt();
   tmpDate.setYMD(year, month, day);
   tmpTime.setHMS(hour, minute, second);
 
-  ASSERT(tmpDate.isValid());
-  ASSERT(tmpTime.isValid());
+  Q_ASSERT(tmpDate.isValid());
+  Q_ASSERT(tmpTime.isValid());
   QDateTime tmpDT(tmpDate, tmpTime);
   // correct for GMT if string is in Zulu format
   if (dtStr.at(dtStr.length()-1) == 'Z')
     tmpDT = tmpDT.addSecs (KGlobal::locale()->localTimeOffset( tmpDT )*60);
   return tmpDT;
 }
@@ -1645,13 +1647,13 @@ Attendee::Role VCalFormat::readRole(const char *s) const
       role = Attendee::Chair;
   //  enum Role { ReqParticipant, OptParticipant, NonParticipant, Chair };
 
   return role;
 }
 
-QCString VCalFormat::writeRole(Attendee::Role role) const
+Q3CString VCalFormat::writeRole(Attendee::Role role) const
 {
     if ( role == Attendee::Chair )
         return "OWNER";
     return "ATTENDEE";
 }
 Attendee::PartStat VCalFormat::readStatus(const char *s) const
@@ -1683,13 +1685,13 @@ Attendee::PartStat VCalFormat::readStatus(const char *s) const
     status = Attendee::NeedsAction;
   }
 
   return status;
 }
 
-QCString VCalFormat::writeStatus(Attendee::PartStat status) const
+Q3CString VCalFormat::writeStatus(Attendee::PartStat status) const
 {
   switch(status) {
     default:
     case Attendee::NeedsAction:
       return "NEEDS ACTION";
       break;
diff --git a/libkcal/vcalformat.h b/libkcal/vcalformat.h
index 6dae3d2..cac9634 100644
--- a/libkcal/vcalformat.h
+++ b/libkcal/vcalformat.h
@@ -20,12 +20,15 @@
 */
 
 #ifndef _VCALFORMAT_H
 #define _VCALFORMAT_H
 
 #include "calformat.h"
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 
 #define _VCAL_VERSION "1.0"
 
 class VObject;
 
 namespace KCal {
@@ -92,22 +95,22 @@ class VCalFormat : public CalFormat {
   
     /** takes a number 0 - 6 and returns the two letter string of that day,
       * i.e. MO, TU, WE, etc. */
     const char *dayFromNum(int day);
     /** the reverse of the above function. */
     int numFromDay(const QString &day);
-    Attendee::Role VCalFormat::readRole(const char *s) const;
-    QCString writeRole(Attendee::Role role) const;
+    Attendee::Role readRole(const char *s) const;
+    Q3CString writeRole(Attendee::Role role) const;
     Attendee::PartStat readStatus(const char *s) const;
-    QCString writeStatus(Attendee::PartStat status) const;
+    Q3CString writeStatus(Attendee::PartStat status) const;
   
   private:
     Calendar *mCalendar;
     bool useLocalTime;
   
-    QPtrList<Event> mEventsRelate;           // events with relations
-    QPtrList<Todo> mTodosRelate;             // todos with relations
+    Q3PtrList<Event> mEventsRelate;           // events with relations
+    Q3PtrList<Todo> mTodosRelate;             // todos with relations
 };
 
 }
 
 #endif
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index e2325d2..92a1737 100644
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@@ -20,41 +20,42 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qstringlist.h>
 #include <qlineedit.h>
-#include <qlistview.h>
-#include <qheader.h>
+#include <q3listview.h>
+#include <q3header.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 #include "kpimprefs.h"
 
 #include "categoryeditdialog.h"
 
 using namespace KPIM;
 
 CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, QWidget* parent,
                                         const char* name, bool modal,
-                                        WFlags fl )
+                                        Qt::WFlags fl )
   : CategoryEditDialog_base( parent, name, modal, fl ),
     mPrefs( prefs )  
 {
   mCategories->header()->hide();
 
   QStringList::Iterator it;
   bool categoriesExist=false;
   for (it = mPrefs->mCustomCategories.begin();
        it != mPrefs->mCustomCategories.end(); ++it ) {
-    new QListViewItem(mCategories,*it);
+    new Q3ListViewItem(mCategories,*it);
     categoriesExist=true;
   }
 
-  connect(mCategories,SIGNAL(selectionChanged(QListViewItem *)),
-          SLOT(editItem(QListViewItem *)));
+  connect(mCategories,SIGNAL(selectionChanged(Q3ListViewItem *)),
+          SLOT(editItem(Q3ListViewItem *)));
   connect(mEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(slotTextChanged(const QString &)));
   mButtonRemove->setEnabled(categoriesExist);
   mButtonModify->setEnabled(categoriesExist);
 #ifndef DESKTOP_VERSION
     mButtonOk->hide();
     mButtonCancel->hide();
@@ -79,13 +80,13 @@ void CategoryEditDialog::slotTextChanged(const QString &text)
     mButtonAdd->setEnabled(!text.isEmpty());
 }
 
 void CategoryEditDialog::add()
 {
   if (!mEdit->text().isEmpty()) {
-    new QListViewItem(mCategories,mEdit->text());
+    new Q3ListViewItem(mCategories,mEdit->text());
     mEdit->setText("");
     mButtonRemove->setEnabled(mCategories->childCount()>0);
     mButtonModify->setEnabled(mCategories->childCount()>0);
   }
 }
 
@@ -118,23 +119,23 @@ void CategoryEditDialog::slotOk()
 }
 
 void CategoryEditDialog::slotApply()
 {
   mPrefs->mCustomCategories.clear();
 
-  QListViewItem *item = mCategories->firstChild();
+  Q3ListViewItem *item = mCategories->firstChild();
   while(item) {
     mPrefs->mCustomCategories.append(item->text(0));
     item = item->nextSibling();
   }
   mPrefs->writeConfig();
 
   emit categoryConfigChanged();
 }
 
-void CategoryEditDialog::editItem(QListViewItem *item)
+void CategoryEditDialog::editItem(Q3ListViewItem *item)
 {
   mEdit->setText(item->text(0));
   mButtonRemove->setEnabled(true);
   mButtonModify->setEnabled(true);
 }
 
diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h
index 9bb3201..828894f 100644
--- a/libkdepim/categoryeditdialog.h
+++ b/libkdepim/categoryeditdialog.h
@@ -21,48 +21,48 @@
     without including the source code for Qt in the source distribution.
 */
 #ifndef KPIM_CATEGORYEDITDIALOG_H
 #define KPIM_CATEGORYEDITDIALOG_H
 
 #include <categoryeditdialog_base.h>
-#include <qlistview.h>
+#include <q3listview.h>
 
 class KPimPrefs;
 
 namespace KPIM {
 
-    class CategorySelectItem :public  QObject, public QCheckListItem
+    class CategorySelectItem :public  QObject, public Q3CheckListItem
 {
 
  Q_OBJECT
   public:
   
-    CategorySelectItem(QListView * parent, const QString & text, Type tt) : QObject( parent ),
-     QCheckListItem (parent, text, tt ) 
+    CategorySelectItem(Q3ListView * parent, const QString & text, Type tt) : QObject( parent ),
+     Q3CheckListItem (parent, text, tt ) 
     {;}
 
     signals:
-    void stateChanged( QListViewItem*);
+    void stateChanged( Q3ListViewItem*);
 
   protected:
 
   virtual void stateChange(bool b)
     {
-        QCheckListItem::stateChange(b);
+        Q3CheckListItem::stateChange(b);
         emit stateChanged( this );
     }
 };
 
 
 class CategoryEditDialog : public CategoryEditDialog_base
 { 
     Q_OBJECT
   public:
     CategoryEditDialog( KPimPrefs *prefs, QWidget* parent = 0,
                         const char* name = 0, 
-                        bool modal = FALSE, WFlags fl = 0 );
+                        bool modal = FALSE, Qt::WFlags fl = 0 );
     ~CategoryEditDialog();
 
   public slots:
     void add();
     void remove();
     void modify();
@@ -72,15 +72,15 @@ class CategoryEditDialog : public CategoryEditDialog_base
     void slotApply();
     
   signals:
     void categoryConfigChanged();
 
   private slots:
-    void editItem(QListViewItem *item);
+    void editItem(Q3ListViewItem *item);
     void slotTextChanged(const QString &text);
-
+  private:
     KPimPrefs *mPrefs;
 };
 
 }
 
 #endif
diff --git a/libkdepim/categoryeditdialog_base.cpp b/libkdepim/categoryeditdialog_base.cpp
index 1908576..c85f6e5 100644
--- a/libkdepim/categoryeditdialog_base.cpp
+++ b/libkdepim/categoryeditdialog_base.cpp
@@ -8,40 +8,44 @@
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 
 #include "categoryeditdialog_base.h"
 
 #include <qvariant.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qlineedit.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 /* 
  *  Constructs a CategoryEditDialog_base as a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
+CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
     : QDialog( parent, name, true, fl )
 
 {
     if ( !name )
         setName( "CategoryEditDialog_base" );
-    CategoryEditDialog_baseLayout = new QGridLayout( this, 1, 1, 11, 6, "CategoryEditDialog_baseLayout"); 
+    CategoryEditDialog_baseLayout = new Q3GridLayout( this, 1, 1, 11, 6, "CategoryEditDialog_baseLayout"); 
 
     mEdit = new QLineEdit( this, "mEdit" );
 
     CategoryEditDialog_baseLayout->addMultiCellWidget( mEdit, 1, 1, 0, 0 );
 
-    Layout13 = new QHBoxLayout( 0, 0, 6, "Layout13"); 
+    Layout13 = new Q3HBoxLayout( 0, 0, 6, "Layout13"); 
 
     // mButtonHelp = new QPushButton( this, "mButtonHelp" );
     //mButtonHelp->setAutoDefault( TRUE );
     //Layout13->addWidget( mButtonHelp );
     //QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
     //Layout13->addItem( spacer );
@@ -57,18 +61,18 @@ CategoryEditDialog_base::CategoryEditDialog_base( QWidget* parent, const char* n
     mButtonCancel = new QPushButton( this, "mButtonCancel" );
     mButtonCancel->setAutoDefault( TRUE );
     Layout13->addWidget( mButtonCancel );
 
     CategoryEditDialog_baseLayout->addMultiCellLayout( Layout13, 2, 2, 0, 1 );
 
-    mCategories = new QListView( this, "mCategories" );
+    mCategories = new Q3ListView( this, "mCategories" );
     mCategories->addColumn( tr2i18n( "Category" ) );
 
     CategoryEditDialog_baseLayout->addWidget( mCategories, 0, 0 );
 
-    layout103 = new QVBoxLayout( 0, 0, 6, "layout103"); 
+    layout103 = new Q3VBoxLayout( 0, 0, 6, "layout103"); 
 
     mButtonAdd = new QPushButton( this, "mButtonAdd" );
     CategoryEditDialog_baseLayout->addMultiCellWidget(mButtonAdd , 1, 1, 1, 1 );
     //layout103->addWidget( mButtonAdd );
 
     mButtonModify = new QPushButton( this, "mButtonModify" );
diff --git a/libkdepim/categoryeditdialog_base.h b/libkdepim/categoryeditdialog_base.h
index 5557ad0..cd577b0 100644
--- a/libkdepim/categoryeditdialog_base.h
+++ b/libkdepim/categoryeditdialog_base.h
@@ -9,50 +9,54 @@
 
 #ifndef CATEGORYEDITDIALOG_BASE_H
 #define CATEGORYEDITDIALOG_BASE_H
 
 #include <qvariant.h>
 #include <qdialog.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
 class QLineEdit;
-class QListView;
-class QListViewItem;
+class Q3ListView;
+class Q3ListViewItem;
 class QPushButton;
 
 class CategoryEditDialog_base : public QDialog
 {
     Q_OBJECT
 
 public:
-    CategoryEditDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    CategoryEditDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
     ~CategoryEditDialog_base();
 
     QLineEdit* mEdit;
     QPushButton* mButtonHelp;
     QPushButton* mApply;
     QPushButton* mButtonOk;
     QPushButton* mButtonCancel;
-    QListView* mCategories;
+    Q3ListView* mCategories;
     QPushButton* mButtonAdd;
     QPushButton* mButtonModify;
     QPushButton* mButtonRemove;
 
 public slots:
     virtual void add();
     virtual void modify();
     virtual void slotApply();
     virtual void remove();
     virtual void slotOk();
 
 protected:
-    QGridLayout* CategoryEditDialog_baseLayout;
-    QHBoxLayout* Layout13;
-    QVBoxLayout* layout103;
+    Q3GridLayout* CategoryEditDialog_baseLayout;
+    Q3HBoxLayout* Layout13;
+    Q3VBoxLayout* layout103;
 
 protected slots:
     virtual void languageChange();
 };
 
 #endif // CATEGORYEDITDIALOG_BASE_H
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 2a9b43e..4f72880 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -18,30 +18,33 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
-#include <qheader.h>
-#include <qapp.h>
+#include <q3header.h>
+#include <qapplication.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QDesktopWidget>
 #include <kmessagebox.h>
 
 
 #include "categoryeditdialog.h"
 #include "categoryselectdialog.h"
 
 #include "kpimprefs.h"
 
 using namespace KPIM;
 
 CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
                                             const char* name, 
-                                            bool modal, WFlags fl )
+                                            bool modal, Qt::WFlags fl )
   : CategorySelectDialog_base( parent, name, true, fl ),
     mPrefs( prefs )
 {
     Q_UNUSED( modal );
     mColorItem = 0;
     mColorEnabled = false;
@@ -78,14 +81,14 @@ void CategorySelectDialog::setCategories()
   mCategories->clear();
   mCategoryList.clear();
 
   QStringList::Iterator it;
   for (it = mPrefs->mCustomCategories.begin();
        it != mPrefs->mCustomCategories.end(); ++it ) {
-      CategorySelectItem * item = new CategorySelectItem(mCategories,*it,QCheckListItem::CheckBox);
-      QObject::connect( item, SIGNAL( stateChanged(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) );
+      CategorySelectItem * item = new CategorySelectItem(mCategories,*it,Q3CheckListItem::CheckBox);
+      QObject::connect( item, SIGNAL( stateChanged(Q3ListViewItem *) ), this, SLOT( clicked(Q3ListViewItem *) ) );
       
   }
 }
 
 CategorySelectDialog::~CategorySelectDialog()
 {
@@ -97,22 +100,22 @@ void CategorySelectDialog::setSelected(const QStringList &selList)
 
   QStringList::ConstIterator it;
   QStringList notFound;
   bool found = false;
   for (it=selList.begin();it!=selList.end();++it) {
       //qDebug(" CategorySelectDialog::setSelected(");
-    QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+    Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
     while (item) {
       if (item->text() == *it) {
         item->setOn(true);
         if ( ! found )
             setColorItem( item );
         found = true;
         break;
       }
-      item = (QCheckListItem *)item->nextSibling();
+      item = (Q3CheckListItem *)item->nextSibling();
     }
 //   if ( ! found ) {
 
 //emit updateCategoriesGlobal();
 //   QMessageBox::information( this, "KO/E: Information!",
 //                                   "Categories found, which were not\n"
@@ -134,42 +137,42 @@ void CategorySelectDialog::setColorEnabled()
 {
     mColorEnabled = true;
     mSetColorCat->show();
 }
 void CategorySelectDialog::setColorCat()
 {
-    QCheckListItem * newColorItem = (QCheckListItem * )mCategories->currentItem ();
+    Q3CheckListItem * newColorItem = (Q3CheckListItem * )mCategories->currentItem ();
    if ( !newColorItem ) {
        KMessageBox::error(this,i18n("There is no current item."));
        return;
    }
    if ( !newColorItem->isOn() )
        newColorItem->setOn( true );
    setColorItem( newColorItem );
 
 }
-void CategorySelectDialog::clicked ( QListViewItem * it )
+void CategorySelectDialog::clicked ( Q3ListViewItem * it )
 {
     if ( ! it )
         return;
-    QCheckListItem *i = (QCheckListItem *) it;
+    Q3CheckListItem *i = (Q3CheckListItem *) it;
     if ( !i->isOn() && i==mColorItem) {
         setColorItem( 0);
-        QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+        Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
         while (item) {
             if (item->isOn()) {
                 setColorItem( item );
                 break;
             }
-            item = (QCheckListItem *)item->nextSibling();
+            item = (Q3CheckListItem *)item->nextSibling();
         }
     } else if ( i->isOn() && !mColorItem) {
         setColorItem( i);
     }
 }
-void  CategorySelectDialog::setColorItem( QCheckListItem * newColorItem )
+void  CategorySelectDialog::setColorItem( Q3CheckListItem * newColorItem )
 {
     if ( !mColorEnabled )
         return;
     if ( mColorItem == newColorItem) 
         return;
     if ( mColorItem ) {
@@ -183,22 +186,22 @@ void  CategorySelectDialog::setColorItem( QCheckListItem * newColorItem )
         mColorItem = newColorItem;
     }
 }
 void CategorySelectDialog::slotApply()
 {
   QStringList categories;
-  QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+  Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
   QString colcat;
   while (item) {
     if (item->isOn()) {
         if ( item == mColorItem)
             colcat = item->text();
         else
             categories.append(item->text());
     }
-    item = (QCheckListItem *)item->nextSibling();
+    item = (Q3CheckListItem *)item->nextSibling();
   }
   categories.sort();
   if ( ! colcat.isEmpty() )
       categories.prepend( colcat );
   // QString categoriesStr = categories.join(",");
 
@@ -217,28 +220,28 @@ void CategorySelectDialog::slotOk()
   emit categoriesSelected(mCategoryList.join(","));
   QDialog::accept();
 }
 
 void CategorySelectDialog::clear()
 {
-  QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+  Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
   while (item) {
     item->setOn(false);
-    item = (QCheckListItem *)item->nextSibling();
+    item = (Q3CheckListItem *)item->nextSibling();
   }  
 }
 
 void CategorySelectDialog::updateCategoryConfig()
 {
   QStringList selected;
-  QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+  Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
   while (item) {
     if (item->isOn()) {
       selected.append(item->text());
     }
-    item = (QCheckListItem *)item->nextSibling();
+    item = (Q3CheckListItem *)item->nextSibling();
   }
 
   setCategories();
   
   setSelected(selected);
 }
diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h
index 680a093..ff7ac58 100644
--- a/libkdepim/categoryselectdialog.h
+++ b/libkdepim/categoryselectdialog.h
@@ -23,23 +23,23 @@
 #ifndef KPIM_CATEGORYSELECTDIALOG_H
 #define KPIM_CATEGORYSELECTDIALOG_H
 
 #include <categoryselectdialog_base.h>
 
 class KPimPrefs;
-class QCheckListItem;
+class Q3CheckListItem;
 
 namespace KPIM {
 
 class CategorySelectDialog : public CategorySelectDialog_base
 { 
     Q_OBJECT
   public:
     CategorySelectDialog( KPimPrefs *prefs, QWidget* parent = 0,
                           const char* name = 0, 
-                          bool modal = FALSE, WFlags fl = 0 );
+                          bool modal = FALSE, Qt::WFlags fl = 0 );
     ~CategorySelectDialog();
 
     void setCategories();
     void setColorEnabled();
     void setSelected(const QStringList &selList);
 
@@ -50,24 +50,24 @@ class CategorySelectDialog : public CategorySelectDialog_base
     void slotApply();
     void clear();
     void accept();
     void editCategoriesDialog();
     void updateCategoryConfig();
     void setColorCat();
-    void clicked ( QListViewItem * ); 
+    void clicked ( Q3ListViewItem * ); 
   signals:
     void categoriesSelected(const QString &);
     void categoriesSelected(const QStringList &);
     void editCategories();
 
   private:
     bool mColorEnabled;
     KPimPrefs *mPrefs;
     QStringList mCategoryList;
-    QCheckListItem *mColorItem;
-    void setColorItem( QCheckListItem * );
+    Q3CheckListItem *mColorItem;
+    void setColorItem( Q3CheckListItem * );
 
     class CategorySelectDialogPrivate;
     CategorySelectDialogPrivate *d;
 };
 
 }
diff --git a/libkdepim/categoryselectdialog_base.cpp b/libkdepim/categoryselectdialog_base.cpp
index 4793fd7..5d53ac4 100644
--- a/libkdepim/categoryselectdialog_base.cpp
+++ b/libkdepim/categoryselectdialog_base.cpp
@@ -8,51 +8,54 @@
 ** WARNING! All changes made in this file will be lost!
 ****************************************************************************/
 
 #include "categoryselectdialog_base.h"
 
 #include <qvariant.h>
-#include <qheader.h>
-#include <qlistview.h>
+#include <q3header.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3HBoxLayout>
 
 /* 
  *  Constructs a CategorySelectDialog_base as a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-CategorySelectDialog_base::CategorySelectDialog_base( QWidget* parent, const char* name, bool modal, WFlags fl )
+CategorySelectDialog_base::CategorySelectDialog_base( QWidget* parent, const char* name, bool modal, Qt::WFlags fl )
     : QDialog( parent, name, modal, fl )
 
 {
     if ( !name )
         setName( "CategorySelectDialog_base" );
-    CategorySelectDialog_baseLayout = new QVBoxLayout( this, 11, 6, "CategorySelectDialog_baseLayout"); 
+    CategorySelectDialog_baseLayout = new Q3VBoxLayout( this, 11, 6, "CategorySelectDialog_baseLayout"); 
 
-    mCategories = new QListView( this, "mCategories" );
+    mCategories = new Q3ListView( this, "mCategories" );
     mCategories->addColumn( i18n( "Category" ) );
     CategorySelectDialog_baseLayout->addWidget( mCategories );
     mSetColorCat = new QPushButton( this, "msetColor" );
     CategorySelectDialog_baseLayout->addWidget( mSetColorCat );
-    Layout12 = new QHBoxLayout( 0, 0, 4, "Layout12"); 
+    Layout12 = new Q3HBoxLayout( 0, 0, 4, "Layout12"); 
 
     mClear = new QPushButton( this, "mClear" );
     Layout12->addWidget( mClear );
     // QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
     //Layout12->addItem( spacer );
 
     mButtonEdit = new QPushButton( this, "mButtonEdit" );
     Layout12->addWidget( mButtonEdit );
     CategorySelectDialog_baseLayout->addLayout( Layout12 );
 
-    Layout11 = new QHBoxLayout( 0, 0, 4, "Layout11"); 
+    Layout11 = new Q3HBoxLayout( 0, 0, 4, "Layout11"); 
 
     //mButtonHelp = new QPushButton( this, "mButtonHelp" );
     //Layout11->addWidget( mButtonHelp );
     //QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
     // Layout11->addItem( spacer_2 );
 
diff --git a/libkdepim/categoryselectdialog_base.h b/libkdepim/categoryselectdialog_base.h
index 59ffa22..71d4ce9 100644
--- a/libkdepim/categoryselectdialog_base.h
+++ b/libkdepim/categoryselectdialog_base.h
@@ -9,29 +9,33 @@
 
 #ifndef CATEGORYSELECTDIALOG_BASE_H
 #define CATEGORYSELECTDIALOG_BASE_H
 
 #include <qvariant.h>
 #include <qdialog.h>
-
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QListView;
-class QListViewItem;
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
+class Q3ListView;
+class Q3ListViewItem;
 class QPushButton;
 
 class CategorySelectDialog_base : public QDialog
 {
     Q_OBJECT
 
 public:
-    CategorySelectDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    CategorySelectDialog_base( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
     ~CategorySelectDialog_base();
 
-    QListView* mCategories;
+    Q3ListView* mCategories;
     QPushButton* mClear;
     QPushButton* mButtonEdit;
     QPushButton* mButtonHelp;
     QPushButton* mApply;
     QPushButton* mButtonOk;
     QPushButton* mButtonCancel;
@@ -40,15 +44,15 @@ public:
 public slots:
     virtual void clear();
     virtual void slotApply();
     virtual void slotOk();
 
 protected:
-    QVBoxLayout* CategorySelectDialog_baseLayout;
-    QHBoxLayout* Layout12;
-    QHBoxLayout* Layout11;
+    Q3VBoxLayout* CategorySelectDialog_baseLayout;
+    Q3HBoxLayout* Layout12;
+    Q3HBoxLayout* Layout11;
 
 protected slots:
     virtual void languageChange();
 };
 
 #endif // CATEGORYSELECTDIALOG_BASE_H
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index f376e6c..3fc548a 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -36,13 +36,15 @@ $Id$
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qtopia/qcopenvelope_qws.h>
 #else
 #include <qapplication.h>
-#include <qprocess.h>
+#include <q3process.h>
+//Added by qt3to4:
+#include <Q3CString>
 #endif
 
 #include <kstaticdeleter.h>
 #include <kmessagebox.h>
 
 
@@ -120,13 +122,13 @@ void QCopTransferItem::setSourceChannel(const QString& sourceChannel)
     if ( !sourceChannel.isEmpty())
         _sourceChannel = sourceChannel;
 }
 
 
 /*********************************************************************************/
-bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
+bool QCopTransferItem::appMessage( const Q3CString& cmsg, const QByteArray& data )
 {
 
   // copied from old mail2
 /*
   static int ii = 0;
 
@@ -143,13 +145,13 @@ bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data
 //  qDebug("QCopTransferItem- QCOP message received: %s ", cmsg.data()  );
 
   //we are in the target and get a request from the source
   if ( (_sourceMessage + _sourceMessageParameters) == cmsg.data())
   {
 
-    QDataStream stream( data, IO_ReadOnly );
+    QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
 
 
     QString sourceChannel;
     QString uid;
     QString param1;
     QString param2;
@@ -223,19 +225,19 @@ bool QCopMapTransferItem::sendMessageToSource(const QString& uid, const QMap<QSt
 #endif
 
 }
 
 
 /*********************************************************************************/
-bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
+bool QCopMapTransferItem::appMessage( const Q3CString& cmsg, const QByteArray& data )
 {
   bool res = QCopTransferItem::appMessage( cmsg, data );
 
   if (res == false)
   {
-    QDataStream stream( data, IO_ReadOnly );
+    QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
 
 //    qDebug("QCopMapTransferItem- QCOP message received: %s ", cmsg.data()  );
 
     //we are in the source and get an answer from the target
     if ((_targetMessage + _targetMessageParameters) == cmsg.data())
     {
@@ -302,22 +304,22 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
 #endif
 
 }
 
 
 /*********************************************************************************/
-bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
+bool QCopListTransferItem::appMessage( const Q3CString& cmsg, const QByteArray& data )
 {
   bool res = QCopTransferItem::appMessage( cmsg, data );
 #ifdef DEBUG_EXT_APP_HANDLER
     qDebug("1QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
 #endif
 
   if (res == false)
   {
-    QDataStream stream( data, IO_ReadOnly );
+    QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
 
 #ifdef DEBUG_EXT_APP_HANDLER
     qDebug("2QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
 #endif
 
     //we are in the source and get an answer from the target
@@ -515,15 +517,15 @@ void ExternalAppHandler::addDefaultAppItem(Types type, int id, const QString& la
   DefaultAppItem* dai = new DefaultAppItem(type, id, label,  channel, message, parameter, message2, parameter2);
   // qDebug("%d %d %s %s ",   type,  id,  label.latin1(), channel.latin1() );
   mDefaultItems.append(dai);
 }
 
 
-QList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type)
+Q3PtrList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type)
 {
-  QList<DefaultAppItem> list;
+  Q3PtrList<DefaultAppItem> list;
 
   DefaultAppItem* dai;
 
   for ( dai=mDefaultItems.first(); dai != 0; dai=mDefaultItems.next() )
   {
     if (dai->_type == type)
@@ -743,13 +745,13 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
 #ifdef DEBUG_EXT_APP_HANDLER
   qDebug("4Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message2.latin1());
   qDebug("passing emailadresses(%s), attachmenturls(%s) as parameters in the form %s to QCopEnvelope", emails.latin1() , urls.latin1(), parameters2.latin1());
 #endif
   qDebug("%s ---  %s   %s --- %s %s", channel.latin1(), message.latin1(),message2.latin1(), parameters.latin1(), parameters2.latin1() );
   //KMessageBox::sorry( 0, message2 );
-  QProcess * proc = new QProcess( this );
+  Q3Process * proc = new Q3Process( this );
   int i = 0;
   proc->addArgument( channel );
 
   if ( message.find (" " ) > 0 ) {
     QStringList list = QStringList::split( " ", message );
     int i = 0;
@@ -769,13 +771,13 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
   QString arg = "to='%1'";
   arg = arg.arg( emails ) + ","+parameters2;;
  
   //KMessageBox::sorry( 0,arg );
   //qDebug("2add%sdd ",arg.latin1() );
   proc->addArgument( arg);
-  proc->launch("");
+  proc->launch(QString());
 #endif
 
   return true;
 }
 
 /**************************************************************************
@@ -828,13 +830,13 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e
     //US we need no names in the To field. The emailadresses are enough
 
   passParameters(&e, parameters, name, emailadress);
 #else // DESKTOP_VERSION
 
   //KMessageBox::sorry( 0,channel );
-  QProcess * proc = new QProcess( this );
+  Q3Process * proc = new Q3Process( this );
   proc->addArgument( channel );
   if ( message.find (" " ) > 0 ) {
     QStringList list = QStringList::split( " ", message );
     int i = 0;
     while ( i < list.count ( ) ) {
       //qDebug("add%sdd ",list[i].latin1() );
@@ -847,13 +849,13 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e
 
   }
   parameters = translateMessage(parameters, name, emailadress);
 
   //KMessageBox::information(0,parameters);
   proc->addArgument( parameters );
-  proc->launch("");
+  proc->launch(QString());
 #endif
 
   return true;
 }
 
 /**************************************************************************
@@ -1229,13 +1231,13 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete
 
 
 /**************************************************************************
  *
  **************************************************************************/
 
-void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data )
+void ExternalAppHandler::appMessage( const Q3CString& cmsg, const QByteArray& data )
 {
     qDebug("ExternalAppHandler::appMessage %s %x", cmsg.data(), this);
     if ( cmsg == "nextView()" ) {
         qDebug("nextView()");
         QTimer::singleShot( 0, this, SIGNAL ( nextView() ));
         return;
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index b899ad7..3247fe4 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -31,12 +31,15 @@ $Id$
 #ifndef EXTERNALAPPHANDLER_H
 #define EXTERNALAPPHANDLER_H
 
 #include <qobject.h>
 #include <qlist.h>
 #include <qmap.h>
+#include <Q3PtrList>
+//Added by qt3to4:
+#include <Q3CString>
 
 class QCopEnvelope;
 
 
 class ExternalAppHandler;
 class QCopTransferItem  : public QObject
@@ -47,13 +50,13 @@ class QCopTransferItem  : public QObject
         QCopTransferItem();
 
     bool sendMessageToTarget(const QString& uid, const QString& param1 = QString::null, const QString& param2 = QString::null, const QString& param3 = QString::null);
 
     void setSourceChannel(const QString& sourceChannel);
 
-    virtual bool appMessage( const QCString& msg, const QByteArray& data );
+    virtual bool appMessage( const Q3CString& msg, const QByteArray& data );
 
 
  signals:
     void receivedMessageFromSource(const QString& sourceChannel, const QString& uid);
     void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1);
     void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2);
@@ -80,13 +83,13 @@ class QCopMapTransferItem : public QCopTransferItem
   public:
     QCopMapTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
 
     bool sendMessageToSource(const QString& uid, const QMap<QString,QString>& nameEmailMap);
 
 
-    virtual bool appMessage( const QCString& msg, const QByteArray& data );
+    virtual bool appMessage( const Q3CString& msg, const QByteArray& data );
 
 
  signals:
     void receivedMessageFromTarget(const QString& uid, const QMap<QString,QString>& nameEmailMap);
 
 };
@@ -101,13 +104,13 @@ class QCopListTransferItem : public QCopTransferItem
   public:
     QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
     ~QCopListTransferItem();
     bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5,  const QStringList& list6);
 
 
-    virtual bool appMessage( const QCString& msg, const QByteArray& data );
+    virtual bool appMessage( const Q3CString& msg, const QByteArray& data );
 
 
  signals:
     void receivedMessageFromTarget(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4 , const QStringList& list5,  const QStringList& list6);
 
 };
@@ -222,17 +225,17 @@ class ExternalAppHandler : public QObject
                                     const QStringList& assembledNameList, const QStringList& uidList);
 
 
     //loadConfig clears the cache and checks again if the applications are available or not
     void loadConfig();
 
-    QList<DefaultAppItem> getAvailableDefaultItems(Types);
+    Q3PtrList<DefaultAppItem> getAvailableDefaultItems(Types);
     DefaultAppItem* getDefaultItem(Types, int);
 
  public  slots:
-    void appMessage( const QCString& msg, const QByteArray& data );
+    void appMessage( const Q3CString& msg, const QByteArray& data );
 
 
  signals:
     void callContactdialog();
     void nextView();
     void doRingSync();
@@ -259,13 +262,13 @@ class ExternalAppHandler : public QObject
                                    const QStringList& emailList, const QStringList& assembledNameList,
                                    const QStringList& uidList);
 
 
   private:
     ExternalAppHandler();
-    QList<DefaultAppItem> mDefaultItems;
+    Q3PtrList<DefaultAppItem> mDefaultItems;
 
     Availability mEmailAppAvailable;
     Availability mPhoneAppAvailable;
     Availability mFaxAppAvailable;
     Availability mSMSAppAvailable;
     Availability mPagerAppAvailable;
diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
index 5094830..9f47766 100644
--- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
+++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp
@@ -27,12 +27,14 @@ Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kdebug.h>
 //#include <klocale.h>
 //#include <stdlib.h>
 
 #include "kdepimconfigwidget.h"
@@ -51,13 +53,13 @@ extern "C"
 #endif
 
 KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name )
   : KCModule( KPimGlobalPrefs::instance(), parent, name )
 {
     //abort();
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
   mConfigWidget = new KDEPIMConfigWidget( (KPimGlobalPrefs*)getPreferences(), this, "KDEPIMConfigWidget" );
   layout->addWidget( mConfigWidget );
   layout->setSpacing( 0 );
   layout->setMargin( 0 );
 
   connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 292951b..11a2b45 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -28,22 +28,27 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #include <qlayout.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcheckbox.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qdir.h>
 #include <qregexp.h>
 #include <qspinbox.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 
 #include <kdialog.h>
 #include <kprefsdialog.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kdateedit.h>
@@ -98,13 +103,13 @@ KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent,
   mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
   mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
   mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
   mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
 
 
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
 
@@ -118,41 +123,41 @@ KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent,
 void KDEPIMConfigWidget::showTimeZoneTab()
 {
     tabWidget->setCurrentPage ( 3 ) ;
 }
 void KDEPIMConfigWidget::setupBackupTab()
 {
-    QVBox *colorPage = new QVBox( this );
+    Q3VBox *colorPage = new Q3VBox( this );
     tabWidget->addTab( colorPage, i18n( "Backup" ) );
     QWidget* topFrame = new QWidget( colorPage ); 
-    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3VBoxLayout *topLayout = new Q3VBoxLayout(topFrame);
     KPrefsWidBool *sb = addWidBool(i18n("Backup enabled"),
                       &(KPimGlobalPrefs::instance()->mBackupEnabled),topFrame);
     topLayout->addWidget((QWidget*)sb->checkBox());
     QWidget* bupFrame = new QWidget( topFrame ); 
     topLayout->addWidget((bupFrame));
     QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), bupFrame, SLOT ( setEnabled( bool ) ) );
-    QVBoxLayout *bupLayout = new QVBoxLayout(bupFrame);
+    Q3VBoxLayout *bupLayout = new Q3VBoxLayout(bupFrame);
     sb = addWidBool(i18n("Use standard backup dir"),
                       &(KPimGlobalPrefs::instance()->mBackupUseDefaultDir),bupFrame);
     bupLayout->addWidget((QWidget*)sb->checkBox());
     mBackupUrl = new KURLRequester( bupFrame );
     mBackupUrl->setPathIsDir();
     mBackupUrl->setURL( KGlobalSettings::backupDataDir() );
     QObject::connect ( sb->checkBox(), SIGNAL (toggled ( bool ) ), mBackupUrl ,SLOT ( setDisabled( bool ) ) );
     bupLayout->addWidget( mBackupUrl );
 
     mBackupUrl->setEnabled( !KPimGlobalPrefs::instance()->mBackupUseDefaultDir );
     bupFrame->setEnabled( KPimGlobalPrefs::instance()->mBackupEnabled );
-    QHBox *dummy = new QHBox(bupFrame);
+    Q3HBox *dummy = new Q3HBox(bupFrame);
     new QLabel(i18n("Number of Backups:"),dummy);
     mBackupNumbersSpin = new QSpinBox(1,21,1,dummy);
     new QLabel(i18n(" "),dummy);
     bupLayout->addWidget( dummy );
 
-    dummy = new QHBox(bupFrame);
+    dummy = new Q3HBox(bupFrame);
     new QLabel(i18n("Make backup every "),dummy);
     mBackupDayCountSpin = new QSpinBox(1,28,1,dummy);
     new QLabel(i18n(" days"),dummy);
     new QLabel(i18n(" "),dummy);
     bupLayout->addWidget( dummy ); 
     QString localKdeDir;
@@ -164,24 +169,24 @@ void KDEPIMConfigWidget::setupBackupTab()
         KPimGlobalPrefs::instance()->mBackupUseDefaultDir = true;
     }
 
 }
 void KDEPIMConfigWidget::setupStoreTab()
 {
-    QVBox *colorPage = new QVBox( this );
+    Q3VBox *colorPage = new Q3VBox( this );
     tabWidget->addTab( colorPage, i18n( "Colors" ) );
     QWidget* cw = new QWidget( colorPage ); 
     KPrefsWidColor *holidayColor =
       addWidColor(i18n("Alternating background of list views"),
                   &(KPimGlobalPrefs::instance()->mAlternateColor),cw);
-    QHBoxLayout *topLayout = new QHBoxLayout(cw);
+    Q3HBoxLayout *topLayout = new Q3HBoxLayout(cw);
     topLayout->addWidget(holidayColor->label());
     topLayout->addWidget( (QWidget* )holidayColor->button());
 
 
-    QVBox *storePage = new QVBox( this ); 
+    Q3VBox *storePage = new Q3VBox( this ); 
     if (  QApplication::desktop()->height() > 240 )
     new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage  );
     new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
     mStoreUrl = new KURLRequester( storePage );
     mStoreUrl->setPathIsDir();
     mStoreUrl->setURL( KGlobal::dirs()->localkdedir() );
@@ -197,13 +202,13 @@ void KDEPIMConfigWidget::setupStoreTab()
             qDebug("Reading config from %s ", confFile.latin1());
         }
     }
                
 #endif 
     new QLabel( i18n("New dirs are created automatically"), storePage  );
-    QHBox *bb = new QHBox( storePage );
+    Q3HBox *bb = new Q3HBox( storePage );
     QPushButton * pb;
     if ( QApplication::desktop()->width() < 640 )
         pb = new QPushButton ( i18n("Save"), bb  );
     else
         pb = new QPushButton ( i18n("Save settings"), bb  );
     connect(pb, SIGNAL( clicked() ), this, SLOT ( saveStoreSettings() ) );
@@ -267,13 +272,13 @@ void KDEPIMConfigWidget::saveStoreSettings()
         saveStoreSettings();
     }
 }
 void KDEPIMConfigWidget::setupExternalAppTab()
 {
   QWidget *externalAppsPage = new QWidget( this );
-  QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
+  Q3VBoxLayout* layout = new Q3VBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
 
   mExternalApps = new QComboBox( externalAppsPage );
 
   QMap<ExternalAppHandler::Types, QString>::Iterator it;
   for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
@@ -282,14 +287,14 @@ void KDEPIMConfigWidget::setupExternalAppTab()
   layout->addWidget( mExternalApps );
 
   connect( mExternalApps, SIGNAL( activated( int ) ),
            this, SLOT (externalapp_changed( int ) ) );
 
 
-  mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
-  QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
+  mExternalAppGroupBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
+  Q3GridLayout *boxLayout = new Q3GridLayout( mExternalAppGroupBox->layout(), 4, 2,    -1, "gridlayout" );
   mExternalAppGroupBox->layout()->setMargin(4);
 
   mClient = new QComboBox( mExternalAppGroupBox );
   boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
 
   connect( mClient, SIGNAL( activated( int ) ),
@@ -349,13 +354,13 @@ void KDEPIMConfigWidget::setupExternalAppTab()
 }
 
   
 void KDEPIMConfigWidget::setupLocaleDateTab()
 {
   QWidget *topFrame = new QWidget( this );
-  QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
+  Q3GridLayout *topLayout = new Q3GridLayout( topFrame, 3, 2);
 
    topLayout->setSpacing(KDialog::spacingHintSmall());
    topLayout->setMargin(KDialog::marginHintSmall());  
    int iii = 0;
 
    
@@ -417,13 +422,13 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
 }
 
 void KDEPIMConfigWidget::setupLocaleTab()
 {
 
   QWidget *topFrame = new QWidget( this );
-   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,4,2);
 
    topLayout->setSpacing(KDialog::spacingHint());
    topLayout->setMargin(KDialog::marginHint());  
    int iii = 0;
  KPrefsWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame);
@@ -439,13 +444,13 @@ void KDEPIMConfigWidget::setupLocaleTab()
    topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
 
    tabWidget->addTab( topFrame, i18n( "Language" ) );
    topFrame = new QWidget( this );
-   topLayout = new QGridLayout(topFrame,4,2);
+   topLayout = new Q3GridLayout(topFrame,4,2);
    
    topLayout->setSpacing(KDialog::spacingHint());
    topLayout->setMargin(KDialog::marginHint());  
    iii = 0;
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame);
@@ -468,25 +473,25 @@ void KDEPIMConfigWidget::setupLocaleTab()
 }
 
 
 void KDEPIMConfigWidget::setupTimeZoneTab()
 {
     QWidget *topFrame;
-    QGridLayout *topLayout ;
+    Q3GridLayout *topLayout ;
 
  
 
 
 
 
   topFrame = new QWidget( this );
-  topLayout = new QGridLayout( topFrame, 5, 2);
+  topLayout = new Q3GridLayout( topFrame, 5, 2);
   topLayout->setSpacing(KDialog::spacingHintSmall());
   topLayout->setMargin(KDialog::marginHintSmall());
 
-  QHBox *timeZoneBox = new QHBox( topFrame );
+  Q3HBox *timeZoneBox = new Q3HBox( topFrame );
   topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
 
   new QLabel( i18n("Timezone:"), timeZoneBox );
   mTimeZoneCombo = new QComboBox( timeZoneBox ); 
   if ( QApplication::desktop()->width() <  300 ) {
        mTimeZoneCombo->setMaximumWidth(150);
@@ -547,13 +552,13 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
   connect( mEndDateSavingEdit, SIGNAL(  dateChanged(QDate)), this, SLOT( modified())  );
   connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) );
   tabWidget->addTab( topFrame, i18n( "Time Zone" ) );
  
 
   topFrame = new QWidget( this );
-  topLayout = new QGridLayout( topFrame, 3, 2);
+  topLayout = new Q3GridLayout( topFrame, 3, 2);
   topLayout->setSpacing(KDialog::spacingHintSmall());
   topLayout->setMargin(KDialog::marginHintSmall());
   tabWidget->addTab( topFrame, i18n( "Fonts" ) );
 
   QLabel* labb = new QLabel( i18n("Global application font for all apps:"),  topFrame );
   topLayout->addMultiCellWidget(labb,0,0,0,2);
@@ -708,13 +713,13 @@ void KDEPIMConfigWidget::updateClientWidgets()
   // update group box
   mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data()));
 
   //update the entries in the client combobox
   mClient->clear();
 
-  QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
+  Q3PtrList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
   DefaultAppItem* dai;
   for ( dai=items.first(); dai != 0; dai=items.next() )
   {
     mClient->insertItem( i18n(dai->_label), dai->_id );
 
     if (dai->_id == mCurrentClient)
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 824ef79..d693015 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -31,20 +31,22 @@ $Id$
 #ifndef KDEPIMCONFIGWIDGET_H
 #define KDEPIMCONFIGWIDGET_H
 
 #include <kprefswidget.h>
 #include <kio/kfile/kurlrequester.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include "externalapphandler.h"
 
 
 class QComboBox;
 class QLineEdit;
 class KPimGlobalPrefs;
-class QGroupBox;
+class Q3GroupBox;
 class QTabWidget;
 class KDateEdit;
 
 class KDEPIMConfigWidget : public KPrefsWidget
 {
   Q_OBJECT
@@ -103,13 +105,13 @@ class KDEPIMConfigWidget : public KPrefsWidget
 //    KListView *mExtensionView;
 
 //    QCheckBox *mNameParsing;
 //    QCheckBox *mViewsSingleClickBox;
 //    QPushButton *mConfigureButton;
         QComboBox* mExternalApps;
-        QGroupBox* mExternalAppGroupBox;
+        Q3GroupBox* mExternalAppGroupBox;
 
 
     QComboBox* mClient;
     QLineEdit* mChannel;
     QLineEdit* mMessage;
     QLineEdit* mParameters;
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index bf38479..28c88d4 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -24,27 +24,31 @@
 
 #include <qapplication.h>
 #include <qevent.h>
 #include <qlineedit.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3Frame>
+#include <QKeyEvent>
 
 #include <kdatepicker.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <qpalette.h>
+#include <QDesktopWidget>
 
 #include "kdateedit.h"
 //#include "kdateedit.moc"
 
 KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
-  : QHBox(parent, name)
+  : Q3HBox(parent, name)
 {
   dateFormShort = true;
   withoutDp = withoutDP;
   mDateEdit = new QLineEdit(this);
   mDateEdit->setText(KGlobal::locale()->formatDate(QDate::currentDate(),dateFormShort));
   setFocusProxy(mDateEdit);
@@ -69,27 +73,27 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
       mDateButton = new QPushButton(this);
       mDateButton->setPixmap(pixmap);
       QPixmap pixmap2 = SmallIcon("today_small");
       QPushButton*  nowButton = new QPushButton(this);
       nowButton->setPixmap(pixmap2);
 
-      mDateFrame = new QVBox(0,0,WType_Popup);
+      mDateFrame = new Q3VBox(0,0,Qt::WType_Popup);
       // mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
-      mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
+      mDateFrame->setFrameStyle( Q3Frame::WinPanel |Q3Frame::Raised );
       mDateFrame->setLineWidth(3);
       mDateFrame->hide();
 
       mDatePicker = new KDatePicker(mDateFrame,QDate::currentDate());
       connect(mDatePicker,SIGNAL(dateEntered(QDate)),SLOT(setDate(QDate)));
       connect(mDatePicker,SIGNAL(dateEntered(QDate)),SIGNAL(dateChanged(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(setDate(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),SIGNAL(dateChanged(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),mDateFrame,SLOT(hide()));
       connect(mDateButton,SIGNAL(clicked()),SLOT(toggleDatePicker()));
       connect(nowButton,SIGNAL(clicked()),SLOT(goToNow()));
-      mDateButton->setFocusPolicy( QWidget::NoFocus ); 
+      mDateButton->setFocusPolicy( Qt::NoFocus ); 
       mDateButton->setAutoDefault( false ); 
       //mDateFrame->resize( 400, 300 );
       
   }
       connect(mDateEdit,SIGNAL(returnPressed()),SLOT(lineEnterPressed()));
       connect(mDateEdit,SIGNAL(textChanged(const QString &)),
@@ -222,41 +226,41 @@ void KDateEdit::setDate( QDate date,int *cpos,const int key ,const bool dateForm
 
   // set date
   switch ( dateForm.at(begin + 1).latin1() ) {
     case 'd':
     case 'a':
     case 'A':
-      if(key == Key_Up) {
+      if(key == Qt::Key_Up) {
         setDate( date.addDays( 1 ) );
       }
-      else if(key == Key_Down) {
+      else if(key == Qt::Key_Down) {
         setDate( date.addDays( -1 ) );
       }
       maxDay = readDate().day();
       break;
     case 'm':
     case 'b':
     case 'B':
-      if(key == Key_Up) {
+      if(key == Qt::Key_Up) {
           int year = ((date.month()+1)>12)?date.year()+1:date.year();
           int month = ((date.month()+1)>12)?1:date.month()+1;
           int day = (QDate(year,month,1).daysInMonth()<maxDay)?QDate(year,month,1).daysInMonth():maxDay;
           setDate( QDate( year, month, day ) );
-      } else if(key == Key_Down) {
+      } else if(key == Qt::Key_Down) {
           int year = ((date.month()-1)<1)?date.year()-1:date.year();
           int month = ((date.month()-1)<1)?12:date.month()-1;
           int day = (QDate(year,month,1).daysInMonth()<maxDay)?QDate(year,month,1).daysInMonth():maxDay;
           setDate( QDate( year, month, day ) );
       }
       break;
     case 'y':
     case 'Y':
-      if(key == Key_Up) {
+      if(key == Qt::Key_Up) {
         setDate( QDate( date.year() + 1, date.month() , date.day()) );
       }
-      else if(key == Key_Down) {
+      else if(key == Qt::Key_Down) {
         setDate( QDate( date.year() - 1, date.month() , date.day()) );
       }
       break;
 /*    default:
       if(key == Key_Up) {
         setDate( date.addDays( 1 ) );
@@ -341,45 +345,45 @@ void KDateEdit::keyPressEvent(QKeyEvent *e)
 {
   QDate date = readDate();
   int cpos = mDateEdit->cursorPosition();
 
   switch(e->key())
   {
-  case Key_Escape:
+      case Qt::Key_Escape:
       mDateEdit->deselect();
-  case Key_Tab:
-      QHBox::keyPressEvent(e);
+      case Qt::Key_Tab:
+      Q3HBox::keyPressEvent(e);
       break;
-  case Key_Up:
+      case Qt::Key_Up:
       // when date invalid then set to currend and return
       if(!date.isValid()) {
         date = QDate::currentDate();
         setDate(date);
         mDateEdit->setCursorPosition(cpos);
         emit(dateChanged(date));
         QString text = i18n( "You entered an invalid date!\n Date changed  to current date." );
         KMessageBox::information( 0, text );
         return;
       }
-      setDate(date, &cpos, Key_Up, dateFormShort);
+      setDate(date, &cpos, Qt::Key_Up, dateFormShort);
       break;
-  case Key_Down:
+      case Qt::Key_Down:
       // when date invalid then set to current and return
       if(!date.isValid()) {
         date = QDate::currentDate();
         setDate(date);
         mDateEdit->setCursorPosition(cpos);
         emit(dateChanged(date));
         QString text = i18n( "You entered an invalid date!\n Date changed  to current date." );
         KMessageBox::information( 0, text );
         return;
       }
-      setDate(date, &cpos, Key_Down, dateFormShort);
+      setDate(date, &cpos, Qt::Key_Down, dateFormShort);
       break;
   default:
-      QHBox::keyPressEvent(e);
+      Q3HBox::keyPressEvent(e);
       break;
   } // switch
   mDateEdit->setCursorPosition(cpos);
 }
 
 void KDateEdit::setSelect( int from, int to )
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index 2d8c452..38eacde 100644
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@@ -21,16 +21,19 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KDATEEDIT_H
 #define KDATEEDIT_H
 
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qdatetime.h>
 #include <qmap.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <QEvent>
 
 class QLineEdit;
 class QPushButton;
 class QObject;
 class QEvent;
 class KDatePicker;
@@ -46,13 +49,13 @@ class KDateValidator;
 * are supported (in the native language): tomorrow, yesturday, today,
 * monday, tuesday, wednesday, thursday, friday, saturday, sunday.
 *
 * @author Cornelius Schumacher <schumacher@kde.org>
 * @author Mike Pilone <mpilone@slac.com>
 */
-class KDateEdit : public QHBox
+class KDateEdit : public Q3HBox
 {
     Q_OBJECT
   public:
     KDateEdit(QWidget *parent=0, const char *name=0, bool withoutDP = false );
     virtual ~KDateEdit();
 
@@ -125,13 +128,13 @@ class KDateEdit : public QHBox
     bool mTextChanged;
     bool mHandleInvalid;
 
     QPushButton *mDateButton;
     QLineEdit *mDateEdit;
     KDatePicker *mDatePicker;
-    QVBox *mDateFrame;
+    Q3VBox *mDateFrame;
     int maxDay;
     bool withoutDp;
 
   protected:
     virtual void keyPressEvent(QKeyEvent *qke);
     void setSelect ( int, int );
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index 68ef943..28b65cf 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -20,30 +20,34 @@
 
 #include "kdatepicker.h"
 #include <kglobal.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpainter.h>
 #include <qdialog.h>
 #include <qtoolbutton.h>
 #include <qfont.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qvalidator.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QKeyEvent>
+#include <QDesktopWidget>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <kglobalsettings.h>
 #include "kdatetbl.h"
 #include "kdateedit.h"
 //#include "kdatepicker.moc"
 
 
 KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
-  : QFrame(parent,name),
+  : Q3Frame(parent,name),
     yearForward(new QToolButton(this)),
     yearBackward(new QToolButton(this)),
     monthForward(new QToolButton(this)),
     monthBackward(new QToolButton(this)),
     selectMonth(new QToolButton(this)),
     selectYear(new QToolButton(this)),
diff --git a/libkdepim/kdatepicker.h b/libkdepim/kdatepicker.h
index 3db9a89..4d904da 100644
--- a/libkdepim/kdatepicker.h
+++ b/libkdepim/kdatepicker.h
@@ -17,14 +17,17 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef MICROKDE_KDATEPICKER_H
 #define MICROKDE_KDATEPICKER_H
 #include <qdatetime.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QKeyEvent>
 
 class QLineEdit;
 class QToolButton;
 class KDateValidator;
 class KDateTable;
 class KDateEdit;
@@ -45,13 +48,13 @@ class KDateEdit;
  *
  *     @version $Id$
  *     @author Tim Gilman, Mirko Boehm
  *
  * @short A date selection widget.
  **/
-class KDatePicker: public QFrame
+class KDatePicker: public Q3Frame
 {
   Q_OBJECT
 public:
   /** The usual constructor.  The given date will be displayed
    * initially.
    **/
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 9c28425..3677e87 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -35,13 +35,13 @@ $Id$
 #include <kglobalsettings.h>
 #include <kstaticdeleter.h>
 
 #include <qregexp.h>
 #include <qfile.h>
 #include <stdlib.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qapplication.h>
 #include "kpimglobalprefs.h"
 
 KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0;
 static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP;
 
@@ -139,15 +139,15 @@ void KPimGlobalPrefs::setGlobalConfig()
                 fileName = fileName+"usertranslation.txt"; 
             else if ( mPreferredLanguage == 2 ) 
                 fileName = fileName+"frenchtranslation.txt"; 
             else if ( mPreferredLanguage == 3 ) 
                 fileName = fileName+"italiantranslation.txt";
             QFile file( fileName );
-            if (file.open( IO_ReadOnly ) ) {
-                QTextStream ts( &file );
-                ts.setEncoding( QTextStream::Latin1 );
+            if (file.open( QIODevice::ReadOnly ) ) {
+                Q3TextStream ts( &file );
+                ts.setEncoding( Q3TextStream::Latin1 );
                 //ts.setCodec( QTextCodec::latin1 );
                 QString  text = ts.read();
                 file.close();  
                 text.replace( QRegExp("\\\\n"), "\n" );
                 QString line;
                 QString we;
@@ -155,13 +155,13 @@ void KPimGlobalPrefs::setGlobalConfig()
                 int br = 0;
                 int nbr;
                 nbr = text.find ( "},", br );
                 line = text.mid( br, nbr - br );
                 br = nbr+1;
                 int se, ee, st, et;
-                mLocaleDict = new QDict<QString>;
+                mLocaleDict = new Q3Dict<QString>;
                 mLocaleDict->setAutoDelete( true );
                 QString end = "{ \"\",\"\" }";
                 while ( (line != end) && (br > 1)  ) {
                     //qDebug("%d *%s* ", br, line.latin1());
                     se = line.find("\"")+1;
                     et = line.findRev("\"",-1);
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index 94ac8ae..01f5ab0 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -29,13 +29,13 @@ $Id$
 */
 
 #ifndef KPIMGLOBALPREFS_H
 #define KPIMGLOBALPREFS_H
 
 #include "kprefs.h"
-#include <qdict.h>
+#include <q3dict.h>
 
 class KPimGlobalPrefs : public KPrefs
 {
   public:
 
     void setGlobalConfig();
@@ -82,13 +82,13 @@ class KPimGlobalPrefs : public KPrefs
     };
 
   private:
     KPimGlobalPrefs( const QString &name = QString::null );
 
    static KPimGlobalPrefs *sInstance;
-    QDict<QString> *mLocaleDict;
+    Q3Dict<QString> *mLocaleDict;
 
 
   public:
     //US I copied the following "locale" settings from KOPrefs 
     int mPreferredDate;
     QString mUserDateFormatLong;
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index 6dc741d..358acbd 100644
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@@ -22,29 +22,30 @@
 */
 
 // $Id$
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
+#include <q3groupbox.h>
+#include <q3buttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
-#include <qtextstream.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3textstream.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
@@ -125,13 +126,13 @@ KPrefsDialogWidFont::KPrefsDialogWidFont(const QString &sampleText,const QString
 {
   mReference = reference;
 
   mLabel = new QLabel(labelText, parent);
 
   mPreview = new QLabel(sampleText,parent);
-  mPreview->setFrameStyle(QFrame::Panel|QFrame::Sunken);
+  mPreview->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken);
 
   mButton = new QPushButton(i18n("Choose..."), parent);
   connect(mButton,SIGNAL(clicked()),SLOT(selectFont())); 
   mPreview->setMaximumHeight( QApplication::desktop()->height() / 12 );
   mPreview->setMaximumWidth( (QApplication::desktop()->width() / 2)-10 );
 }
@@ -209,25 +210,25 @@ QSpinBox *KPrefsDialogWidTime::spinBox()
 
 KPrefsDialogWidRadios::KPrefsDialogWidRadios(const QString &text,int *reference,
                 QWidget *parent)
 {
   mReference = reference;
 
-  mBox = new QButtonGroup(1,Qt::Horizontal,text,parent);
+  mBox = new Q3ButtonGroup(1,Qt::Horizontal,text,parent);
 }
 
 KPrefsDialogWidRadios::~KPrefsDialogWidRadios()
 {
 }
 
 void KPrefsDialogWidRadios::addRadio(const QString &text)
 {
   new QRadioButton(text,mBox);
 }
 
-QButtonGroup *KPrefsDialogWidRadios::groupBox()
+Q3ButtonGroup *KPrefsDialogWidRadios::groupBox()
 {
   return mBox;
 }
 
 void KPrefsDialogWidRadios::readConfig()
 {
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index 52ec809..cc95dd4 100644
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@@ -21,25 +21,27 @@
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KPREFSDIALOG_H
 #define _KPREFSDIALOG_H
 // $Id$
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qlineedit.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include <kdialogbase.h>
 
 class KPrefs;
 class KPrefsDialog;
 
 class KColorButton;
 class QCheckBox;
 class QLabel;
 class QSpinBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 
 /**
   @short Base class for widgets used by @ref KPrefsDialog.
   @author Cornelius Schumacher
   @see KPrefsDialog
 
@@ -255,21 +257,21 @@ class KPrefsDialogWidRadios : public KPrefsDialogWid
     */
     void addRadio(const QString &text);
     
     /**
       Return the box widget used by this widget.
     */
-    QButtonGroup *groupBox();
+    Q3ButtonGroup *groupBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     int *mReference;
 
-    QButtonGroup *mBox;
+    Q3ButtonGroup *mBox;
 };
 
 
 /**
   @short Widget for string settings in @ref KPrefsDialog.
   
@@ -436,13 +438,13 @@ class KPrefsDialog : public KDialogBase
     /** Implement this to write custom configuration widgets. */
     virtual void usrWriteConfig() {}
 
   private:
     KPrefs *mPrefs;
 
-    QPtrList<KPrefsDialogWid> mPrefsWids;
+    Q3PtrList<KPrefsDialogWid> mPrefsWids;
 };
 
 
 #include "kcmconfigs/kdepimconfigwidget.h"
 class KPimPrefsGlobalDialog : public KPrefsDialog
 {
diff --git a/libkdepim/kprefswidget.cpp b/libkdepim/kprefswidget.cpp
index f6a0b38..51431e2 100644
--- a/libkdepim/kprefswidget.cpp
+++ b/libkdepim/kprefswidget.cpp
@@ -22,29 +22,30 @@
 */
 
 // $Id$
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
+#include <q3groupbox.h>
+#include <q3buttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
-#include <qtextstream.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3textstream.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
@@ -128,13 +129,13 @@ KPrefsWidFont::KPrefsWidFont(const QString &sampleText,const QString &labelText,
 {
   mReference = reference;
 
   mLabel = new QLabel(labelText, parent);
 
   mPreview = new QLabel(sampleText,parent);
-  mPreview->setFrameStyle(QFrame::Panel|QFrame::Sunken);
+  mPreview->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken);
 
   mButton = new QPushButton(i18n("Choose..."), parent);
   connect(mButton,SIGNAL(clicked()),SLOT(selectFont())); 
   mPreview->setMaximumHeight( QApplication::desktop()->height() / 12 );
   mPreview->setMaximumWidth( (QApplication::desktop()->width() / 2)-10 );
 }
@@ -215,26 +216,26 @@ QSpinBox *KPrefsWidTime::spinBox()
 
 KPrefsWidRadios::KPrefsWidRadios(const QString &text,int *reference,
                 QWidget *parent)
 {
   mReference = reference;
 
-  mBox = new QButtonGroup(1,Qt::Horizontal,text,parent);
+  mBox = new Q3ButtonGroup(1,Qt::Horizontal,text,parent);
   connect( mBox, SIGNAL( clicked(int)), SIGNAL( modified() ) );
 }
 
 KPrefsWidRadios::~KPrefsWidRadios()
 {
 }
 
 void KPrefsWidRadios::addRadio(const QString &text)
 {
   new QRadioButton(text,mBox);
 }
 
-QButtonGroup *KPrefsWidRadios::groupBox()
+Q3ButtonGroup *KPrefsWidRadios::groupBox()
 {
   return mBox;
 }
 
 void KPrefsWidRadios::readConfig()
 {
diff --git a/libkdepim/kprefswidget.h b/libkdepim/kprefswidget.h
index 8543a39..9de1be5 100644
--- a/libkdepim/kprefswidget.h
+++ b/libkdepim/kprefswidget.h
@@ -22,25 +22,27 @@
 */
 // $Id$
 
 #ifndef _KPREFSWIDGET_H
 #define _KPREFSWIDGET_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QLabel>
 
 class KPrefs;
 
 class KColorButton;
 class QCheckBox;
 class QLabel;
 class QSpinBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 
 /**
   @short Base class for widgets used by @ref KPrefsDialog.
   @author Cornelius Schumacher
   @see KPrefsDialog
 
@@ -262,21 +264,21 @@ class KPrefsWidRadios : public KPrefsWid
     */
     void addRadio(const QString &text);
     
     /**
       Return the box widget used by this widget.
     */
-    QButtonGroup *groupBox();
+    Q3ButtonGroup *groupBox();
     
     void readConfig();
     void writeConfig();
     
   private:
     int *mReference;
 
-    QButtonGroup *mBox;
+    Q3ButtonGroup *mBox;
 };
 
 
 /**
   @short Widget for string settings in @ref KPrefsDialog.
   
@@ -446,10 +448,10 @@ class KPrefsWidget : public QWidget
     /** Implement this to write custom configuration widgets. */
     virtual void usrWriteConfig() {}
 
   private:
     KPrefs *mPrefs;
 
-    QPtrList<KPrefsWid> mPrefsWids;
+    Q3PtrList<KPrefsWid> mPrefsWids;
 };
 
 #endif
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 5708dfc..c844627 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -32,41 +32,44 @@
 #include "ksyncprofile.h"
 #include "ksyncprefsdialog.h"
 #include "kpimprefs.h"
 #include <kmessagebox.h>
 
 #include <qdir.h>
-#include <qprogressbar.h>
-#include <qpopupmenu.h>
+#include <q3progressbar.h>
+#include <q3popupmenu.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextcodec.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kfiledialog.h>
 
 QDateTime KSyncManager::mRequestedSyncEvent;
 
 
-KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
+KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, Q3PopupMenu* syncmenu)
     : QObject(),  mPrefs(prefs ), mParent(parent),mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu)
 {
     mServerSocket = 0;
-    bar = new QProgressBar ( 1, 0 );
+    bar = new Q3ProgressBar ( 1, 0 );
     bar->setCaption ("");
     mWriteBackInPast = 2;
     
 
 }
 
@@ -86,13 +89,13 @@ void KSyncManager::fillSyncMenu()
 {
     if ( mSyncMenu->count() )
         mSyncMenu->clear();
     
     mSyncMenu->insertItem( i18n("Configure..."), 0 );
     mSyncMenu->insertSeparator();
-    QPopupMenu *clearMenu = new QPopupMenu ( mSyncMenu );
+    Q3PopupMenu *clearMenu = new Q3PopupMenu ( mSyncMenu );
     mSyncMenu->insertItem( i18n("Remove sync info"),clearMenu, 5000 );
     clearMenu->insertItem( i18n("For all profiles"), 1 );
     clearMenu->insertSeparator();
     connect ( clearMenu, SIGNAL( activated ( int )  ), this, SLOT (slotClearMenu( int ) ) );
     mSyncMenu->insertSeparator();
     if ( mServerSocket == 0 ) {
@@ -352,13 +355,13 @@ void KSyncManager::enableQuick( bool ask )
 {
     bool autoStart;
     bool changed = false;
     if ( ask ) {
         QDialog dia ( 0, "input-dialog", true );
         QLineEdit lab ( &dia );
-        QVBoxLayout lay( &dia );
+        Q3VBoxLayout lay( &dia );
         lab.setText( mPrefs->mPassiveSyncPort );
         lay.setMargin(7);
         lay.setSpacing(7);
         int po = 9197+mTargetApp;
         QLabel label ( i18n("Port number (Default: %1)\nValid range from 1 to 65535").arg(po), &dia );
         lay.addWidget( &label);
@@ -801,13 +804,13 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
     return;
 }
 bool KSyncManager::edit_pisync_options()
 {
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice );
-    QVBoxLayout lay ( &dia );
+    Q3VBoxLayout lay ( &dia );
     lay.setSpacing( 5 );
     lay.setMargin( 3 );
     QLabel lab1 ( i18n("Password for remote access:"), &dia); 
     lay.addWidget( &lab1 );
     QLineEdit le1 (&dia );
     lay.addWidget( &le1 );
@@ -835,14 +838,14 @@ bool KSyncManager::edit_pisync_options()
 }
 bool KSyncManager::edit_sync_options()
 {
 
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
-    QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
-    QVBoxLayout lay ( &dia );
+    Q3ButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
+    Q3VBoxLayout lay ( &dia );
     lay.setSpacing( 2 );
     lay.setMargin( 3 );
     lay.addWidget(&gr);
     QRadioButton loc ( i18n("Take local entry on conflict"), &gr );
     QRadioButton rem ( i18n("Take remote entry on conflict"), &gr );
     QRadioButton newest( i18n("Take newest entry on conflict"), &gr );
@@ -888,13 +891,13 @@ bool KSyncManager::edit_sync_options()
 QString  KSyncManager::getPassword( )
 {
     QString retfile = "";
     QDialog dia ( mParent, "input-dialog", true );
     QLineEdit lab ( &dia );
     lab.setEchoMode( QLineEdit::Password );
-    QVBoxLayout lay( &dia );
+    Q3VBoxLayout lay( &dia );
     lay.setMargin(7);
     lay.setSpacing(7);
     lay.addWidget( &lab);
     dia.setFixedSize( 230,50 );
     dia.setCaption( i18n("Enter password") );
     QPushButton pb ( "OK",  &dia);
@@ -1331,13 +1334,13 @@ void KSyncManager::readFileFromSocket()
         if ( syncOK ) 
             mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
         mPisyncFinished = true;
     }
 }
 
-KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
+KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : Q3ServerSocket( port, backlog, parent, name )
 {
     mPendingConnect = 0;
     mPassWord = pw;
     mSocket = 0;
     mSyncActionDialog = 0;
     blockRC = false;
@@ -1347,13 +1350,13 @@ void KServerSocket::waitForSocketFinish()
 {
     if (  mSocket ) {
         //qDebug("KSS:: waiting for finish operation");
         QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish()));
         return;
     }
-    mSocket = new QSocket( this );
+    mSocket = new Q3Socket( this );
     connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
     connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
     mSocket->setSocket( mPendingConnect );
     mPendingConnect = 0;
 }
 void KServerSocket::newConnection ( int socket ) 
@@ -1369,13 +1372,13 @@ void KServerSocket::newConnection ( int socket )
         return;
         qDebug("KSS::newConnection Socket deleted! ");
         delete mSocket;
         mSocket = 0;
     }
     mPendingConnect = 0;
-    mSocket = new QSocket( this );
+    mSocket = new Q3Socket( this );
     connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
     connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
     mSocket->setSocket( socket );
 }
 
 void KServerSocket::discardClient()
@@ -1459,17 +1462,17 @@ void KServerSocket::displayErrorMessage()
         KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"), i18n("Pi-Sync Error"));
         mErrorMessage = 0;
     }
 }
 void KServerSocket::error_connect( QString errmess )
 {
-    QTextStream os( mSocket );
-    os.setEncoding( QTextStream::Latin1 );
+    Q3TextStream os( mSocket );
+    os.setEncoding( Q3TextStream::Latin1 );
     os << errmess ;
     mSocket->close();
-    if ( mSocket->state() == QSocket::Idle ) {
+    if ( mSocket->state() == Q3Socket::Idle ) {
         QTimer::singleShot( 0, this , SLOT ( discardClient()));
     }
 }
 void KServerSocket::end_connect()
 {
     delete mSyncActionDialog;
@@ -1481,13 +1484,13 @@ void KServerSocket::send_file()
     if ( mSyncActionDialog )
         delete mSyncActionDialog;
     mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
     mSyncActionDialog->setCaption(i18n("Received sync request"));
     QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); 
     label->setAlignment ( Qt::AlignHCenter );
-    QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( mSyncActionDialog );
     lay->addWidget( label);
     lay->setMargin(7);
     lay->setSpacing(7);
     if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
         int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
         //secs = 333;
@@ -1533,33 +1536,33 @@ void KServerSocket::send_file()
     mSyncActionDialog->raise();
     emit request_file(mResource);
     //emit request_file();
     qApp->processEvents();
     QString fileName = mFileName;
     QFile file( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         mErrorMessage = 0;
         end_connect();
         error_connect("ERROR_FI\r\n\r\n");
         return ;   
     } 
     mSyncActionDialog->setCaption( i18n("Sending file...") );
-    QTextStream ts( &file );
-    ts.setEncoding( QTextStream::Latin1 );
+    Q3TextStream ts( &file );
+    ts.setEncoding( Q3TextStream::Latin1 );
 
-    QTextStream os( mSocket );
-    os.setEncoding( QTextStream::Latin1 );
+    Q3TextStream os( mSocket );
+    os.setEncoding( Q3TextStream::Latin1 );
     while ( ! ts.atEnd() ) {
         os << ts.readLine() << "\r\n";
     }
     os  << "\r\n";
     //os << ts.read();
     file.close();
     mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
     mSocket->close();
-    if ( mSocket->state() == QSocket::Idle )
+    if ( mSocket->state() == Q3Socket::Idle )
         QTimer::singleShot( 10, this , SLOT ( discardClient()));
 }
 void KServerSocket::get_file()
 {
     mSyncActionDialog->setCaption( i18n("Receiving synced file...") );
    
@@ -1585,31 +1588,31 @@ void KServerSocket::readBackFileFromSocket()
         //qDebug("waitformore ");
         QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) ));
         return;
     }
     QString fileName = mFileName;
     QFile file ( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         delete mSyncActionDialog;
         mSyncActionDialog = 0;
         qDebug("KSS:Error open read back file ");
         piFileString = "";
         emit file_received( false, mResource);
         emit file_received( false);
         blockRC = false;
         return ;
                     
     } 
 
     // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
-    QTextStream ts ( &file );
-    ts.setEncoding( QTextStream::Latin1 );
+    Q3TextStream ts ( &file );
+    ts.setEncoding( Q3TextStream::Latin1 );
     mSyncActionDialog->setCaption( i18n("Writing file to disk...") );
     ts << piFileString;
     mSocket->close();
-    if ( mSocket->state() == QSocket::Idle )
+    if ( mSocket->state() == Q3Socket::Idle )
         QTimer::singleShot( 10, this , SLOT ( discardClient()));
     file.close(); 
     piFileString = "";
     emit file_received( true, mResource );
     emit file_received( true);
     delete mSyncActionDialog;
@@ -1645,23 +1648,23 @@ void KCommandSocket::sendFileRequest()
         tlw->setCaption( i18n("Connected! Sending request for remote file ...") );
     mConnectProgress.hide();
     mConnectCount = 300;mConnectMax = 300;
     mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") );
     mConnectProgress.setLabelText( i18n("Waiting for remote file...") ); 
     mTimerSocket->start( 100, true );
-    QTextStream os( mSocket );
-    os.setEncoding( QTextStream::Latin1 );
+    Q3TextStream os( mSocket );
+    os.setEncoding( Q3TextStream::Latin1 );
 
     QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
     os << "GET " << mPassWord << curDt << " " << mRemoteResource  << "\r\n\r\n";
 }
 
 void KCommandSocket::readFile( QString fn )
 {
     if ( !mSocket ) {
-        mSocket = new QSocket( this ); 
+        mSocket = new Q3Socket( this ); 
         //qDebug("KCS: read file - new socket");
         connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
         connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() ));
     }
     mFileString = "";
@@ -1693,44 +1696,44 @@ void KCommandSocket::updateConnectDialog()
         deleteSocket(); 
     
 }
 void KCommandSocket::writeFile( QString fileName  )
 {
     if ( !mSocket ) {
-        mSocket = new QSocket( this );
+        mSocket = new Q3Socket( this );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
         connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
     }
     mFileName = fileName ;
     mConnectCount = 30;mConnectMax = 30;
     mTimerSocket->start( 1000, true );
     mSocket->connectToHost( mHost, mPort ); 
 }
 void KCommandSocket::writeFileToSocket()
 {
     mTimerSocket->stop();
     QFile file2( mFileName );
-    if (!file2.open( IO_ReadOnly ) ) {
+    if (!file2.open( QIODevice::ReadOnly ) ) {
         mConnectProgress.hide();
         mConnectCount = -1;
         mRetVal= errorW;
         mSocket->close();
-        if ( mSocket->state() == QSocket::Idle )
+        if ( mSocket->state() == Q3Socket::Idle )
             QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
         return ;
     }  
     mConnectProgress.setTotalSteps ( file2.size() );
     mConnectProgress.show();
     int count = 0;
     mConnectProgress.setLabelText( i18n("Sending back synced file...") );
     mConnectProgress.setProgress( count );
     mConnectProgress.blockSignals( true );
-    QTextStream ts2( &file2 );
-    ts2.setEncoding( QTextStream::Latin1 );
-    QTextStream os2( mSocket );
-    os2.setEncoding( QTextStream::Latin1 );
+    Q3TextStream ts2( &file2 );
+    ts2.setEncoding( Q3TextStream::Latin1 );
+    Q3TextStream os2( mSocket );
+    os2.setEncoding( Q3TextStream::Latin1 );
     os2 << "PUT " << mPassWord << " " << mRemoteResource << "\r\n\r\n";;
     int byteCount = 0;
     int byteMax = file2.size()/53;
     while ( ! ts2.atEnd() ) {
         qApp->processEvents();
         if ( byteCount > byteMax ) {
@@ -1745,28 +1748,28 @@ void KCommandSocket::writeFileToSocket()
     file2.close();
     mConnectProgress.hide();
     mConnectCount = -1;
     os2 << "\r\n";
     mRetVal= successW;
     mSocket->close();
-    if ( mSocket->state() == QSocket::Idle )
+    if ( mSocket->state() == Q3Socket::Idle )
         QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
     mConnectProgress.blockSignals( false );
 }
 void KCommandSocket::sendStop()
 {
     if ( !mSocket ) {
-        mSocket = new QSocket( this );
+        mSocket = new Q3Socket( this );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
     }
     mSocket->connectToHost( mHost, mPort ); 
-    QTextStream os2( mSocket );
-    os2.setEncoding( QTextStream::Latin1 );
+    Q3TextStream os2( mSocket );
+    os2.setEncoding( Q3TextStream::Latin1 );
     os2 << "STOP\r\n\r\n";
     mSocket->close();
-    if ( mSocket->state() == QSocket::Idle )
+    if ( mSocket->state() == Q3Socket::Idle )
         QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
 }
 
 void KCommandSocket::startReadFileFromSocket()
 {
     if ( ! mFirst )
@@ -1826,31 +1829,31 @@ void KCommandSocket::readFileFromSocket()
     }
     mTimerSocket->stop();
     mConnectCount = -1;
     mConnectProgress.hide();
     QString fileName = mFileName;
     QFile file ( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         mFileString = "";
         mRetVal = errorR;
         qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() );
         deleteSocket();
         return ;
                     
     } 
     // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
-    QTextStream ts ( &file );
-    ts.setEncoding( QTextStream::Latin1 );
+    Q3TextStream ts ( &file );
+    ts.setEncoding( Q3TextStream::Latin1 );
     ts << mFileString;
     file.close();  
     mFileString = "";
     mRetVal = successR;
     mSocket->close();
     // if state is not idle, deleteSocket(); is called via 
     //  connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
-    if ( mSocket->state() == QSocket::Idle )
+    if ( mSocket->state() == Q3Socket::Idle )
         deleteSocket();
 }
 
 void KCommandSocket::deleteSocket()
 {
     //qDebug("KCommandSocket::deleteSocket() ");
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 71d17e9..32c6557 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -21,30 +21,32 @@
 */
 #ifndef _KSYNCMANAGER_H
 #define _KSYNCMANAGER_H
 
 #include <qobject.h>
 #include <qstring.h>
-#include <qsocket.h>
+#include <q3socket.h>
 #include <qdatetime.h>
-#include <qserversocket.h> 
-#include <qtextstream.h>
+#include <q3serversocket.h> 
+#include <q3textstream.h>
 #include <qregexp.h>
-#include <qprogressdialog.h>
+#include <q3progressdialog.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
 #include <kdialog.h>
 
-class QPopupMenu;
+class Q3PopupMenu;
 class KSyncProfile;
 class KPimPrefs;
 class QWidget;
 class KSyncManager;
 class KSyncInterface;
-class QProgressBar;
+class Q3ProgressBar;
 
 
-class KServerSocket : public QServerSocket
+class KServerSocket : public Q3ServerSocket
 {
     Q_OBJECT
 
         public:
     KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
 
@@ -71,13 +73,13 @@ class KServerSocket : public QServerSocket
     bool blockRC;
     void send_file();
     void get_file();
     void end_connect();
     void error_connect( QString );
     QDialog* mSyncActionDialog;
-    QSocket* mSocket; 
+    Q3Socket* mSocket; 
     QString mPassWord;
     QString mFileName; 
     QTime piTime;
     QString piFileString;
 };
 
@@ -105,13 +107,13 @@ class KCommandSocket : public QObject
  private :
     QString mRemoteResource;
     int mConnectCount;
     int mConnectMax;
     KProgressDialog mConnectProgress;
     QWidget* tlw;
-    QSocket* mSocket; 
+    Q3Socket* mSocket; 
     QString mPassWord;
     Q_UINT16 mPort;
     QString mHost;
     QString mFileName;
     QTimer* mTimerSocket;
     int mRetVal;
@@ -129,13 +131,13 @@ class KSyncManager : public QObject
         public:
     enum TargetApp {
         KOPI = 0,
         KAPI = 1,
         PWMPI = 2 };
   
-    KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
+    KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, Q3PopupMenu* syncmenu);
     ~KSyncManager() ;
 
     void multiSync( bool askforPrefs  );
     bool blockSave() { return mBlockSaveFlag; }
     void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
     void setDefaultFileName( QString s) ;
@@ -216,14 +218,14 @@ class KSyncManager : public QObject
     QString mCurrentResourceLocal;
     QString mCurrentResourceRemote;
     bool mBlockSaveFlag;
     QWidget* mParent;
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
-    QPopupMenu* mSyncMenu;
-    QProgressBar* bar;
+    Q3PopupMenu* mSyncMenu;
+    Q3ProgressBar* bar;
     bool mSyncWithDesktop;
 
 private slots:
     void displayErrorPort();
     void confSync();
 
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 2b87298..fd5bbca 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -20,34 +20,38 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
+#include <q3groupbox.h>
+#include <q3buttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qcombobox.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <qapplication.h>
 #include <qlayout.h>
-#include <qscrollview.h>
-#include <qvgroupbox.h>
-#include <qhgroupbox.h>
+#include <q3scrollview.h>
+#include <q3vgroupbox.h>
+#include <q3hgroupbox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3Frame>
  
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
@@ -86,29 +90,29 @@ KSyncPrefsDialog::~KSyncPrefsDialog()
 }
   
 void KSyncPrefsDialog::setupSyncAlgTab()
 {
   QLabel * lab;
   //QFrame *page = addPage(i18n("Sync Prefs"),0,0);
-  QVBox * mainbox = new QVBox( this );
-   QScrollView* sv = new QScrollView( mainbox );
-   QHBoxLayout * lay = new QHBoxLayout( this );
+  Q3VBox * mainbox = new Q3VBox( this );
+   Q3ScrollView* sv = new Q3ScrollView( mainbox );
+   Q3HBoxLayout * lay = new Q3HBoxLayout( this );
    lay->addWidget( mainbox );
-   QHBox * b_box = new QHBox( mainbox );
+   Q3HBox * b_box = new Q3HBox( mainbox );
 
    QPushButton* button = new QPushButton( i18n("Ok"), b_box );
    connect ( button, SIGNAL( clicked()), this, SLOT (slotOK() ) );
    button = new QPushButton( i18n("Cancel"), b_box );
    connect ( button, SIGNAL( clicked()), this, SLOT (reject() ) );
    //QBoxLayout * sl = new QVBoxLayout(this );
    //sl->addWidget ( sv );  
-   sv->setResizePolicy ( QScrollView::AutoOneFit );
-   QFrame *topFrame = new QFrame ( sv );
+   sv->setResizePolicy ( Q3ScrollView::AutoOneFit );
+   Q3Frame *topFrame = new Q3Frame ( sv );
    sv->addChild( topFrame );
    mSetupSyncAlgTab = topFrame;
-   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
+   Q3GridLayout *topLayout = new Q3GridLayout(topFrame,6,2);
    topLayout->setSpacing(spacingHint());
    topLayout->setMargin(marginHint());  
 
    //lab = new QLabel(i18n("Sync settings not yet implemented. DO NOT USE!"), topFrame);
    int iii = 0;
    //topLayout->addMultiCellWidget(lab , iii,iii,0,1);
@@ -117,13 +121,13 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    mMyMachineName = new QLineEdit(topFrame);
    lab = new QLabel(mMyMachineName, i18n("Local device name:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mMyMachineName,iii,1);
    ++iii;
   
-   QHBox* buttonbox = new QHBox( topFrame);
+   Q3HBox* buttonbox = new Q3HBox( topFrame);
    topLayout->addMultiCellWidget(buttonbox, iii,iii,0,1);
    ++iii;
    button = new QPushButton( i18n("New profile"), buttonbox );
    connect ( button, SIGNAL( clicked()), this, SLOT (newProfile() ) ); 
 
    button = new QPushButton( i18n("Clone profile"), buttonbox );
@@ -142,33 +146,33 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mProfileBox, iii,1); 
    ++iii;
 
 
 
-   QHGroupBox *iims = new QHGroupBox( i18n("Multiple Sync options"), topFrame);
+   Q3HGroupBox *iims = new Q3HGroupBox( i18n("Multiple Sync options"), topFrame);
    new QLabel( i18n("Include in multiple "), iims );
    mIncludeInRing = new QCheckBox( i18n("calendar  "), iims  );
    mIncludeInRingAB = new QCheckBox( i18n("addressbook  "), iims  );
    mIncludeInRingPWM = new QCheckBox( i18n("pwmanager"), iims   );
    new QLabel( i18n(" sync"), iims );
    topLayout->addMultiCellWidget(iims, iii,iii,0,1);
    ++iii;
-   QVGroupBox* gb0 = new QVGroupBox( i18n("Sync algo options"), topFrame);
+   Q3VGroupBox* gb0 = new Q3VGroupBox( i18n("Sync algo options"), topFrame);
    topLayout->addMultiCellWidget(gb0, iii,iii,0,1);
    ++iii;
-   QButtonGroup* gr;
+   Q3ButtonGroup* gr;
    {
-       QVGroupBox* topFrame = gb0;
+       Q3VGroupBox* topFrame = gb0;
 
        
 
        mAskForPreferences = new QCheckBox( i18n("Ask for preferences before sync"), topFrame   );
        //topLayout->addMultiCellWidget(mAskForPreferences, iii,iii,0,1);
        //++iii;
-       gr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Sync preferences"), topFrame);
+       gr = new Q3ButtonGroup ( 1,  Qt::Horizontal, i18n("Sync preferences"), topFrame);
        //topLayout->addMultiCellWidget(gr, iii,iii,0,1);
        //++iii;
        loc = new QRadioButton ( i18n("Take local entry on conflict"), gr );
        rem = new QRadioButton ( i18n("Take remote entry on conflict"), gr );
        newest = new QRadioButton ( i18n("Take newest entry on conflict"), gr );
        ask = new QRadioButton ( i18n("Ask for every entry on conflict"), gr );
@@ -178,73 +182,73 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
        mShowSummaryAfterSync = new QCheckBox( i18n("Show summary after sync"), topFrame   );
        //topLayout->addMultiCellWidget(mShowSummaryAfterSync, iii,iii,0,1);
        //++iii;  
 
 #if 0
-       QHGroupBox* gb51 = new QHGroupBox( i18n("Local resources to sync with:"), topFrame); 
+       Q3HGroupBox* gb51 = new Q3HGroupBox( i18n("Local resources to sync with:"), topFrame); 
        {
-           QVBox * fibo2 = new QVBox ( gb51 );
+           Q3VBox * fibo2 = new Q3VBox ( gb51 );
            new QLabel ( i18n("Calendar resources:"), fibo2 );
            //mFilterInCal = new QComboBox( fibo2 );
-           fibo2 = new QVBox ( gb51 );
+           fibo2 = new Q3VBox ( gb51 );
            new QLabel ( i18n("Addressbook resources:"), fibo2 );
            //mFilterInAB = new QComboBox( fibo2 ); 
        }
 #endif
-       QHGroupBox* gb5 = new QHGroupBox( i18n("Apply filter when adding data to local:"), topFrame);
-       QVBox * fibo2 = new QVBox ( gb5 );
+       Q3HGroupBox* gb5 = new Q3HGroupBox( i18n("Apply filter when adding data to local:"), topFrame);
+       Q3VBox * fibo2 = new Q3VBox ( gb5 );
        new QLabel ( i18n("Incoming calendar filter:"), fibo2 );
        mFilterInCal = new QComboBox( fibo2 );
-       fibo2 = new QVBox ( gb5 );
+       fibo2 = new Q3VBox ( gb5 );
        new QLabel ( i18n("Incoming addressbook filter:"), fibo2 );
        mFilterInAB = new QComboBox( fibo2 );
 
        mWriteBackFile = new QCheckBox( i18n("Write back synced data"), topFrame   );
        // topLayout->addMultiCellWidget(mWriteBackFile, iii,iii,0,1);
        // ++iii;
    
-       QVGroupBox* gb2 = new QVGroupBox( i18n("Write back options"), topFrame);
+       Q3VGroupBox* gb2 = new Q3VGroupBox( i18n("Write back options"), topFrame);
        //topLayout->addMultiCellWidget(gb2, iii,iii,0,1);
        //++iii;
        {
-           QVGroupBox*topFrame = gb2; 
+           Q3VGroupBox*topFrame = gb2; 
            mWriteBackExisting= new QCheckBox( i18n("Write back (on remote) existing entries only"), topFrame   );
-           QHGroupBox* gb4 = new QHGroupBox( i18n("Apply filter when adding data to remote:"), topFrame);
-           QVBox * fibo = new QVBox ( gb4 );
+           Q3HGroupBox* gb4 = new Q3HGroupBox( i18n("Apply filter when adding data to remote:"), topFrame);
+           Q3VBox * fibo = new Q3VBox ( gb4 );
            new QLabel ( i18n("Outgoing calendar filter:"), fibo );
            mFilterOutCal = new QComboBox( fibo );
-           fibo = new QVBox ( gb4 );
+           fibo = new Q3VBox ( gb4 );
            new QLabel ( i18n("Outgoing addressbook filter:"), fibo );
            mFilterOutAB = new QComboBox( fibo );
            //topLayout->addMultiCellWidget(mWriteBackExisting, iii,iii,0,1);
            //++iii;
            mWriteBackFuture= new QCheckBox( i18n("Write back (calendar) entries for time period only"), topFrame   );
            //topLayout->addMultiCellWidget(mWriteBackFuture, iii,iii,0,1);
            //++iii;
-           QVGroupBox* gb3 = new QVGroupBox( i18n("Time period"), topFrame);
+           Q3VGroupBox* gb3 = new Q3VGroupBox( i18n("Time period"), topFrame);
            connect ( mWriteBackFuture, SIGNAL( toggled ( bool ) ), gb3, SLOT ( setEnabled ( bool )  ) );
 
            new QLabel( i18n("From ") , gb3 );
-           QHBox * tf1 = new QHBox ( gb3 );
+           Q3HBox * tf1 = new Q3HBox ( gb3 );
            mWriteBackPastWeeks= new QSpinBox(1,104, 1,  tf1 );
            mWriteBackPastWeeks->setMaximumWidth( 100 );
            new QLabel( i18n(" weeks in the past to ") ,tf1 );
-           QHBox * tf2 = new QHBox ( gb3 );
+           Q3HBox * tf2 = new Q3HBox ( gb3 );
            mWriteBackFutureWeeks= new QSpinBox(1,104, 1,  tf2);
            mWriteBackFutureWeeks->setMaximumWidth( 100 );
            new QLabel( i18n(" weeks in the future ") , tf2 );
            //topLayout->addMultiCellWidget(mWriteBackFutureWeeks, iii,iii,1,1);
            //++iii;
            gb3->setEnabled( false ); 
            connect ( mWriteBackExisting, SIGNAL( toggled ( bool ) ), gb4, SLOT ( setDisabled ( bool )  ) );
        }
        connect ( mWriteBackFile, SIGNAL( toggled ( bool ) ), gb2, SLOT ( setEnabled ( bool )  ) );
 
    }
-   proGr = new QButtonGroup ( 1,  Qt::Horizontal, i18n("Profile kind"), topFrame);
+   proGr = new Q3ButtonGroup ( 1,  Qt::Horizontal, i18n("Profile kind"), topFrame);
    gr = proGr;
    topLayout->addMultiCellWidget(gr, iii,iii,0,1);
    ++iii;
    mIsLocal = new QRadioButton ( i18n("Local file"), gr );
    mIsPi = new QRadioButton ( i18n("Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )"), gr );
    connect (mIsPi, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
@@ -252,136 +256,136 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    connect (mIsPiSpecific, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsNotLocal = new QRadioButton ( i18n("Remote file (w down/upload command)"), gr );
    connect (mIsLocal, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) ); 
    mIsPhone = new QRadioButton ( i18n("Mobile device (cell phone)"), gr );
    connect (mIsPhone, SIGNAL( toggled(bool)), this, SLOT (kindChanged(bool) ) );  
 
-   QVGroupBox* gb1 = new QVGroupBox( i18n("Profile kind specific settings"), topFrame);
+   Q3VGroupBox* gb1 = new Q3VGroupBox( i18n("Profile kind specific settings"), topFrame);
    topLayout->addMultiCellWidget(gb1, iii,iii,0,1);
    ++iii;
 
    // ******************************************
    // Profile kind specific settings
    {
        // *** phone *******************************
-       QVGroupBox* topFrame = gb1;
-       phoneWidget = new QVBox( topFrame);
+       Q3VGroupBox* topFrame = gb1;
+       phoneWidget = new Q3VBox( topFrame);
        //topLayout->addMultiCellWidget(phoneWidget, iii,iii,0,1);
        //++iii; 
        mWriteContactToSIM = 0;//new QCheckBox( i18n("Sync contacts with phone SIM card (If not, sync with phone memory)"), phoneWidget );
-       QHBox* temphb = new QHBox( phoneWidget );
+       Q3HBox* temphb = new Q3HBox( phoneWidget );
        new QLabel( i18n("I/O device: "), temphb ); 
        mPhoneDevice = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpDevice() ) );
 
 
-       temphb = new QHBox( phoneWidget );
+       temphb = new Q3HBox( phoneWidget );
        new QLabel( i18n("Connection: "), temphb ); 
        mPhoneConnection = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpConnection() ) );
 
 
-       temphb = new QHBox( phoneWidget );
+       temphb = new Q3HBox( phoneWidget );
        new QLabel( i18n("Model(opt.): "), temphb ); 
        mPhoneModel = new QLineEdit( temphb);
        button = new QPushButton( i18n("Help..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( helpModel() ) );
 
        // *** local*******************************
-       localFileWidget = new QVBox( topFrame);
+       localFileWidget = new Q3VBox( topFrame);
        //topLayout->addMultiCellWidget(localFileWidget, iii,iii,0,1);
        //++iii;
-       temphb = new QHBox( localFileWidget );
+       temphb = new Q3HBox( localFileWidget );
 
        lab = new QLabel( i18n("Local file Cal:"), temphb );
        lab = new QLabel( i18n("Local file ABook:"), temphb );
        lab = new QLabel( i18n("Local file PWMgr:"), temphb );
-       temphb = new QHBox( localFileWidget );
+       temphb = new Q3HBox( localFileWidget );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFile() ) );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFileAB() ) );
        button = new QPushButton( i18n("Choose..."), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT ( chooseFilePWM() ) );
-       temphb = new QHBox( localFileWidget );
+       temphb = new Q3HBox( localFileWidget );
 
        mRemoteFile = new QLineEdit( temphb);
        mRemoteFileAB = new QLineEdit( temphb);
        mRemoteFilePWM = new QLineEdit( temphb);
        mIsKapiFileL = new QCheckBox( i18n("Addressbook file (*.vcf) is used by KA/Pi"), localFileWidget );
 
 
        // *** remote*******************************
-       remoteFileWidget = new QVBox( topFrame);
+       remoteFileWidget = new Q3VBox( topFrame);
        //topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
        //++iii;
-       temphb = new QHBox( remoteFileWidget );
+       temphb = new Q3HBox( remoteFileWidget );
        new QLabel( i18n("Calendar:"), temphb);
        new QLabel( i18n("AddressBook:"), temphb);
        new QLabel( i18n("PWManager:"), temphb);
 
        lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
-       temphb = new QHBox( remoteFileWidget );
+       temphb = new Q3HBox( remoteFileWidget );
        mRemotePrecommand = new QLineEdit(temphb);
        mRemotePrecommandAB = new QLineEdit(temphb);
        mRemotePrecommandPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
-       temphb = new QHBox( remoteFileWidget );
+       temphb = new Q3HBox( remoteFileWidget );
        mLocalTempFile = new QLineEdit(temphb);
        mLocalTempFileAB = new QLineEdit(temphb);
        mLocalTempFilePWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
-       temphb = new QHBox( remoteFileWidget );
+       temphb = new Q3HBox( remoteFileWidget );
        mRemotePostcommand = new QLineEdit(temphb );
        mRemotePostcommandAB = new QLineEdit(temphb );
        mRemotePostcommandPWM = new QLineEdit(temphb );
        mIsKapiFileR = new QCheckBox( i18n("Addressbook file is used by KA/Pi"), remoteFileWidget );
        lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
-       temphb = new QHBox( remoteFileWidget );
+       temphb = new Q3HBox( remoteFileWidget );
        button = new QPushButton( i18n("ssh/scp"), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
        button = new QPushButton( i18n("ftp"), temphb );
        connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
        lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
 
        // *** pi-sync*******************************
-       piWidget = new QVBox( topFrame);
+       piWidget = new Q3VBox( topFrame);
        //topLayout->addMultiCellWidget(piWidget, iii,iii,0,1);
        //++iii;
-       temphb = new QHBox( piWidget );
+       temphb = new Q3HBox( piWidget );
        new QLabel( i18n("Calendar:"), temphb);
        new QLabel( i18n("AddressBook:"), temphb);
        new QLabel( i18n("PWManager:"), temphb);
 
        lab = new QLabel( i18n("Password for remote access: (could be the same for each)"), piWidget);
-       temphb = new QHBox( piWidget );
+       temphb = new Q3HBox( piWidget );
        mRemotePw = new QLineEdit(temphb);
        mRemotePwAB = new QLineEdit(temphb);
        mRemotePwPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Remote IP address: (could be the same for each)"), piWidget);
-       temphb = new QHBox( piWidget );
+       temphb = new Q3HBox( piWidget );
        mRemoteIP = new QLineEdit(temphb);
        mRemoteIPAB = new QLineEdit(temphb);
        mRemoteIPPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Remote port number: (should be different for each)"), piWidget);
-       temphb = new QHBox( piWidget );
+       temphb = new Q3HBox( piWidget );
        mRemotePort = new QLineEdit(temphb);
        mRemotePortAB = new QLineEdit(temphb);
        mRemotePortPWM = new QLineEdit(temphb);
 
        lab = new QLabel( i18n("Local/remote Resource sync partners (Leave empty to not sync)"), piWidget);
-       mTableBox = new QHBox( piWidget );
-       mResTableKopi = new QTable( 1, 1, mTableBox );
-       mResTableKapi = new QTable( 1, 1, mTableBox );
-       mResTablePwmpi = new QTable( 1, 1, mTableBox );
+       mTableBox = new Q3HBox( piWidget );
+       mResTableKopi = new Q3Table( 1, 1, mTableBox );
+       mResTableKapi = new Q3Table( 1, 1, mTableBox );
+       mResTablePwmpi = new Q3Table( 1, 1, mTableBox );
        mResTableKopi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTableKapi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTablePwmpi->horizontalHeader()->setLabel( 0, i18n("Remote") );
        mResTableKopi->setLeftMargin( 80 );
        mResTableKapi->setLeftMargin( 80 );
    } 
@@ -465,13 +469,13 @@ void KSyncPrefsDialog::slotOK()
     if ( mMyMachineName->text() == "undefined" ) {
         KMessageBox::error(this,i18n("Local device name undefined!\nPlease define device name!"),i18n("KO/Pi config error"));
         return;
     }
     int i;
     for (i = 0; i < mSyncProfileNames.count(); ++ i) {
-        if ( mSyncProfileNames.contains( mSyncProfileNames[i]) > 1  ) {
+        if ( mSyncProfileNames.count( mSyncProfileNames[i]) > 1  ) {
             KMessageBox::error(this,i18n("Multiple profiles with same name!\nPlease use unique profile names!"),i18n("KO/Pi config error"));
             return;
         }
     }
     usrWriteConfig();
     QDialog::accept();
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index d8c02de..1d7503e 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -22,28 +22,28 @@
 */
 #ifndef _KSYNCPREFSDIALOG_H
 #define _KSYNCPREFSDIALOG_H
 
 
 #include <kdialogbase.h>
-#include <qptrlist.h>
-#include <qtable.h>
-#include <qhbox.h>
+#include <q3ptrlist.h>
+#include <q3table.h>
+#include <q3hbox.h>
 
 //#include <libkdepim/kprefsdialog.h>
 
 class KColorButton;
 class QSpinBox;;
 class QRadioButton;
 class QCheckBox;
 class QSlider;
 class KURLRequester;
 class QComboBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 class QLineEdit;
-class QVBox;
+class Q3VBox;
 class QStringList;
 class KSyncProfile;
  
 /** Dialog to change the korganizer configuration.
   */
 class KSyncPrefsDialog : public KDialog
@@ -83,13 +83,13 @@ class KSyncPrefsDialog : public KDialog
     void setupSyncAlgTab();
     void readFilter();
     void readResources();
   private:
     void updateMyCaption();
     int currentSelection;
-    QPtrList<KSyncProfile> mSyncProfiles;
+    Q3PtrList<KSyncProfile> mSyncProfiles;
     QStringList mSyncProfileNames;
     QStringList mFilterKapi;
     QStringList mFilterKopi;
     QStringList mResourcesKopi;
     QStringList mResourcesKapi;
     QLineEdit * mMyMachineName;
@@ -102,17 +102,17 @@ class KSyncPrefsDialog : public KDialog
     QCheckBox* mIncludeInRing;
     QCheckBox* mIncludeInRingAB;
     QCheckBox* mIncludeInRingPWM;
     void addProfile ( KSyncProfile* );
     void insertProfiles();
     void saveProfile();
-    QButtonGroup* proGr;
-    QHBox * mTableBox;
-    QTable* mResTableKopi;
-    QTable* mResTableKapi;
-    QTable* mResTablePwmpi;
+    Q3ButtonGroup* proGr;
+    Q3HBox * mTableBox;
+    Q3Table* mResTableKopi;
+    Q3Table* mResTableKapi;
+    Q3Table* mResTablePwmpi;
 
     QComboBox * mFilterOutCal;
     QComboBox * mFilterInCal;
     QComboBox * mFilterOutAB;
     QComboBox * mFilterInAB;
 
@@ -149,16 +149,16 @@ class KSyncPrefsDialog : public KDialog
 
     QLineEdit * mPhoneDevice;
     QLineEdit * mPhoneConnection;
     QLineEdit * mPhoneModel;
 
     QWidget* mSetupSyncAlgTab;
-    QVBox* localFileWidget;
-    QVBox* remoteFileWidget;
-    QVBox* phoneWidget;
-    QVBox* piWidget;
+    Q3VBox* localFileWidget;
+    Q3VBox* remoteFileWidget;
+    Q3VBox* phoneWidget;
+    Q3VBox* piWidget;
     QCheckBox* mWriteBackFile;
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;
     QSpinBox* mWriteBackPastWeeks;
     QCheckBox* mWriteBackExisting;
     QCheckBox* mAskForPreferences;
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 91fcfc5..1e41662 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -17,13 +17,13 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef _KSYNCPROFILE_H
 #define _KSYNCPROFILE_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qcolor.h>
 #include <qfont.h>
 #include <qstringlist.h>
 #include <qobject.h>
 #include <qstring.h>
 
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 7160d0e..fb27311 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -1,10 +1,10 @@
         TEMPLATE= lib
         CONFIG  = qt warn_on
 DEFINES +=KORG_NOKABC
-TARGET = microkdepim
+TARGET = xmicrokdepim
 INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . ..
 DESTDIR=../bin
 
 DEFINES +=  DESKTOP_VERSION
 include( ../variables.pri )
 unix : {
@@ -71,6 +71,8 @@ LIBS += mfc71u.lib
 DEFINES +=  _OL_IMPORT_
 HEADERS += ol_access.h 
 SOURCES += ol_access.cpp 
 #olimport section end
 }
 }
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index f3db68e..4b42184 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -1,12 +1,12 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on
-TARGET = microkdepim
+TARGET = xmicrokdepim
 INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
-LIBS += -lmicrokde
-#LIBS += -lmicrokcal
+LIBS += -lxmicrokde
+#LIBS += -lxmicrokcal
 LIBS += -L$(QPEDIR)/lib
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/lib
 
 
diff --git a/libkdepim/ol_access.cpp b/libkdepim/ol_access.cpp
index 1b05693..821f148 100755
--- a/libkdepim/ol_access.cpp
+++ b/libkdepim/ol_access.cpp
@@ -19,27 +19,27 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
 #include <qlayout.h>
-#include <qprogressbar.h>
-#include <qprogressdialog.h>
-#include <qwidgetstack.h>
+#include <q3progressbar.h>
+#include <q3progressdialog.h>
+#include <q3widgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qapplication.h>
-#include <qhbox.h>
-#include <qheader.h>
+#include <q3hbox.h>
+#include <q3header.h>
 #include <qdatetime.h>
-#include <qlistview.h>
+#include <q3listview.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
@@ -51,19 +51,19 @@
 
 #include "../outport/msoutl9.h"
 #include <ole2.h>
 #include <comutil.h>
 
 
-class OLEListViewItem : public QCheckListItem
+class OLEListViewItem : public Q3CheckListItem
 {
 public:
-    OLEListViewItem( QListView *parent, QString text ) :
-        QCheckListItem( parent, text, QCheckListItem::CheckBox ) { ; };
-    OLEListViewItem(  QListViewItem *after, QString text ) :
-        QCheckListItem( after, text, QCheckListItem::CheckBox ) { ; };
+    OLEListViewItem( Q3ListView *parent, QString text ) :
+        Q3CheckListItem( parent, text, Q3CheckListItem::CheckBox ) { ; };
+    OLEListViewItem(  Q3ListViewItem *after, QString text ) :
+        Q3CheckListItem( after, text, Q3CheckListItem::CheckBox ) { ; };
     ~OLEListViewItem() {};
     void setData( DWORD data ) {mData= data; };
     void setDataID( QString data ){ mDataID = data ;}
     QString dataID() { return mDataID;}
     DWORD data() { return mData ;};
 private:
@@ -75,21 +75,21 @@ class OLEFolderSelect : public KDialogBase
 {
   public:
     OLEFolderSelect() :
       KDialogBase( Plain, "", Ok | Cancel, Ok,
                0, "", true, false, i18n("Import!") )
     {
-        QHBox * mw = new  QHBox( this );
+        Q3HBox * mw = new  Q3HBox( this );
         setMainWidget( mw );
-        mListView = new QListView( mw );
+        mListView = new Q3ListView( mw );
         mListView->addColumn(i18n("Select Folder"));
         mListView->addColumn(i18n("Content Type"));
     }
-    QListView* listView() { return mListView;}
+    Q3ListView* listView() { return mListView;}
 private:
-    QListView* mListView;
+    Q3ListView* mListView;
 };
 
 OL_access *OL_access::sInstance = 0;
 static KStaticDeleter<OL_access> staticDeleterPim;
 
 OL_access *OL_access::instance()
@@ -146,13 +146,13 @@ void OL_access::readContactData( LPDISPATCH  dispItem, KABC::Addressee::List* li
     int i;
     folderItems = mf.GetItems(); 
     QString cap = i18n("Importing contact data");
     if (  syncMode ) {
         cap = i18n("Reading contact data...");
     }
-    QProgressDialog bar( cap,i18n("Abort"), folderItems.GetCount(), 0 );
+    Q3ProgressDialog bar( cap,i18n("Abort"), folderItems.GetCount(), 0 );
     bar.setCaption (i18n("Accessing OL") );
     int h = bar.sizeHint().height() ;
     int w = 300;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
@@ -170,13 +170,13 @@ void OL_access::readContactData( LPDISPATCH  dispItem, KABC::Addressee::List* li
             itm->Release();
         }
 }
 QStringList OL_access::getFolderSelection( int type , QString caption )
 {
     OLEFolderSelect folder_dialog;
-    QListView * listView = folder_dialog.listView();
+    Q3ListView * listView = folder_dialog.listView();
     MAPIFolder mfInbox;
     MAPIFolder mfRoot;
     CString szName;
     _NameSpace olNS; 
     olNS = gOlAppAB.GetNamespace(_T("MAPI"));
     mfInbox = olNS.GetDefaultFolder(6);
@@ -1132,19 +1132,19 @@ DATE Qdt2date( QDateTime dt )
     odt.SetDateTime(dt.date().year(), dt.date().month(),dt.date().day(),
                     dt.time().hour(), dt.time().minute(), dt.time().second() );
     ddd = odt;
     return ddd;
 }
 
-class OLEListViewItem : public QCheckListItem
+class OLEListViewItem : public Q3CheckListItem
 {
   public:
-    OLEListViewItem( QListView *parent, QString text ) :
-      QCheckListItem( parent, text, QCheckListItem::CheckBox ) { ; };
-    OLEListViewItem(  QListViewItem *after, QString text ) :
-      QCheckListItem( after, text, QCheckListItem::CheckBox ) { ; };
+    OLEListViewItem( Q3ListView *parent, QString text ) :
+      Q3CheckListItem( parent, text, Q3CheckListItem::CheckBox ) { ; };
+    OLEListViewItem(  Q3ListViewItem *after, QString text ) :
+      Q3CheckListItem( after, text, Q3CheckListItem::CheckBox ) { ; };
     ~OLEListViewItem() {};
   void setData( DWORD data ) {mData= data; };
     void setDataID( QString data ){ mDataID = data ;}
     QString dataID() { return mDataID;}
   DWORD data() { return mData ;};
   private:
@@ -1156,15 +1156,15 @@ bool KAImportOLdialog::sOLDispatch = false;
 KAImportOLdialog::KAImportOLdialog( const QString &caption, 
                                       KABC::AddressBook * aBook, QWidget *parent ) :
     KDialogBase( Plain, caption, User1 | Close, Ok,
                parent, caption, true, false, i18n("Import!") )
 {
   mSyncMode = false;
-  QHBox * mw = new  QHBox( this );
+  Q3HBox * mw = new  Q3HBox( this );
   setMainWidget( mw );
-  mListView = new QListView( mw );
+  mListView = new Q3ListView( mw );
   mListView->addColumn(i18n("Select Folder"));
   mListView->addColumn(i18n("Content Type"));
   mABook = aBook;
   connect( this, SIGNAL( user1Clicked() ),SLOT ( slotApply()));
   setupFolderView();
   resize( sizeHint().width()+50,  sizeHint().height()+50 );
@@ -1300,13 +1300,13 @@ void KAImportOLdialog::readContactData( DWORD folder )
   int i;
   folderItems = mf.GetItems(); 
   QString cap = i18n("Importing contact data");
   if (  mSyncMode ) {
       cap = i18n("Reading contact data...");
   }
-  QProgressDialog bar( cap,i18n("Abort"), folderItems.GetCount(),this);
+  Q3ProgressDialog bar( cap,i18n("Abort"), folderItems.GetCount(),this);
   bar.setCaption (i18n("Accessing OL") );
   int h = bar.sizeHint().height() ;
   int w = 300;
   int dw = QApplication::desktop()->width();
   int dh = QApplication::desktop()->height();
   //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
diff --git a/libkdepim/ol_access.h b/libkdepim/ol_access.h
index 85dbc6c..3422f65 100755
--- a/libkdepim/ol_access.h
+++ b/libkdepim/ol_access.h
@@ -34,13 +34,13 @@
 #include "../outport/msoutl9.h"
 
 #define OL_CONTACT_DATA 2
 #define OL_CALENDAR_DATA 1 //pending is this the right number
 
 class QDateTime;
-class QListView;
+class Q3ListView;
 class OLEListViewItem;
 class _ContactItem;
 class OL_access : public QObject
 {
     Q_OBJECT
         public:
@@ -129,13 +129,13 @@ class KAImportOLdialog : public KDialogBase
   protected:
     void setupFolderView();
     void addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent);
     void readContactData( DWORD folder );
 
     KABC::AddressBook * mABook;
-    QListView * mListView;
+    Q3ListView * mListView;
     KABC::Addressee::List mAList;
     bool addAddressee( KABC::Addressee a );
   private:
     int importedItems;
     bool mSyncMode;
     QString mSelectedFolderID;
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index 89db22b..0ea73f5 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -19,17 +19,18 @@
     Boston, MA 02111-1307, USA.
 */
 
 
 #include <qstring.h>
 #include <qapplication.h>
-#include <qptrlist.h>
+#include <QDesktopWidget>
+#include <q3ptrlist.h>
 #include <qregexp.h>
 #include <qfile.h>
 #include <qlabel.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <qdir.h>
 #include <kmessagebox.h>
 #include <stdlib.h>
 #include "phoneaccess.h"
 
@@ -43,18 +44,20 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
     //qDebug("save %d ", load );
     QString content = "[gammu]\n";;
     bool write = false;
     bool addPort = true, addConnection = true, addModel = true;
     QFile file( fileName );
     if ( QFile::exists(  fileName) ) {
-        if (!file.open( IO_ReadOnly ) ) {
+        if (!file.open( QIODevice::ReadOnly ) ) {
             qDebug("Error: cannot open %s ", fileName.latin1() );
             return;
         } 
         QString line;
-        while ( file.readLine( line, 1024 ) > 0 ) {
+        char tmp[1024];
+        while ( file.readLine( tmp, 1024 ) > 0 ) {
+            line = tmp;
             //qDebug("*%s* ", line.latin1() );
             if ( line.left(7 ) == "[gammu]" ) {
                ; 
             } else 
             if ( line.left(4 ) == "port" ) {
                 if ( line == "port = " + device+"\n" ) {
@@ -112,18 +115,18 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model
         write = true;
         content += "model = ";
         content += model;
         content += "\n";
     }
     if ( write ) {
-        if (!file.open( IO_WriteOnly ) ) {
+        if (!file.open( QIODevice::WriteOnly ) ) {
             qDebug("Error: cannot write file  %s ", fileName.latin1() );
             return;
         } 
         qDebug("Writing file  %s ", fileName.latin1() );
-        QTextStream ts( &file );
+        Q3TextStream ts( &file );
         ts << content ;
         file.close();
     }
 
 }
 
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 72c4e60..4172cd0 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -35,57 +35,67 @@
 #ifndef QT_NO_SPLITTER___
 
 #include "qpainter.h"
 #include "qdrawutil.h"
 #include "qbitmap.h" 
 #if QT_VERSION >= 0x030000
-#include "qptrlist.h"
-#include "qmemarray.h"
+#include "q3ptrlist.h"
+#include "q3memarray.h"
 #else
 #include <qlist.h>
 #include <qarray.h>
-#define QPtrList QList
-#define QMemArray QArray
+#define Q3PtrList QList
+#define Q3MemArray QArray
 #endif
 #include "qlayoutengine_p.h"
-#include "qobjectlist.h"
+#include "qobject.h"
 #include "qstyle.h"
 #include "qapplication.h" //sendPostedEvents
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qcursor.h>
-#include <qframe.h>
+#include <q3frame.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPixmap>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QPaintEvent>
 #ifndef KDGANTT_MASTER_CVS
 //#include "KDGanttMinimizeSplitter.moc"
 #endif
 
 
 
 #ifndef DOXYGEN_SKIP_INTERNAL
 
 #if QT_VERSION >= 232
 static int mouseOffset;
 static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky
 
-class KDRubberBand: public QFrame
+class KDRubberBand: public Q3Frame
 {
 public:
-    KDRubberBand(  QWidget *parent, const char * name, WFlags f ) :QFrame ( parent, name, f ) {;}
+    KDRubberBand(  QWidget *parent, const char * name, Qt::WFlags f ) :Q3Frame ( parent, name, f ) {;}
 
 protected:
     virtual void mousePressEvent ( QMouseEvent * )
     {
         close();
     };
 
 };
 
 KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o,
                                   KDGanttMinimizeSplitter *parent, const char * name )
-    : QWidget( parent, name ), _activeButton( 0 ), _collapsed( false )
+    : _activeButton( 0 ), _collapsed( false )
 {
-
+    setObjectName(name);
+    setParent(parent);
     if ( QApplication::desktop()->width() > 320 &&  QApplication::desktop()->width() < 650 ) {
         mSizeHint = QSize(7,7);
         mUseOffset = true;
     } else {
         mSizeHint = QSize(6,6);
         mUseOffset = false;
@@ -103,24 +113,24 @@ QSize KDGanttSplitterHandle::sizeHint() const
 }
 
 void KDGanttSplitterHandle::setOrientation( Qt::Orientation o )
 {
     orient = o;
 #ifndef QT_NO_CURSOR
-    if ( o == KDGanttMinimizeSplitter::Horizontal )
-        setCursor( splitHCursor );
+    if ( o == Qt::Horizontal )
+        setCursor( Qt::splitHCursor );
     else
-        setCursor( splitVCursor );
+        setCursor( Qt::splitVCursor );
 #endif
 }
 
 
 void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
 {
     updateCursor( e->pos() );
-    if ( !(e->state()&LeftButton) )
+    if ( !(e->state()&Qt::LeftButton) )
         return;
 
     if ( _activeButton != 0)
         return;
 
     QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
@@ -134,31 +144,31 @@ void KDGanttSplitterHandle::mouseMoveEvent( QMouseEvent *e )
     }
     _collapsed = false;
 }
 
 void KDGanttSplitterHandle::mousePressEvent( QMouseEvent *e )
 {
-    if ( e->button() == LeftButton ) {
+    if ( e->button() == Qt::LeftButton ) {
         _activeButton = onButton( e->pos() );
         mouseOffset = s->pick(e->pos());
         mMouseDown = true;
         repaint();
         updateCursor( e->pos() );
     }
 }
 
 void KDGanttSplitterHandle::updateCursor( const QPoint& p)
 {
     if ( onButton( p ) != 0 ) {
-        setCursor( arrowCursor );
+        setCursor( Qt::arrowCursor );
     }
     else {
-        if ( orient == KDGanttMinimizeSplitter::Horizontal )
-            setCursor( splitHCursor );
+        if ( orient == Qt::Horizontal )
+            setCursor( Qt::splitHCursor );
         else
-            setCursor( splitVCursor );
+            setCursor( Qt::splitVCursor );
     }
 }
 void KDGanttSplitterHandle::toggle()
 {
     int pos;
     int min, max;
@@ -192,13 +202,13 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
             toggle();
         }
         _activeButton = 0;
         updateCursor( e->pos() );
     }
     else {
-        if ( !opaque() && e->button() == LeftButton ) {
+        if ( !opaque() && e->button() == Qt::LeftButton ) {
             QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
         }
     }
@@ -208,16 +218,16 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
     }
     repaint();
 }
 
 int KDGanttSplitterHandle::onButton( const QPoint& p )
 {
-    QValueList<QPointArray> list = buttonRegions();
+    Q3ValueList<Q3PointArray> list = buttonRegions();
     int index = 1;
     int add = 12;
-    for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
+    for( Q3ValueList<Q3PointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         QRect rect = (*it).boundingRect();
         rect.setLeft( rect.left()- add );
         rect.setRight( rect.right() + add);
         rect.setTop( rect.top()- add );
         rect.setBottom( rect.bottom() + add);
         if ( rect.contains( p ) ) {
@@ -226,22 +236,22 @@ int KDGanttSplitterHandle::onButton( const QPoint& p )
         index++;
     }
     return 0;
 }
 
 
-QValueList<QPointArray> KDGanttSplitterHandle::buttonRegions()
+Q3ValueList<Q3PointArray> KDGanttSplitterHandle::buttonRegions()
 {
-    QValueList<QPointArray> list;
+    Q3ValueList<Q3PointArray> list;
 
     int sw = 8;
     int yyy = 1;
     int xxx = 1;
     int voffset[] = { (int) -sw*3, (int) sw*3 };
     for ( int i = 0; i < 2; i++ ) {
-        QPointArray arr;
+        Q3PointArray arr;
         if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ||
              _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Left) {
             int mid = height()/2 + voffset[i];
             arr.setPoints( 3,
                            1-xxx, mid - sw + 4,
                            sw-3-xxx, mid,
@@ -308,17 +318,17 @@ void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
             col = colorGroup().background().dark( 150 );
     }
     //QColor col = backgroundColor().dark( 130 );
     p.setBrush( col );
     p.setPen( col  );
 
-    QValueList<QPointArray> list = buttonRegions();
+    Q3ValueList<Q3PointArray> list = buttonRegions();
     int index = 1;
     if ( mUseOffset )
         p.translate( 0, 1 );
-    for ( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
+    for ( Q3ValueList<Q3PointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) { 
            
             /*
             if ( ! _collapsed ) {
             p.save();
             // p.translate( parentWidget()->style().pixelMetric( QStyle::PM_ButtonShiftHorizontal ),
@@ -374,18 +384,18 @@ public:
 
 class QSplitterData
 {
 public:
     QSplitterData() : opaque( FALSE ), firstShow( TRUE ) {}
 
-    QPtrList<QSplitterLayoutStruct> list;
+    Q3PtrList<QSplitterLayoutStruct> list;
     bool opaque;
     bool firstShow;
 };
 
-void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos,
+void kdganttGeomCalc( Q3MemArray<QLayoutStruct> &chain, int start, int count, int pos,
                  int space, int spacer );
 #endif // DOXYGEN_SKIP_INTERNAL
 
 
 /*!
   \class KDGanttMinimizeSplitter KDGanttMinimizeSplitter.h
@@ -458,30 +468,31 @@ static QSize minSizeHint( const QWidget* w )
 
 /*!
   Constructs a horizontal splitter with the \a parent and \a
   name arguments being passed on to the QFrame constructor.
 */
 KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( QWidget *parent, const char *name )
-    :QFrame(parent,name,WPaintUnclipped)
+    :Q3Frame(parent,name)
 {
+    setAttribute(Qt::WA_PaintUnclipped);
     mRubberBand = 0;
     mFirstHandle = 0;
 #if QT_VERSION >= 232
-     orient = Horizontal;
+     orient = Qt::Horizontal;
      init();
 #endif
 }
 
 /*!
   Constructs a splitter with orientation \a o with the \a parent
   and \a name arguments being passed on to the QFrame constructor.
 */
-KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Orientation o, QWidget *parent, const char *name )
-    :QFrame(parent,name,WPaintUnclipped)
+KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, QWidget *parent, const char *name )
+    :Q3Frame(parent,name)
 { 
-    
+    setAttribute(Qt::WA_PaintUnclipped);
     mRubberBand = 0;
     mFirstHandle = 0;
 #if QT_VERSION >= 232
      orient = o;
      init();
 #endif
@@ -502,13 +513,13 @@ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 
 
 #if QT_VERSION >= 232
 void KDGanttMinimizeSplitter::init()
 {
     data = new QSplitterData;
-    if ( orient == Horizontal )
+    if ( orient == Qt::Horizontal )
         setSizePolicy( QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum) );
     else
         setSizePolicy( QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Expanding) );
 #ifndef DESKTOP_VERSION
      setOpaqueResize( false );
 #else
@@ -531,20 +542,20 @@ void KDGanttMinimizeSplitter::toggle()
 /*!
   \brief the orientation of the splitter
 
   By default the orientation is horizontal (the widgets are side by side).
   The possible orientations are Qt:Vertical and Qt::Horizontal (the default).
 */
-void KDGanttMinimizeSplitter::setOrientation( Orientation o )
+void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o )
 {
 #if QT_VERSION >= 232
     if ( orient == o )
         return;
     orient = o;
 
-    if ( orient == Horizontal )
+    if ( orient == Qt::Horizontal )
         setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
     else
         setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
@@ -583,27 +594,27 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
     if ( data->list.count() > 0 ) {
         s = new QSplitterLayoutStruct;
         s->mode = KeepSize;
         QString tmp = "qt_splithandle_";
         tmp += w->name();
         newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() );
-    if ( ! mFirstHandle )
-        mFirstHandle = newHandle;
+        if ( ! mFirstHandle )
+            mFirstHandle = newHandle;
         s->wid = newHandle;
         newHandle->setId(data->list.count());
         s->isSplitter = TRUE;
         s->sizer = pick( newHandle->sizeHint() );
         if ( first )
             data->list.insert( 0, s );
         else
             data->list.append( s );
     }
     s = new QSplitterLayoutStruct;
     s->mode = Stretch;
     s->wid = w;
-    if ( !testWState( WState_Resized ) && w->sizeHint().isValid() )
+    if ( !testAttribute( Qt::WA_Resized ) && w->sizeHint().isValid() )
         s->sizer = pick( w->sizeHint() );
     else
         s->sizer = pick( w->size() );
     s->isSplitter = FALSE;
     if ( first )
         data->list.insert( 0, s );
@@ -618,26 +629,32 @@ QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool firs
 /*!
   Tells the splitter that a child widget has been inserted or removed.
   The event is passed in \a c.
 */
 void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
 {
-    if ( c->type() == QEvent::ChildInserted ) {
+    if ( c->type() == QEvent::ChildAdded ) {
         if ( !c->child()->isWidgetType() )
             return;
 
-        if ( ((QWidget*)c->child())->testWFlags( WType_TopLevel ) )
+        QWidget *cw = (QWidget*)c->child();
+
+        if ( (cw->windowFlags())&Qt::Window )
+            return;
+
+        // avoid infinite recursion
+        if(cw->objectName().startsWith("qt_splithandle_"))
             return;
 
         QSplitterLayoutStruct *s = data->list.first();
         while ( s ) {
-            if ( s->wid == c->child() )
+            if ( s->wid == cw )
                 return;
             s = data->list.next();
         }
-        addWidget( (QWidget*)c->child() );
+        addWidget( cw );
         recalc( isVisible() );
 
     } else if ( c->type() == QEvent::ChildRemoved ) {
         QSplitterLayoutStruct *p = 0;
         if ( data->list.count() > 1 )
             p = data->list.at(1); //remove handle _after_ first widget.
@@ -667,23 +684,23 @@ void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
   rubber band is removed.
 */
 void KDGanttMinimizeSplitter::setRubberband( int p )
 {
 #ifdef DESKTOP_VERSION
     QPainter paint( this );
-    paint.setPen( gray );
-    paint.setBrush( gray );
-    paint.setRasterOp( XorROP );
+    paint.setPen( Qt::gray );
+    paint.setBrush( Qt::gray );
+    paint.setCompositionMode( QPainter::CompositionMode_Xor );
     QRect r = contentsRect();
     const int rBord = 3; //Themable????
 #if QT_VERSION >= 0x030000
-    int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
+    int sw = style()->pixelMetric(QStyle::PM_SplitterWidth, 0, this);
 #else
     int sw = style().splitterWidth();
 #endif
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         if ( opaqueOldPos >= 0 )
             paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
                             2*rBord, r.height() );
         if ( p >= 0 )
             paint.drawRect( p  + sw/2 - rBord, r.y(), 2*rBord, r.height() );
     } else {
@@ -693,13 +710,13 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
         if ( p >= 0 )
             paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
     }
     opaqueOldPos = p;
 #else 
     if ( !mRubberBand  ) {
-        mRubberBand = new KDRubberBand( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
+        mRubberBand = new KDRubberBand( 0, "rubber", Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop);
         mRubberBand->setFrameStyle( Box | Raised );
         //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
         mRubberBand->setPalette( QPalette ( colorGroup().background().light(), colorGroup().background().dark() ));
     }
     QRect r = contentsRect();
     static int rBord = 0; //Themable????
@@ -707,13 +724,13 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
         if (QApplication::desktop()->width() <= 320 )
             rBord = 3;
         else
             rBord = 4;
     }
     int sw = style().splitterWidth();
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         if ( p >= 0 ) {
             QPoint geo =  mapToGlobal (QPoint ( p  + sw/2 - rBord, r.y()));
             mRubberBand->setGeometry( geo.x(), geo.y(), 2*rBord, r.height() );
         }
     } else {
         if ( p >= 0 ) {
@@ -729,13 +746,13 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
 }
 
 
 /*! \reimp */
 bool KDGanttMinimizeSplitter::event( QEvent *e )
 {
-    if ( e->type() == QEvent::LayoutHint || ( e->type() == QEvent::Show && data->firstShow ) ) {
+    if ( e->type() == QEvent::LayoutRequest || ( e->type() == QEvent::Show && data->firstShow ) ) {
         recalc( isVisible() );
         if ( e->type() == QEvent::Show )
             data->firstShow = FALSE;
     }
     return QWidget::event( e );
 }
@@ -752,13 +769,13 @@ void KDGanttMinimizeSplitter::drawSplitter( QPainter *p,
                               QCOORD x, QCOORD y, QCOORD w, QCOORD h )
 {
 #if 0
     // LR
     style().drawPrimitive(QStyle::PE_Splitter, p, QRect(x, y, w, h), colorGroup(),
                           (orientation() == Qt::Horizontal ?
-                           QStyle::Style_Horizontal : 0));
+                           QStyle::State_Horizontal : 0));
 #endif
 }
 
 
 /*!
   Returns the id of the splitter to the right of or below the widget \a w,
@@ -793,15 +810,15 @@ int KDGanttMinimizeSplitter::idAfter( QWidget* w ) const
   \sa idAfter()
 */
 void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
 {
     p = adjustPos( p, id );
     QSplitterLayoutStruct *s = data->list.at(id);
-    int oldP = orient == Horizontal ? s->wid->x() : s->wid->y();
+    int oldP = orient == Qt::Horizontal ? s->wid->x() : s->wid->y();
     bool upLeft;
-    if ( false && orient == Horizontal ) {
+    if ( false && orient == Qt::Horizontal ) {
         p += s->wid->width();
         upLeft = p > oldP;
     } else
         upLeft = p < oldP;
 
     moveAfter( p, id, upLeft );
@@ -810,14 +827,14 @@ void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
     storeSizes();
 }
 
 
 void KDGanttMinimizeSplitter::setG( QWidget *w, int p, int s, bool isSplitter )
 {
-    if ( orient == Horizontal ) {
-        if ( false && orient == Horizontal && !isSplitter )
+    if ( orient == Qt::Horizontal ) {
+        if ( false && orient == Qt::Horizontal && !isSplitter )
             p = contentsRect().width() - p - s;
         w->setGeometry( p, contentsRect().y(), s, contentsRect().height() );
     } else
         w->setGeometry( contentsRect().x(), p, contentsRect().width(), s );
 }
 
@@ -837,13 +854,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
     QWidget *w = s->wid;
     if ( w->isHidden() ) {
         moveBefore( pos, id-1, upLeft );
     } else if ( s->isSplitter ) {
         int pos1, pos2;
         int dd = s->sizer;
-        if( false && orient == Horizontal ) {
+        if( false && orient == Qt::Horizontal ) {
             pos1 = pos;
             pos2 = pos + dd;
         } else {
             pos2 = pos - dd;
             pos1 = pos2 + 1;
         }
@@ -853,13 +870,13 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
         } else {
             moveBefore( pos2, id-1, upLeft );
             setG( w, pos1, dd, TRUE );
         }
     } else {
         int dd, newLeft, nextPos;
-        if( false && orient == Horizontal ) {
+        if( false && orient == Qt::Horizontal ) {
             dd = w->geometry().right() - pos;
             dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
             newLeft = pos+1;
             nextPos = newLeft + dd;
         } else {
             dd = pos - pick( w->pos() ) + 1;
@@ -890,13 +907,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
     } else if ( pick( w->pos() ) == pos ) {
         //No need to do anything if it's already there.
         return;
     } else if ( s->isSplitter ) {
         int dd = s->sizer;
         int pos1, pos2;
-        if( false && orient == Horizontal ) {
+        if( false && orient == Qt::Horizontal ) {
             pos2 = pos - dd;
             pos1 = pos2 + 1;
         } else {
             pos1 = pos;
             pos2 = pos + dd;
         }
@@ -907,13 +924,13 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
             moveAfter( pos2, id+1, upLeft );
             setG( w, pos1, dd, TRUE );
         }
     } else {
         int left = pick( w->pos() );
         int right, dd,/* newRight,*/ newLeft, nextPos;
-        if ( false && orient == Horizontal ) {
+        if ( false && orient == Qt::Horizontal ) {
             dd = pos - left + 1;
             dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
             newLeft = pos-dd+1;
             nextPos = newLeft - 1;
         } else {
             right = pick( w->geometry().bottomRight() );
@@ -985,15 +1002,15 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
         } else {
             minA += pick( minSize(s->wid) );
             maxA += pick( s->wid->maximumSize() );
         }
     }
     QRect r = contentsRect();
-    if ( orient == Horizontal && false ) {
+    if ( orient == Qt::Horizontal && false ) {
 #if QT_VERSION >= 0x030000
-    int splitterWidth = style().pixelMetric(QStyle::PM_SplitterWidth, this);
+    int splitterWidth = style()->pixelMetric(QStyle::PM_SplitterWidth, 0,this);
 #else
     int splitterWidth = style().splitterWidth();
 #endif
       
         if ( min )
             *min = pick(r.topRight()) - QMIN( maxB, pick(r.size())-minA ) - splitterWidth;
@@ -1027,13 +1044,13 @@ int KDGanttMinimizeSplitter::adjustPos( int p, int id )
 
 void KDGanttMinimizeSplitter::doResize()
 {
     QRect r = contentsRect();
     int i;
     int n = data->list.count();
-    QMemArray<QLayoutStruct> a( n );
+    Q3MemArray<QLayoutStruct> a( n );
     for ( i = 0; i< n; i++ ) {
         a[i].init();
         QSplitterLayoutStruct *s = data->list.at(i);
         if ( s->wid->isHidden() ) {
             a[i].stretch = 0;
             a[i].sizeHint = a[i].minimumSize = 0;
@@ -1129,13 +1146,13 @@ void KDGanttMinimizeSplitter::recalc( bool update )
     } else {
         maxl = QMIN( maxl, QWIDGETSIZE_MAX );
     }
     if ( maxt < mint )
         maxt = mint;
 
-    if ( orient == Horizontal ) {
+    if ( orient == Qt::Horizontal ) {
         setMaximumSize( maxl, maxt );
         setMinimumSize( minl, mint );
     } else {
         setMaximumSize( maxt, maxl );
         setMinimumSize( mint, minl );
     }
@@ -1264,60 +1281,54 @@ void KDGanttMinimizeSplitter::recalcId()
 */
 QSize KDGanttMinimizeSplitter::sizeHint() const
 {
     constPolish();
     int l = 0;
     int t = 0;
-    if ( children() ) {
-        const QObjectList * c = children();
-        QObjectListIt it( *c );
-        QObject * o;
-
-        while( (o=it.current()) != 0 ) {
-            ++it;
+    if ( !children().empty() ) {
+        const QObjectList c = children();
+        for(QObjectList::const_iterator i=c.begin();i!=c.end();++i) {
+            QObject * o = *i;
             if ( o->isWidgetType() &&
                  !((QWidget*)o)->isHidden() ) {
                 QSize s = ((QWidget*)o)->sizeHint();
                 if ( s.isValid() ) {
                     l += pick( s );
                     t = QMAX( t, trans( s ) );
                 }
             }
         }
     }
-    return orientation() == Horizontal ? QSize( l, t ) : QSize( t, l );
+    return orientation() == Qt::Horizontal ? QSize( l, t ) : QSize( t, l );
 }
 
 
 /*!
 \reimp
 */
 
 QSize KDGanttMinimizeSplitter::minimumSizeHint() const
 {
     constPolish();
     int l = 0;
     int t = 0;
-    if ( children() ) {
-        const QObjectList * c = children();
-        QObjectListIt it( *c );
-        QObject * o;
-
-        while( (o=it.current()) != 0 ) {
-            ++it;
+    if ( !children().empty() ) {
+        const QObjectList c = children();
+        for(QObjectList::const_iterator i=c.begin();i!=c.end();++i) {
+            QObject * o = *i;
             if ( o->isWidgetType() &&
                  !((QWidget*)o)->isHidden() ) {
                 QSize s = minSizeHint((QWidget*)o);
                 if ( s.isValid() ) {
                     l += pick( s );
                     t = QMAX( t, trans( s ) );
                 }
             }
         }
     }
-    return orientation() == Horizontal ? QSize( l, t ) : QSize( t, l );
+    return orientation() == Qt::Horizontal ? QSize( l, t ) : QSize( t, l );
 }
 
 
 /*
   Calculates stretch parameters from current sizes
 */
@@ -1399,19 +1410,20 @@ bool KDGanttMinimizeSplitter::isHidden( QWidget *w ) const
     }
     \endcode
 
   \sa setSizes()
 */
 
-QValueList<int> KDGanttMinimizeSplitter::sizes() const
+Q3ValueList<int> KDGanttMinimizeSplitter::sizes() const
 {
+    /* TODO: hacker 
     if ( !testWState(WState_Polished) ) {
         QWidget* that = (QWidget*) this;
         that->polish();
-    }
-    QValueList<int> list;
+    } */
+    Q3ValueList<int> list;
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
         if ( !s->isSplitter )
             list.append( s->sizer );
         s = data->list.next();
     }
@@ -1430,16 +1442,16 @@ QValueList<int> KDGanttMinimizeSplitter::sizes() const
   If \a list contains too few values, the result is undefined
   but the program will still be well-behaved.
 
   \sa sizes()
 */
 
-void KDGanttMinimizeSplitter::setSizes( QValueList<int> list )
+void KDGanttMinimizeSplitter::setSizes( Q3ValueList<int> list )
 {
     processChildEvents();
-    QValueList<int>::Iterator it = list.begin();
+    Q3ValueList<int>::Iterator it = list.begin();
     QSplitterLayoutStruct *s = data->list.first();
     while ( s && it != list.end() ) {
         if ( !s->isSplitter ) {
             s->sizer = *it;
             ++it;
         }
@@ -1453,36 +1465,36 @@ void KDGanttMinimizeSplitter::setSizes( QValueList<int> list )
   Gets all posted child events, ensuring that the internal state of
   the splitter is consistent.
 */
 
 void KDGanttMinimizeSplitter::processChildEvents()
 {
-    QApplication::sendPostedEvents( this, QEvent::ChildInserted );
+    QApplication::sendPostedEvents( this, QEvent::ChildAdded );
 }
 
 
 /*!
   \reimp
 */
 
 void KDGanttMinimizeSplitter::styleChange( QStyle& old )
 {
 
 #if QT_VERSION >= 0x030000
-    int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
+    int sw = style()->pixelMetric(QStyle::PM_SplitterWidth, 0, this);
 #else
     int sw = style().splitterWidth();
 #endif
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
         if ( s->isSplitter )
             s->sizer = sw;
         s = data->list.next();
     }
     doResize();
-    QFrame::styleChange( old );
+    Q3Frame::styleChange( old );
 }
 
 #endif
 
 /*!
   Specifies the direction of the minimize buttons.
@@ -1509,13 +1521,13 @@ KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection()
   unfortunately isn't exported.
 */
 static inline int toFixed( int i ) { return i * 256; }
 static inline int fRound( int i ) {
     return ( i % 256 < 128 ) ? i / 256 : 1 + i / 256;
 }
-void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos,
+void kdganttGeomCalc( Q3MemArray<QLayoutStruct> &chain, int start, int count, int pos,
                 int space, int spacer )
 {
     typedef int fixed;
     int cHint = 0;
     int cMin = 0;
     int cMax = 0;
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 3042e0a..338d965 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -1,6 +1,13 @@
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QChildEvent>
+#include <QMouseEvent>
+#include <QEvent>
 /* -*- Mode: C++ -*-
    $Id$
 */
 
 /****************************************************************************
  ** Copyright (C)  2001-2004 Klarälvdalens Datakonsult AB.  All rights reserved.
@@ -32,38 +39,38 @@
  **********************************************************************/
 
 #ifndef KDGANTTMINIMIZESPLITTER_H
 #define KDGANTTMINIMIZESPLITTER_H
 
 #ifndef QT_H
-#include "qframe.h"
-#include "qvaluelist.h"
+#include "q3frame.h"
+#include "q3valuelist.h"
 #endif // QT_H
 
 #ifndef QT_NO_SPLITTER___
 class QSplitterData;
 class QSplitterLayoutStruct;
 class KDGanttSplitterHandle;
 class KDRubberBand; 
-class KDGanttMinimizeSplitter : public QFrame
+class KDGanttMinimizeSplitter : public Q3Frame
 {
     Q_OBJECT
     //  Q_ENUMS( Direction )
     // Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     // Q_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
 
 public:
     enum ResizeMode { Stretch, KeepSize, FollowSizeHint };
     enum Direction { Left, Right, Up, Down };
 
     KDGanttMinimizeSplitter( QWidget* parent=0, const char* name=0 );
-    KDGanttMinimizeSplitter( Orientation, QWidget* parent=0, const char* name=0 );
+    KDGanttMinimizeSplitter( Qt::Orientation, QWidget* parent=0, const char* name=0 );
     ~KDGanttMinimizeSplitter();
 
-    virtual void setOrientation( Orientation );
-    Orientation orientation() const { return orient; }
+    virtual void setOrientation( Qt::Orientation );
+    Qt::Orientation orientation() const { return orient; }
 
     void setMinimizeDirection( Direction );
     Direction minimizeDirection() const;
 
 #if QT_VERSION >= 232
     virtual void setResizeMode( QWidget *w, ResizeMode );
@@ -74,14 +81,14 @@ public:
     void moveToLast( QWidget * );
 
     void refresh() { recalc( TRUE ); }
     QSize sizeHint() const;
     QSize minimumSizeHint() const;
 
-    QValueList<int> sizes() const;
-    void setSizes( QValueList<int> );
+    Q3ValueList<int> sizes() const;
+    void setSizes( Q3ValueList<int> );
     KDGanttSplitterHandle* firstHandle(){ return mFirstHandle;}
     void expandPos( int id, int* min, int* max );
     KDRubberBand* rubberBand() { return mRubberBand ;}
 public slots:
      void toggle();
 protected:
@@ -111,26 +118,26 @@ private:
     void recalcId();
     void moveBefore( int pos, int id, bool upLeft );
     void moveAfter( int pos, int id, bool upLeft );
     void setG( QWidget *w, int p, int s, bool isSplitter = FALSE );
 
     QCOORD pick( const QPoint &p ) const
-    { return orient == Horizontal ? p.x() : p.y(); }
+    { return orient == Qt::Horizontal ? p.x() : p.y(); }
     QCOORD pick( const QSize &s ) const
-    { return orient == Horizontal ? s.width() : s.height(); }
+    { return orient == Qt::Horizontal ? s.width() : s.height(); }
 
     QCOORD trans( const QPoint &p ) const
-    { return orient == Vertical ? p.x() : p.y(); }
+    { return orient == Qt::Vertical ? p.x() : p.y(); }
     QCOORD trans( const QSize &s ) const
-    { return orient == Vertical ? s.width() : s.height(); }
+    { return orient == Qt::Vertical ? s.width() : s.height(); }
     KDGanttSplitterHandle* mFirstHandle;
     QSplitterData *data;
 #endif
 
 private:
-    Orientation orient;
+    Qt::Orientation orient;
     Direction _direction;
 #ifndef DOXYGEN_SKIP_INTERNAL
     friend class KDGanttSplitterHandle;
 #endif
         private:// Disabled copy constructor and operator=
 #if defined(Q_DISABLE_COPY)
@@ -160,13 +167,13 @@ public:
     void toggle();
 
     int id() const { return myId; } // data->list.at(id())->wid == this
     void setId( int i ) { myId = i; }
 
 protected:
-    QValueList<QPointArray> buttonRegions();
+    Q3ValueList<Q3PointArray> buttonRegions();
     void paintEvent( QPaintEvent * );
     void mouseMoveEvent( QMouseEvent * );
     void mousePressEvent( QMouseEvent * );
     void mouseReleaseEvent( QMouseEvent * );
     int onButton( const QPoint& p );
     void updateCursor( const QPoint& p );
diff --git a/microkde/fncolordialog.h b/microkde/fncolordialog.h
index 615d2ed..52356be 100755
--- a/microkde/fncolordialog.h
+++ b/microkde/fncolordialog.h
@@ -32,18 +32,18 @@
 #include <qslider.h>

 #include <qspinbox.h>

 

 //-----------------------------------------------------------------------------

 // FNPaletteBase

 //-----------------------------------------------------------------------------

-class Q_EXPORT FNPaletteBase : public QWidget

+class /* Q_EXPORT */ FNPaletteBase : public QWidget

 { 

     Q_OBJECT

 public:

         

-    FNPaletteBase(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);

+    FNPaletteBase(QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);

 

         

     virtual ~FNPaletteBase();

 

         

     void setBGColor(QColor c) {

@@ -75,31 +75,31 @@ signals:
 

 

 

 //-----------------------------------------------------------------------------

 // FNColorPalette

 //-----------------------------------------------------------------------------

-class Q_EXPORT FNColorPalette : public FNPaletteBase

+class /* Q_EXPORT */ FNColorPalette : public FNPaletteBase

 { 

     Q_OBJECT

 public:

-    FNColorPalette(QColor c, QWidget* parent = 0, const char* name = 0, WFlags fl = 0);

+    FNColorPalette(QColor c, QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);

     virtual ~FNColorPalette();

 };

 

 

 

 

 //-----------------------------------------------------------------------------

 // FNHSVPalette

 //-----------------------------------------------------------------------------

-class Q_EXPORT FNHSVPalette : public FNPaletteBase

+class /*Q_EXPORT */ FNHSVPalette : public FNPaletteBase

 {

     Q_OBJECT

 public:

-    FNHSVPalette(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);

+    FNHSVPalette(QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);

     virtual ~FNHSVPalette();

 public slots:

     void hueChanged(int v);

 protected:

         virtual void drawImpl(QPainter& pa);

         int _hue;

@@ -108,17 +108,17 @@ protected:
 

 

 

 //-----------------------------------------------------------------------------

 // FNColorDialog

 //-----------------------------------------------------------------------------

-class Q_EXPORT FNColorDialog : public QDialog

+class /*Q_EXPORT */FNColorDialog : public QDialog

 {

         Q_OBJECT

 public:

-        FNColorDialog(QWidget* parent=0, const char* name=0, WFlags f=0);

+        FNColorDialog(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);

         virtual ~FNColorDialog();

         void setColor(QColor c);

         QColor color() const;

 public slots:

         virtual void basePaletteClicked(FNPaletteBase*);

         virtual void hsvPaletteClicked(FNPaletteBase*);

diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index d7c12bb..b058d54 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -3,17 +3,20 @@
 
 #include "kapplication.h"
 #include "ktextedit.h"
 #include <qapplication.h>
 #include <qstring.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qdialog.h>
 #include <qlayout.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qregexp.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 int KApplication::random()
 {
   return rand();
 }
 
@@ -72,54 +75,54 @@ void KApplication::showFile(QString caption, QString fn)
    fileName = getenv("QPEDIR");
    fileName += "/pics/" + fn ;
 #else
    fileName  = qApp->applicationDirPath () + "/" + fn;
 #endif 
     QFile file( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return ;
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     text = ts.read();
     file.close();
     KApplication::showText( caption, text );
   
 }
  
 bool KApplication::convert2latin1(QString fileName)
 {
     QString text;
     QFile file( fileName );
-    if (!file.open( IO_ReadOnly ) ) {
+    if (!file.open( QIODevice::ReadOnly ) ) {
         return false;
         
     } 
-    QTextStream ts( &file );
-    ts.setEncoding( QTextStream::UnicodeUTF8 );
+    Q3TextStream ts( &file );
+    ts.setEncoding( Q3TextStream::UnicodeUTF8 );
     text = ts.read();
     file.close();  
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return false;
     }
-    QTextStream tsIn( &file );
-    tsIn.setEncoding( QTextStream::Latin1 );
+    Q3TextStream tsIn( &file );
+    tsIn.setEncoding( Q3TextStream::Latin1 );
     tsIn << text.latin1();
     file.close(); 
     return true; 
  
 
 }
 void KApplication::showText(QString caption, QString text)
 {
     QDialog dia( 0, "name", true ); ;
     dia.setCaption( caption );
-    QVBoxLayout* lay = new QVBoxLayout( &dia );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     KTextEdit tb ( &dia );
-    tb.setWordWrap( QMultiLineEdit::WidgetWidth );
+    tb.setWordWrap( Q3MultiLineEdit::WidgetWidth );
     lay->addWidget( &tb ); 
     tb.setText( text );
 #ifdef DESKTOP_VERSION
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
@@ -130,29 +133,29 @@ void KApplication::showText(QString caption, QString text)
 
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qdir.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include "kglobal.h"
 #include "klocale.h"
 
 class KBackupPrefs : public QDialog
 {
   public:
     KBackupPrefs( QString message , QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Backup Failed!") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel * lab  = new QLabel( message, this );
         lay->addWidget( lab ); 
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("Choose action"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("Choose action"), this );
         lay->addWidget( format ); 
         format->setExclusive ( true ) ;
         vcal = new QRadioButton(i18n("Try again now"), format );
         tcal = new QRadioButton(i18n("Try again later"), format );
         ical = new QRadioButton(i18n("Try again tomorrow"), format );
         ocal = new QRadioButton(i18n("Disable backup"), format );
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp
index 197bea2..16618fc 100644
--- a/microkde/kcolorbutton.cpp
+++ b/microkde/kcolorbutton.cpp
@@ -1,14 +1,17 @@
 #include "kcolorbutton.h"
 #include "kcolordialog.h"
 #include "qapplication.h"
+#include <QDesktopWidget>
 
 
 #include "qlayout.h"
 #ifdef DESKTOP_VERSION
 #include <qcolordialog.h>
+//Added by qt3to4:
+#include <QPixmap>
 #endif
 void KColorButton:: edit()
 {
 
 #ifdef DESKTOP_VERSION
     QColor col = QColorDialog::getColor ( mColor ); 
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp
index 940196e..12063ca 100644
--- a/microkde/kconfig.cpp
+++ b/microkde/kconfig.cpp
@@ -1,9 +1,11 @@
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include "kdebug.h"
 
 #include "kurl.h"
 #include "kstandarddirs.h"
 #include "kconfig.h"
@@ -50,17 +52,17 @@ void KConfig::setGroup( const QString &group )
 //US
 QString KConfig::group() const {
   return mGroup;
 }
 
 //US added method
-QValueList<int> KConfig::readIntListEntry( const QString & key)
+Q3ValueList<int> KConfig::readIntListEntry( const QString & key)
 {
 //  qDebug("KConfig::readIntListEntry key=%s:", key.latin1());
   
-  QValueList<int> result;
+  Q3ValueList<int> result;
 
   QMap<QString,QString>::ConstIterator mit = mStringMap.find( mGroup + key );
   
   if ( mit == mStringMap.end() ) {
     return result;
   }
@@ -108,13 +110,13 @@ QString KConfig::readEntry( const QString &key, const QString &def )
   
   return QString::fromUtf8((*it).latin1());
 }
 
 QSize KConfig::readSizeEntry( const QString &key, QSize* def )
 {
-  QValueList<int> intlist = readIntListEntry(key);
+  Q3ValueList<int> intlist = readIntListEntry(key);
 
   if (intlist.count() < 2)
     {
       if (def)
       return *def;
       else
@@ -191,17 +193,17 @@ QDateTime KConfig::readDateTimeEntry( const QString &key, const QDateTime *def )
   }
 
   return *it;
 }
 
 //US added method
-void KConfig::writeEntry( const QString &key, const QValueList<int> &value)
+void KConfig::writeEntry( const QString &key, const Q3ValueList<int> &value)
 {
   QStringList valuesAsStrings;
 
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
   
   for( it = value.begin(); it != value.end(); ++it )
   {
     valuesAsStrings << QString::number(*it);
   }
   
@@ -243,13 +245,13 @@ void KConfig::writeEntry( const QString & e, const QColor & c )
     l.append( QString::number ( c.blue() ) );
     writeEntry(  e.utf8(), l );
 }
 
 void KConfig::writeEntry( const QString & e, const QSize & s )
 {
-  QValueList<int> intlist;
+  Q3ValueList<int> intlist;
   intlist << s.width() << s.height();
   writeEntry(  e, intlist );
 }
 
 void KConfig::writeEntry( const QString & e , const QFont & f )
 {
@@ -268,26 +270,26 @@ void KConfig::writeEntry( const QString &key, const QDateTime &dt )
 
 void KConfig::load()
 {
   
 
   QFile f( mFileName );
-  if ( !f.open( IO_ReadOnly ) ) {
+  if ( !f.open( QIODevice::ReadOnly ) ) {
       //qDebug("KConfig: could not open file %s ",mFileName.latin1() );
       return;
   }
 
   mBoolMap.clear();
   mStringMap.clear();
   
-  QTextStream t( &f );
-  t.setEncoding( QTextStream::Latin1 );
+  Q3TextStream t( &f );
+  t.setEncoding( Q3TextStream::Latin1 );
   QString line = t.readLine();
 
   while ( !line.isNull() ) {
-    QStringList tokens = QStringList::split( ",", line );
+    QStringList tokens = line.split(',');
     if ( tokens[0] == "bool" ) {
       bool value = false;
       if ( tokens[2] == "1" ) value = true;      
       mBoolMap.insert( tokens[1], value );
     } else if ( tokens[0] == "QString" ) {
       QString value = tokens[2];
@@ -320,21 +322,21 @@ void KConfig::sync()
   KURL path;
   path.setPath(mFileName);
   QString dir=path.directory();
   KStandardDirs::makeDir(dir);
   
   QFile f( mFileName );
-  if ( !f.open( IO_WriteOnly ) ) {
+  if ( !f.open( QIODevice::WriteOnly ) ) {
   
     qDebug("KConfig::sync() Can't open file %s ",mFileName.latin1() );
     
     return;
   }
 
-  QTextStream t( &f );
-  t.setEncoding( QTextStream::Latin1 );
+  Q3TextStream t( &f );
+  t.setEncoding( Q3TextStream::Latin1 );
   QMap<QString,bool>::ConstIterator itBool;
   for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) {
     t << "bool," << itBool.key() << "," << ( *itBool ? "1" : "0"  ) << endl;
   }
 
   QMap<QString,QString>::ConstIterator itString;
diff --git a/microkde/kconfig.h b/microkde/kconfig.h
index 1a1038f..7b91e44 100644
--- a/microkde/kconfig.h
+++ b/microkde/kconfig.h
@@ -1,12 +1,12 @@
 #ifndef MINIKDE_KCONFIG_H
 #define MINIKDE_KCONFIG_H
 
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qcolor.h>
 #include <qfont.h>
 #include <qmap.h>
 #include <qdatetime.h>
 
 class KConfig
@@ -54,25 +54,25 @@ class KConfig
   bool hasGroup(const QString &group) const;
     
     
     QString getFileName();
     
 //US added method readIntListEntry    
-    QValueList<int> readIntListEntry( const QString &);
+    Q3ValueList<int> readIntListEntry( const QString &);
     
     int readNumEntry( const QString &, int def=0 );
     QString readEntry( const QString &, const QString &def=QString::null );
     QStringList readListEntry( const QString & );
     bool readBoolEntry( const QString &, bool def=false );
     QColor readColorEntry( const QString &, QColor * );
     QFont readFontEntry( const QString &, QFont * );
     QDateTime readDateTimeEntry( const QString &, const QDateTime *pDefault = 0 );
     QSize readSizeEntry(const QString &, QSize* );
     bool hasKey( const QString &);
         
-    void writeEntry( const QString &, const QValueList<int>& );
+    void writeEntry( const QString &, const Q3ValueList<int>& );
     void writeEntry( const QString &, int );
     void writeEntry( const QString &key , unsigned int value) { writeEntry( key, int( value ) ); }
     void writeEntry( const char *key , unsigned int value) { writeEntry( QString( key ), value ); }
     void writeEntry( const char *key, int value ) { writeEntry( QString( key ), value ); } 
     void writeEntry( const QString &, const QString & );
     void writeEntry( const char *key, const QString &value ) { writeEntry( QString( key ), value ); }
diff --git a/microkde/kdatepickernew.cpp b/microkde/kdatepickernew.cpp
index f60a422..8f8001e 100644
--- a/microkde/kdatepickernew.cpp
+++ b/microkde/kdatepickernew.cpp
@@ -310,13 +310,13 @@ KDatePicker::selectMonthClicked()
 {
   // every year can have different month names (in some calendar systems)
   const KCalendarSystem * calendar = KGlobal::locale()->calendar();
   QDate date = table->getDate();
   int i, month, months = calendar->monthsInYear(date);
 
-  QPopupMenu popup(selectMonth);
+  Q3PopupMenu popup(selectMonth);
 
   for (i = 1; i <= months; i++)
     popup.insertItem(calendar->monthName(i, calendar->year(date)), i);
 
   popup.setActiveItem(calendar->month(date) - 1);
 
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index 353f78d..10dc449 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -41,12 +41,20 @@
 #include "kdatetbl.h"
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qpen.h>
 #include <qpainter.h>
 #include <qdialog.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <Q3Frame>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
 #include <assert.h>
 #include <qapplication.h>
 
 KDateValidator::KDateValidator(QWidget* parent, const char* name)
     : QValidator(parent, name)
 {
@@ -66,37 +74,37 @@ KDateValidator::date(const QString& text, QDate& d) const
     QDate tmp = KGlobal::locale()->readDate(text);
     if (!tmp.isNull())
         {
             d = tmp;
             return Acceptable;
         } else
-        return Valid;
+        return QValidator::Intermediate;
 }
 
 void
 KDateValidator::fixup( QString& ) const
 {
 
 }
 
-KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
-    : QGridView(parent, name, f)
+KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, Qt::WFlags f)
+    : Q3GridView(parent, name, f)
 {
     setFont( KGlobalSettings::generalFont() );
     if(!date_.isValid())
         {
             date_=QDate::currentDate();
         }
-    setFocusPolicy( QWidget::StrongFocus );
+    setFocusPolicy( Qt::StrongFocus );
     setNumRows(7); // 6 weeks max + headline
     setNumCols(7); // 7 days a week
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
     viewport()->setBackgroundColor(QColor(220,245,255));
 #if 0
-    viewport()->setEraseColor(lightGray);
+    viewport()->setEraseColor(Qt::lightGray);
 #endif
     mMarkCurrent = false;
     setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
 }
 
 void
@@ -105,13 +113,13 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
     QRect rect;
     QString text;
     QPen pen;
     int w=cellWidth();
     int h=cellHeight();
     int pos;
-    QBrush brushBlue(blue);
+    QBrush brushBlue(Qt::blue);
     QBrush brushLightblue(QColor(220,245,255));
     QFont _font=font();
     // -----
     if(row==0)
         { // we are drawing the headline
             _font.setBold(true);
@@ -130,24 +138,23 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
             }
             if (!normalday)
                 {
                     painter->setPen(QColor(220,245,255));
                     painter->setBrush(brushLightblue);
                     painter->drawRect(0, 0, w, h);
-                    painter->setPen(blue);
+                    painter->setPen(Qt::blue);
                 } else {
-                painter->setPen(blue);
+                painter->setPen(Qt::blue);
                 painter->setBrush(brushBlue);
                 painter->drawRect(0, 0, w, h);
-                painter->setPen(white);
+                painter->setPen(Qt::white);
             }
-            painter->drawText(0, 0, w, h-1, AlignCenter,
+            painter->drawText(0, 0, w, h-1, Qt::AlignCenter,
                               daystr, -1, &rect);
-            painter->setPen(black);
-            painter->moveTo(0, h-1);
-            painter->lineTo(w-1, h-1);
+            painter->setPen(Qt::black);
+            painter->drawLine(0, h-1, w-1, h-1);
             // ----- draw the weekday:
         } else {
         painter->setFont(_font);
         pos=7*(row-1)+col;
         if (KGlobal::locale()->weekStartsMonday())
             pos++;
@@ -158,47 +165,47 @@ KDateTable::paintCell(QPainter *painter, int row, int col)
                 if(pos<firstday)
                     { // previous month
                         text.setNum(numDaysPrevMonth+pos-firstday+1);
                     } else { // following month
                     text.setNum(pos-firstday-numdays+1);
                 }
-                painter->setPen(gray);
+                painter->setPen(Qt::gray);
             } else { // paint a day of the current month
             text.setNum(pos-firstday+1);
-            painter->setPen(black);
+            painter->setPen(Qt::black);
         }
 
         pen=painter->pen();
         if(firstday+date.day()-1==pos)
             {
                 if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
-                    painter->setPen(green);
+                    painter->setPen(Qt::green);
                 else
-                    painter->setPen(red);
+                    painter->setPen(Qt::red);
                 if(hasFocus())
                     {  
-                        painter->setBrush(darkRed);
-                        pen=white;
+                        painter->setBrush(Qt::darkRed);
+                        pen=QColor(Qt::white);
                     } else {
-                    painter->setBrush(darkGray);
-                    pen=white;
+                    painter->setBrush(Qt::darkGray);
+                    pen=QColor(Qt::white);
                 }
             } else {
             if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
                 {
-                    painter->setPen(green);
-                    painter->setBrush(darkGreen);
-                    pen=white;
+                    painter->setPen(Qt::green);
+                    painter->setBrush(Qt::darkGreen);
+                    pen=QColor(Qt::white);
                 } else {
                 painter->setBrush(QColor(220,245,255));
                 painter->setPen(QColor(220,245,255));
             }
         }
         painter->drawRect(0, 0, w, h);
         painter->setPen(pen);
-        painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect);
+        painter->drawText(0, 0, w, h, Qt::AlignCenter, text, -1, &rect);
     }
     /*
     if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); 
     if(rect.height()>maxCell.height()) {
         maxCell.setHeight(rect.height());
     }
@@ -271,13 +278,13 @@ KDateTable::keyPressEvent( QKeyEvent *e )
  
 }
 
 void
 KDateTable::viewportResizeEvent(QResizeEvent * e)
 {
-    QGridView::viewportResizeEvent(e);
+    Q3GridView::viewportResizeEvent(e);
 
     setCellWidth(viewport()->width()/7);
     setCellHeight(viewport()->height()/7);
 }
 
 void
@@ -406,19 +413,19 @@ KDateTable::getDate() const
     return date;
 }
 
 void KDateTable::focusInEvent( QFocusEvent *e )
 {
     repaintContents(false);
-    QGridView::focusInEvent( e );
+    Q3GridView::focusInEvent( e );
 }
 
 void KDateTable::focusOutEvent( QFocusEvent *e )
 {
     repaintContents(false);
-    QGridView::focusOutEvent( e );
+    Q3GridView::focusOutEvent( e );
 }
 
 QSize
 KDateTable::sizeHint() const
 {
     if(maxCell.height()>0 && maxCell.width()>0)
@@ -429,13 +436,13 @@ KDateTable::sizeHint() const
         return QSize(-1, -1);
     }
 }
 
 KDateInternalMonthPicker::KDateInternalMonthPicker
 (QWidget* parent, const char* name)
-    : QGridView(parent, name),
+    : Q3GridView(parent, name),
       result(0) // invalid
 {
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
@@ -448,19 +455,19 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
     if ( QApplication::desktop()->width() > 640 )
         add += 6;
     font.setPointSize(fontsize+add);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
     setNumRows(4);
     setNumCols(3);
     // enable to find drawing failures:
     // setTableFlags(Tbl_clipCellPainting);
 #if 0
-    viewport()->setEraseColor(lightGray); // for consistency with the datepicker
+    viewport()->setEraseColor(Qt::lightGray); // for consistency with the datepicker
 #endif
     // ----- find the preferred size
     //       (this is slow, possibly, but unfortunatly it is needed here):
     QFontMetrics metrics(font);
     for(int i=1; i <= 12; ++i)
         {
@@ -484,13 +491,13 @@ KDateInternalMonthPicker::getResult() const
     return result;
 }
 
 void
 KDateInternalMonthPicker::setupPainter(QPainter *p)
 {
-    p->setPen(black);
+    p->setPen(Qt::black);
 }
 
 void
 KDateInternalMonthPicker::viewportResizeEvent(QResizeEvent*)
 {
     setCellWidth(width()/3);
@@ -502,21 +509,21 @@ KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
 {
     int index;
     QString text;
     // ----- find the number of the cell:
     index=3*row+col+1;
     text=KGlobal::locale()->monthName(index, false);
-    painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
+    painter->drawText(0, 0, cellWidth(), cellHeight(), Qt::AlignCenter, text);
     if ( activeCol == col && activeRow == row )
         painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 
 void
 KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-    if(!isEnabled() || e->button() != LeftButton)
+    if(!isEnabled() || e->button() != Qt::LeftButton)
         {
             KNotifyClient::beep();
             return;
         }
     // -----
     int row, col;
@@ -537,13 +544,13 @@ KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
     }
 }
 
 void
 KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-    if (e->state() & LeftButton)
+    if (e->state() & Qt::LeftButton)
         {
             int row, col;
             QPoint mouseCoord;
             // -----
             mouseCoord = e->pos();
             row=rowAt(mouseCoord.y());
@@ -611,13 +618,13 @@ KDateInternalYearSelector::KDateInternalYearSelector
     QFont font;
     // -----
     font=KGlobalSettings::generalFont();
     font.setPointSize(fontsize);
     setFont(font);
 #if 0
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
 #endif
     // we have to respect the limits of QDate here, I fear:
     val->setRange(0, 8000);
     setValidator(val);
     connect(this, SIGNAL(returnPressed()), SLOT(yearEnteredSlot()));
 }
@@ -658,24 +665,24 @@ KDateInternalYearSelector::setYear(int year)
     // -----
     temp.setNum(year);
     setText(temp);
 }
 
 KPopupFrame::KPopupFrame(QWidget* parent, const char*  name)
-    : QFrame(parent, name, WType_Popup),
+    : Q3Frame(parent, name, Qt::WType_Popup),
       result(0), // rejected
       main(0)
 {
-    setFrameStyle(QFrame::Box|QFrame::Raised);
+    setFrameStyle(Q3Frame::Box|Q3Frame::Raised);
     setMidLineWidth(2);
 }
 
 void
 KPopupFrame::keyPressEvent(QKeyEvent* e)
 {
-    if(e->key()==Key_Escape)
+    if(e->key()==Qt::Key_Escape)
         {
             result=0; // rejected
             qApp->exit_loop();
         }
 }
 
@@ -753,13 +760,13 @@ void KDateTable::virtual_hook( int, void* )
 
 //#include "kdatetbl.moc"
 
 
 KDateInternalWeekPicker::KDateInternalWeekPicker
 (QWidget* parent, const char* name)
-    : QGridView(parent, name),
+    : Q3GridView(parent, name),
       result(0) // invalid
 {
     QRect rect;
     QFont font;
     // -----
     activeCol = -1;
@@ -770,24 +777,24 @@ KDateInternalWeekPicker::KDateInternalWeekPicker
     if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 )
         add += 6;
     font.setPointSize(fontsize+add);
     setFont(font);
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
-    setFrameStyle(QFrame::NoFrame);
+    setFrameStyle(Q3Frame::NoFrame);
     if ( QApplication::desktop()->height() > 240 ) {
         setNumRows(13);
         setNumCols(4);
     } else {
         setNumRows(4);
         setNumCols(13);
     }
     // enable to find drawing failures:
     // setTableFlags(Tbl_clipCellPainting);
 #if 0
-    viewport()->setEraseColor(lightGray); // for consistency with the datepicker
+    viewport()->setEraseColor(Qt::lightGray); // for consistency with the datepicker
 #endif
     // ----- find the preferred size
     //       (this is slow, possibly, but unfortunatly it is needed here):
     QFontMetrics metrics(font);
     for(int i=1; i <= 52; ++i)
         {
@@ -815,13 +822,13 @@ KDateInternalWeekPicker::getResult() const
     return result;
 }
 
 void
 KDateInternalWeekPicker::setupPainter(QPainter *p)
 {
-    p->setPen(black);
+    p->setPen(Qt::black);
 }
 
 void
 KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*)
 {
     setCellWidth(width()/ numCols());
@@ -833,21 +840,21 @@ KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col)
 {
     int index;
     QString text;
     // ----- find the number of the cell:
     index=numCols()*row+col+1;
     text=QString::number( index );
-    painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
+    painter->drawText(0, 0, cellWidth(), cellHeight(), Qt::AlignCenter, text);
     if ( activeCol == col && activeRow == row )
         painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 
 void
 KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e)
 {
-    if(!isEnabled() || e->button() != LeftButton)
+    if(!isEnabled() || e->button() != Qt::LeftButton)
         {
             KNotifyClient::beep();
             return;
         }
     // -----
     int row, col;
@@ -868,13 +875,13 @@ KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e)
     }
 }
 
 void
 KDateInternalWeekPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
-    if (e->state() & LeftButton)
+    if (e->state() & Qt::LeftButton)
         {
             int row, col;
             QPoint mouseCoord;
             // -----
             mouseCoord = e->pos();
             row=rowAt(mouseCoord.y());
diff --git a/microkde/kdatetbl.h b/microkde/kdatetbl.h
index 87808df..2d3d2cf 100644
--- a/microkde/kdatetbl.h
+++ b/microkde/kdatetbl.h
@@ -18,23 +18,29 @@
     Boston, MA 02111-1307, USA.
 */
 #ifndef KDATETBL_H
 #define KDATETBL_H
 
 #include <qvalidator.h>
-#include <qgridview.h>
+#include <q3gridview.h>
 #include <qlineedit.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <Q3Frame>
+#include <QKeyEvent>
+#include <QFocusEvent>
 
 /**
 * A table containing month names. It is used to pick a month directly.
 * @internal
 * @version $Id$
 * @author Tim Gilman, Mirko Boehm
 */
-class KDateInternalMonthPicker : public QGridView
+class KDateInternalMonthPicker : public Q3GridView
 {
   Q_OBJECT
 protected:
   /**
    * Store the month that has been clicked [1..12].
    */
@@ -124,13 +130,13 @@ private:
 
 /**
  * Frame with popup menu behaviour.
  * @author Tim Gilman, Mirko Boehm
  * @version $Id$
  */
-class KPopupFrame : public QFrame
+class KPopupFrame : public Q3Frame
 {
   Q_OBJECT
 protected:
   /**
    * The result. It is returned from exec() when the popup window closes.
    */
@@ -179,13 +185,13 @@ public:
    * Dito.
    */
   int exec(int x, int y);
 
 private:
 
-  virtual bool close(bool alsoDelete) { return QFrame::close(alsoDelete); }
+  virtual bool close(bool alsoDelete) { return Q3Frame::close(alsoDelete); }
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
   class KPopupFramePrivate;
   KPopupFramePrivate *d;
 };
@@ -212,22 +218,22 @@ public:
  * dateSelected(QDate)
  *
  * @internal
  * @version $Id$
  * @author Tim Gilman, Mirko Boehm
  */
-class KDateTable : public QGridView
+class KDateTable : public Q3GridView
 {
     Q_OBJECT
 public:
     /**
      * The constructor.
      */
     KDateTable(QWidget *parent=0,
                QDate date=QDate::currentDate(),
-               const char* name=0, WFlags f=0);
+               const char* name=0, Qt::WFlags f=0);
     /**
      * Returns a recommended size for the widget.
      * To save some time, the size of the largest used cell content is
      * calculated in each paintCell() call, since all calculations have
      * to be done there anyway. The size is stored in maxCell. The
      * sizeHint() simply returns a multiple of maxCell.
@@ -304,13 +310,13 @@ protected:
 private:
     class KDateTablePrivate;
     KDateTablePrivate *d;
 };
 
 #endif // KDATETBL_H
-class KDateInternalWeekPicker : public QGridView
+class KDateInternalWeekPicker : public Q3GridView
 {
   Q_OBJECT
 protected:
   /**
    * Store the month that has been clicked [1..12].
    */
diff --git a/microkde/kdebug.h b/microkde/kdebug.h
index bb9cfe3..534943c 100644
--- a/microkde/kdebug.h
+++ b/microkde/kdebug.h
@@ -1,12 +1,14 @@
 #ifndef MINIKDE_KDEBUG_H
 #define MINIKDE_KDEBUG_H
 
 #include <stdio.h>
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 
 
 class kdbgstream;
 typedef kdbgstream & (*KDBGFUNC)(kdbgstream &); // manipulator function
 
@@ -61,13 +63,13 @@ class kdbgstream {
     kdbgstream &operator<<(const QString&) {
         return *this;
     }
     kdbgstream &operator<<(const char*) {
         return *this;
     }
-    kdbgstream &operator<<(const QCString&) {
+    kdbgstream &operator<<(const Q3CString&) {
       return *this;
     }
     kdbgstream& operator<<(KDBGFUNC f) {
         return (*f)(*this);
     }
     kdbgstream& operator<<(double) {
diff --git a/microkde/kdecore/kcatalogue.cpp b/microkde/kdecore/kcatalogue.cpp
index 97ac326..1600b08 100644
--- a/microkde/kdecore/kcatalogue.cpp
+++ b/microkde/kdecore/kcatalogue.cpp
@@ -17,12 +17,14 @@
    Boston, MA 02111-1307, USA.
 */
 
 //US #include <config.h>
 
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kdebug.h>
 
 #include "kcatalogue.h"
 
 char *k_nl_find_msg(struct kde_loaded_l10nfile *domain_file,
@@ -85,13 +87,13 @@ void KCatalogue::setFileName( const QString & fileName )
 {
   // nothing to do if the file name is already the same
   if ( this->fileName() == fileName ) return;
 
   doUnload();
 
-  QCString newFileName = QFile::encodeName( fileName );
+  Q3CString newFileName = QFile::encodeName( fileName );
 
   if ( !fileName.isEmpty() )
     {
       // set file name
       char *filename = new char[ newFileName.length() + 1 ];
       ::qstrcpy( filename, newFileName );
diff --git a/microkde/kdecore/kconfigbase.h b/microkde/kdecore/kconfigbase.h
index 7e56d11..1ef6a04 100644
--- a/microkde/kdecore/kconfigbase.h
+++ b/microkde/kdecore/kconfigbase.h
@@ -23,12 +23,14 @@
 // $Id$
 
 #ifndef _KCONFIGBASE_H
 #define _KCONFIGBASE_H
 
 #include "kconfig.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 /**
   * Helper class to facilitate working with @ref KConfig / @ref KSimpleConfig
   * groups.
   *
   * Careful programmers always set the group of a
@@ -79,13 +81,13 @@ public:
         { _config->setGroup( group ); }
 
   KConfigGroupSaver( KConfig* config, const char *group )
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
-  KConfigGroupSaver( KConfig* config, const QCString &group )
+  KConfigGroupSaver( KConfig* config, const Q3CString &group )
       : _config(config), _oldgroup(config->group())
         { _config->setGroup( group ); }
 
   ~KConfigGroupSaver() { _config->setGroup( _oldgroup ); }
 
     KConfig* config() { return _config; };
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp
index 6d0475a..0b54eb6 100644
--- a/microkde/kdecore/klibloader.cpp
+++ b/microkde/kdecore/klibloader.cpp
@@ -17,15 +17,18 @@
    Boston, MA 02111-1307, USA.
 */
 //US #include <config.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtimer.h>
-#include <qobjectdict.h>
-#include <qwidgetlist.h>
+#include <q3objectdict.h>
 #include <qwidget.h>
+#include <qwidget.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 
 #include "kapplication.h"
 #include "klibloader.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
 #include "klocale.h"
@@ -42,13 +45,13 @@
 #include <qtopia/qlibrary.h>
 #else
 #include <qlibrary.h> 
 #endif
 
 
-template class QAsciiDict<KLibrary>;
+template class Q3AsciiDict<KLibrary>;
 
 #include <stdlib.h> //getenv
 
 /*US
 #if HAVE_DLFCN_H
 #  include <dlfcn.h>
@@ -117,13 +120,13 @@ KLibrary::~KLibrary()
     if ( m_timer && m_timer->isActive() )
         m_timer->stop();
 
     // If any object is remaining, delete
     if ( m_objs.count() > 0 )
         {
-            QPtrListIterator<QObject> it( m_objs );
+            Q3PtrListIterator<QObject> it( m_objs );
             for ( ; it.current() ; ++it )
                 {
                     kdDebug(150) << "Factory still has object " << it.current() << " " << it.current()->name () << " Library = " << m_libname << endl;
                     disconnect( it.current(), SIGNAL( destroyed() ),
                                 this, SLOT( slotObjectDestroyed() ) );
                 }
@@ -149,13 +152,13 @@ QString KLibrary::fileName() const
 
 KLibFactory* KLibrary::factory()
 {
     if ( m_factory )
         return m_factory;
 
-        QCString symname;
+        Q3CString symname;
         symname.sprintf("init_%s", name().latin1() );
     
         void* sym = symbol( symname );
         if ( !sym )
         {
             qDebug("KLibrary: The library %s does not offer an %s function", name().latin1(), symname.data());
@@ -302,14 +305,14 @@ KLibWrapPrivate::KLibWrapPrivate(KLibrary *l, QLibrary* h)
     }
 }
 
 class KLibLoaderPrivate
 {
 public:
-    QPtrList<KLibWrapPrivate> loaded_stack;
-    QPtrList<KLibWrapPrivate> pending_close;
+    Q3PtrList<KLibWrapPrivate> loaded_stack;
+    Q3PtrList<KLibWrapPrivate> pending_close;
     enum {UNKNOWN, UNLOAD, DONT_UNLOAD} unload_mode;
 
     QString errorMessage;
 };
 
 KLibLoader* KLibLoader::s_self = 0;
@@ -345,13 +348,13 @@ KLibLoader::KLibLoader( QObject* parent, const char* name )
 }
 
 KLibLoader::~KLibLoader()
 {
 //    kdDebug(150) << "Deleting KLibLoader " << this << "  " << name() << endl;
 
-    QAsciiDictIterator<KLibWrapPrivate> it( m_libs );
+    Q3AsciiDictIterator<KLibWrapPrivate> it( m_libs );
     for (; it.current(); ++it )
     {
       kdDebug(150) << "The KLibLoader contains the library " << it.current()->name
         << " (" << it.current()->lib << ")" << endl;
       d->pending_close.append(it.current());
     }
@@ -361,13 +364,13 @@ KLibLoader::~KLibLoader()
     delete d;
 }
 
 //static
 QString KLibLoader::findLibrary( const char * name/*US , const KInstance * instance*/ )
 {
-    QCString libname( name );
+    Q3CString libname( name );
 
     // only append ".la" if there is no extension
     // this allows to load non-libtool libraries as well
     // (mhk, 20000228)
     int pos = libname.findRev('/');
     if (pos < 0)
@@ -418,13 +421,13 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta
 #endif
       }
       if ( libfile.isEmpty() )
       {
 #ifndef NDEBUG
         kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl;
-        self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); 
+        self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(QString(libname)); 
             
         qDebug("KLibLoader::library could not find library: %s", libname.data());
 #endif
             
       }
       else
@@ -466,13 +469,13 @@ KLibrary* KLibLoader::library( const char *name )
       wrap->ref_count++;
       return wrap->lib;
     }
 
     /* Test if this library was loaded at some time, but got
        unloaded meanwhile, whithout being dlclose()'ed.  */
-    QPtrListIterator<KLibWrapPrivate> it(d->loaded_stack);
+    Q3PtrListIterator<KLibWrapPrivate> it(d->loaded_stack);
     for (; it.current(); ++it) {
       if (it.current()->name == name)
         wrap = it.current();
     }
 
     if (wrap) {
@@ -547,13 +550,13 @@ KLibFactory* KLibLoader::factory( const char* name )
 }
 
 void KLibLoader::slotLibraryDestroyed()
 {
   const KLibrary *lib = static_cast<const KLibrary *>( sender() );
 
-  QAsciiDictIterator<KLibWrapPrivate> it( m_libs );
+  Q3AsciiDictIterator<KLibWrapPrivate> it( m_libs );
   for (; it.current(); ++it )
     if ( it.current()->lib == lib )
     {
       KLibWrapPrivate *wrap = it.current();
       wrap->lib = 0;  /* the KLibrary object is already away */
       m_libs.remove( it.currentKey() );
@@ -566,13 +569,13 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
 {
   if (wrap && !d->pending_close.containsRef( wrap ))
     d->pending_close.append( wrap );
 
   /* First delete all KLibrary objects in pending_close, but _don't_ unload
      the DSO behind it.  */
-  QPtrListIterator<KLibWrapPrivate> it(d->pending_close);
+  Q3PtrListIterator<KLibWrapPrivate> it(d->pending_close);
   for (; it.current(); ++it) {
     wrap = it.current();
     if (wrap->lib) {
       disconnect( wrap->lib, SIGNAL( destroyed() ),
                   this, SLOT( slotLibraryDestroyed() ) );
       delete wrap->lib;
diff --git a/microkde/kdecore/klibloader.h b/microkde/kdecore/klibloader.h
index ed57109..53d146e 100644
--- a/microkde/kdecore/klibloader.h
+++ b/microkde/kdecore/klibloader.h
@@ -18,14 +18,14 @@
 #ifndef KLIBLOADER_H
 #define KLIBLOADER_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qasciidict.h>
-#include <qptrlist.h>
+#include <q3asciidict.h>
+#include <q3ptrlist.h>
 #include <kglobal.h>
 
 #include <stdlib.h> // For backwards compatibility
 
 class KInstance;
 class QTimer;
@@ -49,13 +49,13 @@ class QLibrary;
  * @see KLibLoader
  * @author Torben Weis <weis@kde.org>
  */
 class KLibrary : public QObject
 {
     friend class KLibLoader;
-    friend class QAsciiDict<KLibrary>;
+    friend class Q3AsciiDict<KLibrary>;
 
     Q_OBJECT
 public:
     /**
      * @internal
      * Don't create KLibrary objects on your own. Instead use @ref KLibLoader.
@@ -124,13 +124,13 @@ private:
 
     QString m_libname;
     QString m_filename;
     KLibFactory* m_factory;
 //US    void * m_handle;
     QLibrary* m_handle;
-    QPtrList<QObject> m_objs;
+    Q3PtrList<QObject> m_objs;
     QTimer *m_timer;
     KLibraryPrivate *d;
 };
 
 class KLibWrapPrivate;
 
@@ -284,13 +284,13 @@ protected:
     KLibLoader( QObject* parent = 0, const char* name = 0 );
 
 private slots:
     void slotLibraryDestroyed();
 private:
     void close_pending( KLibWrapPrivate * );
-    QAsciiDict<KLibWrapPrivate> m_libs;
+    Q3AsciiDict<KLibWrapPrivate> m_libs;
 
     static KLibLoader* s_self;
 
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 1d8ae9f..dd310fa 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -1,21 +1,22 @@
 #include <qregexp.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 #include "kdebug.h"
 #include "kcalendarsystemgregorian.h"
 
 #include "klocale.h"
 
 #include <qstringlist.h>
 
 //#define COLLECT_TRANSLATION
 
 
-QDict<QString> *mLocaleDict = 0;
-void setLocaleDict( QDict<QString> * dict )
+Q3Dict<QString> *mLocaleDict = 0;
+void setLocaleDict( Q3Dict<QString> * dict )
 {
     mLocaleDict = dict;
 
 }
 
 #ifdef COLLECT_TRANSLATION 
@@ -42,24 +43,24 @@ void addExist(const char *text,QString trans )
 
     }
 
 }
 
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #endif
 void dumpMissing()
 {
 #ifdef COLLECT_TRANSLATION 
     QString fileName = "/tmp/usernewtrans.txt";
     QFile file( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return ;
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
 
     int i;
     for ( i = 0; i< missingTrans.count(); ++i ) {
 
         QString text = missingTrans[i].replace( QRegExp("\n"),"\\n" );
@@ -67,16 +68,16 @@ void dumpMissing()
 
     }
     file.close();
     {
     QString fileName = "/tmp/usertrans.txt";
     QFile file( fileName );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return ;
     } 
-    QTextStream ts( &file );
+    Q3TextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
 
     int i;
     for ( i = 0; i< existingTrans1.count(); ++i ) {
 
         QString text = existingTrans1[i].replace( QRegExp("\n"),"\\n" );
@@ -464,13 +465,13 @@ QString KLocale::formatDateTime(const QDateTime &pDateTime,
   QString format("%1 %2");
 
   if ( intIntDateFormat == Default )
     format = "%1 %2";
   else if ( intIntDateFormat == Format1 )
     format = "%1 %2";
-  else  if ( intIntDateFormat == ISODate )
+  else  if ( intIntDateFormat == Qt::ISODate )
     format = "%1T%2";
 
   QString res = format.arg(formatDate( pDateTime.date(), shortFormat, intIntDateFormat ))
                .arg(formatTime( pDateTime.time(), includeSeconds , intIntDateFormat ));
 
   //qDebug("KLocale::formatDateTime transformed %s, into %s", pDateTime.toString().latin1(), res.latin1() );
@@ -524,13 +525,13 @@ QDate KLocale::readDate(const QString &intstr, const QString &fmt, bool* ok) con
 
       // remove space at the begining
       if (str.length() > strpos && str.at(strpos).isSpace())
         strpos++;
 
       c = fmt.at(fmtpos++);
-      switch (c)
+      switch (c.unicode())
       {
         case 'a':
         case 'A':
           // this will just be ignored
           { // Cristian Tache: porting to Win: Block added because of "j" redefinition
             for (int j = 1; j < 8; j++) {
@@ -635,13 +636,13 @@ QTime KLocale::readTime(const QString &intstr, bool seconds, bool *ok) const
 
       // remove space at the begining
       if (str.length() > strpos && str.at(strpos).isSpace())
         strpos++;
 
       c = Format.at(Formatpos++);
-      switch (c)
+      switch (c.unicode())
         {
         case 'p':
           {
             QString s;
             s = i18n("pm").lower();
             int len = s.length();
@@ -731,13 +732,13 @@ QDateTime KLocale::readDateTime(const QString &intstr,
   QString time = intstr.mid(pos+1);
 
   QString dformat = dateFormat(intIntDateFormat);
   QString tformat = timeFormat(intIntDateFormat);
 
   QDate m_date = readDate(date, dformat, &ok1);
-  QTime m_time = readTime(time, tformat, &ok2);
+  QTime m_time = readTime(time, !tformat.isEmpty(), &ok2);
 
   QDateTime m_dt;
 
   if (ok)
     {
       if ((ok1 == false) || (ok2 == false))
diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h
index 58e0b39..840fc9d 100644
--- a/microkde/kdecore/klocale.h
+++ b/microkde/kdecore/klocale.h
@@ -1,20 +1,20 @@
 #ifndef MINIKDE_KLOCALE_H
 #define MINIKDE_KLOCALE_H
 
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qdatetime.h>
-#include <qdict.h>
+#include <q3dict.h>
 
 #ifndef I18N_NOOP
 #define I18N_NOOP(x) (x)
 #endif
 
 class KCalendarSystem;
-void setLocaleDict( QDict<QString> * dict );
+void setLocaleDict( Q3Dict<QString> * dict );
 QString i18n(const char *text);
 QString i18n(const char *hint, const char *text);
 QString i18n(const char *text1, const char *textn, int num);
 
 // Qt3's uic generates i18n( "msg", "comment" ) calls which conflict
 // with our i18n method. we use uic -tr tr2i18n to redirect
diff --git a/microkde/kdecore/kmdcodec.cpp b/microkde/kdecore/kmdcodec.cpp
index bc03569..db11e52 100644
--- a/microkde/kdecore/kmdcodec.cpp
+++ b/microkde/kdecore/kmdcodec.cpp
@@ -36,12 +36,14 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include <kdebug.h>
 #include "kmdcodec.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 #define KMD5_S11 7
 #define KMD5_S12 12
 #define KMD5_S13 17
 #define KMD5_S14 22
 #define KMD5_S21 5
@@ -144,20 +146,20 @@ static int rikFindChar(register const char * _s, const char c)
     if ((0 == *s) || (c == *s)) break; ++s;
   }
 
   return s - _s;
 }
 
-QCString KCodecs::quotedPrintableEncode(const QByteArray& in, bool useCRLF)
+Q3CString KCodecs::quotedPrintableEncode(const QByteArray& in, bool useCRLF)
 {
   QByteArray out;
   quotedPrintableEncode (in, out, useCRLF);
-  return QCString (out.data(), out.size()+1);
+  return Q3CString (out.data(), out.size()+1);
 }
 
-QCString KCodecs::quotedPrintableEncode(const QCString& str, bool useCRLF)
+Q3CString KCodecs::quotedPrintableEncode(const Q3CString& str, bool useCRLF)
 {
   if (str.isEmpty())
     return "";
 
   QByteArray in (str.length());
   memcpy (in.data(), str.data(), str.length());
@@ -277,20 +279,20 @@ void KCodecs::quotedPrintableEncode(const QByteArray& in, QByteArray& out, bool
     }
   }
 
   out.truncate(cursor - out.data());
 }
 
-QCString KCodecs::quotedPrintableDecode(const QByteArray & in)
+Q3CString KCodecs::quotedPrintableDecode(const QByteArray & in)
 {
   QByteArray out;
   quotedPrintableDecode (in, out);
-  return QCString (out.data(), out.size()+1);
+  return Q3CString (out.data(), out.size()+1);
 }
 
-QCString KCodecs::quotedPrintableDecode(const QCString & str)
+Q3CString KCodecs::quotedPrintableDecode(const Q3CString & str)
 {
   if (str.isEmpty())
     return "";
 
   QByteArray in (str.length());
   memcpy (in.data(), str.data(), str.length());
@@ -352,27 +354,27 @@ void KCodecs::quotedPrintableDecode(const QByteArray& in, QByteArray& out)
     }
   }
 
   out.truncate(cursor - out.data());
 }
 
-QCString KCodecs::base64Encode( const QCString& str, bool insertLFs )
+Q3CString KCodecs::base64Encode( const Q3CString& str, bool insertLFs )
 {
     if ( str.isEmpty() )
         return "";
 
     QByteArray in (str.length());
     memcpy( in.data(), str.data(), str.length() );
     return base64Encode( in, insertLFs );
 }
 
-QCString KCodecs::base64Encode( const QByteArray& in, bool insertLFs )
+Q3CString KCodecs::base64Encode( const QByteArray& in, bool insertLFs )
 {
     QByteArray out;
     base64Encode( in, out, insertLFs );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
 
 void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
                             bool insertLFs )
 {
     // clear out the output buffer
@@ -402,66 +404,63 @@ void KCodecs::base64Encode( const QByteArray& in, QByteArray& out,
     {
         while (sidx < len-2)
         {
             if ( insertLFs )
             {
                 if ( count && (count%76) == 0 )
-                    out.at(didx++) = '\n';
+                    out[didx++] = '\n';
                 count += 4;
             }
-            out.at(didx++) = Base64EncMap[(data[sidx] >> 2) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = Base64EncMap[(data[sidx] >> 2) & 077];
+            out[didx++] = Base64EncMap[(data[sidx+1] >> 4) & 017 |
                                        (data[sidx] << 4) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+2] >> 6) & 003 |
+            out[didx++] = Base64EncMap[(data[sidx+2] >> 6) & 003 |
                                        (data[sidx+1] << 2) & 077];
-            out.at(didx++) = Base64EncMap[data[sidx+2] & 077];
+            out[didx++] = Base64EncMap[data[sidx+2] & 077];
             sidx += 3;
         }
     }
 
     if (sidx < len)
     {
         if ( insertLFs && (count > 0) && (count%76) == 0 )
-           out.at(didx++) = '\n';
+           out[didx++] = '\n';
 
-        out.at(didx++) = Base64EncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = Base64EncMap[(data[sidx] >> 2) & 077];
         if (sidx < len-1)
         {
-            out.at(didx++) = Base64EncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = Base64EncMap[(data[sidx+1] >> 4) & 017 |
                                        (data[sidx] << 4) & 077];
-            out.at(didx++) = Base64EncMap[(data[sidx+1] << 2) & 077];
+            out[didx++] = Base64EncMap[(data[sidx+1] << 2) & 077];
         }
         else
         {
-            out.at(didx++) = Base64EncMap[(data[sidx] << 4) & 077];
+            out[didx++] = Base64EncMap[(data[sidx] << 4) & 077];
         }
     }
 
     // Add padding
     while (didx < out.size())
-    {
-        out.at(didx) = '=';
-        didx++;
-    }
+        out[didx++] = '=';
 }
 
-QCString KCodecs::base64Decode( const QCString& str )
+Q3CString KCodecs::base64Decode( const Q3CString& str )
 {
     if ( str.isEmpty() )
         return "";
 
     QByteArray in( str.length() );
     memcpy( in.data(), str.data(), str.length() );
     return base64Decode( in );
 }
 
-QCString KCodecs::base64Decode( const QByteArray& in )
+Q3CString KCodecs::base64Decode( const QByteArray& in )
 {
     QByteArray out;
     base64Decode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
 
 void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
 {
     out.resize(0);
     if ( in.isEmpty() )
@@ -502,13 +501,13 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
         // Adhere to RFC 2045 and ignore characters
         // that are not part of the encoding table.
         unsigned char ch = data[idx];
         if ((ch > 47 && ch < 58) || (ch > 64 && ch < 91) ||
             (ch > 96 && ch < 123) || ch == '+' || ch == '/' || ch == '=')
         {
-            out.at(outIdx++) = Base64DecMap[ch];
+            out[outIdx++] = Base64DecMap[ch];
         }
         else
         {
             len--;
             tail--;
         }
@@ -520,47 +519,47 @@ void KCodecs::base64Decode( const QByteArray& in, QByteArray& out )
     len = (tail>(len/4)) ? tail-(len/4) : 0;
     unsigned int sidx = 0, didx = 0;
     if ( len > 1 )
     {
       while (didx < len-2)
       {
-          out.at(didx) = (((out.at(sidx) << 2) & 255) | ((out.at(sidx+1) >> 4) & 003));
-          out.at(didx+1) = (((out.at(sidx+1) << 4) & 255) | ((out.at(sidx+2) >> 2) & 017));
-          out.at(didx+2) = (((out.at(sidx+2) << 6) & 255) | (out.at(sidx+3) & 077));
+          out[didx] = (((out[sidx] << 2) & 255) | ((out[sidx+1] >> 4) & 003));
+          out[didx+1] = (((out[sidx+1] << 4) & 255) | ((out[sidx+2] >> 2) & 017));
+          out[didx+2] = (((out[sidx+2] << 6) & 255) | (out[sidx+3] & 077));
           sidx += 4;
           didx += 3;
       }
     }
 
     if (didx < len)
-        out.at(didx) = (((out.at(sidx) << 2) & 255) | ((out.at(sidx+1) >> 4) & 003));
+        out[didx] = (((out[sidx] << 2) & 255) | ((out[sidx+1] >> 4) & 003));
 
     if (++didx < len )
-        out.at(didx) = (((out.at(sidx+1) << 4) & 255) | ((out.at(sidx+2) >> 2) & 017));
+        out[didx] = (((out[sidx+1] << 4) & 255) | ((out[sidx+2] >> 2) & 017));
 
     // Resize the output buffer
     if ( len == 0 || len < out.size() )
       out.resize(len);
 }
 
-QCString KCodecs::uuencode( const QCString& str )
+Q3CString KCodecs::uuencode( const Q3CString& str )
 {
     if ( str.isEmpty() )
         return "";
 
     QByteArray in;
     in.resize( str.length() );
     memcpy( in.data(), str.data(), str.length() );
     return uuencode( in );
 }
 
-QCString KCodecs::uuencode( const QByteArray& in )
+Q3CString KCodecs::uuencode( const QByteArray& in )
 {
     QByteArray out;
     uuencode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
 
 void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
 {
     out.resize( 0 );
     if( in.isEmpty() )
@@ -577,87 +576,87 @@ void KCodecs::uuencode( const QByteArray& in, QByteArray& out )
 
     out.resize( (len+2)/3*4 + ((len+line_len-1)/line_len)*(nl_len+1) );
     // split into lines, adding line-length and line terminator
     while (sidx+line_len < len)
     {
         // line length
-        out.at(didx++) = UUEncMap[line_len];
+        out[didx++] = UUEncMap[line_len];
 
         // 3-byte to 4-byte conversion + 0-63 to ascii printable conversion
         for (unsigned int end = sidx+line_len; sidx < end; sidx += 3)
         {
-            out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-            out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+            out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+            out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                    (data[sidx] << 4) & 077];
-            out.at(didx++) = UUEncMap[(data[sidx+2] >> 6) & 003 |
+            out[didx++] = UUEncMap[(data[sidx+2] >> 6) & 003 |
                                 (data[sidx+1] << 2) & 077];
-            out.at(didx++) = UUEncMap[data[sidx+2] & 077];
+            out[didx++] = UUEncMap[data[sidx+2] & 077];
         }
 
         // line terminator
         //for (unsigned int idx=0; idx < nl_len; idx++)
-        //out.at(didx++) = nl[idx];
+        //out[didx++] = nl[idx];
         memcpy(out.data()+didx, nl, nl_len);
         didx += nl_len;
     }
 
     // line length
-    out.at(didx++) = UUEncMap[len-sidx];
+    out[didx++] = UUEncMap[len-sidx];
     // 3-byte to 4-byte conversion + 0-63 to ascii printable conversion
     while (sidx+2 < len)
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                (data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+2] >> 6) & 003 |
+        out[didx++] = UUEncMap[(data[sidx+2] >> 6) & 003 |
                                (data[sidx+1] << 2) & 077];
-        out.at(didx++) = UUEncMap[data[sidx+2] & 077];
+        out[didx++] = UUEncMap[data[sidx+2] & 077];
         sidx += 3;
     }
 
     if (sidx < len-1)
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] >> 4) & 017 |
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx+1] >> 4) & 017 |
                                (data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx+1] << 2) & 077];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[(data[sidx+1] << 2) & 077];
+        out[didx++] = UUEncMap[0];
     }
     else if (sidx < len)
     {
-        out.at(didx++) = UUEncMap[(data[sidx] >> 2) & 077];
-        out.at(didx++) = UUEncMap[(data[sidx] << 4) & 077];
-        out.at(didx++) = UUEncMap[0];
-        out.at(didx++) = UUEncMap[0];
+        out[didx++] = UUEncMap[(data[sidx] >> 2) & 077];
+        out[didx++] = UUEncMap[(data[sidx] << 4) & 077];
+        out[didx++] = UUEncMap[0];
+        out[didx++] = UUEncMap[0];
     }
 
     // line terminator
     memcpy(out.data()+didx, nl, nl_len);
     didx += nl_len;
 
     // sanity check
     if ( didx != out.size() )
         out.resize( 0 );
 }
 
-QCString KCodecs::uudecode( const QCString& str )
+Q3CString KCodecs::uudecode( const Q3CString& str )
 {
     if ( str.isEmpty() )
         return "";
 
     QByteArray in;
     in.resize( str.length() );
     memcpy( in.data(), str.data(), str.length() );
     return uudecode( in );
 }
 
-QCString KCodecs::uudecode( const QByteArray& in )
+Q3CString KCodecs::uudecode( const QByteArray& in )
 {
     QByteArray out;
     uudecode( in, out );
-    return QCString( out.data(), out.size()+1 );
+    return Q3CString( out.data(), out.size()+1 );
 }
 
 void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
 {
     out.resize( 0 );
     if( in.isEmpty() )
@@ -702,31 +701,31 @@ void KCodecs::uudecode( const QByteArray& in, QByteArray& out )
           while (didx < end-2)
           {
              A = UUDecMap[(unsigned char) data[sidx]];
              B = UUDecMap[(unsigned char) data[sidx+1]];
              C = UUDecMap[(unsigned char) data[sidx+2]];
              D = UUDecMap[(unsigned char) data[sidx+3]];
-             out.at(didx++) = ( ((A << 2) & 255) | ((B >> 4) & 003) );
-             out.at(didx++) = ( ((B << 4) & 255) | ((C >> 2) & 017) );
-             out.at(didx++) = ( ((C << 6) & 255) | (D & 077) );
+             out[didx++] = ( ((A << 2) & 255) | ((B >> 4) & 003) );
+             out[didx++] = ( ((B << 4) & 255) | ((C >> 2) & 017) );
+             out[didx++] = ( ((C << 6) & 255) | (D & 077) );
              sidx += 4;
           }
         }
 
         if (didx < end)
         {
             A = UUDecMap[(unsigned char) data[sidx]];
             B = UUDecMap[(unsigned char) data[sidx+1]];
-            out.at(didx++) = ( ((A << 2) & 255) | ((B >> 4) & 003) );
+            out[didx++] = ( ((A << 2) & 255) | ((B >> 4) & 003) );
         }
 
         if (didx < end)
         {
             B = UUDecMap[(unsigned char) data[sidx+1]];
             C = UUDecMap[(unsigned char) data[sidx+2]];
-            out.at(didx++) = ( ((B << 4) & 255) | ((C >> 2) & 017) );
+            out[didx++] = ( ((B << 4) & 255) | ((C >> 2) & 017) );
         }
 
         // skip padding
         while (sidx < len  && data[sidx] != '\n' && data[sidx] != '\r')
             sidx++;
 
@@ -758,24 +757,24 @@ KMD5::KMD5(const char *in, int len)
 KMD5::KMD5(const QByteArray& in)
 {
     init();
     update( in );
 }
 
-KMD5::KMD5(const QCString& in)
+KMD5::KMD5(const Q3CString& in)
 {
     init();
     update( in );
 }
 
 void KMD5::update(const QByteArray& in)
 {
     update(in.data(), int(in.size()));
 }
 
-void KMD5::update(const QCString& in)
+void KMD5::update(const Q3CString& in)
 {
     update(in.data(), int(in.length()));
 }
 
 void KMD5::update(const unsigned char* in, int len)
 {
@@ -870,13 +869,13 @@ void KMD5::finalize ()
 bool KMD5::verify( const KMD5::Digest& digest)
 {
     finalize();
     return (0 == memcmp(rawDigest(), digest, sizeof(KMD5::Digest)));
 }
 
-bool KMD5::verify( const QCString& hexdigest)
+bool KMD5::verify( const Q3CString& hexdigest)
 {
     finalize();
     return (0 == strcmp(hexDigest().data(), hexdigest));
 }
 
 const KMD5::Digest& KMD5::rawDigest()
@@ -889,36 +888,36 @@ void KMD5::rawDigest( KMD5::Digest& bin )
 {
     finalize();
     memcpy( bin, m_digest, 16 );
 }
 
 
-QCString KMD5::hexDigest()
+Q3CString KMD5::hexDigest()
 {
-    QCString s(33);
+    Q3CString s(33);
 
     finalize();
     sprintf(s.data(), "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
             m_digest[0], m_digest[1], m_digest[2], m_digest[3], m_digest[4], m_digest[5],
             m_digest[6], m_digest[7], m_digest[8], m_digest[9], m_digest[10], m_digest[11],
             m_digest[12], m_digest[13], m_digest[14], m_digest[15]);
 
     return s;
 }
 
-void KMD5::hexDigest(QCString& s)
+void KMD5::hexDigest(Q3CString& s)
 {
     finalize();
     s.resize(33);
     sprintf(s.data(), "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
             m_digest[0], m_digest[1], m_digest[2], m_digest[3], m_digest[4], m_digest[5],
             m_digest[6], m_digest[7], m_digest[8], m_digest[9], m_digest[10], m_digest[11],
             m_digest[12], m_digest[13], m_digest[14], m_digest[15]);
 }
 
-QCString KMD5::base64Digest()
+Q3CString KMD5::base64Digest()
 {
     QByteArray ba(16);
 
     finalize();
     memcpy(ba.data(), m_digest, 16);
     return KCodecs::base64Encode(ba);
@@ -953,13 +952,13 @@ void KMD5::transform( const unsigned char block[64] )
     Q_UINT32 a = m_state[0], b = m_state[1], c = m_state[2], d = m_state[3], x[16];
 
     decode (x, block, 64);
     //memcpy( x, block, 64 );
 
 //US    Q_ASSERT(!m_finalized);  // not just a user error, since the method is private
-    ASSERT(!m_finalized);  // not just a user error, since the method is private
+    Q_ASSERT(!m_finalized);  // not just a user error, since the method is private
 
     /* Round 1 */
     FF (a, b, c, d, x[ 0], KMD5_S11, 0xd76aa478); /* 1 */
     FF (d, a, b, c, x[ 1], KMD5_S12, 0xe8c7b756); /* 2 */
     FF (c, d, a, b, x[ 2], KMD5_S13, 0x242070db); /* 3 */
     FF (b, c, d, a, x[ 3], KMD5_S14, 0xc1bdceee); /* 4 */
diff --git a/microkde/kdecore/kmdcodec.h b/microkde/kdecore/kmdcodec.h
index 2c4d611..616b683 100644
--- a/microkde/kdecore/kmdcodec.h
+++ b/microkde/kdecore/kmdcodec.h
@@ -36,12 +36,14 @@
 
 #define KBase64 KCodecs
 
 #include <qglobal.h>
 #include <qstring.h>
 #include <qiodevice.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 /**
  * A wrapper class for the most commonly used encoding and
  * decoding algorithms.  Currently there is support for encoding
  * and decoding input using base64, uu and the quoted-printable
  * specifications.
@@ -78,13 +80,13 @@ public:
    * @param in      data to be encoded.
    * @param useCRLF if true the input data is expected to have
    *                CRLF line breaks and the output will have CRLF line
    *                breaks, too.
    * @return        quoted-printable encoded data.
    */
-  static QCString quotedPrintableEncode(const QByteArray & in,
+  static Q3CString quotedPrintableEncode(const QByteArray & in,
                                         bool useCRLF = true);
 
   /**
    * @overload
    *
    * Same as above except it accepts a null terminated
@@ -93,13 +95,13 @@ public:
    * @param str     data to be encoded.
    * @param useCRLF if true the input data is expected to have
    *                CRLF line breaks and the output will have CRLF line
    *                breaks, too.
    * @return        quoted-printable encoded data.
    */
-  static QCString quotedPrintableEncode(const QCString & str,
+  static Q3CString quotedPrintableEncode(const Q3CString & str,
                                         bool useCRLF = true);
 
   /**
    * Encodes the given data using the quoted-printable algorithm.
    *
    * Use this function if you want the result of the encoding
@@ -126,24 +128,24 @@ public:
    *
    * Accepts data with CRLF or standard unix line breaks.
    *
    * @param in  the data to be decoded.
    * @return    decoded data.
    */
-  static QCString quotedPrintableDecode(const QByteArray & in);
+  static Q3CString quotedPrintableDecode(const QByteArray & in);
 
   /**
    * @overload
    *
    * Same as above except it accepts a null terminated
    * string instead an array.
    *
    * @param str  the data to be decoded.
    * @return     decoded data.
    */
-  static QCString quotedPrintableDecode(const QCString & str);
+  static Q3CString quotedPrintableDecode(const Q3CString & str);
 
   /**
    * Decodes a quoted-printable encoded data.
    *
    * Accepts data with CRLF or standard unix line breaks.
    * Use this function if you want the result of the decoding
@@ -172,24 +174,24 @@ public:
    * line is longer than 45 octets (60 characters), excluding the
    * line terminator.
    *
    * @param in   the data to be uuencoded
    * @return     a uuencoded data.
    */
-  static QCString uuencode( const QByteArray& in );
+  static Q3CString uuencode( const QByteArray& in );
 
   /**
    * @overload
    *
    * Same as the above functions except it accepts
    * a null terminated string instead an array.
    *
    * @param str   the string to be uuencoded.
    * @return      the encoded string.
    */
-  static QCString uuencode( const QCString& str );
+  static Q3CString uuencode( const Q3CString& str );
 
   /**
    * Encodes the given data using the uuencode algorithm.
    *
    * Use this function if you want the result of the encoding
    * to be placed in another array and cut down the number of
@@ -212,24 +214,24 @@ public:
    * the utilities in unix and unix-like OS will be
    * automatically ignored.
    *
    * @param in   the data uuencoded data to be decoded.
    * @return     a decoded string.
    */
-  static QCString uudecode( const QByteArray& in );
+  static Q3CString uudecode( const QByteArray& in );
 
   /**
    * @overload
    *
    * Same as the above functions except it accepts
    * a null terminated string instead an array.
    *
    * @param str   the string to be decoded.
    * @return      a uudecoded string.
    */
-  static QCString uudecode( const QCString& str );
+  static Q3CString uudecode( const Q3CString& str );
 
   /**
    * Decodes the given data using the uudecode algorithm.
    *
    * Use this function if you want the result of the decoding
    * to be placed in another array which cuts down the number
@@ -260,25 +262,25 @@ public:
    *
    * @param in         the data to be encoded.
    * @param insertLFs  limit the number of characters per line.
    *
    * @return           a base64 encoded string.
    */
-  static QCString base64Encode( const QByteArray& in, bool insertLFs = false);
+  static Q3CString base64Encode( const QByteArray& in, bool insertLFs = false);
 
   /**
    * @overload
    *
    * Same as the above functions except it accepts
    * a null terminated string instead an array.
    *
    * @param str       the string to be encoded.
    * @param insertLFs limit the number of characters per line.
    * @return          the decoded string.
    */
-  static QCString base64Encode( const QCString& str, bool insertLFs = false );
+  static Q3CString base64Encode( const Q3CString& str, bool insertLFs = false );
 
   /**
    * Encodes the given data using the base64 algorithm.
    *
    * Use this function if you want the result of the encoding
    * to be placed in another array which cuts down the number
@@ -305,24 +307,24 @@ public:
    * Decodes the given data that was encoded using the
    * base64 algorithm.
    *
    * @param in   the base64-encoded data to be decoded.
    * @return     the decoded data.
    */
-  static QCString base64Decode( const QByteArray& in );
+  static Q3CString base64Decode( const QByteArray& in );
 
   /**
    * @overload
    *
    * Same as the above functions except it accepts
    * a null terminated string instead an array.
    *
    * @param str  the base64-encoded string.
    * @return     the decoded string.
    */
-  static QCString base64Decode( const QCString& str );
+  static Q3CString base64Decode( const Q3CString& str );
 
   /**
    * Decodes the given data that was encoded with the base64
    * algorithm.
    *
    * Use this function if you want the result of the decoding
@@ -428,13 +430,13 @@ public:
 
   /**
    * @overload
    *
    * Same as above except it accepts a QByteArray as its argument.
    */
-  KMD5(const QCString& a );
+  KMD5(const Q3CString& a );
 
   /**
    * Updates the message to be digested. Be sure to add all data
    * before you read the digest. After reading the digest, you
    * can <b>not</b> add more data!
    *
@@ -457,13 +459,13 @@ public:
 
   /**
    * @overload
    *
    * @param in     message to be added to the digest (QByteArray).
    */
-  void update(const QCString& in );
+  void update(const Q3CString& in );
 
   /**
    * @overload
    *
    * reads the data from an I/O device, i.e. from a file (QFile).
    *
@@ -499,35 +501,35 @@ public:
   void rawDigest( KMD5::Digest& bin );
 
   /**
    * Returns the value of the calculated message digest in
    * a hexadecimal representation.
    */
-  QCString hexDigest ();
+  Q3CString hexDigest ();
 
   /**
    * @overload
    */
-  void hexDigest(QCString&);
+  void hexDigest(Q3CString&);
 
   /**
    * Returns the value of the calculated message digest in
    * a base64-encoded representation.
    */
-  QCString base64Digest ();
+  Q3CString base64Digest ();
 
   /**
    * returns true if the calculated digest for the given
    * message matches the given one.
    */
   bool verify( const KMD5::Digest& digest);
 
   /**
    * @overload
    */
-  bool verify(const QCString&);
+  bool verify(const Q3CString&);
 
 protected:
   /**
    *  Performs the real update work.  Note
    *  that length is implied to be 64.
    */
diff --git a/microkde/kdecore/kprefs.cpp b/microkde/kdecore/kprefs.cpp
index 0220a34..d4010fa 100644
--- a/microkde/kdecore/kprefs.cpp
+++ b/microkde/kdecore/kprefs.cpp
@@ -18,12 +18,14 @@
     Boston, MA 02111-1307, USA.
 */
 
 // $Id$
 
 #include <qcolor.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <kdebug.h>
 
@@ -137,23 +139,23 @@ class KPrefsItemStringList : public KPrefsItem {
     QStringList mDefault;
 };
 
 
 class KPrefsItemIntList : public KPrefsItem {
   public:
-    KPrefsItemIntList(const QString &group,const QString &name,QValueList<int> *,
-                      const QValueList<int> &defaultValue=QValueList<int>());
+    KPrefsItemIntList(const QString &group,const QString &name,Q3ValueList<int> *,
+                      const Q3ValueList<int> &defaultValue=Q3ValueList<int>());
     virtual ~KPrefsItemIntList() {}
     
     void setDefault();
     void readConfig(KConfig *);
     void writeConfig(KConfig *);    
 
   private:
-    QValueList<int> *mReference;
-    QValueList<int> mDefault;
+    Q3ValueList<int> *mReference;
+    Q3ValueList<int> mDefault;
 };
 
 
 KPrefsItemBool::KPrefsItemBool(const QString &group,const QString &name,
                                bool *reference,bool defaultValue) :
   KPrefsItem(group,name)
@@ -361,13 +363,13 @@ void KPrefsItemStringList::readConfig(KConfig *config)
   config->setGroup(mGroup);
   *mReference = config->readListEntry(mName);
 }
 
 
 KPrefsItemIntList::KPrefsItemIntList(const QString &group,const QString &name,
-                                     QValueList<int> *reference,const QValueList<int> &defaultValue) :
+                                     Q3ValueList<int> *reference,const Q3ValueList<int> &defaultValue) :
   KPrefsItem(group,name)
 {
   mReference = reference;
   mDefault = defaultValue;
 }
 
@@ -502,11 +504,11 @@ void KPrefs::addItemPassword(const QString &key,QString *reference,const QString
 void KPrefs::addItemStringList(const QString &key,QStringList *reference,
                                const QStringList &defaultValue)
 {
   addItem(new KPrefsItemStringList(*mCurrentGroup,key,reference,defaultValue));
 }
 
-void KPrefs::addItemIntList(const QString &key,QValueList<int> *reference,
-                            const QValueList<int> &defaultValue)
+void KPrefs::addItemIntList(const QString &key,Q3ValueList<int> *reference,
+                            const Q3ValueList<int> &defaultValue)
 {
   addItem(new KPrefsItemIntList(*mCurrentGroup,key,reference,defaultValue));
 }
diff --git a/microkde/kdecore/kprefs.h b/microkde/kdecore/kprefs.h
index 95d2724..d9d1572 100644
--- a/microkde/kdecore/kprefs.h
+++ b/microkde/kdecore/kprefs.h
@@ -18,17 +18,19 @@
     Boston, MA 02111-1307, USA.
 */
 #ifndef _KPREFS_H
 #define _KPREFS_H
 // $Id$
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qcolor.h>
 #include <qfont.h>
 #include <qsize.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 class KConfig;
 
 /**
   @short Class for storing a preferences setting
   @author Cornelius Schumacher
@@ -280,14 +282,14 @@ class KPrefs {
       @param reference Pointer to the variable, which is set by readConfig()
                        and setDefaults() calls and read by writeConfig() calls.
       @param defaultValue Default value, which is used by setDefaults() and
                           when the config file does not yet contain the key of
                           this item.
     */
-    void addItemIntList(const QString &key,QValueList<int> *reference,
-                        const QValueList<int> &defaultValue=QValueList<int>());
+    void addItemIntList(const QString &key,Q3ValueList<int> *reference,
+                        const Q3ValueList<int> &defaultValue=Q3ValueList<int>());
 
   protected:
     /**
       Implemented by subclasses that use special defaults.
     */
     virtual void usrSetDefaults() {};
@@ -307,10 +309,10 @@ class KPrefs {
 
   private:
     static QString *mCurrentGroup;
 
     KConfig *mConfig;  // pointer to KConfig object
 
-    QPtrList<KPrefsItem> mItems;
+    Q3PtrList<KPrefsItem> mItems;
 };
 
 #endif
diff --git a/microkde/kdecore/kshortcut.h b/microkde/kdecore/kshortcut.h
index 4813734..244d590 100644
--- a/microkde/kdecore/kshortcut.h
+++ b/microkde/kdecore/kshortcut.h
@@ -560,13 +560,13 @@ class KShortcut
         /**
          * Creates a new shortcut with the given Qt key code
          * as the only key sequence.
          * @param keyQt the qt keycode
          * @see Qt::Key
          */
-        KShortcut( int keyQt ) {}
+        KShortcut( int /*keyQt */) {}
 
         /**
          * Creates a new shortcut that contains only the given qt key
          * sequence.
          * @param keySeq the qt key sequence to add
          */
@@ -596,22 +596,22 @@ class KShortcut
          * Creates a new key sequence that contains the given key sequence.
          * The description consists of semicolon-separated keys as
          * used in @ref KKeySequence::KKeySequence(const QString&).
          * @param shortcut the description of the key
          * @see KKeySequence::KKeySequence(const QString&)
          */
-        KShortcut( const char* shortcut ) {}
+        KShortcut( const char* /*shortcut */) {}
 
         /**
          * Creates a new key sequence that contains the given key sequence.
          * The description consists of semicolon-separated keys as
          * used in @ref KKeySequence::KKeySequence(const QString&).
          * @param shortcut the description of the key
          * @see KKeySequence::KKeySequence(const QString&)
          */
-        KShortcut( const QString& shortcut ) {}
+        KShortcut( const QString& /*shortcut */) {}
         ~KShortcut() {}
 
         /**
          * Clears the shortcut. The shortcut is null after calling this 
          * function.
          * @see isNull()
@@ -813,13 +813,13 @@ class KShortcut
          */
         //USQString toString() const;
 
         /**
          * @internal
          */
-  QString toStringInternal( const KShortcut* pcutDefault = 0 ) const
+  QString toStringInternal( const KShortcut* /*pcutDefault*/ = 0 ) const
   {
     return "EMPTY IMPL.";
   }
 
         /**
          * Returns a null shortcut.
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index d5bfefd..f10934b 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -34,21 +34,23 @@
 //US #endif
 //US#include <sys/types.h>
 //US#include <dirent.h>
 //US#include <pwd.h>
 
 #include <qregexp.h>
-#include <qasciidict.h>
-#include <qdict.h>
+#include <q3asciidict.h>
+#include <q3dict.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qstring.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "kstandarddirs.h"
 #include "kconfig.h"
 #include "kdebug.h"
 //US #include "kinstance.h"
 #include "kshell.h"
@@ -56,21 +58,21 @@
 //US#include <unistd.h>
 
 //US
 QString KStandardDirs::mAppDir = QString::null;
 
 
-template class QDict<QStringList>;
+template class Q3Dict<QStringList>;
 
 #if 0
-#include <qtextedit.h>
+#include <q3textedit.h>
 void ddd( QString op )
 {
-  static QTextEdit * dot = 0;
+  static Q3TextEdit * dot = 0;
   if ( ! dot )
-  dot = new QTextEdit();
+  dot = new Q3TextEdit();
 
   dot->show();
 
   dot->append( op );
 
 }
@@ -82,13 +84,13 @@ public:
     : restrictionsActive(false),
       dataRestrictionActive(false)
    { }
 
    bool restrictionsActive;
    bool dataRestrictionActive;
-   QAsciiDict<bool> restrictions;
+   Q3AsciiDict<bool> restrictions;
    QStringList xdgdata_prefixes;
    QStringList xdgconf_prefixes;
 };
 
 static const char* const types[] = {"html", "icon", "apps", "sound",
                               "data", "locale", "services", "mime",
@@ -442,13 +444,13 @@ static void lookupDirectory(const QString& path, const QString &relPart,
 
 /*US
       if (!recursive && !regexp.exactMatch(fn))
         continue; // No match
 */
 //US this should do the same:
-      int pos = regexp.match(fn);
+      int pos = regexp.exactMatch(fn);
       if (!recursive && !pos == 0)
         continue; // No match
 
       QString pathfn = path + fn;
 /*US
       if ( stat( QFile::encodeName(pathfn), &buff ) != 0 ) {
@@ -479,13 +481,13 @@ static void lookupDirectory(const QString& path, const QString &relPart,
 
 /*US
         if (!regexp.exactMatch(fn))
           continue; // No match
 */
 //US this should do the same:
-        pos = regexp.match(fn);
+        pos = regexp.exactMatch(fn);
         if (!pos == 0)
           continue; // No match
       }
 
 //US      if ( S_ISREG( buff.st_mode))
       if ( pathfnInfo.isFile())
@@ -1105,13 +1107,13 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
 
     while( i < len )
     {
 //US        struct stat st;
         int pos = target.find('/', i);
         base += target.mid(i - 1, pos - i + 1);
-        QCString baseEncoded = QFile::encodeName(base);
+        Q3CString baseEncoded = QFile::encodeName(base);
         // bail out if we encountered a problem
 //US        if (stat(baseEncoded, &st) != 0)
         QFileInfo baseEncodedInfo(baseEncoded);
         if (!baseEncodedInfo.exists())
         {
           // Directory does not exist....
@@ -1205,13 +1207,13 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
 
 QString readEnvPath(const char *env)
 {
   //#ifdef _WIN32_
   //    return "";
   //#else
-  QCString c_path;
+  Q3CString c_path;
   if ( getenv(env) != NULL )
     c_path = QString ( getenv(env) );
   if (c_path.isEmpty())
     return QString::null;
   return QFile::decodeName(c_path);
    //#endif
diff --git a/microkde/kdecore/kstandarddirs.h b/microkde/kdecore/kstandarddirs.h
index 901384e..f0e28fc 100644
--- a/microkde/kdecore/kstandarddirs.h
+++ b/microkde/kdecore/kstandarddirs.h
@@ -21,13 +21,13 @@
 */
 
 #ifndef SSK_KSTDDIRS_H
 #define SSK_KSTDDIRS_H
 
 #include <qstring.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstringlist.h>
 #include <kglobal.h>
 
 class KConfig;
 class KStandardDirsPrivate;
 
@@ -571,17 +571,17 @@ public:
          
  private:
 
         QStringList prefixes;
 
         // Directory dictionaries
-        QDict<QStringList> absolutes;
-        QDict<QStringList> relatives;
+        Q3Dict<QStringList> absolutes;
+        Q3Dict<QStringList> relatives;
 
-        mutable QDict<QStringList> dircache;
-        mutable QDict<QString> savelocations;
+        mutable Q3Dict<QStringList> dircache;
+        mutable Q3Dict<QString> savelocations;
 
         // Disallow assignment and copy-construction
         KStandardDirs( const KStandardDirs& );
         KStandardDirs& operator= ( const KStandardDirs& );
 
         bool addedCustoms;
diff --git a/microkde/kdeui/kaction.cpp b/microkde/kdeui/kaction.cpp
index d38a6d5..c2df381 100644
--- a/microkde/kdeui/kaction.cpp
+++ b/microkde/kdeui/kaction.cpp
@@ -25,12 +25,15 @@
 
 #include "kaction.h"
 
 #include <assert.h>
 
 #include <qtooltip.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3ValueList>
 //US#include <qwhatsthis.h>
 //US#include <kaccel.h>
 //US#include <kaccelbase.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kguiitem.h>
@@ -39,15 +42,15 @@
 //US#include <kpopupmenu.h>
 #include <ktoolbar.h>
 #include <ktoolbarbutton.h>
 
 //US added this includefiles
 #include <qmenubar.h>
-#include <qtoolbar.h>
-#include <qpopupmenu.h>
-#include <qiconset.h>
+#include <q3toolbar.h>
+#include <q3popupmenu.h>
+#include <qicon.h>
 
 /**
 * How it works.
 * KActionCollection is an organizing container for KActions.
 * KActionCollection keeps track of the information necessary to handle
 * configuration and shortcuts.
@@ -84,13 +87,13 @@ public:
   {
     m_kaccel = 0;
     m_configurable = true;
   }
 
   KAccel *m_kaccel;
-  QValueList<KAccel*> m_kaccelList;
+  Q3ValueList<KAccel*> m_kaccelList;
 
   QString m_groupText;
   QString m_group;
 
   KShortcut m_cut;
   KShortcut m_cutDefault;
@@ -104,13 +107,13 @@ public:
                                       m_id = s.m_id; m_representative = s.m_representative; }
     QWidget* m_container;
     int m_id;
     QWidget* m_representative;
   };
 
-  QValueList<Container> m_containers;
+  Q3ValueList<Container> m_containers;
 };
 
 //---------------------------------------------------------------------
 // KAction
 //---------------------------------------------------------------------
 KAction::KAction( const QString& text, const KShortcut& cut,
@@ -127,13 +130,13 @@ KAction::KAction( const QString& text, const QString& sIconName, const KShortcut
 : QObject( parent, name )
 {
         initPrivate( text, cut, receiver, slot );
   d->setIconName( sIconName );
 }
 
-KAction::KAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+KAction::KAction( const QString& text, const QIcon& pix, const KShortcut& cut,
         const QObject* receiver, const char* slot,
         KActionCollection* parent, const char* name )
 : QObject( parent, name )
 {
         initPrivate( text, cut, receiver, slot );
   d->setIconSet( pix );
@@ -161,13 +164,13 @@ KAction::KAction( const QString& text, const KShortcut& cut,
                   const QObject* receiver,
                   const char* slot, QObject* parent, const char* name )
  : QObject( parent, name )
 {
     initPrivate( text, cut, receiver, slot );
 }
-KAction::KAction( const QString& text, const QIconSet& pix,
+KAction::KAction( const QString& text, const QIcon& pix,
                   const KShortcut& cut,
                   QObject* parent, const char* name )
  : QObject( parent, name )
 {
     initPrivate( text, cut, 0, 0 );
     setIconSet( pix );
@@ -179,13 +182,13 @@ KAction::KAction( const QString& text, const QString& pix,
 : QObject( parent, name )
 {
     initPrivate( text, cut, 0, 0 );
     d->setIconName( pix );
 }
 
-KAction::KAction( const QString& text, const QIconSet& pix,
+KAction::KAction( const QString& text, const QIcon& pix,
                   const KShortcut& cut,
                   const QObject* receiver, const char* slot, QObject* parent,
                   const char* name )
  : QObject( parent, name )
 {
     initPrivate( text, cut, receiver, slot );
@@ -503,25 +506,25 @@ void KAction::setAccel( int keyQt )
 
 void KAction::updateShortcut( int i )
 {
   int id = itemId( i );
 
   QWidget* w = container( i );
-  if ( w->inherits( "QPopupMenu" ) ) {
-    QPopupMenu* menu = static_cast<QPopupMenu*>(w);
+  if ( w->inherits( "Q3PopupMenu" ) ) {
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>(w);
     updateShortcut( menu, id );
   }
   else if ( w->inherits( "QMenuBar" ) )
 //US    static_cast<QMenuBar*>(w)->setAccel( d->m_cut.keyCodeQt(), id );
 //US    (QMenuBar*)(w)->setAccel( d->m_cut.keyCodeQt(), id );
 
       ;   //qDebug("KAction::updateShortcut( int i ) ...1 has top be fixed");
 
 }
 
-void KAction::updateShortcut( QPopupMenu* menu, int id )
+void KAction::updateShortcut( Q3PopupMenu* menu, int id )
 {
 /*US
   //kdDebug(129) << "KAction::updateShortcut(): this = " << this << " d->m_kaccelList.count() = " << d->m_kaccelList.count() << endl;
   // If the action has a KAccel object,
   //  show the string representation of its shortcut.
   if ( d->m_kaccel || d->m_kaccelList.count() ) {
@@ -618,13 +621,13 @@ void KAction::updateToolTip( int i )
 {
     //qDebug("KAction::updateToolTip ...1 has top be fixed");
  QWidget *w = container( i );
 
   if ( w->inherits( "KToolBar" ) )
     QToolTip::add( static_cast<KToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() );
-  else if ( w->inherits( "QToolBar" ) )
+  else if ( w->inherits( "Q3ToolBar" ) )
     QToolTip::add( static_cast<KToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() );
 }
 
 QString KAction::toolTip() const
 {
   return d->toolTip();
@@ -643,15 +646,15 @@ int KAction::plug( QWidget *w, int index )
   // Check if action is permitted
 //US  if (kapp && !kapp->authorizeKAction(name()))
 //US    return -1;
 
   plugShortcut();
 
-  if ( w->inherits("QPopupMenu") )
+  if ( w->inherits("Q3PopupMenu") )
   {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( w );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( w );
     int id;
     // Don't insert shortcut into menu if it's already in a KAccel object.
     //qDebug("KAction::plug warning: real shortcuts not available yet.  ");
 //US    int keyQt = (d->m_kaccelList.count() || d->m_kaccel) ? 0 : d->m_cut.keyCodeQt();
     int keyQt = 0;
     
@@ -718,13 +721,13 @@ int KAction::plug( QWidget *w, int index )
         if ( icon.isEmpty() )
             icon = "unknown";
         bar->insertButton( icon, id_, SIGNAL( clicked() ), this,
                            SLOT( slotActivated() ),
                            d->isEnabled(), d->plainText(), index/*US, instance*/ );
     }
-    bar->getButton( id_ )->setName( QCString("toolbutton_")+name() );
+    bar->getButton( id_ )->setName( Q3CString("toolbutton_")+name() );
     
 //US    if ( !d->whatsThis().isEmpty() )
 //US        QWhatsThis::add( bar->getButton(id_), whatsThisWithIcon() );
     if ( !d->toolTip().isEmpty() )
       QToolTip::add( bar->getButton(id_), d->toolTip() );
 
@@ -746,15 +749,15 @@ void KAction::unplug( QWidget *w )
 {
   int i = findContainer( w );
   if ( i == -1 )
     return;
   int id = itemId( i );
 
-  if ( w->inherits( "QPopupMenu" ) )
+  if ( w->inherits( "Q3PopupMenu" ) )
   {
-    QPopupMenu *menu = static_cast<QPopupMenu *>( w );
+    Q3PopupMenu *menu = static_cast<Q3PopupMenu *>( w );
     menu->removeItem( id );
   }
   else if ( w->inherits( "KToolBar" ) )
   {
     KToolBar *bar = static_cast<KToolBar *>( w );
     bar->removeItemDelayed( id );
@@ -859,14 +862,14 @@ void KAction::setEnabled(bool enable)
 }
 
 void KAction::updateEnabled( int i )
 {
     QWidget *w = container( i );
 
-    if ( w->inherits("QPopupMenu") )
-      static_cast<QPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
+    if ( w->inherits("Q3PopupMenu") )
+      static_cast<Q3PopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
     else if ( w->inherits("QMenuBar") )
       static_cast<QMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
     else if ( w->inherits( "KToolBar" ) )
     {
       static_cast<KToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
     }
@@ -903,16 +906,16 @@ void KAction::setText( const QString& text )
 }
 
 void KAction::updateText( int i )
 {
   QWidget *w = container( i );
 
-  if ( w->inherits( "QPopupMenu" ) ) {
+  if ( w->inherits( "Q3PopupMenu" ) ) {
     int id = itemId( i );
-    static_cast<QPopupMenu*>(w)->changeItem( id, d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), id );
+    static_cast<Q3PopupMenu*>(w)->changeItem( id, d->text() );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), id );
   }
   else if ( w->inherits( "QMenuBar" ) )
     static_cast<QMenuBar*>(w)->changeItem( itemId( i ), d->text() );
   else if ( w->inherits( "KToolBar" ) )
   {
       //qDebug("KAction::updateText ...3 has top be fixed");
@@ -944,34 +947,34 @@ void KAction::setIcon( const QString &icon )
 }
 
 void KAction::updateIcon( int id )
 {
   QWidget* w = container( id );
 
-  if ( w->inherits( "QPopupMenu" ) ) {
+  if ( w->inherits( "Q3PopupMenu" ) ) {
     int itemId_ = itemId( id );
-    static_cast<QPopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), itemId_ );
+    static_cast<Q3PopupMenu*>(w)->changeItem( itemId_, d->iconSet( KIcon::Small ), d->text() );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), itemId_ );
   }
   else if ( w->inherits( "QMenuBar" ) )
     static_cast<QMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( KIcon::Small ), d->text() );
   else if ( w->inherits( "KToolBar" ) )
     static_cast<KToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
-  else if ( w->inherits( "QToolBar" ) )
+  else if ( w->inherits( "Q3ToolBar" ) )
   {
     qDebug("KAction::updateIcon has top be fixed");
 //US    static_cast<QToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
   }
 }
 
 QString KAction::icon() const
 {
   return d->iconName( );
 }
 
-void KAction::setIconSet( const QIconSet &iconset )
+void KAction::setIconSet( const QIcon &iconset )
 {
   d->setIconSet( iconset );
 
   int len = containerCount();
   for( int i = 0; i < len; ++i )
     updateIconSet( i );
@@ -979,30 +982,30 @@ void KAction::setIconSet( const QIconSet &iconset )
 
 
 void KAction::updateIconSet( int id )
 {
   QWidget *w = container( id );
 
-  if ( w->inherits( "QPopupMenu" ) )
+  if ( w->inherits( "Q3PopupMenu" ) )
   {
     int itemId_ = itemId( id );
-    static_cast<QPopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() );
-    updateShortcut( static_cast<QPopupMenu*>(w), itemId_ );
+    static_cast<Q3PopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() );
+    updateShortcut( static_cast<Q3PopupMenu*>(w), itemId_ );
   }
   else if ( w->inherits( "QMenuBar" ) )
     static_cast<QMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() );
   else if ( w->inherits( "KToolBar" ) )
   {
     if ( icon().isEmpty() && d->hasIconSet() ) // only if there is no named icon ( scales better )
       static_cast<KToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() );
     else
       static_cast<KToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet( KIcon::Small ) );
   }
 }
 
-QIconSet KAction::iconSet( KIcon::Group group, int size ) const
+QIcon KAction::iconSet( KIcon::Group group, int size ) const
 {
   return d->iconSet( group, size );
 }
 
 bool KAction::hasIcon() const
 {
@@ -1019,13 +1022,13 @@ void KAction::setWhatsThis( const QString& text )
     updateWhatsThis( i );
 }
 
 void KAction::updateWhatsThis( int i )
 {
   qDebug("KAction::updateWhatsThis ...1 has top be fixed");
-  QPopupMenu* pm = popupMenu( i );
+  Q3PopupMenu* pm = popupMenu( i );
   if ( pm )
   {
     pm->setWhatsThis( itemId( i ), d->whatsThis() );
     return;
   }
 
@@ -1061,16 +1064,16 @@ QWidget* KAction::container( int index ) const
 KToolBar* KAction::toolBar( int index ) const
 {
 //US  return dynamic_cast<KToolBar *>( d->m_containers[ index ].m_container );
   return (KToolBar *)( d->m_containers[ index ].m_container );
 }
 
-QPopupMenu* KAction::popupMenu( int index ) const
+Q3PopupMenu* KAction::popupMenu( int index ) const
 {
 //US  return dynamic_cast<QPopupMenu *>( d->m_containers[ index ].m_container );
-    return (QPopupMenu *)( d->m_containers[ index ].m_container );
+    return (Q3PopupMenu *)( d->m_containers[ index ].m_container );
 }
 
 QWidget* KAction::representative( int index ) const
 {
   return d->m_containers[ index ].m_representative;
 }
@@ -1152,13 +1155,13 @@ void KAction::slotDestroyed()
 
 }
 
 int KAction::findContainer( const QWidget* widget ) const
 {
   int pos = 0;
-  QValueList<KActionPrivate::Container>::ConstIterator it = d->m_containers.begin();
+  Q3ValueList<KActionPrivate::Container>::ConstIterator it = d->m_containers.begin();
   while( it != d->m_containers.end() )
   {
     if ( (*it).m_representative == widget || (*it).m_container == widget )
       return pos;
     ++it;
     ++pos;
@@ -1167,13 +1170,13 @@ int KAction::findContainer( const QWidget* widget ) const
   return -1;
 }
 
 void KAction::removeContainer( int index )
 {
   int i = 0;
-  QValueList<KActionPrivate::Container>::Iterator it = d->m_containers.begin();
+  Q3ValueList<KActionPrivate::Container>::Iterator it = d->m_containers.begin();
   while( it != d->m_containers.end() )
   {
     if ( i == index )
     {
       d->m_containers.remove( it );
       return;
diff --git a/microkde/kdeui/kaction.h b/microkde/kdeui/kaction.h
index 13e2e1e..5c690ec 100644
--- a/microkde/kdeui/kaction.h
+++ b/microkde/kdeui/kaction.h
@@ -26,27 +26,29 @@
 #ifndef __kaction_h__
 #define __kaction_h__
 
 
 //US #include <qkeysequence.h>
 #include <qobject.h>
-#include <qvaluelist.h>
-#include <qguardedptr.h>
+#include <q3valuelist.h>
+#include <qpointer.h>
+//Added by qt3to4:
+#include <Q3PopupMenu>
 #include <kguiitem.h>
 #include <kshortcut.h>
 #include <kstdaction.h>
 //US#include <kicontheme.h>
 
 //US added the following files
 #include <kiconloader.h>
 
 class QMenuBar;
-class QPopupMenu;
+class Q3PopupMenu;
 //USclass QComboBox;
 //USclass QPoint;
-class QIconSet;
+class QIcon;
 class QString;
 class KToolBar;
 
 class KAccel;
 //USclass KAccelActions;
 //USclass KConfig;
@@ -256,13 +258,13 @@ public:
      * @param receiver The SLOT's parent.
      * @param slot The SLOT to invoke to execute this action.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
      
-    KAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KAction( const QString& text, const QIcon& pix, const KShortcut& cut,
              const QObject* receiver, const char* slot,
              KActionCollection* parent, const char* name );
 
     /**
      * Constructs an action with text, icon, potential keyboard
      * shortcut, and a SLOT to call when this action is invoked by
@@ -305,23 +307,23 @@ public:
          */
         KAction( const QString& text, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
         /**
          * @obsolete
          */
-        KAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+        KAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                 QObject* parent = 0, const char* name = 0 );
         /**
          * @obsolete
          */
         KAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                 QObject* parent = 0, const char* name = 0 );
         /**
          * @obsolete
          */
-        KAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+        KAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
         /**
          * @obsolete
          */
         KAction( const QString& text, const QString& pix, const KShortcut& cut,
                 const QObject* receiver, const char* slot, QObject* parent,
@@ -458,16 +460,16 @@ public:
     virtual QString toolTip() const;
 
     /**
      * Get the QIconSet from which the icons used to display this action will
      * be chosen.
      */
-    virtual QIconSet iconSet( KIcon::Group group, int size=0 ) const;
+    virtual QIcon iconSet( KIcon::Group group, int size=0 ) const;
 
 #ifndef KDE_NO_COMPAT
-    QIconSet iconSet() const
+    QIcon iconSet() const
     {
       return iconSet( KIcon::Small );
     }
 #endif
 
     virtual QString icon() const;
@@ -515,13 +517,13 @@ public slots:
     virtual void setToolTip( const QString& );
 
     /**
      * Sets the QIconSet from which the icons used to display this action will
      * be chosen.
      */
-    virtual void setIconSet( const QIconSet &iconSet );
+    virtual void setIconSet( const QIcon &iconSet );
 
     virtual void setIcon( const QString& icon );
 
     /**
      * Enables or disables this action. All uses of this action (eg. in menus
      * or toolbars) will be updated to reflect the state of the action.
@@ -543,22 +545,22 @@ protected slots:
     virtual void slotDestroyed();
     virtual void slotKeycodeChanged();
     virtual void slotActivated();
 
 protected:
     KToolBar* toolBar( int index ) const;
-    QPopupMenu* popupMenu( int index ) const;
+    Q3PopupMenu* popupMenu( int index ) const;
     void removeContainer( int index );
     int findContainer( const QWidget* widget ) const;
     void plugMainWindowAccel( QWidget *w );
 
     void addContainer( QWidget* parent, int id );
     void addContainer( QWidget* parent, QWidget* representative );
 
     virtual void updateShortcut( int i );
-    virtual void updateShortcut( QPopupMenu* menu, int id );
+    virtual void updateShortcut( Q3PopupMenu* menu, int id );
     virtual void updateGroup( int id );
     virtual void updateText(int i );
     virtual void updateEnabled(int i);
     virtual void updateIconSet(int i);
     virtual void updateIcon( int i);
     virtual void updateToolTip( int id );
diff --git a/microkde/kdeui/kactionclasses.cpp b/microkde/kdeui/kactionclasses.cpp
index 82e6c8b..c611865 100644
--- a/microkde/kdeui/kactionclasses.cpp
+++ b/microkde/kdeui/kactionclasses.cpp
@@ -25,15 +25,17 @@
 
 #include "kactionclasses.h"
 
 #include <assert.h>
 
 #include <qfontdatabase.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 //US#include <qwhatsthis.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 //US#include <kaccel.h>
 //US#include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 //US#include <kfontcombo.h>
@@ -45,19 +47,19 @@
 #include <ktoolbarbutton.h>
 #include <kurl.h>
 
 //US added the following includefiles
 #include <kconfigbase.h>
 #include <qwidget.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmenubar.h>
-#include <qmainwindow.h>
-#include <qtoolbar.h>
+#include <q3mainwindow.h>
+#include <q3toolbar.h>
 #include <qcombobox.h>
-#include <qmainwindow.h>
-
+#include <q3mainwindow.h>
+#include <qcoreapplication.h>
 
 static QFontDatabase *fontDataBase = 0;
 
 static void cleanupFontDatabase()
 {
     delete fontDataBase;
@@ -80,13 +82,13 @@ static void get_fonts( QStringList &lst )
         if ( !lst.contains( family ) )
             lst.append( family );
     }
     lst.sort();
 }
 
-static QValueList<int> get_standard_font_sizes()
+static Q3ValueList<int> get_standard_font_sizes()
 {
     if ( !fontDataBase ) {
         fontDataBase = new QFontDatabase();
         qAddPostRoutine( cleanupFontDatabase );
     }
     return fontDataBase->standardSizes();
@@ -117,13 +119,13 @@ KToggleAction::KToggleAction( const QString& text, const KShortcut& cut,
                               QObject* parent, const char* name )
   : KAction( text, cut, receiver, slot, parent, name )
 {
   d = new KToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const QString& text, const QIconSet& pix,
+KToggleAction::KToggleAction( const QString& text, const QIcon& pix,
                               const KShortcut& cut,
                               QObject* parent, const char* name )
   : KAction( text, pix, cut, parent, name )
 {
   d = new KToggleActionPrivate;
 }
@@ -133,13 +135,13 @@ KToggleAction::KToggleAction( const QString& text, const QString& pix,
                               QObject* parent, const char* name )
  : KAction( text, pix, cut, parent, name )
 {
   d = new KToggleActionPrivate;
 }
 
-KToggleAction::KToggleAction( const QString& text, const QIconSet& pix,
+KToggleAction::KToggleAction( const QString& text, const QIcon& pix,
                               const KShortcut& cut,
                               const QObject* receiver,
                               const char* slot, QObject* parent,
                               const char* name )
   : KAction( text, pix, cut, receiver, slot, parent, name )
 {
@@ -166,13 +168,13 @@ KToggleAction::~KToggleAction()
 {
     delete d;
 }
 
 int KToggleAction::plug( QWidget* widget, int index )
 {
-  if ( !widget->inherits("QPopupMenu") && !widget->inherits("KToolBar") )
+  if ( !widget->inherits("Q3PopupMenu") && !widget->inherits("KToolBar") )
   {
     kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl;
     return -1;
   }
 
 /*US
@@ -181,17 +183,17 @@ int KToggleAction::plug( QWidget* widget, int index )
 */
 
   int _index = KAction::plug( widget, index );
   if ( _index == -1 )
     return _index;
 
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
   {
     int id = itemId( _index );
     
-    static_cast<QPopupMenu*>(widget)->setItemChecked( id, d->m_checked );
+    static_cast<Q3PopupMenu*>(widget)->setItemChecked( id, d->m_checked );
   } else if ( widget->inherits( "KToolBar" ) ) {
 
     KToolBar *bar = static_cast<KToolBar *>( widget );
 
     bar->setToggle( itemId( _index ), true );
     bar->setButton( itemId( _index ), isChecked() );
@@ -211,19 +213,18 @@ void KToggleAction::setChecked( bool c )
   int len = containerCount();
 
   for( int i = 0; i < len; ++i )
     updateChecked( i );
 
   if ( c && parent() && !exclusiveGroup().isEmpty() ) {
-    const QObjectList *list = parent()->children();
-    if ( list ) {
-      QObjectListIt it( *list );
-      for( ; it.current(); ++it ) {
-        if ( it.current()->inherits( "KToggleAction" ) && it.current() != this &&
-            static_cast<KToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) {
-          KToggleAction *a = static_cast<KToggleAction*>(it.current());
+    const QObjectList list = parent()->children();
+    if ( !list.empty() ) {
+      for(QObjectList::const_iterator it=list.begin();it!=list.end();++it) {
+        if ( (*it)->inherits( "KToggleAction" ) && (*it) != this &&
+            static_cast<KToggleAction*>((*it))->exclusiveGroup() == exclusiveGroup() ) {
+          KToggleAction *a = static_cast<KToggleAction*>(*it);
           if( a->isChecked() ) {
             a->setChecked( false );
             emit a->toggled( false );
           }
         }
       }
@@ -232,14 +233,14 @@ void KToggleAction::setChecked( bool c )
 }
 
 void KToggleAction::updateChecked( int id )
 {
   QWidget *w = container( id );
 
-  if ( w->inherits( "QPopupMenu" ) )
-    static_cast<QPopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
+  if ( w->inherits( "Q3PopupMenu" ) )
+    static_cast<Q3PopupMenu*>(w)->setItemChecked( itemId( id ), d->m_checked );
   else if ( w->inherits( "QMenuBar" ) )
     static_cast<QMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked );
   else if ( w->inherits( "KToolBar" ) )
   {
     QWidget* r = static_cast<KToolBar*>( w )->getButton( itemId( id ) );
     if ( r && r->inherits( "KToolBarButton" ) )
@@ -280,13 +281,13 @@ KRadioAction::KRadioAction( const QString& text, const KShortcut& cut,
                             const QObject* receiver, const char* slot,
                             QObject* parent, const char* name )
 : KToggleAction( text, cut, receiver, slot, parent, name )
 {
 }
 
-KRadioAction::KRadioAction( const QString& text, const QIconSet& pix,
+KRadioAction::KRadioAction( const QString& text, const QIcon& pix,
                             const KShortcut& cut,
                             QObject* parent, const char* name )
 : KToggleAction( text, pix, cut, parent, name )
 {
 }
 
@@ -294,13 +295,13 @@ KRadioAction::KRadioAction( const QString& text, const QString& pix,
                             const KShortcut& cut,
                             QObject* parent, const char* name )
 : KToggleAction( text, pix, cut, parent, name )
 {
 }
 
-KRadioAction::KRadioAction( const QString& text, const QIconSet& pix,
+KRadioAction::KRadioAction( const QString& text, const QIcon& pix,
                             const KShortcut& cut,
                             const QObject* receiver, const char* slot,
                             QObject* parent, const char* name )
 : KToggleAction( text, pix, cut, receiver, slot, parent, name )
 {
 }
@@ -346,13 +347,13 @@ public:
     m_menu = 0;
     m_current = -1;
     m_comboWidth = -1;
   }
   bool m_edit;
   bool m_menuAccelsEnabled;
-  QPopupMenu *m_menu;
+  Q3PopupMenu *m_menu;
   int m_current;
   int m_comboWidth;
   QStringList m_list;
 
   QString makeMenuText( const QString &_text )
   {
@@ -384,13 +385,13 @@ KSelectAction::KSelectAction( const QString& text, const KShortcut& cut,
                               QObject* parent, const char* name )
   : KAction( text, cut, receiver, slot, parent, name )
 {
   d = new KSelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const QString& text, const QIconSet& pix,
+KSelectAction::KSelectAction( const QString& text, const QIcon& pix,
                               const KShortcut& cut,
                               QObject* parent, const char* name )
   : KAction( text, pix, cut, parent, name )
 {
   d = new KSelectActionPrivate;
 }
@@ -400,13 +401,13 @@ KSelectAction::KSelectAction( const QString& text, const QString& pix,
                               QObject* parent, const char* name )
   : KAction( text, pix, cut, parent, name )
 {
   d = new KSelectActionPrivate;
 }
 
-KSelectAction::KSelectAction( const QString& text, const QIconSet& pix,
+KSelectAction::KSelectAction( const QString& text, const QIcon& pix,
                               const KShortcut& cut,
                               const QObject* receiver,
                               const char* slot, QObject* parent,
                               const char* name )
   : KAction( text, pix, cut, receiver, slot, parent, name )
 {
@@ -436,13 +437,13 @@ KSelectAction::~KSelectAction()
   delete d; d = 0;
 }
 
 void KSelectAction::setCurrentItem( int id )
 {
     if ( id >= (int)d->m_list.count() ) {
-        ASSERT(id < (int)d->m_list.count());
+        Q_ASSERT(id < (int)d->m_list.count());
         return;
     }
 
     if ( d->m_menu )
     {
         if ( d->m_current >= 0 )
@@ -476,19 +477,19 @@ void KSelectAction::setComboWidth( int width )
   int len = containerCount();
 
   for( int i = 0; i < len; ++i )
     updateComboWidth( i );
 
 }
-QPopupMenu* KSelectAction::popupMenu() const
+Q3PopupMenu* KSelectAction::popupMenu() const
 {
         kdDebug(129) << "KSelectAction::popupMenu()" << endl; // remove -- ellis
   if ( !d->m_menu )
   {
 //US    d->m_menu = new KPopupMenu(0L, "KSelectAction::popupMenu()");
-    d->m_menu = new QPopupMenu(0L, "QSelectAction::popupMenu()");
+    d->m_menu = new Q3PopupMenu(0L, "QSelectAction::popupMenu()");
     setupMenu();
     if ( d->m_current >= 0 )
       d->m_menu->setItemChecked( d->m_current, true );
   }
 
   return d->m_menu;
@@ -640,18 +641,18 @@ void KSelectAction::updateItems( int id )
 int KSelectAction::plug( QWidget *widget, int index )
 {
 //US  if (kapp && !kapp->authorizeKAction(name()))
 //US    return -1;
   
   kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
   {
     // Create the PopupMenu and store it in m_menu
     (void)popupMenu();
 
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
     int id;
     
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), d->m_menu, -1, index );
     else
       id = menu->insertItem( text(), d->m_menu, -1, index );
@@ -679,13 +680,13 @@ int KSelectAction::plug( QWidget *widget, int index )
                       toolTip(), -1, index );
 
     KComboBox *cb = bar->getCombo( id_ );
     if ( cb )
     {
          cb->setMaximumHeight( 34 );
-      if (!isEditable()) cb->setFocusPolicy(QWidget::NoFocus);
+      if (!isEditable()) cb->setFocusPolicy(Qt::NoFocus);
       cb->setMinimumWidth( cb->sizeHint().width() );
       if ( d->m_comboWidth > 0 )
       {
         cb->setMinimumWidth( d->m_comboWidth );
         cb->setMaximumWidth( d->m_comboWidth );
       }
@@ -849,13 +850,13 @@ KListAction::KListAction( const QString& text, const KShortcut& cut,
 {
   d = new KListActionPrivate;
   if ( receiver )
     connect( this, SIGNAL( activated( int ) ), receiver, slot );
 }
 
-KListAction::KListAction( const QString& text, const QIconSet& pix,
+KListAction::KListAction( const QString& text, const QIcon& pix,
                           const KShortcut& cut,
                           QObject* parent, const char* name )
   : KSelectAction( text, pix, cut, parent, name )
 {
   d = new KListActionPrivate;
 }
@@ -865,13 +866,13 @@ KListAction::KListAction( const QString& text, const QString& pix,
                           QObject* parent, const char* name )
   : KSelectAction( text, pix, cut, parent, name )
 {
   d = new KListActionPrivate;
 }
 
-KListAction::KListAction( const QString& text, const QIconSet& pix,
+KListAction::KListAction( const QString& text, const QIcon& pix,
                           const KShortcut& cut, const QObject* receiver,
                           const char* slot, QObject* parent,
                           const char* name )
   : KSelectAction( text, pix, cut, parent, name )
 {
   d = new KListActionPrivate;
@@ -962,13 +963,13 @@ KRecentFilesAction::KRecentFilesAction( const QString& text,
   if ( receiver )
     connect( this,     SIGNAL(urlSelected(const KURL&)),
              receiver, slot );
 }
 
 KRecentFilesAction::KRecentFilesAction( const QString& text,
-                                        const QIconSet& pix,
+                                        const QIcon& pix,
                                         const KShortcut& cut,
                                         QObject* parent, const char* name,
                                         uint maxItems )
   : KListAction( text, pix, cut, parent, name)
 {
   d = new KRecentFilesActionPrivate;
@@ -988,13 +989,13 @@ KRecentFilesAction::KRecentFilesAction( const QString& text,
   d->m_maxItems = maxItems;
 
   init();
 }
 
 KRecentFilesAction::KRecentFilesAction( const QString& text,
-                                        const QIconSet& pix,
+                                        const QIcon& pix,
                                         const KShortcut& cut,
                                         const QObject* receiver,
                                         const char* slot,
                                         QObject* parent, const char* name,
                                         uint maxItems )
   : KListAction( text, pix, cut, parent, name)
@@ -1198,13 +1199,13 @@ KFontAction::KFontAction( const QString& text, const KShortcut& cut,
     d = new KFontActionPrivate;
     get_fonts( d->m_fonts );
     KSelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( const QString& text, const QIconSet& pix,
+KFontAction::KFontAction( const QString& text, const QIcon& pix,
                           const KShortcut& cut,
                           QObject* parent, const char* name )
     : KSelectAction( text, pix, cut, parent, name )
 {
     d = new KFontActionPrivate;
     get_fonts( d->m_fonts );
@@ -1220,13 +1221,13 @@ KFontAction::KFontAction( const QString& text, const QString& pix,
     d = new KFontActionPrivate;
     get_fonts( d->m_fonts );
     KSelectAction::setItems( d->m_fonts );
     setEditable( true );
 }
 
-KFontAction::KFontAction( const QString& text, const QIconSet& pix,
+KFontAction::KFontAction( const QString& text, const QIcon& pix,
                           const KShortcut& cut,
                           const QObject* receiver, const char* slot,
                           QObject* parent, const char* name )
     : KSelectAction( text, pix, cut, receiver, slot, parent, name )
 {
     d = new KFontActionPrivate;
@@ -1358,13 +1359,13 @@ KFontSizeAction::KFontSizeAction( const QString& text,
                                   QObject* parent, const char* name )
   : KSelectAction( text, cut, receiver, slot, parent, name )
 {
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const QString& text, const QIconSet& pix,
+KFontSizeAction::KFontSizeAction( const QString& text, const QIcon& pix,
                                   const KShortcut& cut,
                                   QObject* parent, const char* name )
   : KSelectAction( text, pix, cut, parent, name )
 {
   init();
 }
@@ -1374,13 +1375,13 @@ KFontSizeAction::KFontSizeAction( const QString& text, const QString& pix,
                                   QObject* parent, const char* name )
   : KSelectAction( text, pix, cut, parent, name )
 {
   init();
 }
 
-KFontSizeAction::KFontSizeAction( const QString& text, const QIconSet& pix,
+KFontSizeAction::KFontSizeAction( const QString& text, const QIcon& pix,
                                   const KShortcut& cut,
                                   const QObject* receiver,
                                   const char* slot, QObject* parent,
                                   const char* name )
     : KSelectAction( text, pix, cut, receiver, slot, parent, name )
 {
@@ -1411,15 +1412,15 @@ KFontSizeAction::~KFontSizeAction()
 
 void KFontSizeAction::init()
 {
     d = new KFontSizeActionPrivate;
 
     setEditable( true );
-    QValueList<int> sizes = get_standard_font_sizes();
+    Q3ValueList<int> sizes = get_standard_font_sizes();
     QStringList lst;
-    for ( QValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it )
+    for ( Q3ValueList<int>::Iterator it = sizes.begin(); it != sizes.end(); ++it )
         lst.append( QString::number( *it ) );
 
     setItems( lst );
 }
 
 void KFontSizeAction::setFontSize( int size )
@@ -1434,26 +1435,26 @@ void KFontSizeAction::setFontSize( int size )
         return;
     }
 
     int index = items().findIndex( QString::number( size ) );
     if ( index == -1 ) {
         // Insert at the correct position in the list (to keep sorting)
-        QValueList<int> lst;
+        Q3ValueList<int> lst;
         // Convert to list of ints
         QStringList itemsList = items();
         for (QStringList::Iterator it = itemsList.begin() ; it != itemsList.end() ; ++it)
             lst.append( (*it).toInt() );
         // New size
         lst.append( size );
         // Sort the list
 qDebug("KFontSizeAction::setFontSize heapsort not found.");
 //US has to be fixed
 //US        qHeapSort( lst );
         // Convert back to string list
         QStringList strLst;
-        for (QValueList<int>::Iterator it = lst.begin() ; it != lst.end() ; ++it)
+        for (Q3ValueList<int>::Iterator it = lst.begin() ; it != lst.end() ; ++it)
             strLst.append( QString::number(*it) );
         KSelectAction::setItems( strLst );
         // Find new current item
         index = lst.findIndex( size );
         setCurrentItem( index );
     }
@@ -1489,23 +1490,23 @@ void KFontSizeAction::slotActivated( const QString& size )
 class KActionMenu::KActionMenuPrivate
 {
 public:
   KActionMenuPrivate()
   {
 //US    m_popup = new KPopupMenu(0L,"KActionMenu::KActionMenuPrivate");
-    m_popup = new QPopupMenu(0L,"KActionMenu::KActionMenuPrivate");
+    m_popup = new Q3PopupMenu(0L,"KActionMenu::KActionMenuPrivate");
     m_delayed = true;
     m_stickyMenu = true;
   }
   ~KActionMenuPrivate()
   {
     delete m_popup; m_popup = 0;
   }
   
 //US  KPopupMenu *m_popup;
-  QPopupMenu *m_popup;
+  Q3PopupMenu *m_popup;
   bool m_delayed;
   bool m_stickyMenu;
 };
 
 KActionMenu::KActionMenu( QObject* parent, const char* name )
   : KAction( parent, name )
@@ -1519,13 +1520,13 @@ KActionMenu::KActionMenu( const QString& text, QObject* parent,
   : KAction( text, 0, parent, name )
 {
   d = new KActionMenuPrivate;
   setShortcutConfigurable( false );
 }
 
-KActionMenu::KActionMenu( const QString& text, const QIconSet& icon,
+KActionMenu::KActionMenu( const QString& text, const QIcon& icon,
                           QObject* parent, const char* name )
   : KAction( text, icon, 0, parent, name )
 {
   d = new KActionMenuPrivate;
   setShortcutConfigurable( false );
 }
@@ -1549,13 +1550,13 @@ void KActionMenu::popup( const QPoint& global )
 {
   popupMenu()->popup( global );
 }
 
 
 //US KPopupMenu* KActionMenu::popupMenu() const
-QPopupMenu* KActionMenu::popupMenu() const
+Q3PopupMenu* KActionMenu::popupMenu() const
 {
   return d->m_popup;
 }
 
 void KActionMenu::insert( KAction* cmd, int index )
 {
@@ -1589,15 +1590,15 @@ int KActionMenu::plug( QWidget* widget, int index )
 {
 /*US  
   if (kapp && !kapp->authorizeKAction(name()))
     return -1;
 */    
   kdDebug(129) << "KAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
   {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
     int id;
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), d->m_popup, -1, index );
     else
       id = menu->insertItem( text(), d->m_popup, -1, index );
 
@@ -1778,18 +1779,18 @@ int KToolBarPopupAction::plug( QWidget *widget, int index )
 
 
   return KAction::plug( widget, index );
 }
 
 //US KPopupMenu *KToolBarPopupAction::popupMenu() const
-QPopupMenu *KToolBarPopupAction::popupMenu() const
+Q3PopupMenu *KToolBarPopupAction::popupMenu() const
 {
     if ( !m_popup ) {
         KToolBarPopupAction *that = const_cast<KToolBarPopupAction*>(this);
 //US        that->m_popup = new KPopupMenu;
-        that->m_popup = new QPopupMenu;
+        that->m_popup = new Q3PopupMenu;
     }
     return m_popup;
 }
 
 ////////
 
@@ -1950,13 +1951,13 @@ void KWidgetAction::unplug( QWidget *w )
 }
 
 void KWidgetAction::slotToolbarDestroyed()
 {
   //Q_ASSERT( m_widget ); // When exiting the app the widget could be destroyed before the toolbar.
 
-  ASSERT( isPlugged() );
+  Q_ASSERT( isPlugged() );
   if( !m_widget || !isPlugged() )
     return;
 
   // Don't let a toolbar being destroyed, delete my widget.
   m_widget->reparent( 0L, QPoint(), false /*showIt*/ );
 }
@@ -1971,15 +1972,15 @@ KActionSeparator::KActionSeparator( QObject *parent, const char *name )
 KActionSeparator::~KActionSeparator()
 {
 }
 
 int KActionSeparator::plug( QWidget *widget, int index )
 {
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits("Q3PopupMenu") )
   {
-    QPopupMenu* menu = static_cast<QPopupMenu*>( widget );
+    Q3PopupMenu* menu = static_cast<Q3PopupMenu*>( widget );
 
     int id = menu->insertSeparator( index );
 
     addContainer( menu, id );
     connect( menu, SIGNAL( destroyed() ), this, SLOT( slotDestroyed() ) );
 
diff --git a/microkde/kdeui/kactionclasses.h b/microkde/kdeui/kactionclasses.h
index f6e7a0f..a9b9104 100644
--- a/microkde/kdeui/kactionclasses.h
+++ b/microkde/kdeui/kactionclasses.h
@@ -31,17 +31,20 @@
 //US#include <qkeysequence.h>
 //US#include <qobject.h>
 //US#include <qvaluelist.h>
 //US#include <qguardedptr.h>
 //US#include <kguiitem.h>
 #include <kshortcut.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PopupMenu>
 //US#include <kstdaction.h>
 //US#include <kicontheme.h>
 
 class QMenuBar;
-class QPopupMenu;
+class Q3PopupMenu;
 //USclass QComboBox;
 //USclass QPoint;
 //USclass QIconSet;
 //USclass QString;
 //USclass KToolBar;
 
@@ -51,13 +54,13 @@ class KConfig;
 //USclass KConfigBase;
 class KURL;
 //USclass KInstance;
 
 
 //US class KToolBar needs to be replaced
-class KToolBar;
+#include "ktoolbar.h"
 class KActionCollection;
 
 //US class KPopupMenu needs to be replaced
 //US class KPopupMenu;
 //USclass KMainWindow;
 
@@ -102,13 +105,13 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KToggleAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
              QObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -124,13 +127,13 @@ public:
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The SLOT to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KToggleAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KToggleAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                    const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -243,13 +246,13 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KRadioAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                   QObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -265,13 +268,13 @@ public:
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The SLOT to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KRadioAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KRadioAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                   const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -349,13 +352,13 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KSelectAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
              QObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -371,13 +374,13 @@ public:
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The SLOT to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KSelectAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KSelectAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                    const QObject* receiver, const char* slot, QObject* parent, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -435,13 +438,13 @@ public:
     /**
      * When this action is plugged into a toolbar, it creates a combobox.
      * This returns the maximum width set by setComboWidth
      */
     virtual int comboWidth() const;
 
-    QPopupMenu* popupMenu() const;
+    Q3PopupMenu* popupMenu() const;
 
     /**
      * Deprecated. See @ref setMenuAccelsEnabled .
      * @since 3.1
      */
     void setRemoveAmpersandsInCombo( bool b );
@@ -564,13 +567,13 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KListAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                       QObject* parent = 0, const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
@@ -586,13 +589,13 @@ public:
      *  @param cut The corresponding keyboard accelerator (shortcut).
      *  @param receiver The SLOT's parent.
      *  @param slot The SLOT to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
-    KListAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KListAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                           const QObject* receiver, const char* slot, QObject* parent,
                   const char* name = 0 );
 
     /**
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
@@ -682,13 +685,13 @@ public:
    *  @param pix The icons that go with this action.
    *  @param cut The corresponding keyboard accelerator (shortcut).
    *  @param parent This action's parent.
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+  KRecentFilesAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                       QObject* parent, const char* name = 0,
                       uint maxItems = 10 );
 
   /**
    *  @param text The text that will be displayed.
    *  @param pix The dynamically loaded icon that goes with this action.
@@ -709,13 +712,13 @@ public:
    *  @param slot The SLOT to invoke when a URL is selected.
    *  Its signature is of the form slotURLSelected( const KURL & ).
    *  @param parent This action's parent.
    *  @param name An internal name for this action.
    *  @param maxItems The maximum number of files to display
    */
-  KRecentFilesAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+  KRecentFilesAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                       const QObject* receiver, const char* slot,
                       QObject* parent, const char* name = 0,
                       uint maxItems = 10 );
 
   /**
    *  @param text The text that will be displayed.
@@ -831,17 +834,17 @@ class KFontAction : public KSelectAction
 public:
     KFontAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0,
                  const char* name = 0 );
     KFontAction( const QString& text, const KShortcut& cut,
                  const QObject* receiver, const char* slot, QObject* parent,
                  const char* name = 0 );
-    KFontAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KFontAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                  QObject* parent = 0, const char* name = 0 );
     KFontAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                  QObject* parent = 0, const char* name = 0 );
-    KFontAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KFontAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                  const QObject* receiver, const char* slot, QObject* parent,
                  const char* name = 0 );
     KFontAction( const QString& text, const QString& pix, const KShortcut& cut,
                  const QObject* receiver, const char* slot, QObject* parent,
                  const char* name = 0 );
 
@@ -870,17 +873,17 @@ class KFontSizeAction : public KSelectAction
     Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 public:
     KFontSizeAction( const QString& text, const KShortcut& cut = KShortcut(), QObject* parent = 0,
                      const char* name = 0 );
     KFontSizeAction( const QString& text, const KShortcut& cut, const QObject* receiver,
                      const char* slot, QObject* parent, const char* name = 0 );
-    KFontSizeAction( const QString& text, const QIconSet& pix, const KShortcut& cut = KShortcut(),
+    KFontSizeAction( const QString& text, const QIcon& pix, const KShortcut& cut = KShortcut(),
                      QObject* parent = 0, const char* name = 0 );
     KFontSizeAction( const QString& text, const QString& pix, const KShortcut& cut = KShortcut(),
                      QObject* parent = 0, const char* name = 0 );
-    KFontSizeAction( const QString& text, const QIconSet& pix, const KShortcut& cut,
+    KFontSizeAction( const QString& text, const QIcon& pix, const KShortcut& cut,
                      const QObject* receiver, const char* slot,
                      QObject* parent, const char* name = 0 );
     KFontSizeAction( const QString& text, const QString& pix, const KShortcut& cut,
                      const QObject* receiver, const char* slot,
                      QObject* parent, const char* name = 0 );
     KFontSizeAction( QObject* parent = 0, const char* name = 0 );
@@ -928,24 +931,24 @@ class KActionMenu : public KAction
   Q_PROPERTY( bool delayed READ delayed WRITE setDelayed )
   Q_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
 
 public:
     KActionMenu( const QString& text, QObject* parent = 0,
                  const char* name = 0 );
-    KActionMenu( const QString& text, const QIconSet& icon,
+    KActionMenu( const QString& text, const QIcon& icon,
                  QObject* parent = 0, const char* name = 0 );
     KActionMenu( const QString& text, const QString& icon,
                  QObject* parent = 0, const char* name = 0 );
     KActionMenu( QObject* parent = 0, const char* name = 0 );
     virtual ~KActionMenu();
 
     virtual void insert( KAction*, int index = -1 );
     virtual void remove( KAction* );
 
 //US    KPopupMenu* popupMenu() const;
-    QPopupMenu* popupMenu() const;
+    Q3PopupMenu* popupMenu() const;
     void popup( const QPoint& global );
 
     /**
      * Returns true if this action creates a delayed popup menu
      * when plugged in a KToolbar.
      */
@@ -1064,13 +1067,13 @@ public:
     /**
      * The popup menu that is shown when clicking (some time) on the toolbar
      * button. You may want to plug items into it on creation, or connect to
      * aboutToShow for a more dynamic menu.
      */
 //US    KPopupMenu *popupMenu() const;
-    QPopupMenu *popupMenu() const;
+    Q3PopupMenu *popupMenu() const;
 
     /**
      * Returns true if this action creates a delayed popup menu
      * when plugged in a KToolbar.
      */
     bool delayed() const;
@@ -1095,13 +1098,13 @@ public:
      * Default: sticky.
      */
     void setStickyMenu(bool sticky);
 
 private:
 //US    KPopupMenu *m_popup;
-    QPopupMenu *m_popup;
+    Q3PopupMenu *m_popup;
     bool m_delayed:1;
     bool m_stickyMenu:1;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
     class KToolBarPopupActionPrivate;
@@ -1144,14 +1147,14 @@ public:
     }
 
 public slots:
     virtual void setChecked( bool );
 
 private:
-    QCString               m_toolBarName;
-    QGuardedPtr<KToolBar>  m_toolBar;
+    Q3CString               m_toolBarName;
+    QPointer<KToolBar>  m_toolBar;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
     class KToggleToolBarActionPrivate;
     KToggleToolBarActionPrivate *d;
 };
@@ -1192,13 +1195,13 @@ public:
      * destroyed. It will be hidden and reparented to 0L instead.
      */
     virtual void unplug( QWidget *w );
 protected slots:
     void slotToolbarDestroyed();
 private:
-    QGuardedPtr<QWidget> m_widget;
+    QPointer<QWidget> m_widget;
     bool                 m_autoSized;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
     class KWidgetActionPrivate;
     KWidgetActionPrivate *d;
diff --git a/microkde/kdeui/kactioncollection.cpp b/microkde/kdeui/kactioncollection.cpp
index 69e5d02..4d66c7f 100644
--- a/microkde/kdeui/kactioncollection.cpp
+++ b/microkde/kdeui/kactioncollection.cpp
@@ -23,24 +23,26 @@
     Boston, MA 02111-1307, USA.
 */
 
 #include "kactioncollection.h"
 //US#include "kactionshortcutlist.h"
 
-#include <qptrdict.h>
+#include <q3ptrdict.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //US#include <qvariant.h>
 
 //US#include <kaccel.h>
 //US#include <kaccelbase.h>
 //US#include <kapplication.h>
 #include <kdebug.h>
 //US#include <kxmlguifactory.h>
 
 //US I included the following files
-#include <qasciidict.h>
-#include <qptrlist.h>
+#include <q3asciidict.h>
+#include <q3ptrlist.h>
 #include "kaction.h"
 #include <kglobal.h>
 #include <qobject.h>
 #include <qwidget.h>
 
 class KActionCollection::KActionCollectionPrivate
@@ -64,19 +66,19 @@ public:
 //US  QString m_sXMLFile;
   bool m_bAutoConnectShortcuts;
   //bool m_bOneKAccelOnly;
   //int m_iWidgetCurrent;
   //QValueList<QWidget*> m_widgetList;
   //QValueList<KAccel*> m_kaccelList;
-  QValueList<KActionCollection*> m_docList;
+  Q3ValueList<KActionCollection*> m_docList;
   QWidget *m_widget;
   KAccel *m_kaccel;
   KAccel *m_builderKAccel;
 
-  QAsciiDict<KAction> m_actionDict;
-  QPtrDict< QPtrList<KAction> > m_dctHighlightContainers;
+  Q3AsciiDict<KAction> m_actionDict;
+  Q3PtrDict< Q3PtrList<KAction> > m_dctHighlightContainers;
   bool m_highlight;
   KAction *m_currentHighlightAction;
   bool m_statusCleared;
 };
 
 KActionCollection::KActionCollection( QWidget *parent, const char *name /*US,
@@ -130,13 +132,13 @@ KActionCollection::KActionCollection( const KActionCollection &copy )
 }
 // KDE 4: remove end
 
 KActionCollection::~KActionCollection()
 {
   kdDebug(129) << "KActionCollection::~KActionCollection(): this = " << this << endl;
-  for ( QAsciiDictIterator<KAction> it( d->m_actionDict ); it.current(); ++it ) {
+  for ( Q3AsciiDictIterator<KAction> it( d->m_actionDict ); it.current(); ++it ) {
     KAction* pAction = it.current();
     if ( pAction->m_parentCollection == this )
       pAction->m_parentCollection = 0L;
   }
 
 //US  delete d->m_kaccel;
@@ -362,13 +364,13 @@ KAction* KActionCollection::_take( KAction* action )
   emit removed( action );
   return a;
 }
 
 void KActionCollection::_clear()
 {
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
   while ( it.current() )
     _remove( it.current() );
 }
 
 void KActionCollection::insert( KAction* action )   { _insert( action ); }
 void KActionCollection::remove( KAction* action )   { _remove( action ); }
@@ -383,13 +385,13 @@ KAction* KActionCollection::action( const char* name, const char* classname ) co
   KAction* pAction = 0;
 
   if ( !classname && name )
     pAction = d->m_actionDict[ name ];
 
   else {
-    QAsciiDictIterator<KAction> it( d->m_actionDict );
+    Q3AsciiDictIterator<KAction> it( d->m_actionDict );
     for( ; it.current(); ++it )
     {
       if ( ( !name || strcmp( it.current()->name(), name ) == 0 ) &&
           ( !classname || strcmp( it.current()->className(), classname ) == 0 ) ) {
         pAction = it.current();
         break;
@@ -404,13 +406,13 @@ KAction* KActionCollection::action( const char* name, const char* classname ) co
 
   return pAction;
 }
 
 KAction* KActionCollection::action( int index ) const
 {
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
   it += index;
   return it.current();
 //  return d->m_actions.at( index );
 }
 /*US
 bool KActionCollection::readShortcutSettings( const QString& sConfigGroup, KConfigBase* pConfig )
@@ -429,25 +431,25 @@ uint KActionCollection::count() const
 }
 
 QStringList KActionCollection::groups() const
 {
   QStringList lst;
 
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
   for( ; it.current(); ++it )
     if ( !it.current()->group().isEmpty() && !lst.contains( it.current()->group() ) )
       lst.append( it.current()->group() );
 
   return lst;
 }
 
 KActionPtrList KActionCollection::actions( const QString& group ) const
 {
   KActionPtrList lst;
 
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
   for( ; it.current(); ++it )
     if ( it.current()->group() == group )
       lst.append( it.current() );
     else if ( it.current()->group().isEmpty() && group.isEmpty() )
       lst.append( it.current() );
 
@@ -455,13 +457,13 @@ KActionPtrList KActionCollection::actions( const QString& group ) const
 }
 
 KActionPtrList KActionCollection::actions() const
 {
   KActionPtrList lst;
 
-  QAsciiDictIterator<KAction> it( d->m_actionDict );
+  Q3AsciiDictIterator<KAction> it( d->m_actionDict );
   for( ; it.current(); ++it )
     lst.append( it.current() );
 
   return lst;
 }
 
@@ -505,27 +507,27 @@ bool KActionCollection::highlightingEnabled() const
 
 void KActionCollection::connectHighlight( QWidget *container, KAction *action )
 {
   if ( !d->m_highlight )
     return;
 
-  QPtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
+  Q3PtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
 
   if ( !actionList )
   {
-    actionList = new QPtrList<KAction>;
+    actionList = new Q3PtrList<KAction>;
 
-    if ( container->inherits( "QPopupMenu" ) )
+    if ( container->inherits( "Q3PopupMenu" ) )
     {
       connect( container, SIGNAL( highlighted( int ) ),
                this, SLOT( slotMenuItemHighlighted( int ) ) );
       connect( container, SIGNAL( aboutToHide() ),
                this, SLOT( slotMenuAboutToHide() ) );
     }
 //US    else if ( container->inherits( "KToolBar" ) )
-    else if ( container->inherits( "QToolBar" ) )
+    else if ( container->inherits( "Q3ToolBar" ) )
     {
       connect( container, SIGNAL( highlighted( int, bool ) ),
                this, SLOT( slotToolBarButtonHighlighted( int, bool ) ) );
     }
 
     connect( container, SIGNAL( destroyed() ),
@@ -539,13 +541,13 @@ void KActionCollection::connectHighlight( QWidget *container, KAction *action )
 
 void KActionCollection::disconnectHighlight( QWidget *container, KAction *action )
 {
   if ( !d->m_highlight )
     return;
 
-  QPtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
+  Q3PtrList<KAction> *actionList = d->m_dctHighlightContainers[ container ];
 
   if ( !actionList )
     return;
 
   actionList->removeRef( action );
 
@@ -622,18 +624,18 @@ void KActionCollection::slotDestroyed()
 {
     d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<QObject *>(sender()) ) );
 }
 
 KAction *KActionCollection::findAction( QWidget *container, int id )
 {
-  QPtrList<KAction> *actionList = d->m_dctHighlightContainers[ reinterpret_cast<void *>( container ) ];
+  Q3PtrList<KAction> *actionList = d->m_dctHighlightContainers[ reinterpret_cast<void *>( container ) ];
 
   if ( !actionList )
     return 0;
 
-  QPtrListIterator<KAction> it( *actionList );
+  Q3PtrListIterator<KAction> it( *actionList );
   for (; it.current(); ++it )
     if ( it.current()->isPlugged( container, id ) )
       return it.current();
 
   return 0;
 }
@@ -641,15 +643,15 @@ KAction *KActionCollection::findAction( QWidget *container, int id )
 // KDE 4: remove
 KActionCollection KActionCollection::operator+(const KActionCollection &c ) const
 {
   kdWarning(129) << "KActionCollection::operator+(): function is severely deprecated." << endl;
   KActionCollection ret( *this );
 
-  QValueList<KAction *> actions = c.actions();
-  QValueList<KAction *>::ConstIterator it = actions.begin();
-  QValueList<KAction *>::ConstIterator end = actions.end();
+  Q3ValueList<KAction *> actions = c.actions();
+  Q3ValueList<KAction *>::ConstIterator it = actions.begin();
+  Q3ValueList<KAction *>::ConstIterator end = actions.end();
   for (; it != end; ++it )
     ret.insert( *it );
 
   return ret;
 }
 
@@ -667,13 +669,13 @@ KActionCollection &KActionCollection::operator=( const KActionCollection &copy )
   return *this;
 }
 
 KActionCollection &KActionCollection::operator+=( const KActionCollection &c )
 {
   kdWarning(129) << "KActionCollection::operator+=(): function is severely deprecated." << endl;
-  QAsciiDictIterator<KAction> it(c.d->m_actionDict);
+  Q3AsciiDictIterator<KAction> it(c.d->m_actionDict);
   for ( ; it.current(); ++it )
     insert( it.current() );
 
   return *this;
 }
 // KDE 4: remove end
diff --git a/microkde/kdeui/kactioncollection.h b/microkde/kdeui/kactioncollection.h
index b9466d0..50cb02a 100644
--- a/microkde/kdeui/kactioncollection.h
+++ b/microkde/kdeui/kactioncollection.h
@@ -27,12 +27,14 @@
 #define __kactioncollection_h__
 
 #include <kaction.h>
 
 //US #include <qkeysequence.h>
 #include <qobject.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //US#include <qvaluelist.h>
 //US#include <qguardedptr.h>
 //US #include <kguiitem.h>
 //US#include <kshortcut.h>
 //US#include <kstdaction.h>
 //US#include <kicontheme.h>
@@ -57,13 +59,13 @@
 //USclass KMainWindow;
 
 //US added inclidefiles
 class QWidget;
 
 
-typedef QValueList<KAction *> KActionPtrList;
+typedef Q3ValueList<KAction *> KActionPtrList;
 
 /**
  * A managed set of KAction objects.
  */
 class KActionCollection : public QObject
 {
diff --git a/microkde/kdeui/kbuttonbox.cpp b/microkde/kdeui/kbuttonbox.cpp
index 83d622a..3ea6703 100644
--- a/microkde/kdeui/kbuttonbox.cpp
+++ b/microkde/kdeui/kbuttonbox.cpp
@@ -46,37 +46,39 @@
  */
 
 //US #include "kbuttonbox.moc"
  
 #include <kbuttonbox.h>
 #include <qpushbutton.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 #include <assert.h>
 
 #define minButtonWidth 50
 
 class KButtonBox::Item {
 public:
   QPushButton *button;
   bool noexpand;
   unsigned short stretch;
   unsigned short actual_size;
 };
 
-template class QPtrList<KButtonBox::Item>;
+template class Q3PtrList<KButtonBox::Item>;
 
 class KButtonBoxPrivate {
 public:
   unsigned short border;
   unsigned short autoborder;
   unsigned short orientation;
   bool activated;
-  QPtrList<KButtonBox::Item> buttons;
+  Q3PtrList<KButtonBox::Item> buttons;
 };
 
-KButtonBox::KButtonBox(QWidget *parent, Orientation _orientation,
+KButtonBox::KButtonBox(QWidget *parent, Qt::Orientation _orientation,
                        int border, int autoborder)
   :  QWidget(parent)
 {
   data = new KButtonBoxPrivate;
   assert(data != 0);
 
@@ -146,13 +148,13 @@ void KButtonBox::layout() {
   setMinimumSize(sizeHint());
 }
 
 void KButtonBox::placeButtons() {
   unsigned int i;
 
-  if(data->orientation == Horizontal) {
+  if(data->orientation == Qt::Horizontal) {
     // calculate free size and stretches
     int fs = width() - 2 * data->border;
     int stretch = 0;
     for(i = 0; i < data->buttons.count(); i++) {
       Item *item = data->buttons.at(i);
       if(item->button != 0) {
@@ -248,32 +250,32 @@ QSize KButtonBox::sizeHint() const {
         QSize s;
         if(item->noexpand)
           s = that->buttonSizeHint(b);
         else
           s = bs;
 
-        if(data->orientation == Horizontal)
+        if(data->orientation == Qt::Horizontal)
           dw += s.width();
         else
           dw += s.height();
 
         if( i != data->buttons.count() - 1 )
           dw += data->autoborder;
       }
     }
 
-    if(data->orientation == Horizontal)
+    if(data->orientation == Qt::Horizontal)
         return QSize(dw, bs.height() + 2 * data->border);
     else
         return QSize(bs.width() + 2 * data->border, dw);
   }
 }
 
 QSizePolicy KButtonBox::sizePolicy() const
 {
-    return data->orientation == Horizontal?
+    return data->orientation == Qt::Horizontal?
         QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed ) :
         QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum );
 }
 
 /*
  * Returns the best size for a button. If a button is less than
diff --git a/microkde/kdeui/kbuttonbox.h b/microkde/kdeui/kbuttonbox.h
index 1104366..2e0f41d 100644
--- a/microkde/kdeui/kbuttonbox.h
+++ b/microkde/kdeui/kbuttonbox.h
@@ -18,12 +18,14 @@
 */
 
 #ifndef __KBUTTONBOX__H__
 #define __KBUTTONBOX__H__
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 class QPushButton;
 
 class KButtonBoxPrivate;
 /**
  * Container widget for buttons. 
  * 
@@ -45,13 +47,13 @@ public:
     * Create an empty container for buttons.
     *
     * If @p _orientation is @p Vertical, the buttons inserted with 
     * @ref addButton() are laid out from top to bottom, otherwise they 
     * are laid out from left to right.
     */
-  KButtonBox(QWidget *parent, Orientation _orientation = Horizontal,
+  KButtonBox(QWidget *parent, Qt::Orientation _orientation = Qt::Horizontal,
              int border = 0, int _autoborder = 6);
 
   /**
     * Free private data field
     */
   ~KButtonBox();
diff --git a/microkde/kdeui/kguiitem.cpp b/microkde/kdeui/kguiitem.cpp
index 828c5e6..c91ffb7 100644
--- a/microkde/kdeui/kguiitem.cpp
+++ b/microkde/kdeui/kguiitem.cpp
@@ -17,13 +17,13 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qregexp.h>
 #include <qstring.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qpixmap.h>
 
 #include <assert.h>
 //US #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -59,13 +59,13 @@ public:
 
     QString m_text;
     QString m_toolTip;
     QString m_whatsThis;
     QString m_statusText;
     QString m_iconName;
-    QIconSet m_iconSet;
+    QIcon m_iconSet;
     bool m_hasIcon : 1;
     bool m_enabled : 1;
 };
 
 
 KGuiItem::KGuiItem() {
@@ -79,13 +79,13 @@ KGuiItem::KGuiItem( const QString &text,    const QString &iconName,
     d->m_text = text;
     d->m_toolTip =  toolTip;
     d->m_whatsThis = whatsThis;
     setIconName( iconName );
 }
 
-KGuiItem::KGuiItem( const QString &text,    const QIconSet &iconSet,
+KGuiItem::KGuiItem( const QString &text,    const QIcon &iconSet,
                     const QString &toolTip, const QString &whatsThis )
 {
     d = new KGuiItemPrivate;
     d->m_text = text;
     d->m_toolTip =  toolTip;
     d->m_whatsThis = whatsThis;
@@ -121,13 +121,13 @@ QString KGuiItem::plainText() const {
   QString stripped( d->m_text );
   stripped.replace( QRegExp( "&(?!&)" ), QString::null );
 
   return stripped;
 }
 
-QIconSet KGuiItem::iconSet( KIcon::Group group, int size /*US, KInstance* instance */ ) const
+QIcon KGuiItem::iconSet( KIcon::Group group, int size /*US, KInstance* instance */ ) const
 {
     if( d->m_hasIcon )
     {
         if( !d->m_iconName.isEmpty())
         {
 // some caching here would(?) come handy
@@ -145,13 +145,13 @@ QIconSet KGuiItem::iconSet( KIcon::Group group, int size /*US, KInstance* instan
         else
         {
             return d->m_iconSet;
         }
     }
     else
-        return QIconSet();
+        return QIcon();
 }
 
 QString KGuiItem::iconName() const
 {
     return d->m_iconName;
 }
@@ -174,23 +174,23 @@ bool KGuiItem::hasIcon() const
 }
 
 void KGuiItem::setText( const QString &text ) {
     d->m_text=text;
 }
 
-void KGuiItem::setIconSet( const QIconSet &iconset )
+void KGuiItem::setIconSet( const QIcon &iconset )
 {
     d->m_iconSet = iconset;
     d->m_iconName = QString::null;
     d->m_hasIcon = !iconset.isNull();
 }
 
 void KGuiItem::setIconName( const QString &iconName )
 {
     d->m_iconName = iconName;
-    d->m_iconSet = QIconSet();
+    d->m_iconSet = QIcon();
     d->m_hasIcon = !iconName.isEmpty();
 }
 
 void KGuiItem::setToolTip( const QString &toolTip) {
     d->m_toolTip = toolTip;
 }
diff --git a/microkde/kdeui/kguiitem.h b/microkde/kdeui/kguiitem.h
index 0079bb4..6f92137 100644
--- a/microkde/kdeui/kguiitem.h
+++ b/microkde/kdeui/kguiitem.h
@@ -20,15 +20,15 @@
 */
 
 #ifndef __kguiitem_h__
 #define __kguiitem_h__
 
 #include <qstring.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qpixmap.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 //US#include <kicontheme.h>
 #include <kglobal.h>
 
 //US added the following files
 #include <kiconloader.h>
 
@@ -39,40 +39,40 @@ public:
 
     KGuiItem( const QString &text, 
               const QString &iconName  = QString::null,
               const QString &toolTip   = QString::null, 
               const QString &whatsThis = QString::null );
 
-    KGuiItem( const QString &text, const QIconSet &iconSet, 
+    KGuiItem( const QString &text, const QIcon &iconSet, 
               const QString &toolTip   = QString::null, 
               const QString &whatsThis = QString::null );
 
     KGuiItem( const KGuiItem &rhs );
     KGuiItem &operator=( const KGuiItem &rhs );
 
     ~KGuiItem();
 
     QString text() const;
     QString plainText() const;
-    QIconSet iconSet( KIcon::Group, int size = 0/*US , KInstance* instance = KGlobal::instance()*/) const;
+    QIcon iconSet( KIcon::Group, int size = 0/*US , KInstance* instance = KGlobal::instance()*/) const;
 
 #ifndef KDE_NO_COMPAT
-    QIconSet iconSet() const { return iconSet( KIcon::Small); }
+    QIcon iconSet() const { return iconSet( KIcon::Small); }
 #endif
 
     QString iconName() const;
     QString toolTip() const;
     QString whatsThis() const;
     bool isEnabled() const;
     bool hasIcon() const;
 #ifndef KDE_NO_COMPAT
     bool hasIconSet() const { return hasIcon(); }
 #endif
 
     void setText( const QString &text );
-    void setIconSet( const QIconSet &iconset );
+    void setIconSet( const QIcon &iconset );
     void setIconName( const QString &iconName );
     void setToolTip( const QString &tooltip );
     void setWhatsThis( const QString &whatsThis );
     void setEnabled( bool enable );
 
 private:
diff --git a/microkde/kdeui/kjanuswidget.cpp b/microkde/kdeui/kjanuswidget.cpp
index 462c44f..3d9173d 100644
--- a/microkde/kdeui/kjanuswidget.cpp
+++ b/microkde/kdeui/kjanuswidget.cpp
@@ -19,21 +19,29 @@
  */
 
 #include <qpixmap.h>
 #include <qbitmap.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qtabwidget.h>
-#include <qlistview.h>
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qgrid.h>
+#include <q3listview.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
+#include <q3grid.h>
 #include <qpainter.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3Frame>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 /*US 
 #include <qbitmap.h>
 #include <qgrid.h>
 #include <qhbox.h>
 #include <qheader.h>
 #include <qlabel.h>
@@ -62,19 +70,19 @@
 #include <kdialog.h> // Access to some static members
 #include <kdebug.h>
 #include <klistview.h>
 
 #include "kjanuswidget.h"
 
-class KJanusWidget::IconListItem : public QListBoxItem
+class KJanusWidget::IconListItem : public Q3ListBoxItem
 {
   public:
-    IconListItem( QListBox *listbox, const QPixmap &pixmap,
+    IconListItem( Q3ListBox *listbox, const QPixmap &pixmap,
                    const QString &text );
-    virtual int height( const QListBox *lb ) const;
-    virtual int width( const QListBox *lb ) const;
+    virtual int height( const Q3ListBox *lb ) const;
+    virtual int width( const Q3ListBox *lb ) const;
     int expandMinimumWidth( int width );
 
   protected:
     const QPixmap &defaultPixmap();
     void paint( QPainter *painter );
 
@@ -95,27 +103,27 @@ public:
   // Reverse dictionary. Used because showPage() may be performance critical.
   QMap<QWidget*,int> mPageToInt;
   // Dictionary of title string associated with page.
   QMap<int, QString> mIntToTitle;
 };
 
-template class QPtrList<QListViewItem>;
+template class Q3PtrList<Q3ListViewItem>;
 
 
 KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
   : QWidget( parent, name ),
     mValid(false), mPageList(0),
     mTitleList(0), mFace(face), mTitleLabel(0), mActivePageWidget(0),
     mShowIconsInTreeList(false), d(0)
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this );
   if( mFace == TreeList || mFace == IconList )
   {
     d = new KJanusWidgetPrivate;
 
-    QFrame *page = 0;
+    Q3Frame *page = 0;
     if( mFace == TreeList )
     {
     //US
     qDebug("KJanusWidget::KJanusWidget TreeList not implemented yet");
 /*US    
       QSplitter *splitter = new QSplitter( this );
@@ -142,46 +150,46 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
       page = new QFrame( p );
       hbox->addWidget( page, 10 );
 */      
     }
     else
     {
-      QHBoxLayout *hbox = new QHBoxLayout( topLayout );
+      Q3HBoxLayout *hbox = new Q3HBoxLayout( topLayout );
       mIconList = new IconListBox( this );
 
       QFont listFont( mIconList->font() );
       listFont.setBold( true );
       mIconList->setFont( listFont );
 
       mIconList->verticalScrollBar()->installEventFilter( this );
       hbox->addWidget( mIconList );
       connect( mIconList, SIGNAL(selectionChanged()), SLOT(slotShowPage()));
       hbox->addSpacing( KDialog::marginHint() );
-      page = new QFrame( this );
+      page = new Q3Frame( this );
       hbox->addWidget( page, 10 );
     }
 
     //
     // Rest of page area. Title at top with a separator below and a
     // pagestack using all available space at bottom.
     //
 
-    QVBoxLayout *vbox = new QVBoxLayout( page, 0, KDialog::spacingHint() );
+    Q3VBoxLayout *vbox = new Q3VBoxLayout( page, 0, KDialog::spacingHint() );
 
     mTitleLabel = new QLabel( QString::fromLatin1("Empty page"), page, "KJanusWidgetTitleLabel" );
     vbox->addWidget( mTitleLabel );
 
     QFont titleFont( mTitleLabel->font() );
     titleFont.setBold( true );
     mTitleLabel->setFont( titleFont );
 
     mTitleSep = new KSeparator( page );
-    mTitleSep->setFrameStyle( QFrame::HLine|QFrame::Plain );
+    mTitleSep->setFrameStyle( Q3Frame::HLine|Q3Frame::Plain );
     vbox->addWidget( mTitleSep );
 
-    mPageStack = new QWidgetStack( page );
+    mPageStack = new Q3WidgetStack( page );
     connect(mPageStack, SIGNAL(aboutToShow(QWidget *)),
             SIGNAL(aboutToShowPage(QWidget *)));
     vbox->addWidget( mPageStack, 10 );
   }
   else if( mFace == Tabbed )
   {
@@ -196,13 +204,13 @@ KJanusWidget::KJanusWidget( QWidget *parent, const char *name, int face )
     mSwallowPage = new QWidget( this );
     topLayout->addWidget( mSwallowPage, 10 );
   }
   else
   {
     mFace = Plain;
-    mPlainPage = new QFrame( this );
+    mPlainPage = new Q3Frame( this );
     topLayout->addWidget( mPlainPage, 10 );
   }
 /*US
   if ( kapp )
     connect(kapp,SIGNAL(kdisplayFontChanged()),SLOT(slotFontChanged()));
 */    
@@ -242,13 +250,13 @@ KJanusWidget::~KJanusWidget()
 bool KJanusWidget::isValid() const
 {
   return( mValid );
 }
 
 
-QFrame *KJanusWidget::plainPage()
+Q3Frame *KJanusWidget::plainPage()
 {
   return( mPlainPage );
 }
 
 
 int KJanusWidget::face() const
@@ -263,135 +271,135 @@ QWidget *KJanusWidget::FindParent()
   }
   else {
     return this;
   }
 }
 
-QFrame *KJanusWidget::addPage( const QStringList &items, const QString &header,
+Q3Frame *KJanusWidget::addPage( const QStringList &items, const QString &header,
                                const QPixmap &pixmap )
 {
   if( mValid == false )
   {
     kdDebug() << "addPage: Invalid object" << endl;
     return( 0 );
   }
 
-  QFrame *page = new QFrame( FindParent(), "page" );
+  Q3Frame *page = new Q3Frame( FindParent(), "page" );
   addPageWidget( page, items, header, pixmap );
 
   return page;
 }
 
 void KJanusWidget::pageGone( QObject *obj )
 {
 //  QObject* obj = (QObject*)sender();
   removePage( static_cast<QWidget*>( obj ) );
 }
 
-void KJanusWidget::slotReopen( QListViewItem * item )
+void KJanusWidget::slotReopen( Q3ListViewItem * item )
 {
   if( item )
     item->setOpen( true );
 }
 
-QFrame *KJanusWidget::addPage( const QString &itemName, const QString &header,
+Q3Frame *KJanusWidget::addPage( const QString &itemName, const QString &header,
                                const QPixmap &pixmap )
 {
 
   QStringList items;
   items << itemName;
   return addPage(items, header, pixmap);
 }
 
 
 
-QVBox *KJanusWidget::addVBoxPage( const QStringList &items,
+Q3VBox *KJanusWidget::addVBoxPage( const QStringList &items,
                                   const QString &header,
                                   const QPixmap &pixmap )
 {
   if( mValid == false )
   {
       qDebug("addPage: Invalid object ");
     
     return( 0 );
   }
 
-  QVBox *page = new QVBox(FindParent() , "vbox_page" );
+  Q3VBox *page = new Q3VBox(FindParent() , "vbox_page" );
   page->setSpacing( KDialog::spacingHintSmall() );
   addPageWidget( page, items, header, pixmap );
 
   return page;
 }
 
-QVBox *KJanusWidget::addVBoxPage( const QString &itemName,
+Q3VBox *KJanusWidget::addVBoxPage( const QString &itemName,
                                   const QString &header,
                                   const QPixmap &pixmap )
 {
   QStringList items;
   items << itemName;
   return addVBoxPage(items, header, pixmap);
 }
 
-QHBox *KJanusWidget::addHBoxPage( const QStringList &items,
+Q3HBox *KJanusWidget::addHBoxPage( const QStringList &items,
                                   const QString &header,
                                   const QPixmap &pixmap )
 {
   if( mValid == false ) {
     kdDebug() << "addPage: Invalid object" << endl;
     return( 0 );
   }
 
-  QHBox *page = new QHBox(FindParent(), "hbox_page");
+  Q3HBox *page = new Q3HBox(FindParent(), "hbox_page");
   page->setSpacing( KDialog::spacingHint() );
   addPageWidget( page, items, header, pixmap );
 
   return page;
 }
 
-QHBox *KJanusWidget::addHBoxPage( const QString &itemName,
+Q3HBox *KJanusWidget::addHBoxPage( const QString &itemName,
                                   const QString &header,
                                   const QPixmap &pixmap )
 {
   QStringList items;
   items << itemName;
   return addHBoxPage(items, header, pixmap);
 }
 
-QGrid *KJanusWidget::addGridPage( int n, QGrid::Direction dir,
+Q3Grid *KJanusWidget::addGridPage( int n, Qt::Orientation dir,
                                   const QStringList &items,
                                   const QString &header,
                                   const QPixmap &pixmap )
 {
   if( mValid == false )
   {
     kdDebug() << "addPage: Invalid object" << endl;
     return( 0 );
   }
 
-  QGrid *page = new QGrid( n, dir, FindParent(), "page" );
+  Q3Grid *page = new Q3Grid( n, dir, FindParent(), "page" );
   page->setSpacing( KDialog::spacingHint() );
   addPageWidget( page, items, header, pixmap );
 
   return page;
 }
 
 
-QGrid *KJanusWidget::addGridPage( int n, QGrid::Direction dir,
+Q3Grid *KJanusWidget::addGridPage( int n, Qt::Orientation dir,
                                   const QString &itemName,
                                   const QString &header,
                                   const QPixmap &pixmap )
 {
   QStringList items;
   items << itemName;
   return addGridPage(n, dir, items, header, pixmap);
 }
 
-void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, QFrame *page)
+void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, Q3Frame *page)
 {
   bool isTop = true;
-  QListViewItem *curTop = 0, *child, *last, *newChild;
+  Q3ListViewItem *curTop = 0, *child, *last, *newChild;
   unsigned int index = 1;
   QStringList curPath;
 
   for ( QStringList::ConstIterator it = items.begin(); it != items.end(); ++it, index++ ) {
     QString name = (*it);
     bool isPath = ( index != items.count() );
@@ -409,15 +417,15 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
     for (last = 0; child && child->text(0) != name ; last = child, child = child->nextSibling());
 
     if (last == 0 && child == 0) {
       // This node didn't have any children at all, lets just insert the
       // new child.
       if (isTop)
-        newChild = new QListViewItem(mTreeList, name);
+        newChild = new Q3ListViewItem(mTreeList, name);
       else
-        newChild = new QListViewItem(curTop, name);
+        newChild = new Q3ListViewItem(curTop, name);
 
     }
     else if (child != 0) {
       // we found the given name in this child.
       if (!isPath) {
         kdDebug() << "The element inserted was already in the TreeList box!" << endl;
@@ -428,15 +436,15 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
         newChild  = child;
       }
     }
     else {
       // the node had some children, but we didn't find the given name
       if (isTop)
-        newChild = new QListViewItem(mTreeList, last, name);
+        newChild = new Q3ListViewItem(mTreeList, last, name);
       else
-        newChild = new QListViewItem(curTop, last, name);
+        newChild = new Q3ListViewItem(curTop, last, name);
     }
 
     // Now make the element expandable if it is a path component, and make
     // ready for next loop
     if (isPath) {
       newChild->setExpandable(true);
@@ -456,13 +464,13 @@ void KJanusWidget::InsertTreeListItem(const QStringList &items, const QPixmap &p
       }
       mTreeListToPageStack.insert(newChild, page);
     }
   }
 }
 
-void KJanusWidget::addPageWidget( QFrame *page, const QStringList &items,
+void KJanusWidget::addPageWidget( Q3Frame *page, const QStringList &items,
                                   const QString &header,const QPixmap &pixmap )
 {
 /*US the following signal causes a segmentation fault while closing the dialog. 
   Why not just remove all pages in the destructor??
 */  
 //US  connect(page, SIGNAL(destroyed(QObject*)), this, SLOT(pageGone(QObject*)));
@@ -547,21 +555,21 @@ bool KJanusWidget::setSwallowedWidget( QWidget *widget )
   // Remove current layout and make a new.
   //
   if( mSwallowPage->layout() != 0 )
   {
     delete mSwallowPage->layout();
   }
-  QGridLayout *gbox = new QGridLayout( mSwallowPage, 1, 1, 0 );
+  Q3GridLayout *gbox = new Q3GridLayout( mSwallowPage, 1, 1, 0 );
 
   //
   // Hide old children
   //
-  QObjectList *l = (QObjectList*)mSwallowPage->children(); // silence please
-  for( uint i=0; i < l->count(); i++ )
+  QObjectList l = mSwallowPage->children(); // silence please
+  for( uint i=0; i < l.count(); i++ )
   {
-    QObject *o = l->at(i);
+    QObject *o = l.at(i);
     if( o->isWidgetType() )
     {
       ((QWidget*)o)->hide();
     }
   }
 
@@ -594,22 +602,22 @@ bool KJanusWidget::slotShowPage()
   {
     return( false );
   }
 
   if( mFace == TreeList )
   {
-    QListViewItem *node = mTreeList->selectedItem();
+    Q3ListViewItem *node = mTreeList->selectedItem();
     if( node == 0 ) { return( false ); }
 
     QWidget *stackItem = mTreeListToPageStack[node];
     // Make sure to call through the virtual function showPage(int)
     return showPage(d->mPageToInt[stackItem]);
   }
   else if( mFace == IconList )
   {
-    QListBoxItem *node = mIconList->item( mIconList->currentItem() );
+    Q3ListBoxItem *node = mIconList->item( mIconList->currentItem() );
     if( node == 0 ) { return( false ); }
     QWidget *stackItem = mIconListToPageStack[node];
     // Make sure to call through the virtual function showPage(int)
     return showPage(d->mPageToInt[stackItem]);
   }
 
@@ -643,27 +651,27 @@ bool KJanusWidget::showPage( QWidget *w )
     mActivePageWidget = w;
 
     int index = d->mPageToInt[w];
     mTitleLabel->setText( d->mIntToTitle[index] );
     if( mFace == TreeList )
     {
-      QMap<QListViewItem *, QWidget *>::Iterator it;
+      QMap<Q3ListViewItem *, QWidget *>::Iterator it;
       for (it = mTreeListToPageStack.begin(); it != mTreeListToPageStack.end(); ++it){
-        QListViewItem *key = it.key();
+        Q3ListViewItem *key = it.key();
         QWidget *val = it.data();
         if (val == w) {
           mTreeList->setSelected(key, true );
           break;
         }
       }
     }
     else
     {
-      QMap<QListBoxItem *, QWidget *>::Iterator it;
+      QMap<Q3ListBoxItem *, QWidget *>::Iterator it;
       for (it = mIconListToPageStack.begin(); it != mIconListToPageStack.end(); ++it){
-        QListBoxItem *key = it.key();
+        Q3ListBoxItem *key = it.key();
         QWidget *val = it.data();
         if (val == w) {
           mIconList->setSelected( key, true );
           break;
         }
       }
@@ -683,19 +691,19 @@ bool KJanusWidget::showPage( QWidget *w )
 }
 
 
 int KJanusWidget::activePageIndex() const
 {
   if( mFace == TreeList) {
-    QListViewItem *node = mTreeList->selectedItem();
+    Q3ListViewItem *node = mTreeList->selectedItem();
     if( node == 0 ) { return -1; }
     QWidget *stackItem = mTreeListToPageStack[node];
     return d->mPageToInt[stackItem];
   }
   else if (mFace == IconList) {
-    QListBoxItem *node = mIconList->item( mIconList->currentItem() );
+    Q3ListBoxItem *node = mIconList->item( mIconList->currentItem() );
     if( node == 0 ) { return( false ); }
     QWidget *stackItem = mIconListToPageStack[node];
     return d->mPageToInt[stackItem];
   }
   else if( mFace == Tabbed ) {
     QWidget *widget = mTabControl->currentPage();
@@ -758,13 +766,13 @@ void KJanusWidget::slotFontChanged()
     mIconList->invalidateWidth();
   }
 }
 */
 
 // makes the treelist behave like the list of kcontrol
-void KJanusWidget::slotItemClicked(QListViewItem *it)
+void KJanusWidget::slotItemClicked(Q3ListViewItem *it)
 {
   if(it && (it->childCount()>0))
     it->setOpen(!it->isOpen());
 }
 
 void KJanusWidget::setFocus()
@@ -892,17 +900,17 @@ void KJanusWidget::setRootIsDecorated( bool state )
 
 void KJanusWidget::unfoldTreeList( bool persist )
 {
   if( mFace == TreeList )
   {
     if( persist )
-      connect( mTreeList, SIGNAL( collapsed( QListViewItem * ) ), this, SLOT( slotReopen( QListViewItem * ) ) );
+      connect( mTreeList, SIGNAL( collapsed( Q3ListViewItem * ) ), this, SLOT( slotReopen( Q3ListViewItem * ) ) );
     else
-      disconnect( mTreeList, SIGNAL( collapsed( QListViewItem * ) ), this, SLOT( slotReopen( QListViewItem * ) ) );
+      disconnect( mTreeList, SIGNAL( collapsed( Q3ListViewItem * ) ), this, SLOT( slotReopen( Q3ListViewItem * ) ) );
 
-    for( QListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() )
+    for( Q3ListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() )
       item->setOpen( true );
   }
 }
 
 void KJanusWidget::showEvent( QShowEvent * )
 {
@@ -950,25 +958,25 @@ bool KJanusWidget::eventFilter( QObject *o, QEvent *e )
 //
 // Code for the icon list box
 //
 
 
 KJanusWidget::IconListBox::IconListBox( QWidget *parent, const char *name,
-                                        WFlags f )
+                                        Qt::WFlags f )
   :KListBox( parent, name, f ), mShowAll(false), mHeightValid(false),
    mWidthValid(false)
 {
 }
 
 
 void KJanusWidget::IconListBox::updateMinimumHeight()
 {
   if( mShowAll == true && mHeightValid == false )
   {
     int h = frameWidth()*2;
-    for( QListBoxItem *i = item(0); i != 0; i = i->next() )
+    for( Q3ListBoxItem *i = item(0); i != 0; i = i->next() )
     {
       h += i->height( this );
     }
     setMinimumHeight( h );
     mHeightValid = true;
   }
@@ -977,19 +985,19 @@ void KJanusWidget::IconListBox::updateMinimumHeight()
 
 void KJanusWidget::IconListBox::updateWidth()
 {
   if( mWidthValid == false )
   {
     int maxWidth = 10;
-    for( QListBoxItem *i = item(0); i != 0; i = i->next() )
+    for( Q3ListBoxItem *i = item(0); i != 0; i = i->next() )
     {
       int w = ((IconListItem *)i)->width(this);
       maxWidth = QMAX( w, maxWidth );
     }
 
-    for( QListBoxItem *i = item(0); i != 0; i = i->next() )
+    for( Q3ListBoxItem *i = item(0); i != 0; i = i->next() )
     {
       ((IconListItem *)i)->expandMinimumWidth( maxWidth );
     }
 
     if( verticalScrollBar()->isVisible() )
     {
@@ -1019,15 +1027,15 @@ void KJanusWidget::IconListBox::setShowAll( bool showAll )
   mShowAll = showAll;
   mHeightValid = false;
 }
 
 
 
-KJanusWidget::IconListItem::IconListItem( QListBox *listbox, const QPixmap &pixmap,
+KJanusWidget::IconListItem::IconListItem( Q3ListBox *listbox, const QPixmap &pixmap,
                                           const QString &text )
-  : QListBoxItem( listbox )
+  : Q3ListBoxItem( listbox )
 {
   mPixmap = pixmap;
   if( mPixmap.isNull() == true )
   {
     mPixmap = defaultPixmap();
   }
@@ -1080,26 +1088,26 @@ void KJanusWidget::IconListItem::paint( QPainter *painter )
   if( text().isEmpty() == false )
   {
     painter->drawText( 0, hp+7, mMinimumWidth, ht, Qt::AlignCenter, text() );
   }
 }
 
-int KJanusWidget::IconListItem::height( const QListBox *lb ) const
+int KJanusWidget::IconListItem::height( const Q3ListBox *lb ) const
 {
   if( text().isEmpty() == true )
   {
     return( mPixmap.height() );
   }
   else
   {
     return( mPixmap.height() + lb->fontMetrics().lineSpacing()+10 );
   }
 }
 
 
-int KJanusWidget::IconListItem::width( const QListBox *lb ) const
+int KJanusWidget::IconListItem::width( const Q3ListBox *lb ) const
 {
   int wt = lb->fontMetrics().boundingRect(text()).width()+10;
   int wp = mPixmap.width() + 10;
   int w  = QMAX( wt, wp );
   return( QMAX( w, mMinimumWidth ) );
 }
@@ -1119,13 +1127,13 @@ void KJanusWidget::removePage( QWidget *page )
   }
     
   int index = d->mPageToInt[page];
   
   if ( mFace == TreeList )
   {
-    QMap<QListViewItem*, QWidget *>::Iterator i;
+    QMap<Q3ListViewItem*, QWidget *>::Iterator i;
     for( i = mTreeListToPageStack.begin(); i != mTreeListToPageStack.end(); ++i )
       if (i.data()==page)
       {
         delete i.key();
         mPageStack->removeWidget(page);
         mTreeListToPageStack.remove(i);
@@ -1134,13 +1142,13 @@ void KJanusWidget::removePage( QWidget *page )
         d->mIntToPage.remove(index);
         break;
       }
   }
   else if ( mFace == IconList )
   {
-    QMap<QListBoxItem*, QWidget *>::Iterator i;
+    QMap<Q3ListBoxItem*, QWidget *>::Iterator i;
     for( i = mIconListToPageStack.begin(); i != mIconListToPageStack.end(); ++i )
       if (i.data()==page)
       {
         delete i.key();
         mPageStack->removeWidget(page);
         mIconListToPageStack.remove(i);
diff --git a/microkde/kdeui/kjanuswidget.h b/microkde/kdeui/kjanuswidget.h
index 6d3f23d..72465ea 100644
--- a/microkde/kdeui/kjanuswidget.h
+++ b/microkde/kdeui/kjanuswidget.h
@@ -17,16 +17,22 @@
  *  Boston, MA 02111-1307, USA.
  */
 
 #ifndef _KJANUS_WIDGET_H_
 #define _KJANUS_WIDGET_H_
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qwidget.h>
 #include <qmap.h>
-#include <qgrid.h>
+#include <q3grid.h>
+//Added by qt3to4:
+#include <QShowEvent>
+#include <Q3Frame>
+#include <QPixmap>
+#include <QLabel>
+#include <QEvent>
 #include <klistbox.h>
 
 /*US
 #include <qptrlist.h>
 #include <qpixmap.h>
 #include <qsplitter.h>
@@ -35,18 +41,18 @@
 #include <qmap.h>
 
 */
 
 class KSeparator;
 class KListView;
-class QWidgetStack;
+class Q3WidgetStack;
 class QLabel;
 class QTabWidget;
-class QListViewItem;
-class QVBox;
-class QHBox;
+class Q3ListViewItem;
+class Q3VBox;
+class Q3HBox;
 
 /**
  * Provides a number of ready to use layouts (faces). It is used
  * as an internal widget in @ref KDialogBase, but can also used as a
  * widget of its own.
  *
@@ -99,13 +105,13 @@ class KJanusWidget : public QWidget
   Q_OBJECT
 
   private:
     class IconListBox : public KListBox
     {
       public:
-        IconListBox( QWidget *parent=0, const char *name=0, WFlags f=0 );
+        IconListBox( QWidget *parent=0, const char *name=0, Qt::WFlags f=0 );
         void updateMinimumHeight();
         void updateWidth();
         void invalidateHeight();
         void invalidateWidth();
         void setShowAll( bool showAll );
 
@@ -190,13 +196,13 @@ class KJanusWidget : public QWidget
 
     /**
      * Returns the empty widget that is available in Plain mode.
      *
      * @return The widget or 0 if the face in not Plain.
      */
-    virtual QFrame *plainPage();
+    virtual Q3Frame *plainPage();
 
     /**
      * Add a new page when the class is used in TreeList, IconList or Tabbed
      * mode. The returned widget is empty and you must add your widgets
      * as children to this widget. In most cases you must create a layout
      * manager and associate it with this widget as well.
@@ -211,13 +217,13 @@ class KJanusWidget : public QWidget
      * @param pixmap Used in IconList mode or in TreeList mode. You should
      *        prefer a pixmap with size 32x32 pixels.
      *
      * @return The empty page or 0 if the face is not TreeList, IconList or
      *         Tabbed.
      */
-    virtual QFrame *addPage(const QString &item,const QString &header=QString::null,
+    virtual Q3Frame *addPage(const QString &item,const QString &header=QString::null,
                     const QPixmap &pixmap=QPixmap() );
 
     /**
      * This is like addPage just above, with the difference that the first
      * element is a list of strings. These strings are used to form a path
      * of folders down to the given page. The initial elements are names
@@ -228,13 +234,13 @@ class KJanusWidget : public QWidget
             * Deleting the returned frame will cause the listitem or tab to be
          * removed (you can re-add a page with the same name later.
      *
          * Deleting the returned frame will cause the listitem or tab to be
          * removed (you can re-add a page with the same name later.
      **/
-     virtual QFrame *addPage(const QStringList &items, const QString &header=QString::null,
+     virtual Q3Frame *addPage(const QStringList &items, const QString &header=QString::null,
                     const QPixmap &pixmap=QPixmap() );
 
     /**
      * Add a new page when the class is used in TreeList, IconList or Tabbed
      * mode. The returned widget is empty and you must add your widgets
      * as children to this widget. The returned widget is a @ref QVBox
@@ -250,13 +256,13 @@ class KJanusWidget : public QWidget
      *        will be used instead.
      * @param pixmap Used in IconList mode or in TreeList mode. You should
      *        prefer a pixmap with size 32x32 pixels.
      *
      * @return The empty page or 0 if the face is not TreeList, IconList or
      *         Tabbed.  */
-    virtual QVBox *addVBoxPage( const QString &item,
+    virtual Q3VBox *addVBoxPage( const QString &item,
                         const QString &header=QString::null,
                         const QPixmap &pixmap=QPixmap() );
 
     /**
      * This is like addVBoxPage just above, with the difference that the first
      * element is a list of strings. These strings are used to form a path
@@ -266,13 +272,13 @@ class KJanusWidget : public QWidget
      * be added for the IconList face too. In other faces than the
      * TreeList, all the strings except the last one is ignored.
      *
      * Deleting the returned frame will cause the listitem or tab to be
      * removed (you can re-add a page with the same name later.
      **/
-    virtual QVBox *addVBoxPage( const QStringList &items,
+    virtual Q3VBox *addVBoxPage( const QStringList &items,
                         const QString &header=QString::null,
                         const QPixmap &pixmap=QPixmap() );
 
     /**
      * Add a new page when the class is used in TreeList, IconList or Tabbed
      * mode. The returned widget is empty and you must add your widgets
@@ -290,13 +296,13 @@ class KJanusWidget : public QWidget
      * @param pixmap Used in IconList mode or in TreeList mode. You should
      *        prefer a pixmap with size 32x32 pixels.
      *
      * @return The empty page or 0 if the face is not TreeList, IconList or
      *         Tabbed.
      */
-    virtual QHBox *addHBoxPage( const QString &itemName,
+    virtual Q3HBox *addHBoxPage( const QString &itemName,
                         const QString &header=QString::null,
                         const QPixmap &pixmap=QPixmap() );
 
     /**
      * This is like addHBoxPage just above, with the difference that the first
      * element is a list of strings. These strings are used to form a path
@@ -306,13 +312,13 @@ class KJanusWidget : public QWidget
      * be added for the IconList face too. In other faces than the
      * TreeList, all the strings except the last one is ignored.
      *
      * Deleting the returned frame will cause the listitem or tab to be
      * removed (you can re-add a page with the same name later.
      **/
-    virtual QHBox *addHBoxPage( const QStringList &items,
+    virtual Q3HBox *addHBoxPage( const QStringList &items,
                         const QString &header=QString::null,
                         const QPixmap &pixmap=QPixmap() );
 
     /**
      * Add a new page when the class is used in either TreeList or Tabbed
      * mode. The returned widget is empty and you must add your widgets
@@ -334,13 +340,13 @@ class KJanusWidget : public QWidget
      *        prefer a pixmap with size 32x32 pixels.
      *
      * @return The empty page or 0 if the face is not TreeList, IconList or
      *         Tabbed.
      */
 //US changed Orientation into Direction for compatibility
-    virtual QGrid *addGridPage( int n, QGrid::Direction dir,
+    virtual Q3Grid *addGridPage( int n, Qt::Orientation dir,
                         const QString &itemName,
                         const QString &header=QString::null,
                         const QPixmap &pixmap=QPixmap() );
 
     /**
      * This is like addGridPage just above, with the difference that the first
@@ -352,13 +358,13 @@ class KJanusWidget : public QWidget
      * TreeList, all the strings except the last one is ignored.
      *
      * Deleting the returned frame will cause the listitem or tab to be
      * removed (you can re-add a page with the same name later.
      **/
 //US changed Orientation into Direction for compatibility
-    virtual QGrid *addGridPage( int n, QGrid::Direction dir,
+    virtual Q3Grid *addGridPage( int n, Qt::Orientation dir,
                         const QStringList &items,
                         const QString &header=QString::null,
                         const QPixmap &pixmap=QPixmap() );
 
     /**
      * @short Removes a page created with @ref addPage, @ref addVBoxPage,
@@ -514,44 +520,44 @@ class KJanusWidget : public QWidget
      */
     virtual bool eventFilter( QObject *o, QEvent *e );
 
   private slots:
     bool slotShowPage();
 //US not yet implemented    void slotFontChanged();
-    void slotItemClicked(QListViewItem *it);
+    void slotItemClicked(Q3ListViewItem *it);
     void pageGone( QObject *obj); // signal from the added page's "destroyed" signal
-    void slotReopen(QListViewItem *item);
+    void slotReopen(Q3ListViewItem *item);
 
   protected:
     bool showPage( QWidget *w );
-    void addPageWidget( QFrame *page, const QStringList &items,
+    void addPageWidget( Q3Frame *page, const QStringList &items,
                         const QString &header, const QPixmap &pixmap );
-    void InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, QFrame *page);
+    void InsertTreeListItem(const QStringList &items, const QPixmap &pixmap, Q3Frame *page);
     QWidget *FindParent();
 
   private:
     bool mValid;
 
     // Obsolete members. Remove in KDE 4.
-    QPtrList<QWidget> *mPageList;
+    Q3PtrList<QWidget> *mPageList;
     QStringList *mTitleList;
 
     int          mFace;
     KListView    *mTreeList;
     IconListBox  *mIconList;
-    QWidgetStack *mPageStack;
+    Q3WidgetStack *mPageStack;
     QLabel       *mTitleLabel;
     QTabWidget   *mTabControl;
-    QFrame       *mPlainPage;
+    Q3Frame       *mPlainPage;
     QWidget      *mSwallowPage;
     QWidget      *mActivePageWidget;
     KSeparator   *mTitleSep;
 //US    QSplitter::ResizeMode mTreeListResizeMode;
     bool         mShowIconsInTreeList;
-    QMap<QListViewItem *, QWidget *> mTreeListToPageStack;
-    QMap<QListBoxItem *, QWidget *> mIconListToPageStack;
+    QMap<Q3ListViewItem *, QWidget *> mTreeListToPageStack;
+    QMap<Q3ListBoxItem *, QWidget *> mIconListToPageStack;
     QMap<QString, QPixmap> mFolderIconMap;
     QMap<QString, QStringList> mChildrenNames;
     QMap<QString, QWidget *> mChildPages;
 
   public:
     class IconListItem;
diff --git a/microkde/kdeui/klistbox.cpp b/microkde/kdeui/klistbox.cpp
index c65b892..71020b3 100644
--- a/microkde/kdeui/klistbox.cpp
+++ b/microkde/kdeui/klistbox.cpp
@@ -13,38 +13,44 @@
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #include <qtimer.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QFocusEvent>
 
 #include <kglobalsettings.h>
 //US#include <kcursor.h>
 #include <kapplication.h>
 //US#include <kipc.h>
 #include <kdebug.h>
 
 #include "klistbox.h"
 
 #ifdef Q_WS_X11
+#include <QX11Info>
 #include <X11/Xlib.h>
 #endif
 #ifdef _WIN32_
 #define Q_WS_QWS
 #endif
-KListBox::KListBox( QWidget *parent, const char *name, WFlags f )
-    : QListBox( parent, name, f )
+KListBox::KListBox( QWidget *parent, const char *name, Qt::WFlags f )
+    : Q3ListBox( parent, name, f )
 {
     connect( this, SIGNAL( onViewport() ),
              this, SLOT( slotOnViewport() ) );
-    connect( this, SIGNAL( onItem( QListBoxItem * ) ),
-             this, SLOT( slotOnItem( QListBoxItem * ) ) );
+    connect( this, SIGNAL( onItem( Q3ListBoxItem * ) ),
+             this, SLOT( slotOnItem( Q3ListBoxItem * ) ) );
 
-    connect( this, SIGNAL( mouseButtonClicked( int, QListBoxItem *, 
+    connect( this, SIGNAL( mouseButtonClicked( int, Q3ListBoxItem *, 
         const QPoint & ) ),
-              this, SLOT( slotMouseButtonClicked( int, QListBoxItem *,
+              this, SLOT( slotMouseButtonClicked( int, Q3ListBoxItem *,
         const QPoint & ) ) );
 /*US    
 
     slotSettingsChanged(KApplication::SETTINGS_MOUSE);
     if (kapp)
     {
@@ -57,13 +63,13 @@ KListBox::KListBox( QWidget *parent, const char *name, WFlags f )
     m_bUseSingle = true;
     m_pAutoSelect = new QTimer( this );
     connect( m_pAutoSelect, SIGNAL( timeout() ),
       this, SLOT( slotAutoSelect() ) );
 }
 
-void KListBox::slotOnItem( QListBoxItem *item )
+void KListBox::slotOnItem( Q3ListBoxItem *item )
 {
 /*US
     if ( item && m_bChangeCursorOverItem && m_bUseSingle )
         viewport()->setCursor( KCursor().handCursor() );
 */
     if ( item && (m_autoSelectDelay > -1) && m_bUseSingle ) {
@@ -136,17 +142,17 @@ void KListBox::slotAutoSelect()
 
 #ifdef Q_WS_X11 //FIXME
   Window root;
   Window child;
   int root_x, root_y, win_x, win_y;
   uint keybstate;
-  XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child,
+  XQueryPointer( x11Info().display(), x11Info().appRootWindow(), &root, &child,
                  &root_x, &root_y, &win_x, &win_y, &keybstate );
 #endif
 
-  QListBoxItem* previousItem = item( currentItem() ); 
+  Q3ListBoxItem* previousItem = item( currentItem() ); 
   setCurrentItem( m_pCurrentItem );
 
   if( m_pCurrentItem ) {
 #ifndef Q_WS_QWS //FIXME
     //Shift pressed?
     if( (keybstate & ShiftMask) ) {
@@ -164,13 +170,13 @@ void KListBox::slotAutoSelect()
 //US      bool select = !m_pCurrentItem->isSelected();
       bool select = !m_pCurrentItem->selected();
       bool update = viewport()->isUpdatesEnabled();
       viewport()->setUpdatesEnabled( false );
 
       bool down = index( previousItem ) < index( m_pCurrentItem );
-      QListBoxItem* it = down ? previousItem : m_pCurrentItem;
+      Q3ListBoxItem* it = down ? previousItem : m_pCurrentItem;
       for (;it ; it = it->next() ) {
         if ( down && it == m_pCurrentItem ) {
           setSelected( m_pCurrentItem, select );
           break;
         }
         if ( !down && it == previousItem ) {
@@ -183,13 +189,13 @@ void KListBox::slotAutoSelect()
       blockSignals( block );
       viewport()->setUpdatesEnabled( update );
       triggerUpdate( false );
 
       emit selectionChanged();
 
-      if( selectionMode() == QListBox::Single )
+      if( selectionMode() == Q3ListBox::Single )
         emit selectionChanged( m_pCurrentItem );
     }
 #ifndef Q_WS_QWS //FIXME
     else if( (keybstate & ControlMask) )
       setSelected( m_pCurrentItem, !m_pCurrentItem->isSelected() );
 #endif
@@ -210,20 +216,20 @@ void KListBox::slotAutoSelect()
   }
   else
     kdDebug() << "Thats not supposed to happen!!!!" << endl;
 #endif
 }
 
-void KListBox::emitExecute( QListBoxItem *item, const QPoint &pos )
+void KListBox::emitExecute( Q3ListBoxItem *item, const QPoint &pos )
 {
 #ifdef Q_WS_X11 //FIXME
   Window root;
   Window child;
   int root_x, root_y, win_x, win_y;
   uint keybstate;
-  XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child,
+  XQueryPointer( x11Info().display(), x11Info().appRootWindow(), &root, &child,
                  &root_x, &root_y, &win_x, &win_y, &keybstate );
 #endif
     
   m_pAutoSelect->stop();
   
 #ifndef Q_WS_QWS //FIXME
@@ -243,71 +249,71 @@ void KListBox::emitExecute( QListBoxItem *item, const QPoint &pos )
 // F1 (and combinations) and Escape since these are used
 // to start help or close the dialog. This functionality
 // should be done in QListView but it is not (at least now)
 //
 void KListBox::keyPressEvent(QKeyEvent *e)
 {
-  if( e->key() == Key_Escape )
+  if( e->key() == Qt::Key_Escape )
   {
     e->ignore();
   }
-  else if( e->key() == Key_F1 )
+  else if( e->key() == Qt::Key_F1 )
   {
     e->ignore();
   }
   else
   {
-    QListBox::keyPressEvent(e);
+    Q3ListBox::keyPressEvent(e);
   }
 }
 
 void KListBox::focusOutEvent( QFocusEvent *fe )
 {
   m_pAutoSelect->stop();
 
-  QListBox::focusOutEvent( fe );
+  Q3ListBox::focusOutEvent( fe );
 }
 
 void KListBox::leaveEvent( QEvent *e ) 
 {
   m_pAutoSelect->stop();
 
-  QListBox::leaveEvent( e );
+  Q3ListBox::leaveEvent( e );
 }
 
 void KListBox::contentsMousePressEvent( QMouseEvent *e )
 {
-  if( (selectionMode() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) ) {
+  if( (selectionMode() == Extended) && (e->state() & Qt::ShiftButton) && !(e->state() & Qt::ControlButton) ) {
     bool block = signalsBlocked();
     blockSignals( true );
 
     clearSelection();
 
     blockSignals( block );
   }
 
-  QListBox::contentsMousePressEvent( e );
+  Q3ListBox::contentsMousePressEvent( e );
 }
 
 void KListBox::contentsMouseDoubleClickEvent ( QMouseEvent * e )
 {
-  QListBox::contentsMouseDoubleClickEvent( e );
+  Q3ListBox::contentsMouseDoubleClickEvent( e );
 
-  QListBoxItem* item = itemAt( e->pos() );
+  Q3ListBoxItem* item = itemAt( e->pos() );
 
   if( item ) {
     emit doubleClicked( item, e->globalPos() );
 
-    if( (e->button() == LeftButton) && !m_bUseSingle )
+    if( (e->button() == Qt::LeftButton) && !m_bUseSingle )
       emitExecute( item, e->globalPos() );
   }
 }
 
-void KListBox::slotMouseButtonClicked( int btn, QListBoxItem *item, const QPoint &pos )
+void KListBox::slotMouseButtonClicked( int btn, Q3ListBoxItem *item, const QPoint &pos )
 {
-  if( (btn == LeftButton) && item )
+  if( (btn == Qt::LeftButton) && item )
     emitExecute( item, pos );
 }
 
 void KListBox::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
diff --git a/microkde/kdeui/klistbox.h b/microkde/kdeui/klistbox.h
index 8023780..5ec514b 100644
--- a/microkde/kdeui/klistbox.h
+++ b/microkde/kdeui/klistbox.h
@@ -15,13 +15,18 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #ifndef KLISTBOX_H
 #define KLISTBOX_H
 
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QFocusEvent>
+#include <QKeyEvent>
+#include <QEvent>
 
 /**
  * Extends the functionality of @ref QListBox to honor the system
  * wide settings for Single Click/Double Click mode, Auto Selection and
  * Change Cursor over Link.
  *
@@ -32,18 +37,18 @@
  * mentioned. This way you don't need to care about the current
  * settings.  If you want to get informed when the user selects
  * something connect to the @ref QListBox::selectionChanged() signal.
  * 
  * @short A variant of @ref QListBox that honors KDE's system-wide settings.
  **/
-class KListBox : public QListBox
+class KListBox : public Q3ListBox
 {
     Q_OBJECT
 
 public:
-  KListBox( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+  KListBox( QWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0 );
 
 signals:
 
   /**
    * Emitted whenever the user executes an listbox item. 
    *
@@ -51,26 +56,26 @@ signals:
    * setting the user clicked or double clicked on that item.
    * @param item is the pointer to the executed listbox item. 
    *
    * Note that you may not delete any @ref QListBoxItem objects in slots 
    * connected to this signal.
    */
-  void executed( QListBoxItem *item );
+  void executed( Q3ListBoxItem *item );
 
   /**
    * Emitted whenever the user executes an listbox item. 
    *
    * That means depending on the KDE wide Single Click/Double Click 
    * setting the user clicked or double clicked on that item.
    * @param item is the pointer to the executed listbox item. 
    * @param pos is the position where the user has clicked
    *
    * Note that you may not delete any @ref QListBoxItem objects in slots 
    * connected to this signal.
    */
-  void executed( QListBoxItem *item, const QPoint &pos );
+  void executed( Q3ListBoxItem *item, const QPoint &pos );
 
   /**
    * This signal gets emitted whenever the user double clicks into the 
    * listbox. 
    *
    * @param item The pointer to the clicked listbox item. 
@@ -80,27 +85,27 @@ signals:
    * connected to this signal.  
    *
    * This signal is more or less here for the sake of completeness.
    * You should normally not need to use this. In most cases it's better
    * to use @ref executed() instead.
    */
-  void doubleClicked( QListBoxItem *item, const QPoint &pos );
+  void doubleClicked( Q3ListBoxItem *item, const QPoint &pos );
 
 protected slots:
-  void slotOnItem( QListBoxItem *item );
+  void slotOnItem( Q3ListBoxItem *item );
   void slotOnViewport();
 
 //US  void slotSettingsChanged(int);
 
   /**
    * Auto selection happend.
    */
   void slotAutoSelect();
 
 protected:
-  void emitExecute( QListBoxItem *item, const QPoint &pos );
+  void emitExecute( Q3ListBoxItem *item, const QPoint &pos );
 
   /**
    * @reimplemented
    */
   virtual void keyPressEvent(QKeyEvent *e);
   /**
@@ -120,19 +125,19 @@ protected:
    */
   virtual void contentsMouseDoubleClickEvent ( QMouseEvent *e );
 
   bool m_bUseSingle;
 //US  bool m_bChangeCursorOverItem;
 
-  QListBoxItem* m_pCurrentItem;
+  Q3ListBoxItem* m_pCurrentItem;
 
   QTimer* m_pAutoSelect;
   int m_autoSelectDelay;
 
 private slots:
-  void slotMouseButtonClicked( int btn, QListBoxItem *item, const QPoint &pos );
+  void slotMouseButtonClicked( int btn, Q3ListBoxItem *item, const QPoint &pos );
 
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
   class KListBoxPrivate;
   KListBoxPrivate *d;
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp
index 60f3084..0e98160 100644
--- a/microkde/kdeui/klistview.cpp
+++ b/microkde/kdeui/klistview.cpp
@@ -15,19 +15,33 @@
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qtimer.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qcursor.h>
 #include <qtooltip.h>
 #include <qstyle.h>
 #include <qpainter.h>
+//Added by qt3to4:
+#include <QDragLeaveEvent>
+#include <QKeyEvent>
+#include <Q3ValueList>
+#include <Q3PtrList>
+#include <QPixmap>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QEvent>
+#include <QPaintEvent>
 
 #include <kglobalsettings.h>
 #include <kconfig.h>
 #include <kconfigbase.h>
 //US #include <kcursor.h>
 #include <kapplication.h>
@@ -35,23 +49,24 @@
 #include <kdebug.h>
 #ifdef _WIN32_
 #define Q_WS_QWS
 #endif
 #ifndef _WIN32_
 #define private public
-#include <qlistview.h>
+#include <q3listview.h>
 #undef private
 #endif
 #include "klistview.h"
 //US #include "klistviewlineedit.h"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
+#include <Q3Action>
 
 // /*US
-class KListView::Tooltip : public QToolTip
+class KListView::Tooltip /* TODO:hacker:TODO: : public QToolTip */
 {
 public:
   Tooltip (KListView* parent, QToolTipGroup* group = 0L);
   virtual ~Tooltip () {}
 
 protected:
@@ -64,13 +79,13 @@ protected:
 
 private:
   KListView* mParent;
 };
 
 KListView::Tooltip::Tooltip (KListView* parent, QToolTipGroup* group)
-  : QToolTip (parent, group),
+  : /* XXX:hacker:XXX: QToolTip (parent, group), */
         mParent (parent)
 {
 }
 
 void KListView::Tooltip::maybeTip (const QPoint&)
 {
@@ -120,26 +135,26 @@ public:
 
   ~KListViewPrivate ()
   {
 //US    delete editor;
   }
 
-  QListViewItem* pCurrentItem;
+  Q3ListViewItem* pCurrentItem;
 
   QTimer autoSelect;
   int autoSelectDelay;
 
   QTimer dragExpand;
-  QListViewItem* dragOverItem;
+  Q3ListViewItem* dragOverItem;
   QPoint dragOverPoint;
   
   QPoint startDragPos;
   int dragDelay;
 
 //US  KListViewLineEdit *editor;
-  QValueList<int> renameable;
+  Q3ValueList<int> renameable;
 
   bool cursorInExecuteArea:1;
   bool bUseSingle:1;
   bool bChangeCursorOverItem:1;
   bool itemsMovable:1;
   bool selectedBySimpleMove : 1;
@@ -167,14 +182,14 @@ public:
   int contextMenuKey;
   bool showContextMenusOnPress;
 
   QRect mOldDropVisualizer;
   int mDropVisualizerWidth;
   QRect mOldDropHighlighter;
-  QListViewItem *afterItemDrop;
-  QListViewItem *parentItemDrop;
+  Q3ListViewItem *afterItemDrop;
+  Q3ListViewItem *parentItemDrop;
 
   QColor alternateBackground;
 };
 
 /*US
 KListViewLineEdit::KListViewLineEdit(KListView *parent)
@@ -223,47 +238,47 @@ void KListViewLineEdit::load(QListViewItem *i, int c)
 }
 */
         /*Helper functions to for
          *tabOrderedRename functionality.
  */
 
-static int nextCol (KListView *pl, QListViewItem *pi, int start, int dir)
+static int nextCol (KListView *pl, Q3ListViewItem *pi, int start, int dir)
 {
         if (pi)
         {
                         //Find the next renameable column in the current row
                 for (; ((dir == +1) ? (start < pl->columns()) : (start >= 0)); start += dir)
                         if (pl->isRenameable(start))
                                 return start;
         }
 
         return -1;
 }
 
-static QListViewItem *prevItem (QListViewItem *pi)
+static Q3ListViewItem *prevItem (Q3ListViewItem *pi)
 {
-        QListViewItem *pa = pi->itemAbove();
+        Q3ListViewItem *pa = pi->itemAbove();
 
                 /*Does what the QListViewItem::previousSibling()
                  *of my dreams would do.
          */
         if (pa && pa->parent() == pi->parent())
                 return pa;
 
         return NULL;
 }
 
-static QListViewItem *lastQChild (QListViewItem *pi)
+static Q3ListViewItem *lastQChild (Q3ListViewItem *pi)
 {
         if (pi)
         {
                         /*Since there's no QListViewItem::lastChild().
                          *This finds the last sibling for the given
                          *item.
                  */
-                for (QListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling())
+                for (Q3ListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling())
                         pi = pt;
         }
 
         return pi;
 }
 /*US
@@ -325,16 +340,16 @@ bool KListViewLineEdit::event (QEvent *pe)
         if (pe->type() == QEvent::KeyPress)
         {
                 QKeyEvent *k = (QKeyEvent *) pe;
 
             if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) &&
                         p->tabOrderedRenaming() && p->itemsRenameable() &&
-                        !(k->state() & ControlButton || k->state() & AltButton))
+                        !(k->state() & Qt::ControlButton || k->state() & AltButton))
                 {
                         selectNextCell(item, col,
-                                (k->key() == Key_Tab && !(k->state() & ShiftButton)));
+                                (k->key() == Key_Tab && !(k->state() & Qt::ShiftButton)));
                         return true;
             }
         }
 
         return KLineEdit::event(pe);
 }
@@ -403,25 +418,25 @@ void KListViewLineEdit::slotSelectionChanged()
     col = 0;
     hide();
 }
 */
 
 KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse  )
-  : QListView( parent, name ),
+  : Q3ListView( parent, name ),
         d (new KListViewPrivate (this))
 {
 #ifndef DESKTOP_VERSION
     if ( emulateRightMouse )
         QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
 //US  setDragAutoScroll(true);
 
   connect( this, SIGNAL( onViewport() ),
                    this, SLOT( slotOnViewport() ) );
-  connect( this, SIGNAL( onItem( QListViewItem * ) ),
-                   this, SLOT( slotOnItem( QListViewItem * ) ) );
+  connect( this, SIGNAL( onItem( Q3ListViewItem * ) ),
+                   this, SLOT( slotOnItem( Q3ListViewItem * ) ) );
 
   connect (this, SIGNAL(contentsMoving(int,int)),
                    this, SLOT(cleanDropVisualizer()));
   connect (this, SIGNAL(contentsMoving(int,int)),
                    this, SLOT(cleanItemHighlighter()));
 
@@ -442,23 +457,23 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse
   connect(&d->dragExpand, SIGNAL( timeout() ),
                   this, SLOT( slotDragExpand() ) );
 
   // context menu handling
   if (d->showContextMenusOnPress)
         {
-          connect (this, SIGNAL (rightButtonPressed (QListViewItem*, const QPoint&, int)),
-                           this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int)));
+          connect (this, SIGNAL (rightButtonPressed (Q3ListViewItem*, const QPoint&, int)),
+                           this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int)));
         }
   else
         {
-          connect (this, SIGNAL (rightButtonClicked (QListViewItem*, const QPoint&, int)),
-                           this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int)));
+          connect (this, SIGNAL (rightButtonClicked (Q3ListViewItem*, const QPoint&, int)),
+                           this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int)));
         }
 
-  connect (this, SIGNAL (menuShortCutPressed (KListView*, QListViewItem*)),
-                   this, SLOT (emitContextMenu (KListView*, QListViewItem*)));
+  connect (this, SIGNAL (menuShortCutPressed (KListView*, Q3ListViewItem*)),
+                   this, SLOT (emitContextMenu (KListView*, Q3ListViewItem*)));
   
  
   //qDebug("KListView::KListView make alternate color configurable");  
   d->alternateBackground = KGlobalSettings::alternateBackgroundColor();
 }
 
@@ -477,13 +492,13 @@ bool KListView::isExecuteArea( const QPoint& point )
   return false;
 }
 QSize KListView::sizeHint() const
 {
     //qDebug("KListView::QSize sizeHint() ");
 #ifdef DESKTOP_VERSION
-    return QListView::sizeHint();
+    return Q3ListView::sizeHint();
 #else
     return QSize ( 40, 40 );
 #endif
 
 }
 bool KListView::isExecuteArea( int x )
@@ -500,13 +515,13 @@ bool KListView::isExecuteArea( int x )
 
     x += contentsX(); // in case of a horizontal scrollbar
     return ( x > offset && x < ( offset + width ) );
   }
 }
 
-void KListView::slotOnItem( QListViewItem *item )
+void KListView::slotOnItem( Q3ListViewItem *item )
 {
   QPoint vp = viewport()->mapFromGlobal( QCursor::pos() );
   if ( item && isExecuteArea( vp.x() ) && (d->autoSelectDelay > -1) && d->bUseSingle ) {
     d->autoSelect.start( d->autoSelectDelay, true );
     d->pCurrentItem = item;
   }
@@ -531,18 +546,18 @@ void KListView::slotSettingsChanged(int category)
     //US I create my private category (=1) to set the settings
   case 1:
     d->dragDelay = 2;
     //US set explicitly d->bUseSingle = KGlobalSettings::singleClick();
     //    qDebug("KListView::slotSettingsChanged: single%i", d->bUseSingle);
 
-    disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
-               this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int)));
+    disconnect(this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)),
+               this, SLOT (slotMouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)));
 
     if( d->bUseSingle )
-      connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)),
-               this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int)));
+      connect (this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)),
+               this, SLOT (slotMouseButtonClicked( int, Q3ListViewItem*, const QPoint &, int)));
 
     //US d->bChangeCursorOverItem = KGlobalSettings::changeCursorOverIcon();
     //US d->autoSelectDelay = KGlobalSettings::autoSelectDelay();
 
     if( !d->bUseSingle || !d->bChangeCursorOverItem )
        viewport()->unsetCursor();
@@ -608,13 +623,13 @@ void KListView::slotAutoSelect()
         }
 
   //Give this widget the keyboard focus.
   if( !hasFocus() )
     setFocus();
 
-  QListViewItem* previousItem = currentItem();
+  Q3ListViewItem* previousItem = currentItem();
   setCurrentItem( d->pCurrentItem );
 
 #if 0
 #ifndef Q_WS_QWS
   // FIXME(E): Implement for Qt Embedded
   if( d->pCurrentItem ) {
@@ -629,13 +644,13 @@ void KListView::slotAutoSelect()
 
       bool select = !d->pCurrentItem->isSelected();
       bool update = viewport()->isUpdatesEnabled();
       viewport()->setUpdatesEnabled( false );
 
       bool down = previousItem->itemPos() < d->pCurrentItem->itemPos();
-      QListViewItemIterator lit( down ? previousItem : d->pCurrentItem );
+      Q3ListViewItemIterator lit( down ? previousItem : d->pCurrentItem );
       for ( ; lit.current(); ++lit ) {
                 if ( down && lit.current() == d->pCurrentItem ) {
                   d->pCurrentItem->setSelected( select );
                   break;
                 }
                 if ( !down && lit.current() == previousItem ) {
@@ -648,13 +663,13 @@ void KListView::slotAutoSelect()
       blockSignals( block );
       viewport()->setUpdatesEnabled( update );
       triggerUpdate();
 
       emit selectionChanged();
 
-      if( selectionMode() == QListView::Single )
+      if( selectionMode() == Q3ListView::Single )
                 emit selectionChanged( d->pCurrentItem );
     }
     else if( (keybstate & ControlMask) )
       setSelected( d->pCurrentItem, !d->pCurrentItem->isSelected() );
     else {
       bool block = signalsBlocked();
@@ -681,13 +696,13 @@ void KListView::slotHeaderChanged()
     int w = 0;
     for (int i = 0; i < columns() - 1; ++i) w += columnWidth(i);
     setColumnWidth( columns() - 1, viewport()->width() - w - 1 );
   }
 }
 
-void KListView::emitExecute( int buttonstate, QListViewItem *item, const QPoint &pos, int c)
+void KListView::emitExecute( int buttonstate, Q3ListViewItem *item, const QPoint &pos, int c)
 {
   //  qDebug("KListView::emitExecute buttonstate=%i", buttonstate);
     if( isExecuteArea( viewport()->mapFromGlobal(pos) ) ) {
 
         // Double click mode ?
         if ( !d->bUseSingle )
@@ -698,26 +713,26 @@ void KListView::emitExecute( int buttonstate, QListViewItem *item, const QPoint
         else
         {
           //US special implementation for embedded systems
             d->autoSelect.stop();
 
             //Dont emit executed if in SC mode and Shift or Ctrl are pressed
-            if( !( (buttonstate==ShiftButton) || (buttonstate==ControlButton) )) {
+            if( !( (buttonstate==Qt::ShiftButton) || (buttonstate==Qt::ControlButton) )) {
               //            if( !( ((keybstate & ShiftMask) || (keybstate & ControlMask)) ) ) {
 
                 emit executed( item );
                 emit executed( item, pos, c );
             }
         }
     }
 }
 
 void KListView::focusInEvent( QFocusEvent *fe )
 {
  //   kdDebug()<<"KListView::focusInEvent()"<<endl;
-  QListView::focusInEvent( fe );
+  Q3ListView::focusInEvent( fe );
   if ((d->selectedBySimpleMove)
       && (d->selectionMode == FileManager)
       && (fe->reason()!=QFocusEvent::Popup)
       && (fe->reason()!=QFocusEvent::ActiveWindow)
       && (currentItem()!=0))
   {
@@ -744,37 +759,37 @@ void KListView::focusOutEvent( QFocusEvent *fe )
   {
       currentItem()->setSelected(false);
       currentItem()->repaint();
       emit selectionChanged();
   };
 
-  QListView::focusOutEvent( fe );
+  Q3ListView::focusOutEvent( fe );
 }
 
 void KListView::leaveEvent( QEvent *e )
 {
   d->autoSelect.stop();
 
-  QListView::leaveEvent( e );
+  Q3ListView::leaveEvent( e );
 }
 
 bool KListView::event( QEvent *e )
 {
   if (e->type() == QEvent::ApplicationPaletteChange) {
     //qDebug("KListView::event make alternate color configurable");  
 //US  d->alternateBackground=KGlobalSettings::alternateBackgroundColor();
   d->alternateBackground = QColor(240, 240, 240);
   }
 
-  return QListView::event(e);
+  return Q3ListView::event(e);
 }
 
 void KListView::contentsMousePressEvent( QMouseEvent *e )
 {
   //qDebug("KListView::contentsMousePressEvent");
-  if( (selectionModeExt() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) )
+  if( (selectionModeExt() == Extended) && (e->state() & Qt::ShiftButton) && !(e->state() & Qt::ControlButton) )
   {
     bool block = signalsBlocked();
     blockSignals( true );
 
     clearSelection();
 
@@ -790,44 +805,44 @@ void KListView::contentsMousePressEvent( QMouseEvent *e )
         currentItem()->repaint();
 //        emit selectionChanged();
      };
   };
 
   QPoint p( contentsToViewport( e->pos() ) );
-  QListViewItem *at = itemAt (p);
+  Q3ListViewItem *at = itemAt (p);
 
   // true if the root decoration of the item "at" was clicked (i.e. the +/- sign)
   bool rootDecoClicked = at
            && ( p.x() <= header()->cellPos( header()->mapToActual( 0 ) ) +
                 treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() )
            && ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) );
 
-  if (e->button() == LeftButton && !rootDecoClicked)
+  if (e->button() == Qt::LeftButton && !rootDecoClicked)
   {
     //Start a drag
     d->startDragPos = e->pos();
 
     if (at)
     {
       d->validDrag = true;
       d->pressedOnSelected = at->isSelected();
     }
   }
 
-  QListView::contentsMousePressEvent( e );
+  Q3ListView::contentsMousePressEvent( e );
 }
 
 void KListView::contentsMouseMoveEvent( QMouseEvent *e )
 {
     if (!dragEnabled() || d->startDragPos.isNull() || !d->validDrag) {
-      QListView::contentsMouseMoveEvent (e);
+      Q3ListView::contentsMouseMoveEvent (e);
       return;
     }
 
   QPoint vp = contentsToViewport(e->pos());
-  QListViewItem *item = itemAt( vp );
+  Q3ListViewItem *item = itemAt( vp );
 
   //do we process cursor changes at all?
   if ( item && d->bChangeCursorOverItem && d->bUseSingle )
     {
       //Cursor moved on a new item or in/out the execute area
       if( (item != d->pCurrentItem) ||
@@ -850,28 +865,28 @@ void KListView::contentsMouseMoveEvent( QMouseEvent *e )
       (newPos.x() > d->startDragPos.x()+d->dragDelay ||
        newPos.x() < d->startDragPos.x()-d->dragDelay ||
        newPos.y() > d->startDragPos.y()+d->dragDelay ||
        newPos.y() < d->startDragPos.y()-d->dragDelay))
     //(d->startDragPos - e->pos()).manhattanLength() > QApplication::startDragDistance())
     {
-      QListView::contentsMouseReleaseEvent( 0 );
+      Q3ListView::contentsMouseReleaseEvent( 0 );
       startDrag();
       d->startDragPos = QPoint();
       d->validDrag = false;
     }
 }
 
 void KListView::contentsMouseReleaseEvent( QMouseEvent *e )
 {
-  if (e->button() == LeftButton)
+  if (e->button() == Qt::LeftButton)
   {
     // If the row was already selected, maybe we want to start an in-place editing
     if ( d->pressedOnSelected && itemsRenameable() )
     {
       QPoint p( contentsToViewport( e->pos() ) );
-      QListViewItem *at = itemAt (p);
+      Q3ListViewItem *at = itemAt (p);
       if ( at )
       {
         // true if the root decoration of the item "at" was clicked (i.e. the +/- sign)
         bool rootDecoClicked =
                   ( p.x() <= header()->cellPos( header()->mapToActual( 0 ) ) +
                     treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() )
@@ -887,46 +902,46 @@ void KListView::contentsMouseReleaseEvent( QMouseEvent *e )
     }
 
     d->pressedOnSelected = false;
     d->validDrag = false;
     d->startDragPos = QPoint();
   }
-  QListView::contentsMouseReleaseEvent( e );
+  Q3ListView::contentsMouseReleaseEvent( e );
 }
 
 void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e )
 {
   //qDebug("KListView::contentsMouseDoubleClickEvent");
   // We don't want to call the parent method because it does setOpen,
   // whereas we don't do it in single click mode... (David)
   //QListView::contentsMouseDoubleClickEvent( e );
 
   QPoint vp = contentsToViewport(e->pos());
-  QListViewItem *item = itemAt( vp );
-  emit QListView::doubleClicked( item ); // we do it now
+  Q3ListViewItem *item = itemAt( vp );
+  emit Q3ListView::doubleClicked( item ); // we do it now
 
   int col = item ? header()->mapToLogical( header()->cellAt( vp.x() ) ) : -1;
 
   if( item ) {
     //qDebug("KListView::contentsMouseDoubleClickEvent: emit doubleClicked");
 
     emit doubleClicked( item, e->globalPos(), col );
 
-    if( (e->button() == LeftButton) && !d->bUseSingle ) {
+    if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) {
       //qDebug("KListView::contentsMouseDoubleClickEvent: emitExecute");
 
       emitExecute( e->button(), item, e->globalPos(), col);
     }
   }
 }
 
-void KListView::slotMouseButtonClicked( int btn, QListViewItem *item, const QPoint &pos, int c )
+void KListView::slotMouseButtonClicked( int btn, Q3ListViewItem *item, const QPoint &pos, int c )
 {
   //qDebug("KListView::slotMouseButtonClicked");
 
-  if( (btn == LeftButton) && item ) {
+  if( (btn == Qt::LeftButton) && item ) {
     //qDebug("KListView::slotMouseButtonClicked: emitExecute");
 
     emitExecute(btn, item, pos, c);
   }
 }
 
@@ -958,31 +973,31 @@ qDebug("KListView::contentsDropEvent drag&drop not supported yet");
     }
   }
 */
   
 }
 
-void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme)
+void KListView::movableDropEvent (Q3ListViewItem* parent, Q3ListViewItem* afterme)
 {
-  QPtrList<QListViewItem> items, afterFirsts, afterNows;
-  QListViewItem *current=currentItem();
+  Q3PtrList<Q3ListViewItem> items, afterFirsts, afterNows;
+  Q3ListViewItem *current=currentItem();
   bool hasMoved=false;
-  for (QListViewItem *i = firstChild(), *iNext=0; i != 0; i = iNext)
+  for (Q3ListViewItem *i = firstChild(), *iNext=0; i != 0; i = iNext)
   {
     iNext=i->itemBelow();
     if (!i->isSelected())
       continue;
 
     // don't drop an item after itself, or else
     // it moves to the top of the list
     if (i==afterme)
       continue;
 
     i->setSelected(false);
 
-    QListViewItem *afterFirst = i->itemAbove();
+    Q3ListViewItem *afterFirst = i->itemAbove();
 
         if (!hasMoved)
         {
                 emit aboutToMove();
                 hasMoved=true;
         }
@@ -997,13 +1012,13 @@ void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme)
     afterFirsts.append (afterFirst);
     afterNows.append (afterme);
 
     afterme = i;
   }
   clearSelection();
-  for (QListViewItem *i=items.first(); i != 0; i=items.next() )
+  for (Q3ListViewItem *i=items.first(); i != 0; i=items.next() )
     i->setSelected(true);
   if (current)
     setCurrentItem(current);
 
   emit moved(items,afterFirsts,afterNows);
 
@@ -1083,20 +1098,20 @@ void KListView::cleanDropVisualizer()
 
 int KListView::depthToPixels( int depth )
 {
     return treeStepSize() * ( depth + (rootIsDecorated() ? 1 : 0) ) + itemMargin();
 }
 
-void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewItem *&after)
+void KListView::findDrop(const QPoint &pos, Q3ListViewItem *&parent, Q3ListViewItem *&after)
 {
   QPoint p (contentsToViewport(pos));
 
   // Get the position to put it in
-  QListViewItem *atpos = itemAt(p);
+  Q3ListViewItem *atpos = itemAt(p);
 
-  QListViewItem *above;
+  Q3ListViewItem *above;
   if (!atpos) // put it at the end
     above = lastItem();
   else
   {
     // Get the closest item before us ('atpos' or the one above, if any)
       if (p.y() - itemRect(atpos).topLeft().y() < (atpos->height()/2))
@@ -1120,14 +1135,14 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte
               return;
           }
       }
 
       // Ok, there's one more level of complexity. We may want to become a new
       // sibling, but of an upper-level group, rather than the "above" item
-      QListViewItem * betterAbove = above->parent();
-      QListViewItem * last = above;
+      Q3ListViewItem * betterAbove = above->parent();
+      Q3ListViewItem * last = above;
       while ( betterAbove )
       {
           // We are allowed to become a sibling of "betterAbove" only if we are
           // after its last child
           if ( last->nextSibling() == 0 )
           {
@@ -1143,27 +1158,27 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte
   }
   // set as sibling
   after = above;
   parent = after ? after->parent() : 0L ;
 }
 
-QListViewItem* KListView::lastChild () const
+Q3ListViewItem* KListView::lastChild () const
 {
-  QListViewItem* lastchild = firstChild();
+  Q3ListViewItem* lastchild = firstChild();
 
   if (lastchild)
         for (; lastchild->nextSibling(); lastchild = lastchild->nextSibling());
 
   return lastchild;
 }
 
-QListViewItem *KListView::lastItem() const
+Q3ListViewItem *KListView::lastItem() const
 {
-  QListViewItem* last = lastChild();
+  Q3ListViewItem* last = lastChild();
 
-  for (QListViewItemIterator it (last); it.current(); ++it)
+  for (Q3ListViewItemIterator it (last); it.current(); ++it)
     last = it.current();
 
   return last;
 }
 
 KLineEdit *KListView::renameLineEdit() const
@@ -1184,18 +1199,18 @@ qDebug("KListView::startDrag drag&drop not supported yet.");
 
   if (drag->drag() && drag->target() != viewport())
     emit moved();
 */    
 }
 
-QDragObject *KListView::dragObject()
+Q3DragObject *KListView::dragObject()
 {
   if (!currentItem())
         return 0;
 
-  return new QStoredDrag("application/x-qlistviewitem", viewport());
+  return new Q3StoredDrag("application/x-qlistviewitem", viewport());
 }
 
 void KListView::setItemsMovable(bool b)
 {
   d->itemsMovable=b;
 }
@@ -1243,25 +1258,25 @@ bool KListView::dropVisualizer() const
 
 void KListView::setDropVisualizer(bool b)
 {
   d->dropVisualizer=b;
 }
 
-QPtrList<QListViewItem> KListView::selectedItems() const
+Q3PtrList<Q3ListViewItem> KListView::selectedItems() const
 {
-  QPtrList<QListViewItem> list;
-  for (QListViewItem *i=firstChild(); i!=0; i=i->itemBelow())
+  Q3PtrList<Q3ListViewItem> list;
+  for (Q3ListViewItem *i=firstChild(); i!=0; i=i->itemBelow())
         if (i->isSelected()) list.append(i);
   return list;
 }
 
 
-void KListView::moveItem(QListViewItem *item, QListViewItem *parent, QListViewItem *after)
+void KListView::moveItem(Q3ListViewItem *item, Q3ListViewItem *parent, Q3ListViewItem *after)
 {
   // sanity check - don't move a item into it's own child structure
-  QListViewItem *i = parent;
+  Q3ListViewItem *i = parent;
   while(i)
     {
       if(i == item)
         return;
       i = i->parent();
     }
@@ -1293,25 +1308,25 @@ qDebug("KListView::contentsDragEnterEvent drag&drop not supported yet.");
 
 void KListView::setDropVisualizerWidth (int w)
 {
   d->mDropVisualizerWidth = w > 0 ? w : 1;
 }
 
-QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent,
-                                    QListViewItem *after)
+QRect KListView::drawDropVisualizer(QPainter *p, Q3ListViewItem *parent,
+                                    Q3ListViewItem *after)
 {
     QRect insertmarker;
 
     if (!after && !parent)
         insertmarker = QRect (0, 0, viewport()->width(), d->mDropVisualizerWidth/2);
     else
     {
         int level = 0;
         if (after)
         {
-            QListViewItem* it = 0L;
+            Q3ListViewItem* it = 0L;
             if (after->isOpen())
             {
                 // Look for the last child (recursively)
                 it = after->firstChild();
                 if (it)
                     while (it->nextSibling() || it->firstChild())
@@ -1335,18 +1350,18 @@ QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent,
         insertmarker.setBottom (insertmarker.bottom() + d->mDropVisualizerWidth/2);
     }
 
     // This is not used anymore, at least by KListView itself (see viewportPaintEvent)
     // Remove for KDE 3.0.
     if (p)
-        p->fillRect(insertmarker, Dense4Pattern);
+        p->fillRect(insertmarker, Qt::Dense4Pattern);
 
     return insertmarker;
 }
 
-QRect KListView::drawItemHighlighter(QPainter *painter, QListViewItem *item)
+QRect KListView::drawItemHighlighter(QPainter *painter, Q3ListViewItem *item)
 {
   QRect r;
 
   if (item)
   {
     r = itemRect(item);
@@ -1373,13 +1388,13 @@ void KListView::cleanItemHighlighter ()
     QRect rect=d->mOldDropHighlighter;
     d->mOldDropHighlighter = QRect();
     viewport()->repaint(rect, true);
   }
 }
 
-void KListView::rename(QListViewItem *item, int c)
+void KListView::rename(Q3ListViewItem *item, int c)
 {
   if (d->renameable.contains(c))
   {
     ensureItemVisible(item);
 //US    d->editor->load(item,c);
 qDebug("KListView::rename has to be verified");  
@@ -1400,13 +1415,13 @@ void KListView::setRenameable (int col, bool yesno)
   if (yesno && d->renameable.find(col)==d->renameable.end())
     d->renameable+=col;
   else if (!yesno && d->renameable.find(col)!=d->renameable.end())
     d->renameable.remove(col);
 }
 
-void KListView::doneEditing(QListViewItem *item, int row)
+void KListView::doneEditing(Q3ListViewItem *item, int row)
 {
   emit itemRenamed(item, item->text(row), row);
   emit itemRenamed(item);
 }
 
 bool KListView::acceptDrag(QDropEvent* e) const
@@ -1444,18 +1459,18 @@ void KListView::setDropHighlighter(bool b)
 
 bool KListView::dropHighlighter() const
 {
         return d->dropHighlighter;
 }
 
-bool KListView::showTooltip(QListViewItem *item, const QPoint &, int column) const
+bool KListView::showTooltip(Q3ListViewItem *item, const QPoint &, int column) const
 {
         return ((tooltip(item, column).length()>0) && (column==tooltipColumn()));
 }
 
-QString KListView::tooltip(QListViewItem *item, int column) const
+QString KListView::tooltip(Q3ListViewItem *item, int column) const
 {
         return item->text(column);
 }
 
 void KListView::setTabOrderedRenaming(bool b)
 {
@@ -1479,13 +1494,13 @@ void KListView::keyPressEvent (QKeyEvent* e)
         {
           emit signalDelete ( );
           return;
         }
 
   if (d->selectionMode != FileManager)
-        QListView::keyPressEvent (e);
+        Q3ListView::keyPressEvent (e);
   else
         fileManagerKeyPressEvent (e);
 }
 
 void KListView::activateAutomaticSelection()
 {
@@ -1510,76 +1525,76 @@ bool KListView::automaticSelection() const
    return d->selectedBySimpleMove;
 }
 
 void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
 {
    //don't care whether it's on the keypad or not
-    int e_state=(e->state() & ~Keypad);
+    int e_state=(e->state() & ~Qt::Keypad);
 
     int oldSelectionDirection(d->selectionDirection);
 
-    if ((e->key()!=Key_Shift) && (e->key()!=Key_Control)
-        && (e->key()!=Key_Meta) && (e->key()!=Key_Alt))
+    if ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control)
+        && (e->key()!=Qt::Key_Meta) && (e->key()!=Qt::Key_Alt))
     {
-       if ((e_state==ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove))
+       if ((e_state==Qt::ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove))
           selectAll(FALSE);
        d->selectionDirection=0;
-       d->wasShiftEvent = (e_state == ShiftButton);
+       d->wasShiftEvent = (e_state == Qt::ShiftButton);
     };
 
-    //d->wasShiftEvent = (e_state == ShiftButton);
+    //d->wasShiftEvent = (e_state == Qt::ShiftButton);
 
 
-    QListViewItem* item = currentItem();
+    Q3ListViewItem* item = currentItem();
     if (item==0) return;
 
-    QListViewItem* repaintItem1 = item;
-    QListViewItem* repaintItem2 = 0L;
-    QListViewItem* visItem = 0L;
+    Q3ListViewItem* repaintItem1 = item;
+    Q3ListViewItem* repaintItem2 = 0L;
+    Q3ListViewItem* visItem = 0L;
 
-    QListViewItem* nextItem = 0L;
+    Q3ListViewItem* nextItem = 0L;
     int items = 0;
 
-    bool shiftOrCtrl((e_state==ControlButton) || (e_state==ShiftButton));
+    bool shiftOrCtrl((e_state==Qt::ControlButton) || (e_state==Qt::ShiftButton));
     int selectedItems(0);
-    for (QListViewItem *tmpItem=firstChild(); tmpItem!=0; tmpItem=tmpItem->nextSibling())
+    for (Q3ListViewItem *tmpItem=firstChild(); tmpItem!=0; tmpItem=tmpItem->nextSibling())
        if (tmpItem->isSelected()) selectedItems++;
 
     if (((selectedItems==0) || ((selectedItems==1) && (d->selectedUsingMouse)))
-        && (e_state==NoButton)
-        && ((e->key()==Key_Down)
-        || (e->key()==Key_Up)
-        || (e->key()==Key_Next)
-        || (e->key()==Key_Prior)
-        || (e->key()==Key_Home)
-        || (e->key()==Key_End)))
+        && (e_state==Qt::NoButton)
+        && ((e->key()==Qt::Key_Down)
+        || (e->key()==Qt::Key_Up)
+        || (e->key()==Qt::Key_Next)
+        || (e->key()==Qt::Key_Prior)
+        || (e->key()==Qt::Key_Home)
+        || (e->key()==Qt::Key_End)))
     {
        d->selectedBySimpleMove=true;
        d->selectedUsingMouse=false;
     }
     else if (selectedItems>1)
        d->selectedBySimpleMove=false;
 
     bool emitSelectionChanged(false);
 
     switch (e->key())
     {
-    case Key_Escape:
+      case Qt::Key_Escape:
        selectAll(FALSE);
        emitSelectionChanged=TRUE;
        break;
 
-    case Key_Space:
+      case Qt::Key_Space:
        //toggle selection of current item
        if (d->selectedBySimpleMove)
           d->selectedBySimpleMove=false;
        item->setSelected(!item->isSelected());
        emitSelectionChanged=TRUE;
        break;
 
-    case Key_Insert:
+      case Qt::Key_Insert:
        //toggle selection of current item and move to the next item
        if (d->selectedBySimpleMove)
        {
           d->selectedBySimpleMove=false;
           if (!item->isSelected()) item->setSelected(TRUE);
        }
@@ -1597,13 +1612,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
           setCurrentItem(nextItem);
        };
        d->selectionDirection=1;
        emitSelectionChanged=TRUE;
        break;
 
-    case Key_Down:
+      case Qt::Key_Down:
        nextItem=item->itemBelow();
        //toggle selection of current item and move to the next item
        if (shiftOrCtrl)
        {
           d->selectionDirection=1;
           if (d->selectedBySimpleMove)
@@ -1630,13 +1645,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
           repaintItem2=nextItem;
           visItem=nextItem;
           setCurrentItem(nextItem);
        };
        break;
 
-    case Key_Up:
+      case Qt::Key_Up:
        nextItem=item->itemAbove();
        d->selectionDirection=-1;
        //move to the prev. item and toggle selection of this one
        // => No, can't select the last item, with this. For symmetry, let's
        // toggle selection and THEN move up, just like we do in down (David)
        if (shiftOrCtrl)
@@ -1665,13 +1680,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
           repaintItem2=nextItem;
           visItem=nextItem;
           setCurrentItem(nextItem);
        };
        break;
 
-    case Key_End:
+      case Qt::Key_End:
        //move to the last item and toggle selection of all items inbetween
        nextItem=item;
        if (d->selectedBySimpleMove)
           item->setSelected(false);
        if (shiftOrCtrl)
           d->selectedBySimpleMove=false;
@@ -1690,13 +1705,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
           }
           nextItem=nextItem->itemBelow();
        }
        emitSelectionChanged=TRUE;
        break;
 
-    case Key_Home:
+      case Qt::Key_Home:
        // move to the first item and toggle selection of all items inbetween
        nextItem = firstChild();
        visItem = nextItem;
        repaintItem2 = visItem;
        if (d->selectedBySimpleMove)
           item->setSelected(false);
@@ -1712,13 +1727,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
           item->setSelected( !item->isSelected() );
        }
        setCurrentItem( firstChild() );
        emitSelectionChanged=TRUE;
        break;
 
-    case Key_Next:
+      case Qt::Key_Next:
        items=visibleHeight()/item->height();
        nextItem=item;
        if (d->selectedBySimpleMove)
           item->setSelected(false);
        if (shiftOrCtrl)
        {
@@ -1748,13 +1763,13 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
              return;
           }
           nextItem=nextItem->itemBelow();
        }
        break;
 
-    case Key_Prior:
+      case Qt::Key_Prior:
        items=visibleHeight()/item->height();
        nextItem=item;
        if (d->selectedBySimpleMove)
           item->setSelected(false);
        if (shiftOrCtrl)
        {
@@ -1782,31 +1797,31 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e)
              return;
           }
           nextItem=nextItem->itemAbove();
        }
        break;
 
-    case Key_Minus:
+      case Qt::Key_Minus:
        if ( item->isOpen() )
           setOpen( item, FALSE );
        break;
-    case Key_Plus:
+      case Qt::Key_Plus:
        if (  !item->isOpen() && (item->isExpandable() || item->childCount()) )
           setOpen( item, TRUE );
        break;
     default:
-       bool realKey = ((e->key()!=Key_Shift) && (e->key()!=Key_Control)
-                        && (e->key()!=Key_Meta) && (e->key()!=Key_Alt));
+       bool realKey = ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control)
+                        && (e->key()!=Qt::Key_Meta) && (e->key()!=Qt::Key_Alt));
 
        bool selectCurrentItem = (d->selectedBySimpleMove) && (item->isSelected());
        if (realKey && selectCurrentItem)
           item->setSelected(false);
        //this is mainly for the "goto filename beginning with pressed char" feature (aleXXX)
-       QListView::SelectionMode oldSelectionMode = selectionMode();
-       setSelectionMode (QListView::Multi);
-       QListView::keyPressEvent (e);
+       Q3ListView::SelectionMode oldSelectionMode = selectionMode();
+       setSelectionMode (Q3ListView::Multi);
+       Q3ListView::keyPressEvent (e);
        setSelectionMode (oldSelectionMode);
        if (realKey && selectCurrentItem)
        {
           currentItem()->setSelected(true);
           emitSelectionChanged=TRUE;
        }
@@ -1847,17 +1862,17 @@ void KListView::setSelectionModeExt (SelectionModeExt mode)
     switch (mode)
     {
     case Single:
     case Multi:
     case Extended:
     case NoSelection:
-        setSelectionMode (static_cast<QListView::SelectionMode>(static_cast<int>(mode)));
+        setSelectionMode (static_cast<Q3ListView::SelectionMode>(static_cast<int>(mode)));
         break;
 
     case FileManager:
-        setSelectionMode (QListView::Extended);
+        setSelectionMode (Q3ListView::Extended);
         break;
 
     default:
         kdWarning () << "Warning: illegal selection mode " << int(mode) << " set!" << endl;
         break;
     }
@@ -1865,63 +1880,63 @@ void KListView::setSelectionModeExt (SelectionModeExt mode)
 
 KListView::SelectionModeExt KListView::selectionModeExt () const
 {
   return d->selectionMode;
 }
 
-int KListView::itemIndex( const QListViewItem *item ) const
+int KListView::itemIndex( const Q3ListViewItem *item ) const
 {
     if ( !item )
         return -1;
 
     if ( item == firstChild() )
         return 0;
     else {
-        QListViewItemIterator it(firstChild());
+        Q3ListViewItemIterator it(firstChild());
         uint j = 0;
         for (; it.current() && it.current() != item; ++it, ++j );
 
         if( !it.current() )
           return -1;
 
         return j;
     }
 }
 
-QListViewItem* KListView::itemAtIndex(int index)
+Q3ListViewItem* KListView::itemAtIndex(int index)
 {
    if (index<0)
       return 0;
 
    int j(0);
-   for (QListViewItemIterator it=firstChild(); it.current(); it++)
+   for (Q3ListViewItemIterator it=firstChild(); it.current(); it++)
    {
       if (j==index)
          return it.current();
       j++;
    };
    return 0;
 }
 
 
-void KListView::emitContextMenu (KListView*, QListViewItem* i)
+void KListView::emitContextMenu (KListView*, Q3ListViewItem* i)
 {
   QPoint p;
   //    qDebug("KListView::emitContextMenu ");
 
   if (i)
         p = viewport()->mapToGlobal(itemRect(i).center());
   else
         p = mapToGlobal(rect().center());
 
   emit contextMenu (this, i, p);
 }
 
-void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col)
+void KListView::emitContextMenu (Q3ListViewItem* i, const QPoint& p, int col)
 {
-    QListViewItem* item = i;
+    Q3ListViewItem* item = i;
     int c = col;
     // do not trust the values for QListViewItem* i and int col;
     //    qDebug("KListView::emitContextMenu col");
     if ( col == -1 ) {
         QPoint pp =  viewport()->mapFromGlobal(p);
         item = itemAt( pp);
@@ -1930,32 +1945,32 @@ void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col)
     emit contextRequest( item, p,  c );
     emit contextMenu (this, item, p);
 }
 
 void KListView::setAcceptDrops (bool val)
 {
-  QListView::setAcceptDrops (val);
+  Q3ListView::setAcceptDrops (val);
   viewport()->setAcceptDrops (val);
 }
 
 int KListView::dropVisualizerWidth () const
 {
         return d->mDropVisualizerWidth;
 }
 
 
 void KListView::viewportPaintEvent(QPaintEvent *e)
 {
-  QListView::viewportPaintEvent(e);
+  Q3ListView::viewportPaintEvent(e);
 
   if (d->mOldDropVisualizer.isValid() && e->rect().intersects(d->mOldDropVisualizer))
     {
       QPainter painter(viewport());
 
       // This is where we actually draw the drop-visualizer
-      painter.fillRect(d->mOldDropVisualizer, Dense4Pattern);
+      painter.fillRect(d->mOldDropVisualizer, Qt::Dense4Pattern);
     }
   if (d->mOldDropHighlighter.isValid() && e->rect().intersects(d->mOldDropHighlighter))
     {
       QPainter painter(viewport());
 
 qDebug("KListView::viewportPaintEvent has to be verified");  
@@ -1985,39 +2000,39 @@ bool KListView::fullWidth() const
 {
   return d->fullWidth;
 }
 
 int KListView::addColumn(const QString& label, int width)
 {
-  int result = QListView::addColumn(label, width);
+  int result = Q3ListView::addColumn(label, width);
   if (d->fullWidth) {
 //US    header()->setStretchEnabled(false, columns()-2);
 //US    header()->setStretchEnabled(true, columns()-1);
   }
   return result;
 }
 
-int KListView::addColumn(const QIconSet& iconset, const QString& label, int width)
+int KListView::addColumn(const QIcon& iconset, const QString& label, int width)
 {
-  int result = QListView::addColumn(iconset, label, width);
+  int result = Q3ListView::addColumn(iconset, label, width);
   if (d->fullWidth) {
 //US    header()->setStretchEnabled(false, columns()-2);
 //US    header()->setStretchEnabled(true, columns()-1);
   }
   return result;
 }
 
 void KListView::removeColumn(int index)
 {
-  QListView::removeColumn(index);
+  Q3ListView::removeColumn(index);
 //US  if (d->fullWidth && index == columns()) header()->setStretchEnabled(true, columns()-1);
 }
 
 void KListView::viewportResizeEvent(QResizeEvent* e)
 {
-  QListView::viewportResizeEvent(e);
+  Q3ListView::viewportResizeEvent(e);
 }
 
 const QColor &KListView::alternateBackground() const
 {
   return d->alternateBackground;
 }
@@ -2067,77 +2082,77 @@ void KListView::restoreLayout(KConfig *config, const QString &group)
 }
 
 void KListView::setSorting(int column, bool ascending)
 {
   d->sortColumn = column;
   d->sortAscending = ascending;
-  QListView::setSorting(column, ascending);
+  Q3ListView::setSorting(column, ascending);
 }
 
 int KListView::columnSorted(void) const
 {
   return d->sortColumn;
 }
 
 bool KListView::ascendingSort(void) const
 {
   return d->sortAscending;
 }
 
-KListViewItem::KListViewItem(QListView *parent)
-  : QListViewItem(parent)
+KListViewItem::KListViewItem(Q3ListView *parent)
+  : Q3ListViewItem(parent)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListViewItem *parent)
-  : QListViewItem(parent)
+KListViewItem::KListViewItem(Q3ListViewItem *parent)
+  : Q3ListViewItem(parent)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListView *parent, QListViewItem *after)
-  : QListViewItem(parent, after)
+KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after)
+  : Q3ListViewItem(parent, after)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after)
-  : QListViewItem(parent, after)
+KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after)
+  : Q3ListViewItem(parent, after)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListView *parent,
+KListViewItem::KListViewItem(Q3ListView *parent,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListViewItem *parent,
+KListViewItem::KListViewItem(Q3ListViewItem *parent,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListView *parent, QListViewItem *after,
+KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
   init();
 }
 
-KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after,
+KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
-  : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
+  : Q3ListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
   init();
 }
 
 KListViewItem::~KListViewItem()
 {
@@ -2209,18 +2224,18 @@ void KListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, in
         _cg.setBrush(QColorGroup::Base, QBrush(backgroundColor(), *pm));
         QPoint o = p->brushOrigin();
         p->setBrushOrigin( o.x()-listView()->contentsX(), o.y()-listView()->contentsY() );
   }
   else if (isAlternate()) {
 //US       if (listView()->viewport()->backgroundMode()==Qt::FixedColor)
-       if (listView()->viewport()->backgroundMode()==QWidget::PaletteBackground)
+       if (listView()->viewport()->backgroundMode()==Qt::PaletteBackground)
             _cg.setColor(QColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground());
        else
         _cg.setColor(QColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground());
   }
-  QListViewItem::paintCell(p, _cg, column, width, alignment);
+  Q3ListViewItem::paintCell(p, _cg, column, width, alignment);
 }
 
 //US we do not have a "global KDE" variable to setup singleClick functionality
 void KListView::setSingleClick(bool s)
 {
   d->bUseSingle = s;
diff --git a/microkde/kdeui/klistview.h b/microkde/kdeui/klistview.h
index 9f0d9fd..2176525 100644
--- a/microkde/kdeui/klistview.h
+++ b/microkde/kdeui/klistview.h
@@ -17,23 +17,34 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #ifndef KLISTVIEW_H
 #define KLISTVIEW_H
 
-#include <qlistview.h>
-
-#include <qptrlist.h>
+#include <q3listview.h>
+
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QDragLeaveEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QDragEnterEvent>
 
 //US 
 class QDropEvent;
 class QDragLeaveEvent;
 class QDragMoveEvent;
 class QDragEnterEvent;
 
-class QDragObject;
+class Q3DragObject;
 class KConfig;
 class KLineEdit;
 /**
  * This Widget extends the functionality of QListView to honor the system
  * wide settings for Single Click/Double Click mode, AutoSelection and
  * ChangeCursorOverLink (TM).
@@ -54,13 +65,13 @@ class KLineEdit;
  * KListView is drag-enabled, too: to benefit from that you've got derive from it.
  * Reimplement @ref dragObject() and (possibly) @ref startDrag(),
  * and @ref setDragEnabled(true).
  *
  * @version $Id$
  */
-class KListView : public QListView
+class KListView : public Q3ListView
 {
   Q_OBJECT
   Q_ENUMS( SelectionModeExt )
   Q_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth )
   Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable )
   Q_PROPERTY( bool itemsRenameable READ itemsRenameable WRITE setItemsRenameable )
@@ -103,21 +114,21 @@ public:
    *    Additionally the current item is always selected automatically when
    *    navigating using the keyboard, except other items were selected explicitely.
    *
    *   This way e.g. SHIFT+up/PgUp then SHIFT+down/PgDn leaves no item selected
    */
   enum SelectionModeExt {
-        Single = QListView::Single,
-        Multi = QListView::Multi,
-        Extended = QListView::Extended,
-        NoSelection = QListView::NoSelection,
+        Single = Q3ListView::Single,
+        Multi = Q3ListView::Multi,
+        Extended = Q3ListView::Extended,
+        NoSelection = Q3ListView::NoSelection,
         FileManager
   };
   void repaintContents( bool erase = true )
         {
-            QScrollView::repaintContents( contentsX(), contentsY(),
+            Q3ScrollView::repaintContents( contentsX(), contentsY(),
                                           visibleWidth(), visibleHeight(), erase );
         };
   /**
    * Constructor.
    *
    * The parameters @p parent and @p name are handled by
@@ -158,32 +169,32 @@ public:
    */
   bool isExecuteArea( int x );
 
   /**
    * @return a list containing the currently selected items.
    */
-  QPtrList<QListViewItem> selectedItems() const; // ### BIC: KDE 4: use an implicitly shared class! (QValueList?)
+  Q3PtrList<Q3ListViewItem> selectedItems() const; // ### BIC: KDE 4: use an implicitly shared class! (QValueList?)
 
   /**
    * Arbitrarily move @p item to @p parent, positioned immediately after item @p after.
    */
-  void moveItem(QListViewItem *item, QListViewItem *parent, QListViewItem *after);
+  void moveItem(Q3ListViewItem *item, Q3ListViewItem *parent, Q3ListViewItem *after);
 
   /**
    * @return the last item (not child!) of this listview.
    *
    * @see lastChild()
    */
-  QListViewItem *lastItem() const;
+  Q3ListViewItem *lastItem() const;
 
   /**
    * @return the last child of this listview.
    *
    * @see lastItem()
    */
-  QListViewItem* lastChild () const;
+  Q3ListViewItem* lastChild () const;
 
   /**
    * @return the lineedit used for inline renaming.
    * Use that to setup a @ref KCompletion or @ref QValidator for the lineedit
    *
    * @since 3.2
@@ -273,20 +284,20 @@ public:
 
   /**
    * Returns the index of @p item within the item tree or -1 if
    * @p item doesn't exist in this list view. This function takes
    * all items into account not only the visible ones.
    */
-  int itemIndex( const QListViewItem *item ) const;
+  int itemIndex( const Q3ListViewItem *item ) const;
 
   /**
    * Returns the item of @p index within the item tree or 0 if
    * @p index doesn't exist in this list view. This function takes
    * all items into account not only the visible ones.
    */
-  QListViewItem* itemAtIndex(int index);
+  Q3ListViewItem* itemAtIndex(int index);
 
   /**
    * @deprecated
    * @see #setFullWidth()
    */
   void setFullWidth();
@@ -311,13 +322,13 @@ public:
    * @see #removeColumn()
    */
   virtual int addColumn(const QString& label, int width = -1);
   /**
    * Reimplemented for full width support
    */
-  virtual int addColumn(const QIconSet& iconset, const QString& label, int width = -1);
+  virtual int addColumn(const QIcon& iconset, const QString& label, int width = -1);
   /**
    * Reimplemented for full width support
    *
    * @see #addColumn()
    */
   virtual void removeColumn(int index);
@@ -385,26 +396,26 @@ signals:
    * setting the user clicked or double clicked on that item.
    * @param item is the pointer to the executed listview item.
    *
    * Note that you may not delete any @ref QListViewItem objects in slots
    * connected to this signal.
    */
-  void executed( QListViewItem *item );
+  void executed( Q3ListViewItem *item );
 
   /**
    * This signal is emitted whenever the user executes an listview item.
    * That means depending on the KDE wide Single Click/Double Click
    * setting the user clicked or double clicked on that item.
    * @param item is the pointer to the executed listview item.
    * @param pos is the position where the user has clicked
    * @param c is the column into which the user clicked.
    *
    * Note that you may not delete any @ref QListViewItem objects in slots
    * connected to this signal.
    */
-  void executed( QListViewItem *item, const QPoint &pos, int c );
+  void executed( Q3ListViewItem *item, const QPoint &pos, int c );
 
   /**
    * This signal gets emitted whenever the user double clicks into the
    * listview.
    * @param item is the pointer to the clicked listview item.
    * @param pos is the position where the user has clicked, and
@@ -414,26 +425,26 @@ signals:
    * connected to this signal.
    *
    * This signal is more or less here for the sake of completeness.
    * You should normally not need to use this. In most cases its better
    * to use @ref #executed() instead.
    */
-  void doubleClicked( QListViewItem *item, const QPoint &pos, int c );
-  void contextRequest( QListViewItem *item, const QPoint &pos, int c );
+  void doubleClicked( Q3ListViewItem *item, const QPoint &pos, int c );
+  void contextRequest( Q3ListViewItem *item, const QPoint &pos, int c );
 
   /**
    * This signal gets emitted whenever something acceptable is
    * dropped onto the listview.
    *
    * @param e is the drop event itself (it has already been accepted)
    * @param after is the item after which the drop occured (or 0L, if
    * the drop was above all items)
    *
    * @see #acceptDrop()
    */
-  void dropped (QDropEvent * e, QListViewItem *after);
+  void dropped (QDropEvent * e, Q3ListViewItem *after);
 
   /**
    * This signal gets emitted whenever something acceptable is
    * dropped onto the listview.
    *
    * This is an overloaded version of the above (provided to simplify
@@ -441,13 +452,13 @@ signals:
    *
    * @param list is the listview
    * @param e is the drop event itself (it has already been accepted)
    * @param after is the item after which the drop occured (or 0L, if
    * the drop was above all items
    */
-  void dropped (KListView* list, QDropEvent* e, QListViewItem* after);
+  void dropped (KListView* list, QDropEvent* e, Q3ListViewItem* after);
 
   /**
    * This signal gets emitted whenever something acceptable is
    * dropped onto the listview.
    *
    * This function also provides a parent, in the event that your listview
@@ -455,26 +466,26 @@ signals:
    * @param list is the listview
    * @param e is the drop event itself (it has already been accepted)
    * @param parent the item that is to be the parent of the new item
    * @param after is the item after which the drop occured (or 0L, if
    * the drop was above all items
    */
-  void dropped (KListView* list, QDropEvent* e, QListViewItem* parent, QListViewItem* after);
+  void dropped (KListView* list, QDropEvent* e, Q3ListViewItem* parent, Q3ListViewItem* after);
 
   /**
    * This signal gets emitted whenever something acceptable is
    * dropped onto the listview.
    *
    * This function also provides a parent, in the event that your listview
    * is a tree
    * @param e is the drop event itself (it has already been accepted)
    * @param parent the item that is to be the parent of the new item
    * @param after is the item after which the drop occured (or 0L, if
    * the drop was above all items
    */
-  void dropped (QDropEvent* e, QListViewItem* parent, QListViewItem* after);
+  void dropped (QDropEvent* e, Q3ListViewItem* parent, Q3ListViewItem* after);
 
   /**
    * This signal is emitted when ever the user moves an item in the list via
    * DnD.
    * If more than one item is moved at the same time, this signal is only emitted
    * once.
@@ -499,64 +510,64 @@ signals:
    * This differs from @ref moved(), so be careful. All the items will have been
    * moved before @ref moved() is emitted, which is not true in this method. // FIXME
    * @param item the item that was moved
    * @param afterFirst the item that parameter item was in before the move, in the list
    * @param afterNow the item it's currently after.
    */
-  void moved (QListViewItem *item, QListViewItem *afterFirst, QListViewItem *afterNow);
+  void moved (Q3ListViewItem *item, Q3ListViewItem *afterFirst, Q3ListViewItem *afterNow);
 
 
   /**
    * This signal is emitted after all the items have been moved. It reports info for
    * each and every item moved, in order.  The first element in @p items associates
    * with the first of afterFirst and afterNow.
    */
-  void moved(QPtrList<QListViewItem> &items, QPtrList<QListViewItem> &afterFirst, QPtrList<QListViewItem> &afterNow);
+  void moved(Q3PtrList<Q3ListViewItem> &items, Q3PtrList<Q3ListViewItem> &afterFirst, Q3PtrList<Q3ListViewItem> &afterNow);
 
   /**
    * This signal gets emitted when an item is renamed via in-place renaming.
    *
    * @param item is the renamed item.
    * @param str is the new value of column @p col.
    * @param col is the renamed column.
    */
-  void itemRenamed(QListViewItem* item, const QString &str, int col);
+  void itemRenamed(Q3ListViewItem* item, const QString &str, int col);
 
   /**
    * Same as above, but without the extra information.
    */
-  void itemRenamed(QListViewItem* item);
+  void itemRenamed(Q3ListViewItem* item);
   void signalDelete();
 
   /**
    * This signal is emitted when the shortcut key for popup-menus is pressed.
    *
    * Normally you should not use this, just connect a slot to signal
    * @ref contextMenu (KListView*, QListViewItem*, const QPoint&) to correctly
    * handle showing context menus regardless of settings.
    *
    * @param list is this listview.
    * @param item is the @ref currentItem() at the time the key was pressed. May be 0L.
    */
-  void menuShortCutPressed (KListView* list, QListViewItem* item);
+  void menuShortCutPressed (KListView* list, Q3ListViewItem* item);
 
   /**
    * This signal is emitted whenever a context-menu should be shown for item @p i.
    * It automatically adjusts for all settings involved (Menu key, showMenuOnPress/Click).
    *
    * @param l is this listview.
    * @param i is the item for which the menu should be shown. May be 0L.
    * @param p is the point at which the menu should be shown.
    */
-  void contextMenu (KListView* l, QListViewItem* i, const QPoint& p);
+  void contextMenu (KListView* l, Q3ListViewItem* i, const QPoint& p);
 
 public slots:
   /**
    * Rename column @p c of @p item.
    */
-  virtual void rename(QListViewItem *item, int c);
+  virtual void rename(Q3ListViewItem *item, int c);
 
   /**
    * By default, if you called setItemsRenameable(true),
    * only the first column is renameable.
    * Use this function to enable the feature on other columns.
    *
@@ -670,13 +681,13 @@ protected:
    * It differs from the above only in what arguments it takes.
    *
    * @param i the item whose rect() is passed to the above function.
    * @param p is translated from contents coordinates to viewport coordinates
    * before being passed to the above function.
    */
-  inline bool below (QListViewItem* i, const QPoint& p)
+  inline bool below (Q3ListViewItem* i, const QPoint& p)
   {
         return below (itemRect(i), contentsToViewport(p));
   }
 
   /**
    * Reimplemented to reload the alternate background in palette changes.
@@ -686,13 +697,13 @@ protected:
 
   /**
    * Emit signal @ref #executed.
    * @internal
    */
   //US I added buttonstate to pass the current keyboard status 
-  void emitExecute( int buttonstate, QListViewItem *item, const QPoint &pos, int c);
+  void emitExecute( int buttonstate, Q3ListViewItem *item, const QPoint &pos, int c);
 
   /**
    * Reimplemented for internal reasons.
    * Further reimplementations should call this function or else
    * some features may not work correctly.
    *
@@ -718,18 +729,18 @@ protected:
    */
   virtual void leaveEvent( QEvent *e );
 
   /**
    * @return the tooltip for @p column of @p item.
    */
-  virtual QString tooltip(QListViewItem* item, int column) const;
+  virtual QString tooltip(Q3ListViewItem* item, int column) const;
 
   /**
    * @return whether the tooltip for @p column of @p item shall be shown at point @p pos.
    */
-  virtual bool showTooltip(QListViewItem *item, const QPoint &pos, int column) const;
+  virtual bool showTooltip(Q3ListViewItem *item, const QPoint &pos, int column) const;
 
   /**
    * Reimplemented for internal reasons.
    * Further reimplementations should call this function or else
    * some features may not work correctly.
    *
@@ -802,13 +813,13 @@ protected:
 
   /**
    * @return a dragobject encoding the current selection.
    *
    * @see setDragEnabled()
    */
-  virtual QDragObject *dragObject();
+  virtual Q3DragObject *dragObject();
 
   /**
    * @return true if the @p event provides some acceptable
    * format.
    * A common mistake is to forget the "const" in your reimplementation
    */
@@ -818,21 +829,21 @@ protected:
    * Paint the drag line. If painter is null, don't try to :)
    *
    * If after == 0 then the marker should be drawn at the top.
    *
    * @return the rectangle that you painted to.
    */
-  virtual QRect drawDropVisualizer (QPainter *p, QListViewItem *parent, QListViewItem *after);
+  virtual QRect drawDropVisualizer (QPainter *p, Q3ListViewItem *parent, Q3ListViewItem *after);
 
   /**
    * Paint the drag rectangle. If painter is null, don't try to :)
    *
    *
    * @return the rectangle that you painted to.
    */
-  virtual QRect drawItemHighlighter(QPainter *painter, QListViewItem *item);
+  virtual QRect drawItemHighlighter(QPainter *painter, Q3ListViewItem *item);
 
   /**
    * This method calls @ref dragObject() and starts the drag.
    *
    * Reimplement it to do fancy stuff like setting a pixmap or
    * using a non-default DragMode
@@ -883,14 +894,14 @@ protected slots:
   /**
    * Update internal settings whenever the global ones change.
    * @internal
    */
   void slotSettingsChanged(int);
 
-  void slotMouseButtonClicked( int btn, QListViewItem *item, const QPoint &pos, int c );
-  void doneEditing(QListViewItem *item, int row);
+  void slotMouseButtonClicked( int btn, Q3ListViewItem *item, const QPoint &pos, int c );
+  void doneEditing(Q3ListViewItem *item, int row);
 
   /**
    * Repaint the rect where I was drawing the drop line.
    */
   void cleanDropVisualizer();
 
@@ -899,24 +910,24 @@ protected slots:
    */
   void cleanItemHighlighter();
 
   /**
    * Emit the @ref contextMenu signal. This slot is for mouse actions.
    */
-  void emitContextMenu (QListViewItem*, const QPoint&, int);
+  void emitContextMenu (Q3ListViewItem*, const QPoint&, int);
 
   /**
    * Emit the @ref #contextMenu signal. This slot is for key presses.
    */
-  void emitContextMenu (KListView*, QListViewItem*);
+  void emitContextMenu (KListView*, Q3ListViewItem*);
 
   /**
    * Accessory slot for AutoSelect
    * @internal
    */
-  void slotOnItem( QListViewItem *item );
+  void slotOnItem( Q3ListViewItem *item );
 
   /**
    * Accessory slot for AutoSelect/ChangeCursorOverItem
    * @internal
    */
   void slotOnViewport();
@@ -936,21 +947,21 @@ protected slots:
   void slotHeaderChanged();
 
 protected:
   /**
    * Handle dropEvent when itemsMovable() is set to true.
    */
-  virtual void movableDropEvent (QListViewItem* parent, QListViewItem* afterme);
+  virtual void movableDropEvent (Q3ListViewItem* parent, Q3ListViewItem* afterme);
 
   /**
    * Where is the nearest QListViewItem that I'm going to drop?
    *
    * FIXME KDE 4.0: Make this method const so it can be called from an
    * acceptDrag method without ugly casts
    */
-  virtual void findDrop(const QPoint &pos, QListViewItem *&parent, QListViewItem *&after);
+  virtual void findDrop(const QPoint &pos, Q3ListViewItem *&parent, Q3ListViewItem *&after);
 
   /**
    * A special keyPressEvent (for FileManager selection mode).
    */
   void fileManagerKeyPressEvent (QKeyEvent*);
 
@@ -971,45 +982,45 @@ private:
 /**
  * A listview item with support for alternate background colours. It is
  * a drop-in replacement for @ref QListViewItem
  *
  * @short listview item with alternate background colour support
  */
-class KListViewItem : public QListViewItem
+class KListViewItem : public Q3ListViewItem
 {
 public:
   /**
    * constructors. The semantics remain as in @ref QListViewItem.
    * Although they accept a @ref QListViewItem as parent, please
    * don't mix KListViewItem (or subclasses) with QListViewItem
    * (or subclasses).
    */
-  KListViewItem(QListView *parent);
-  KListViewItem(QListViewItem *parent);
-  KListViewItem(QListView *parent, QListViewItem *after);
-  KListViewItem(QListViewItem *parent, QListViewItem *after);
+  KListViewItem(Q3ListView *parent);
+  KListViewItem(Q3ListViewItem *parent);
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *after);
+  KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after);
 
-  KListViewItem(QListView *parent,
+  KListViewItem(Q3ListView *parent,
     QString, QString = QString::null,
     QString = QString::null, QString = QString::null,
     QString = QString::null, QString = QString::null,
     QString = QString::null, QString = QString::null);
 
-  KListViewItem(QListViewItem *parent,
+  KListViewItem(Q3ListViewItem *parent,
     QString, QString = QString::null,
     QString = QString::null, QString = QString::null,
     QString = QString::null, QString = QString::null,
     QString = QString::null, QString = QString::null);
 
-  KListViewItem(QListView *parent, QListViewItem *after,
+  KListViewItem(Q3ListView *parent, Q3ListViewItem *after,
     QString, QString = QString::null,
     QString = QString::null, QString = QString::null,
     QString = QString::null, QString = QString::null,
     QString = QString::null, QString = QString::null);
 
-  KListViewItem(QListViewItem *parent, QListViewItem *after,
+  KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after,
     QString, QString = QString::null,
     QString = QString::null, QString = QString::null,
     QString = QString::null, QString = QString::null,
     QString = QString::null, QString = QString::null);
 
   virtual ~KListViewItem();
diff --git a/microkde/kdeui/kmainwindow.cpp b/microkde/kdeui/kmainwindow.cpp
index fa678f2..bac0db8 100644
--- a/microkde/kdeui/kmainwindow.cpp
+++ b/microkde/kdeui/kmainwindow.cpp
@@ -18,18 +18,24 @@
 
      You should have received a copy of the GNU Library General Public License
      along with this library; see the file COPYING.LIB.  If not, write to
      the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
  */
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qstringlist.h>
 #include <qtimer.h>
 #include <qmenubar.h>
 #include <qstatusbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QChildEvent>
+#include <Q3PtrList>
 
  
 #include "kdebug.h"
 #include "kmainwindow.h"
 #include "kglobalsettings.h"
 #include "kactioncollection.h"
@@ -51,13 +57,13 @@ public:
     QRect defaultWindowSize;
 };
 
 static bool no_query_exit = false;
 
 KMainWindow::KMainWindow( QWidget* parent, const char *name )
-    : QMainWindow( parent, name ) /*LR, f ) with the default widget flag we cannot have fastload */ /*US, KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )*/
+    : Q3MainWindow( parent, name ) /*LR, f ) with the default widget flag we cannot have fastload */ /*US, KXMLGUIBuilder( this ), helpMenu2( 0 ), factory_( 0 )*/
 {
     mQToolBar = 0;
     initKMainWindow(name);
 }
 
 void KMainWindow::parseGeometry(bool parsewidth)
@@ -273,13 +279,13 @@ void KMainWindow::setCaption( const QString &caption, bool modified )
 //US    setPlainCaption( kapp->makeStdCaption(caption, true, modified) );
     setPlainCaption( caption + "modified:" );
 }
 
 void KMainWindow::setPlainCaption( const QString &caption )
 {
-    QMainWindow::setCaption( caption );
+    Q3MainWindow::setCaption( caption );
 #ifndef Q_WS_QWS
 //US the following is disabled for the embedded version
 //US    NETWinInfo info( qt_xdisplay(), winId(), qt_xrootwin(), 0 );
 //US    info.setName( caption.utf8().data() );
 #endif
 }
@@ -418,16 +424,16 @@ void KMainWindow::createStandardStatusBarAction(){
     connect(d->showStatusBarAction, SIGNAL(toggled(bool)), statusBar(), SLOT(setShown(bool)));
     if(internalStatusBar())
       d->showStatusBarAction->setChecked(!internalStatusBar()->isHidden());
   }
 }
 
-QToolBar *KMainWindow::tBar(  )
+Q3ToolBar *KMainWindow::tBar(  )
 {
     if  ( ! mQToolBar )
-      mQToolBar =   new QToolBar( this );
+      mQToolBar =   new Q3ToolBar( this );
     return mQToolBar;
 }
 
 KToolBar *KMainWindow::toolBar( const char * name )
 {
    
@@ -440,39 +446,40 @@ KToolBar *KMainWindow::toolBar( const char * name )
 
 /*US
     if ( builderClient() )
         return new KToolBar(this, name, honor_mode); // XMLGUI constructor
     else
 */    
-      return new KToolBar(this, Top, false, name, honor_mode ); // non-XMLGUI
+      return new KToolBar(this, Qt::Top, false, name, honor_mode ); // non-XMLGUI
 }
 
-QPtrListIterator<KToolBar> KMainWindow::toolBarIterator()
+Q3PtrListIterator<KToolBar> KMainWindow::toolBarIterator()
 {
     toolbarList.clear();
-    QPtrList<QToolBar> lst;
-    for ( int i = (int)QMainWindow::Unmanaged; i <= (int)Minimized; ++i ) {
-        lst = toolBars( (ToolBarDock)i );
-        for ( QToolBar *tb = lst.first(); tb; tb = lst.next() ) {
+    QList<Q3ToolBar*> lst;
+    for ( int i = (int)Qt::Unmanaged; i <= (int)Qt::Minimized; ++i ) {
+        lst = toolBars( (Qt::ToolBarDock)i );
+        for(QList<Q3ToolBar*>::iterator i=lst.begin();i!=lst.end();++i) {
+            Q3ToolBar *tb = *i;
             if ( !tb->inherits( "KToolBar" ) )
                 continue;
             toolbarList.append( (KToolBar*)tb );
         }
     }
-    return QPtrListIterator<KToolBar>( toolbarList );
+    return Q3PtrListIterator<KToolBar>( toolbarList );
 }
 
 void KMainWindow::setAutoSaveSettings( const QString & groupName, bool saveWindowSize )
 {
     d->autoSaveSettings = true;
     d->autoSaveGroup = groupName;
     d->autoSaveWindowSize = saveWindowSize;
     // Get notified when the user moves a toolbar around
 //US    connect( this, SIGNAL( dockWindowPositionChanged( QDockWindow * ) ),
 //US             this, SLOT( setSettingsDirty() ) );
-    connect( this, SIGNAL( toolBarPositionChanged(QToolBar *) ),
+    connect( this, SIGNAL( toolBarPositionChanged(Q3ToolBar *) ),
              this, SLOT( setSettingsDirty() ) );
 
              
     // Get default values
 //US    int scnum = QApplication::desktop()->screenNumber(parentWidget());
 //US    QRect desk = QApplication::desktop()->screenGeometry(scnum);
@@ -500,13 +507,13 @@ QString KMainWindow::autoSaveGroup() const
 {
     return d->autoSaveGroup;
 }
 
 void KMainWindow::saveAutoSaveSettings()
 {
-    ASSERT( d->autoSaveSettings );
+    Q_ASSERT( d->autoSaveSettings );
     //kdDebug(200) << "KMainWindow::saveAutoSaveSettings -> saving settings" << endl;
     saveMainWindowSettings( KGlobal::config(), d->autoSaveGroup );
     KGlobal::config()->sync();
     d->settingsDirty = false;
     if ( d->settingsTimer )
         d->settingsTimer->stop();
@@ -636,13 +643,13 @@ void KMainWindow::saveMainWindowSettings(KConfig *config, const QString &configG
         else
           config->deleteEntry(QString::fromLatin1("MenuBar"));
     }
 
     int n = 1; // Toolbar counter. toolbars are counted from 1,
     KToolBar *toolbar = 0;
-    QPtrListIterator<KToolBar> it( toolBarIterator() );
+    Q3PtrListIterator<KToolBar> it( toolBarIterator() );
     while ( ( toolbar = it.current() ) ) {
         ++it;
         QString group;
         if (!configGroup.isEmpty())
         {
            // Give a number to the toolbar, but prefer a name if there is one,
@@ -711,25 +718,27 @@ void KMainWindow::applyMainWindowSettings(KConfig *config, const QString &config
 
     QMenuBar* mb = internalMenuBar();
     if (mb) {
         entryList.clear();
 //US        i = config->readListEntry (QString::fromLatin1("MenuBar"), entryList, ';');
         entryList = config->readListEntry (QString::fromLatin1("MenuBar"));
-        entry = entryList.first();
-        if (entry==QString::fromLatin1("Disabled"))
-        {
-            mb->hide(); 
-        } else
-        {
-            mb->show();
-        }
+        if(!entryList.empty()) {
+            entry = entryList.first();
+            if (entry==QString::fromLatin1("Disabled"))
+            {
+                mb->hide(); 
+            } else
+            {
+                mb->show();
+            }
+        }
     }
 
         int n = 1; // Toolbar counter. toolbars are counted from 1,
         KToolBar *toolbar;
-        QPtrListIterator<KToolBar> it( toolBarIterator() ); // must use own iterator
+        Q3PtrListIterator<KToolBar> it( toolBarIterator() ); // must use own iterator
 
         for ( ; it.current(); ++it) {
             toolbar= it.current();
             QString group;
             if (!configGroup.isEmpty())
             {
@@ -753,13 +762,13 @@ void KMainWindow::finalizeGUI( bool force )
     // of the other toolbars, so in theory it should be called only once per
     // toolbar, but in increasing order of indexes.
     // Since we can't do that immediately, we move them, and _then_
     // we call positionYourself again for each of them, but this time
     // the toolbariterator should give them in the proper order.
     // Both the XMLGUI and applySettings call this, hence "force" for the latter.
-    QPtrListIterator<KToolBar> it( toolBarIterator() );
+    Q3PtrListIterator<KToolBar> it( toolBarIterator() );
     for ( ; it.current() ; ++ it )
             it.current()->positionYourself( force );
 
     d->settingsDirty = false;
 }
 
@@ -848,13 +857,13 @@ QString KMainWindow::settingsGroup() const
 }
 
 void KMainWindow::resizeEvent( QResizeEvent * e)
 {
     if ( d->autoSaveWindowSize )
         setSettingsDirty(); 
-    QMainWindow::resizeEvent( e ); 
+    Q3MainWindow::resizeEvent( e ); 
 }
 
 bool KMainWindow::hasMenuBar()
 {
         return (internalMenuBar());
 }
@@ -866,13 +875,13 @@ QMenuBar *KMainWindow::menuBar()
     QMenuBar * mb = internalMenuBar();
     if ( !mb ) {
 //US        mb = new KMenuBar( this );
         mb = new QMenuBar( this );
         // trigger a re-layout and trigger a call to the private
         // setMenuBar method.
-        QMainWindow::menuBar();
+        Q3MainWindow::menuBar();
     }
     return mb;
 }
 
 //US KStatusBar *KMainWindow::statusBar()
 QStatusBar *KMainWindow::statusBar()
@@ -881,13 +890,13 @@ QStatusBar *KMainWindow::statusBar()
     QStatusBar * sb = internalStatusBar();
     if ( !sb ) {
 //US        sb = new KStatusBar( this );
         sb = new QStatusBar( this );
         // trigger a re-layout and trigger a call to the private
         // setStatusBar method.
-        QMainWindow::statusBar();
+        Q3MainWindow::statusBar();
     }
     return sb;
 }
 
 void KMainWindow::shuttingDown()
 {
@@ -905,48 +914,36 @@ void KMainWindow::shuttingDown()
 }
 
 //US KMenuBar *KMainWindow::internalMenuBar()
 QMenuBar *KMainWindow::internalMenuBar()
 {
 //US    QObjectList *l = queryList( "KMenuBar", 0, false, false );
-    QObjectList *l = queryList( "QMenuBar", 0, false, false );
-    if ( !l || !l->first() ) {
-        delete l;
-        return 0;
-    }
-
-//US    KMenuBar *m = (KMenuBar*)l->first();
-    QMenuBar *m = (QMenuBar*)l->first();
-    delete l;
-    return m;
+    QObjectList l = queryList( "QMenuBar", 0, false, false );
+    if(l.empty())
+        return 0;
+    return (QMenuBar*)l.front();
 }
 
 //US KStatusBar *KMainWindow::internalStatusBar()
 QStatusBar *KMainWindow::internalStatusBar()
 {
 //US    QObjectList *l = queryList( "KStatusBar", 0, false, false );
-    QObjectList *l = queryList( "QStatusBar", 0, false, false );
-    if ( !l || !l->first() ) {
-        delete l;
-        return 0;
-    }
-
-//US    KStatusBar *s = (KStatusBar*)l->first();
-    QStatusBar *s = (QStatusBar*)l->first();
-    delete l;
-    return s;
+    QObjectList l = queryList( "QStatusBar", 0, false, false );
+    if(l.empty())
+        return 0;
+    return (QStatusBar*)l.front();
 }
 
 void KMainWindow::childEvent( QChildEvent* e)
 {
-    QMainWindow::childEvent( e );
+    Q3MainWindow::childEvent( e );
 }
 
 void KMainWindow::paintEvent( QPaintEvent * e)
 {
-    QMainWindow::paintEvent( e );
+    Q3MainWindow::paintEvent( e );
 }
 
 QSize KMainWindow::sizeForCentralWidgetSize(QSize size)
 {
     KToolBar *tb = (KToolBar*)child( "mainToolBar", "KToolBar" );
     if (tb && !tb->isHidden()) {
diff --git a/microkde/kdeui/kmainwindow.h b/microkde/kdeui/kmainwindow.h
index 2dc8033..a3ac82f 100644
--- a/microkde/kdeui/kmainwindow.h
+++ b/microkde/kdeui/kmainwindow.h
@@ -1,6 +1,11 @@
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QChildEvent>
+#include <QCloseEvent>
+#include <QPaintEvent>
 /*
     This file is part of the KDE libraries
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License version 2 as published by the Free Software Foundation.
@@ -47,18 +52,18 @@ class QStatusBar;
 class KMainWindowPrivate;
 class KAction;
 
 #include <ktoolbar.h>
 #include <ktoolbarhandler.h>
 #include <kxmlguiclient.h>
-#include <qmainwindow.h>
-#include <qptrlist.h>
+#include <q3mainwindow.h>
+#include <q3ptrlist.h>
 
 class KActionCollection;
 
-class KMainWindow : public QMainWindow, virtual public KXMLGUIClient
+class KMainWindow : public Q3MainWindow, virtual public KXMLGUIClient
 {
   Q_OBJECT
 
 private:
 //US create private defaultconstructor
     KMainWindow() {;};
@@ -317,18 +322,18 @@ public:
      *             specified "mainToolBar" is assumed.
      *
      * @return A pointer to the toolbar
      **/
     KToolBar *toolBar( const char *name=0 );
     // method for getting rid of KDE-Crap
-    QToolBar *tBar( );
+    Q3ToolBar *tBar( );
 
     /**
      * @return An iterator over the list of all toolbars for this window.
      */
-    QPtrListIterator<KToolBar> toolBarIterator();
+    Q3PtrListIterator<KToolBar> toolBarIterator();
 
     /**
      * @return A KAccel instance bound to this mainwindow. Used automatically
      * by KAction to make keybindings work in all cases.
      */
     KAccel *accel();
@@ -755,22 +760,22 @@ private slots:
     */
     void shuttingDown();
 
     void saveAutoSaveSettings();
             
 private:
-    QToolBar * mQToolBar;
+    Q3ToolBar * mQToolBar;
 //US    KMenuBar *internalMenuBar();
     QMenuBar *internalMenuBar();
 //US    KStatusBar *internalStatusBar();
     QStatusBar *internalStatusBar();
     
     KMainWindowPrivate *d;
     void initKMainWindow(const char *name);
 
-    QPtrList<KToolBar> toolbarList;
+    Q3PtrList<KToolBar> toolbarList;
 
 protected:
     virtual void virtual_hook( int id, void* data );
     
 };
 
diff --git a/microkde/kdeui/knuminput.cpp b/microkde/kdeui/knuminput.cpp
index 335d6f4..da01a20 100644
--- a/microkde/kdeui/knuminput.cpp
+++ b/microkde/kdeui/knuminput.cpp
@@ -39,12 +39,15 @@
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qsize.h>
 #include <qslider.h>
 #include <qspinbox.h>
 #include <qstyle.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QEvent>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "knumvalidator.h"
@@ -103,17 +106,17 @@ void KNumInput::setLabel(const QString & label, int a)
         m_label = 0;
         m_alignment = 0;
     }
     else {
         if (m_label) m_label->setText(label);
         else m_label = new QLabel(label, this, "KNumInput::QLabel");
-        m_label->setAlignment((a & (~(AlignTop|AlignBottom|AlignVCenter)))
-                              | AlignVCenter);
+        m_label->setAlignment((a & (~(Qt::AlignTop|Qt::AlignBottom|Qt::AlignVCenter)))
+                              | Qt::AlignVCenter);
         // if no vertical alignment set, use Top alignment
-        if(!(a & (AlignTop|AlignBottom|AlignVCenter)))
-           a |= AlignTop;
+        if(!(a & (Qt::AlignTop|Qt::AlignBottom|Qt::AlignVCenter)))
+           a |= Qt::AlignTop;
         m_alignment = a;
     }
 
     layout(true);
 }
 
@@ -128,13 +131,13 @@ void KNumInput::layout(bool deep)
     int w1 = m_colw1;
     int w2 = m_colw2;
 
     // label sizeHint
     m_sizeLabel = (m_label ? m_label->sizeHint() : QSize(0,0));
 
-    if(m_label && (m_alignment & AlignVCenter))
+    if(m_label && (m_alignment & Qt::AlignVCenter))
         m_colw1 = m_sizeLabel.width() + 4;
     else
         m_colw1 = 0;
 
     // slider sizeHint
     m_sizeSlider = (m_slider ? m_slider->sizeHint() : QSize(0, 0));
@@ -199,26 +202,26 @@ void KNumInput::setSteps(int minor, int major)
 
 // ----------------------------------------------------------------------------
 
 KIntSpinBox::KIntSpinBox(QWidget *parent, const char *name)
     : QSpinBox(0, 99, 1, parent, name)
 {
-    editor()->setAlignment(AlignRight);
+    setAlignment(Qt::AlignRight);
     val_base = 10;
     setValue(0);
 }
 
 KIntSpinBox::~KIntSpinBox()
 {
 }
 
 KIntSpinBox::KIntSpinBox(int lower, int upper, int step, int value, int base,
                          QWidget* parent, const char* name)
     : QSpinBox(lower, upper, step, parent, name)
 {
-    editor()->setAlignment(AlignRight);
+    setAlignment(Qt::AlignRight);
     val_base = base;
     setValue(value);
 }
 
 void KIntSpinBox::setBase(int base)
 {
@@ -240,15 +243,15 @@ int KIntSpinBox::mapTextToValue(bool* ok)
 {
     return cleanText().toInt(ok, val_base);
 }
 
 void KIntSpinBox::setEditFocus(bool mark)
 {
-    editor()->setFocus();
+    setFocus();
     if(mark)
-        editor()->selectAll();
+        selectAll();
 }
 
 
 // ----------------------------------------------------------------------------
 
 class KIntNumInput::KIntNumInputPrivate {
@@ -322,20 +325,20 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
     upper = kMax(upper, lower);
     lower = kMin(upper, lower);
     m_spin->setMinValue(lower);
     m_spin->setMaxValue(upper);
     m_spin->setLineStep(step);
 
-    step = m_spin->lineStep(); // maybe QRangeControl didn't like out lineStep?
+    step = m_spin->singleStep(); // maybe QRangeControl didn't like out lineStep?
 
     if(slider) {
         if (m_slider)
             m_slider->setRange(lower, upper);
         else {
             m_slider = new QSlider(lower, upper, step, m_spin->value(),
-                                   QSlider::Horizontal, this);
+                                   Qt::Horizontal, this);
             m_slider->setTickmarks(QSlider::Below);
             connect(m_slider, SIGNAL(valueChanged(int)),
                     m_spin, SLOT(setValue(int)));
         }
 
         // calculate (upper-lower)/10 without overflowing int's:
@@ -355,23 +358,23 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
 
     layout(true);
 }
 
 void KIntNumInput::setMinValue(int min)
 {
-    setRange(min, m_spin->maxValue(), m_spin->lineStep(), m_slider);
+    setRange(min, m_spin->maxValue(), m_spin->singleStep(), m_slider);
 }
 
 int KIntNumInput::minValue() const
 {
     return m_spin->minValue();
 }
 
 void KIntNumInput::setMaxValue(int max)
 {
-    setRange(m_spin->minValue(), max, m_spin->lineStep(), m_slider);
+    setRange(m_spin->minValue(), max, m_spin->singleStep(), m_slider);
 }
 
 int KIntNumInput::maxValue() const
 {
     return m_spin->maxValue();
 }
@@ -412,22 +415,22 @@ QSize KIntNumInput::minimumSizeHint() const
     int w;
     int h;
 
     h = 2 + QMAX(m_sizeSpin.height(), m_sizeSlider.height());
 
     // if in extra row, then count it here
-    if(m_label && (m_alignment & (AlignBottom|AlignTop)))
+    if(m_label && (m_alignment & (Qt::AlignBottom|Qt::AlignTop)))
         h += 4 + m_sizeLabel.height();
     else
         // label is in the same row as the other widgets
         h = QMAX(h, m_sizeLabel.height() + 2);
 
     w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
     w += m_colw1 + m_colw2;
 
-    if(m_alignment & (AlignTop|AlignBottom))
+    if(m_alignment & (Qt::AlignTop|Qt::AlignBottom))
         w = QMAX(w, m_sizeLabel.width() + 4);
 
     return QSize(w, h);
 }
 
 void KIntNumInput::doLayout()
@@ -441,29 +444,29 @@ void KIntNumInput::doLayout()
 
 void KIntNumInput::resizeEvent(QResizeEvent* e)
 {
     int w = m_colw1;
     int h = 0;
 
-    if(m_label && (m_alignment & AlignTop)) {
+    if(m_label && (m_alignment & Qt::AlignTop)) {
         m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
         h += m_sizeLabel.height() + 4;
     }
 
-    if(m_label && (m_alignment & AlignVCenter))
+    if(m_label && (m_alignment & Qt::AlignVCenter))
         m_label->setGeometry(0, 0, w, m_sizeSpin.height());
 
     m_spin->setGeometry(w, h, m_slider ? m_colw2 : QMAX(m_colw2, e->size().width() - w), m_sizeSpin.height());
     w += m_colw2 + 8;
 
     if(m_slider)
         m_slider->setGeometry(w, h, e->size().width() - w, m_sizeSpin.height());
 
     h += m_sizeSpin.height() + 2;
 
-    if(m_label && (m_alignment & AlignBottom))
+    if(m_label && (m_alignment & Qt::AlignBottom))
         m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
 }
 
 KIntNumInput::~KIntNumInput()
 {
         delete d;
@@ -643,50 +646,50 @@ QSize KDoubleNumInput::minimumSizeHint() const
     int w;
     int h;
 
     h = 2 + QMAX(m_sizeEdit.height(), m_sizeSlider.height());
 
     // if in extra row, then count it here
-    if(m_label && (m_alignment & (AlignBottom|AlignTop)))
+    if(m_label && (m_alignment & (Qt::AlignBottom|Qt::AlignTop)))
         h += 4 + m_sizeLabel.height();
     else
         // label is in the same row as the other widgets
         h = QMAX(h, m_sizeLabel.height() + 2);
 
     w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
     w += m_colw1 + m_colw2;
 
-    if(m_alignment & (AlignTop|AlignBottom))
+    if(m_alignment & (Qt::AlignTop|Qt::AlignBottom))
         w = QMAX(w, m_sizeLabel.width() + 4);
 
     return QSize(w, h);
 }
 
 void KDoubleNumInput::resizeEvent(QResizeEvent* e)
 {
     int w = m_colw1;
     int h = 0;
 
-    if(m_label && (m_alignment & AlignTop)) {
+    if(m_label && (m_alignment & Qt::AlignTop)) {
         m_label->setGeometry(0, 0, e->size().width(), m_sizeLabel.height());
         h += m_sizeLabel.height() + 4;
     }
 
-    if(m_label && (m_alignment & AlignVCenter))
+    if(m_label && (m_alignment & Qt::AlignVCenter))
         m_label->setGeometry(0, 0, w, m_sizeEdit.height());
 
     d->spin->setGeometry(w, h, m_slider ? m_colw2
                                           : e->size().width() - w, m_sizeEdit.height());
     w += m_colw2 + 8;
 
     if(m_slider)
         m_slider->setGeometry(w, h, e->size().width() - w, m_sizeEdit.height());
 
     h += m_sizeEdit.height() + 2;
 
-    if(m_label && (m_alignment & AlignBottom))
+    if(m_label && (m_alignment & Qt::AlignBottom))
         m_label->setGeometry(0, h, m_sizeLabel.width(), m_sizeLabel.height());
 }
 
 void KDoubleNumInput::doLayout()
 {
     m_sizeEdit = d->spin->sizeHint();
@@ -727,20 +730,20 @@ void KDoubleNumInput::setRange(double lower, double upper, double step,
     if(slider) {
         // upcast to base type to get the min/maxValue in int form:
         QSpinBox * spin = d->spin;
         int slmax = spin->maxValue();
         int slmin = spin->minValue();
         int slvalue = spin->value();
-        int slstep = spin->lineStep();
+        int slstep = spin->singleStep();
         if (m_slider) {
             m_slider->setRange(slmin, slmax);
             m_slider->setLineStep(slstep);
             m_slider->setValue(slvalue);
         } else {
             m_slider = new QSlider(slmin, slmax, slstep, slvalue,
-                                   QSlider::Horizontal, this);
+                                   Qt::Horizontal, this);
             m_slider->setTickmarks(QSlider::Below);
             // feedback line: when one moves, the other moves, too:
             connect(m_slider, SIGNAL(valueChanged(int)),
                     SLOT(sliderMoved(int)) );
         }
         connect(spin, SIGNAL(valueChanged(int)),
@@ -909,23 +912,23 @@ public:
   KDoubleValidator * mValidator;
 };
 
 KDoubleSpinBox::KDoubleSpinBox( QWidget * parent, const char * name )
   : QSpinBox( parent, name )
 {
-  editor()->setAlignment( Qt::AlignRight );
+  setAlignment( Qt::AlignRight );
   d = new Private();
   updateValidator();
 }
 
 KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step,
                                 double value, int precision,
                                 QWidget * parent, const char * name )
   : QSpinBox( parent, name )
 {
-  editor()->setAlignment( Qt::AlignRight );
+  setAlignment( Qt::AlignRight );
   d = new Private();
   setRange( lower, upper, step, precision );
   setValue( value );
   connect( this, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)) );
 }
 
@@ -1024,13 +1027,13 @@ void KDoubleSpinBox::setMaxValue( double value ) {
   if ( !ok ) return;
   base::setMaxValue( max );
   updateValidator();
 }
 
 double KDoubleSpinBox::lineStep() const {
-  return d->mapToDouble( base::lineStep() );
+  return d->mapToDouble( base::singleStep() );
 }
 
 void KDoubleSpinBox::setLineStep( double step ) {
   bool ok = false;
   if ( step > maxValue() - minValue() )
     base::setLineStep( 1 );
@@ -1069,13 +1072,13 @@ void KDoubleSpinBox::slotValueChanged( int value ) {
 }
 
 void KDoubleSpinBox::updateValidator() {
   if ( !d->mValidator ) {
     d->mValidator =  new KDoubleValidator( minValue(), maxValue(), precision(),
                                            this, "d->mValidator" );
-    base::setValidator( d->mValidator );
+    lineEdit()->setValidator( d->mValidator );
   } else
     d->mValidator->setRange( minValue(), maxValue(), precision() );
 }
 
 void KNumInput::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
diff --git a/microkde/kdeui/knuminput.h b/microkde/kdeui/knuminput.h
index 123fefa..9f9e200 100644
--- a/microkde/kdeui/knuminput.h
+++ b/microkde/kdeui/knuminput.h
@@ -26,12 +26,17 @@
 
 #ifndef K_NUMINPUT_H
 #define K_NUMINPUT_H
 
 #include <qwidget.h>
 #include <qspinbox.h>
+#include <QLineEdit>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
+#include <QEvent>
 
 class QLabel;
 class QSlider;
 class QLineEdit;
 class QLayout;
 class QValidator;
@@ -78,13 +83,13 @@ public:
      *
      *     @li @p AlignTop     The label is placed above the edit/slider
      *     @li @p AlignVCenter The label is placed left beside the edit
      *     @li @p AlignBottom  The label is placed below the edit/slider
      *
      */
-    virtual void setLabel(const QString & label, int a = AlignLeft | AlignTop);
+    virtual void setLabel(const QString & label, int a = Qt::AlignLeft | Qt::AlignTop);
 
     /**
      * @return the text of the label.
      */
     QString label() const;
 
@@ -299,13 +304,13 @@ public:
      */
     void setSpecialValueText(const QString& text);
 
     /**
      * @reimplemented
      */
-    virtual void setLabel(const QString & label, int a = AlignLeft | AlignTop);
+    virtual void setLabel(const QString & label, int a = Qt::AlignLeft | Qt::AlignTop);
 
     /**
      * This method returns the minimum size necessary to display the
      * control. The minimum size is enough to show all the labels
      * in the current font (font change may invalidate the return value).
      *
@@ -585,13 +590,13 @@ public:
      */
     void setSpecialValueText(const QString& text);
 
     /**
      * @reimplemented
      */
-    virtual void setLabel(const QString & label, int a = AlignLeft | AlignTop);
+    virtual void setLabel(const QString & label, int a = Qt::AlignLeft | Qt::AlignTop);
     /**
      * @reimplemented
      */
     virtual QSize minimumSizeHint() const;
     /**
      * @reimplemented
@@ -755,12 +760,16 @@ public:
     /**
      * sets focus and optionally marks all text
      *
      */
     void setEditFocus(bool mark);
 
+    void setValidator(const QValidator *v) {
+        lineEdit()->setValidator(v);
+    }
+
 protected:
 
     /**
      *  Overloaded the method in QSpinBox
      *  to make use of the base given in the constructor.
      */
diff --git a/microkde/kdeui/kpopupmenu.cpp b/microkde/kdeui/kpopupmenu.cpp
index 96d2a87..7e1503c 100644
--- a/microkde/kdeui/kpopupmenu.cpp
+++ b/microkde/kdeui/kpopupmenu.cpp
@@ -1,13 +1,16 @@
 
 #include <kpopupmenu.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <QFocusEvent>
+#include <Q3PopupMenu>
 
 
 KPopupMenu::KPopupMenu ( QWidget * parent, const char * name )
-    : QPopupMenu ( parent, name ) {;}
+    : Q3PopupMenu ( parent, name ) {;}
 
 
 
 KMenuBar::KMenuBar ( QWidget * parent, const char * name )
     : QPEMenuBar ( parent, name ) {}
 
diff --git a/microkde/kdeui/kpopupmenu.h b/microkde/kdeui/kpopupmenu.h
index fd00f36..1c903ad 100644
--- a/microkde/kdeui/kpopupmenu.h
+++ b/microkde/kdeui/kpopupmenu.h
@@ -1,18 +1,20 @@
 #ifndef KPOPUPMENU_H
 #define KPOPUPMENU_H
 
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <QFocusEvent>
 #ifdef DESKTOP_VERSION
 #include <qmenubar.h>
 #define QPEMenuBar QMenuBar
 #else
 #include <qpe/qpemenubar.h>
 #endif
 
-class KPopupMenu : public QPopupMenu
+class KPopupMenu : public Q3PopupMenu
 {
 Q_OBJECT
     public:
     KPopupMenu ( QWidget * parent=0, const char * name=0 );
 
 };
diff --git a/microkde/kdeui/kseparator.cpp b/microkde/kdeui/kseparator.cpp
index d028420..66000f0 100644
--- a/microkde/kdeui/kseparator.cpp
+++ b/microkde/kdeui/kseparator.cpp
@@ -15,56 +15,58 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
 
 #include <qstyle.h>
+//Added by qt3to4:
+#include <Q3Frame>
 
 #include <kdebug.h>
 //US #include <kapplication.h>
 
 //US #include "kseparator.moc"
 
 #include "kseparator.h"
 
-KSeparator::KSeparator(QWidget* parent, const char* name, WFlags f)
-   : QFrame(parent, name, f)
+KSeparator::KSeparator(QWidget* parent, const char* name, Qt::WFlags f)
+   : Q3Frame(parent, name, f)
 {
    setLineWidth(1);
    setMidLineWidth(0);
    setOrientation( HLine );
 }
 
 
 
-KSeparator::KSeparator(int orientation, QWidget* parent, const char* name, WFlags f)
-   : QFrame(parent, name, f)
+KSeparator::KSeparator(int orientation, QWidget* parent, const char* name, Qt::WFlags f)
+   : Q3Frame(parent, name, f)
 {
    setLineWidth(1);
    setMidLineWidth(0);
    setOrientation( orientation );
 }
 
 
 
 void KSeparator::setOrientation(int orientation)
 {
    switch(orientation)
    {
-      case Vertical:
+       case Qt::Vertical:
       case VLine:
-         setFrameStyle( QFrame::VLine | QFrame::Sunken );
+         setFrameStyle( Q3Frame::VLine | Q3Frame::Sunken );
          setMinimumSize(2, 0);
          break;
       
       default:
          kdWarning() << "KSeparator::setOrientation(): invalid orientation, using default orientation HLine" << endl;
          
-      case Horizontal:
+      case Qt::Horizontal:
       case HLine:
-         setFrameStyle( QFrame::HLine | QFrame::Sunken );
+         setFrameStyle( Q3Frame::HLine | Q3Frame::Sunken );
          setMinimumSize(0, 2);
          break;
    }
 }
 
 
diff --git a/microkde/kdeui/kseparator.h b/microkde/kdeui/kseparator.h
index 6d2712a..c673475 100644
--- a/microkde/kdeui/kseparator.h
+++ b/microkde/kdeui/kseparator.h
@@ -17,37 +17,37 @@
  *
  */
 
 #ifndef __KSEPARATOR_H__
 #define __KSEPARATOR_H__
 
-#include <qframe.h>
+#include <q3frame.h>
 
 /**
  * Standard horizontal or vertical separator.
  *
  * @author Michael Roth <mroth@wirlweb.de>
  * @version $Id$
 */
-class KSeparator : public QFrame
+class KSeparator : public Q3Frame
 {
   Q_OBJECT
   Q_PROPERTY( int orientation READ orientation WRITE setOrientation )
  public:
   /**
    * Constructor.
    **/
-  KSeparator(QWidget* parent=0, const char* name=0, WFlags f=0);
+  KSeparator(QWidget* parent=0, const char* name=0, Qt::WFlags f=0);
   /**
    * Constructor.
    *
    * @param orientation Set the orientation of the separator.
    * Possible values are HLine or Horizontal and VLine or Vertical.
    **/
   KSeparator(int orientation, QWidget* parent=0, const char* name=0, 
-             WFlags f=0);
+             Qt::WFlags f=0);
   
   /**
    * Returns the orientation of the separator.
    *
    * Possible values are VLine and HLine.
    **/
diff --git a/microkde/kdeui/ksqueezedtextlabel.cpp b/microkde/kdeui/ksqueezedtextlabel.cpp
index 37fa29a..e2c61fd 100644
--- a/microkde/kdeui/ksqueezedtextlabel.cpp
+++ b/microkde/kdeui/ksqueezedtextlabel.cpp
@@ -15,12 +15,15 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
 #include "ksqueezedtextlabel.h"
 #include <qtooltip.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
 KSqueezedTextLabel::KSqueezedTextLabel( const QString &text , QWidget *parent, const char *name )
  : QLabel ( parent, name ) {
   setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ));
   fullText = text;
   squeezeTextToLabel();
diff --git a/microkde/kdeui/ksqueezedtextlabel.h b/microkde/kdeui/ksqueezedtextlabel.h
index 1634adc..487d0b0 100644
--- a/microkde/kdeui/ksqueezedtextlabel.h
+++ b/microkde/kdeui/ksqueezedtextlabel.h
@@ -17,12 +17,14 @@
 */
 
 #ifndef KSQUEEZEDTEXTLABEL_H
 #define KSQUEEZEDTEXTLABEL_H
 
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
 /**
  * A label class that squeezes its text into the label
  *
  * If the text is too long to fit into the label it is divided into
  * remaining left and right parts which are separated by three dots.
diff --git a/microkde/kdeui/kstdaction.cpp b/microkde/kdeui/kstdaction.cpp
index cfd7b54..f0d162d 100644
--- a/microkde/kdeui/kstdaction.cpp
+++ b/microkde/kdeui/kstdaction.cpp
@@ -16,13 +16,13 @@
    Boston, MA 02111-1307, USA.
 */
 
 #include "kstdaction.h"
 
 #include <qtoolbutton.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 
 //US #include <kaboutdata.h>
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 027e5e9..02db316 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -22,28 +22,39 @@
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifdef KDE_USE_FINAL
 #undef Always
-#include <qdockwindow.h>
+#include <q3dockwindow.h>
 #endif
-
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
+#include <QPixmap>
+#include <Q3Frame>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QShowEvent>
+#include <QDesktopWidget>
+#include <QBoxLayout>
 
 
 #include "ktoolbar.h"
 #include "kmainwindow.h"
 
 #include <string.h>
 
 #include <qpainter.h>
 #include <qtooltip.h>
 #include <qdrawutil.h>
 #include <qstring.h>
 #include <qrect.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qtimer.h>
 #include <qstyle.h>
 #include <qapplication.h>
 
 //US #include <config.h>
 
@@ -66,14 +77,14 @@
 
 #include "ktoolbarbutton.h"
 
 //US 
 #include "kconfigbase.h"
 
-#include <qpopupmenu.h>
-#include <qmainwindow.h>
+#include <q3popupmenu.h>
+#include <q3mainwindow.h>
 
 enum {
     CONTEXT_TOP = 0,
     CONTEXT_LEFT = 1,
     CONTEXT_RIGHT = 2,
     CONTEXT_BOTTOM = 3,
@@ -99,13 +110,13 @@ public:
         m_enableContext  = true;
 
         m_xmlguiClient   = 0;
         m_configurePlugged = false;
 
 //US        oldPos = Qt::DockUnmanaged;
-        oldPos = QMainWindow::Unmanaged;
+        oldPos = Qt::Unmanaged;
 
         modified = m_isHorizontal = positioned = FALSE;
 
         HiddenDefault = false;
         IconSizeDefault = 0;
         IconTextDefault = "IconOnly";
@@ -126,60 +137,60 @@ public:
     bool m_configurePlugged : 1;
     bool modified : 1;
     bool positioned : 1;
 
     QWidget *m_parent;
 
-    QMainWindow::ToolBarDock oldPos;
+    Qt::ToolBarDock oldPos;
 
     KXMLGUIClient *m_xmlguiClient;
 
     struct ToolBarInfo
     {
 //US        ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( Qt::DockTop ) {}
-        ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( QMainWindow::Top ) {}
+        ToolBarInfo() : index( 0 ), offset( -1 ), newline( FALSE ), dock( Qt::DockTop ) {}
 //US        ToolBarInfo( Qt::Dock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {}
-        ToolBarInfo( QMainWindow::ToolBarDock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {}
+        ToolBarInfo( Qt::ToolBarDock d, int i, bool n, int o ) : index( i ), offset( o ), newline( n ), dock( d ) {}
         int index, offset;
         bool newline;
 //US        Qt::Dock dock;
-        QMainWindow::ToolBarDock dock;
+        Qt::ToolBarDock dock;
     };
 
     ToolBarInfo toolBarInfo;
-    QValueList<int> iconSizes;
+    Q3ValueList<int> iconSizes;
     QTimer repaintTimer;
 
   // Default Values.
   bool HiddenDefault;
   int IconSizeDefault;
   QString IconTextDefault;
   int IndexDefault;
   bool NewLineDefault;
   int OffsetDefault;
   QString PositionDefault;
 
-   QPtrList<QWidget> idleButtons;
+   Q3PtrList<QWidget> idleButtons;
 };
 
-KToolBarSeparator::KToolBarSeparator(Orientation o , bool l, QToolBar *parent,
+KToolBarSeparator::KToolBarSeparator(Qt::Orientation o , bool l, Q3ToolBar *parent,
                                      const char* name )
-    :QFrame( parent, name ), line( l )
+    :Q3Frame( parent, name ), line( l )
 {
-    connect( parent, SIGNAL(orientationChanged(Orientation)),
-             this, SLOT(setOrientation(Orientation)) );
+    connect( parent, SIGNAL(orientationChanged(Qt::Orientation)),
+             this, SLOT(setOrientation(Qt::Orientation)) );
     setOrientation( o );
     setBackgroundMode( parent->backgroundMode() );
     setBackgroundOrigin( ParentOrigin );
 }
 
-void KToolBarSeparator::setOrientation( Orientation o )
+void KToolBarSeparator::setOrientation( Qt::Orientation o )
 {
     orient = o;
     if ( line ) {
-        if ( orientation() == Vertical )
+        if ( orientation() == Qt::Vertical )
             setFrameStyle( HLine + Sunken );
         else
             setFrameStyle( VLine + Sunken );
     } else {
             setFrameStyle( NoFrame );
     }
@@ -189,54 +200,54 @@ void KToolBarSeparator::styleChange( QStyle& )
 {
     setOrientation( orient );
 }
 
 QSize KToolBarSeparator::sizeHint() const
 {
-    return orientation() == Vertical ? QSize( 0, 6 ) : QSize( 6, 0 );
+    return orientation() == Qt::Vertical ? QSize( 0, 6 ) : QSize( 6, 0 );
 }
 
 QSizePolicy KToolBarSeparator::sizePolicy() const
 {
     return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
 }
 
 KToolBar::KToolBar( QWidget *parent, const char *name, bool honorStyle, bool readConfig )
 #ifdef DESKTOP_VERSION
-    : QToolBar( QString::fromLatin1( name ),
-      parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
+    : Q3ToolBar( QString::fromLatin1( name ),
+      parent && parent->inherits( "Q3MainWindow" ) ? static_cast<Q3MainWindow*>(parent) : 0,
       parent, FALSE,
       name ? name : "mainToolBar")
 #else
-  : QPEToolBar( parent && parent->inherits( "QMainWindow" ) ? static_cast<QMainWindow*>(parent) : 0,
+  : QPEToolBar( parent && parent->inherits( "Q3MainWindow" ) ? static_cast<Q3MainWindow*>(parent) : 0,
                 QString::fromLatin1( name ))
 
 
 #endif
 {
     init( readConfig, honorStyle );
 }
 
-KToolBar::KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
+KToolBar::KToolBar( Q3MainWindow *parentWindow, Qt::ToolBarDock dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
 #ifdef DESKTOP_VERSION
-    : QToolBar( QString::fromLatin1( name ),
+    : Q3ToolBar( QString::fromLatin1( name ),
       parentWindow, dock, newLine,
       name ? name : "mainToolBar")
 #else
   : QPEToolBar( parentWindow,QString::fromLatin1( name ))
 
 
 #endif
 
 {
     init( readConfig, honorStyle );
 }
 
-KToolBar::KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
+KToolBar::KToolBar( Q3MainWindow *parentWindow, QWidget *dock, bool newLine, const char *name, bool honorStyle, bool readConfig )
 #ifdef DESKTOP_VERSION
-    : QToolBar( QString::fromLatin1( name ),
+    : Q3ToolBar( QString::fromLatin1( name ),
       parentWindow, dock, newLine,
       name ? name : "mainToolBar")
 #else
   : QPEToolBar( parentWindow,QString::fromLatin1( name ))
 
 
@@ -277,14 +288,14 @@ void KToolBar::init( bool readConfig, bool honorStyle )
 */
     // finally, read in our configurable settings
     if ( readConfig )
         slotReadConfig();
 
     if ( mainWindow() )
-        connect( mainWindow(), SIGNAL( toolBarPositionChanged( QToolBar * ) ),
-                 this, SLOT( toolBarPosChanged( QToolBar * ) ) );
+        connect( mainWindow(), SIGNAL( toolBarPositionChanged( Q3ToolBar * ) ),
+                 this, SLOT( toolBarPosChanged( Q3ToolBar * ) ) );
 
     // Hack to make sure we recalculate our size when we dock.
 //US    connect( this, SIGNAL(placeChanged(QDockWindow::Place)), SLOT(rebuildLayout()) );
 }
 
 int KToolBar::insertButton(const QString& icon, int id, bool enabled,
@@ -338,25 +349,25 @@ int KToolBar::insertButton(const QPixmap& pixmap, int id, const char *signal,
     connect( button, signal, receiver, slot );
     doConnections( button );
     return index;
 }
 
 
-int KToolBar::insertButton(const QString& icon, int id, QPopupMenu *popup,
+int KToolBar::insertButton(const QString& icon, int id, Q3PopupMenu *popup,
                             bool enabled, const QString &text, int index )
 {
     KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text );
     insertWidgetInternal( button, index, id );
     button->setEnabled( enabled );
     button->setPopup( popup );
     doConnections( button );
     return index;
 }
 
 
-int KToolBar::insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup,
+int KToolBar::insertButton(const QPixmap& pixmap, int id, Q3PopupMenu *popup,
                             bool enabled, const QString &text, int index )
 {
     KToolBarButton *button = new KToolBarButton( pixmap, id, this, 0, text );
     insertWidgetInternal( button, index, id );
     button->setEnabled( enabled );
     button->setPopup( popup );
@@ -537,25 +548,25 @@ void KToolBar::setButtonIcon( int id, const QString& _icon )
 //US    KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
     KToolBarButton * button = (KToolBarButton *)( *it );
     if ( button )
         button->setIcon( _icon );
 }
 
-void KToolBar::setButtonIconSet( int id, const QIconSet& iconset )
+void KToolBar::setButtonIconSet( int id, const QIcon& iconset )
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return;
 //US    KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
     KToolBarButton * button = (KToolBarButton *)( *it );
     if ( button )
         button->setIconSet( iconset );
 }
 
 
-void KToolBar::setDelayedPopup (int id , QPopupMenu *_popup, bool toggle )
+void KToolBar::setDelayedPopup (int id , Q3PopupMenu *_popup, bool toggle )
 {
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return;
 //US    KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
     KToolBarButton * button = (KToolBarButton *)( *it );
@@ -784,13 +795,13 @@ void KToolBar::setItemAutoSized (int id, bool yes )
         setStretchableWidget( w );
 }
 
 
 void KToolBar::clear ()
 {
-    QToolBar::clear();
+    Q3ToolBar::clear();
     widget2id.clear();
     id2widget.clear();
 }
 
 
 void KToolBar::removeItem(int id)
@@ -873,27 +884,27 @@ void KToolBar::enableMoving(bool flag )
 
 void KToolBar::setBarPos (BarPosition bpos)
 {
     if ( !mainWindow() )
         return;
 //US    mainWindow()->moveDockWindow( this, (Dock)bpos );
-    mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos );
+    mainWindow()->moveToolBar( this, (Qt::ToolBarDock)bpos );
 }
 
 
 const KToolBar::BarPosition KToolBar::barPos()
 {
-    if ( !(QMainWindow*)mainWindow() )
+    if ( !(Q3MainWindow*)mainWindow() )
         return KToolBar::Top;
 //US    Dock dock;
-    QMainWindow::ToolBarDock dock;
+    Qt::ToolBarDock dock;
     int dm1, dm2;
     bool dm3;
-    ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 );
+    ((Q3MainWindow*)mainWindow())->getLocation( (Q3ToolBar*)this, dock, dm1, dm3, dm2 );
 //US    if ( dock == DockUnmanaged ) {
-    if ( dock == QMainWindow::Unmanaged ) {
+    if ( dock == Qt::Unmanaged ) {
         return (KToolBar::BarPosition)Top;
     }
     return (BarPosition)dock;
 }
 
 
@@ -964,13 +975,13 @@ void KToolBar::setIconText(IconText icontext, bool update)
 
     if (doUpdate)
         emit modechange(); // tell buttons what happened
 
     // ugly hack to force a QMainWindow::triggerLayout( TRUE )
     if ( mainWindow() ) {
-        QMainWindow *mw = mainWindow();
+        Q3MainWindow *mw = mainWindow();
         mw->setUpdatesEnabled( FALSE );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setUpdatesEnabled( TRUE );
     }
 }
@@ -1001,13 +1012,13 @@ void KToolBar::setIconSize(int size, bool update)
 
     if (doUpdate)
         emit modechange(); // tell buttons what happened
 
     // ugly hack to force a QMainWindow::triggerLayout( TRUE )
     if ( mainWindow() ) {
-        QMainWindow *mw = mainWindow();
+        Q3MainWindow *mw = mainWindow();
         mw->setUpdatesEnabled( FALSE );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setToolBarsMovable( !mw->toolBarsMovable() );
         mw->setUpdatesEnabled( TRUE );
     }
 }
@@ -1059,16 +1070,16 @@ void KToolBar::setItemNoStyle(int id, bool no_style )
 void KToolBar::setFlat (bool flag)
 {
     if ( !mainWindow() )
         return;
     if ( flag )
 //US        mainWindow()->moveDockWindow( this, DockMinimized );
-        mainWindow()->moveToolBar( this, QMainWindow::Minimized );
+        mainWindow()->moveToolBar( this, Qt::Minimized );
     else
 //US        mainWindow()->moveDockWindow( this, DockTop );
-        mainWindow()->moveToolBar( this, QMainWindow::Top );
+        mainWindow()->moveToolBar( this, Qt::Top );
     // And remember to save the new look later
 /*US    
     if ( mainWindow()->inherits( "KMainWindow" ) )
         static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
 */        
 }
@@ -1246,40 +1257,40 @@ void KToolBar::doConnections( KToolBarButton *button )
 }
 
 void KToolBar::mousePressEvent ( QMouseEvent *m )
 {
     if ( !mainWindow() )
         return;
-    QMainWindow *mw = mainWindow();
+    Q3MainWindow *mw = mainWindow();
     if ( mw->toolBarsMovable() && d->m_enableContext ) {
-        if ( m->button() == RightButton ) {
+        if ( m->button() == Qt::RightButton ) {
             int i = contextMenu()->exec( m->globalPos(), 0 );
             switch ( i ) {
             case -1:
                 return; // popup cancelled
             case CONTEXT_LEFT:
 //US                mw->moveDockWindow( this, DockLeft );
-                mw->moveToolBar( this, QMainWindow::Left );
+                mw->moveToolBar( this, Qt::Left );
                 break;
             case CONTEXT_RIGHT:
 //US                mw->moveDockWindow( this, DockRight );
-                mw->moveToolBar( this, QMainWindow::Right );
+                mw->moveToolBar( this, Qt::Right );
                 break;
             case CONTEXT_TOP:
 //US                mw->moveDockWindow( this, DockTop );
-                mw->moveToolBar( this, QMainWindow::Top );
+                mw->moveToolBar( this, Qt::Top );
                 break;
             case CONTEXT_BOTTOM:
 //US                mw->moveDockWindow( this, DockBottom );
-                mw->moveToolBar( this, QMainWindow::Bottom );
+                mw->moveToolBar( this, Qt::Bottom );
                 break;
             case CONTEXT_FLOAT:
                 break;
             case CONTEXT_FLAT:
 //US                mw->moveDockWindow( this, DockMinimized );
-                mw->moveToolBar( this, QMainWindow::Minimized );
+                mw->moveToolBar( this, Qt::Minimized );
                 break;
             case CONTEXT_ICONS:
                 setIconText( IconOnly );
                 break;
             case CONTEXT_TEXTRIGHT:
                 setIconText( IconTextRight );
@@ -1329,13 +1340,13 @@ void KToolBar::rebuildLayout()
         if ( w->inherits( "KToolBarSeparator" ) &&
              !( (KToolBarSeparator*)w )->showLine() ) {
             l->addSpacing( 6 );
             w->hide();
             continue;
         }
-        if ( w->inherits( "QPopupMenu" ) )
+        if ( w->inherits( "Q3PopupMenu" ) )
             continue;
         l->addWidget( w );
         w->show();
     }
     if ( rightAligned ) {
         l->addStretch();
@@ -1361,41 +1372,41 @@ void KToolBar::rebuildLayout()
 void KToolBar::childEvent( QChildEvent *e )
 {
 
     if ( e->child()->isWidgetType() ) {
         QWidget * w = (QWidget*)e->child();
         if ( e->type() == QEvent::ChildInserted ) {
-            if ( !e->child()->inherits( "QPopupMenu" ) &&
+            if ( !e->child()->inherits( "Q3PopupMenu" ) &&
                  ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) {
 
                 // prevent items that have been explicitly inserted by insert*() from
                 // being inserted again
                 if ( !widget2id.contains( w ) )
                 {
                     int dummy = -1;
                     insertWidgetInternal( w, dummy, -1 );
                 }
             }
-        } else {
+        } else if( e->type() == QEvent::ChildRemoved ) {
             removeWidgetInternal( w );
         }
-        if ( isVisibleTo( 0 ) )
+        /* TODO:hacker: if ( isVisibleTo( 0 ) )
         {
             QBoxLayout *l = boxLayout();
             // QLayout *l = layout();
 
             // clear the old layout so that we don't get unnecassery layout
             // changes till we have rebuild the thing
             QLayoutIterator it = l->iterator();
             while ( it.current() ) {
                it.deleteCurrent();
             }
             layoutTimer->start( 50, TRUE );
-        }
+        } */
     }
-    QToolBar::childEvent( e );
+    Q3ToolBar::childEvent( e );
 }
 
 void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id )
 {
     // we can't have it in widgets, or something is really wrong
     //widgets.removeRef( w );
@@ -1413,39 +1424,39 @@ void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id )
     id2widget.insert( id, w );
     widget2id.insert( w, id );
 }
 void KToolBar::repaintMe()
 {
     setUpdatesEnabled( true );
-    QToolBar::repaint( true );
+    Q3ToolBar::repaint( true );
     qDebug(" KToolBar::repaintMe() ");
 }
 
 void KToolBar::showEvent( QShowEvent *e )
 {
     rebuildLayout();
-    QToolBar::showEvent( e );
+    Q3ToolBar::showEvent( e );
 }
 
 void KToolBar::setStretchableWidget( QWidget *w )
 {
-    QToolBar::setStretchableWidget( w );
+    Q3ToolBar::setStretchableWidget( w );
     stretchableWidget = w;
 }
 
 QSizePolicy KToolBar::sizePolicy() const
 {
-    if ( orientation() == Horizontal )
+    if ( orientation() == Qt::Horizontal )
         return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
     else
         return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding );
 }
 
 QSize KToolBar::sizeHint() const
 {  
-    QSize sh = QToolBar::sizeHint();
+    QSize sh = Q3ToolBar::sizeHint();
     //qDebug("%x KToolBar::sizeHint() %d %d ",this, QToolBar::sizeHint().width(),QToolBar::sizeHint().height() );
     if ( sh.height() <= 20 || sh.width() < 60 )
         return QSize(  sizeHintW, sizeHintH );
     KToolBar* ttt =  (KToolBar*) this;
     ttt->sizeHintW = sh.width();
     ttt->sizeHintH = sh.height();
@@ -1505,13 +1516,13 @@ QSize KToolBar::sizeHint() const
        minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ));
 */       
        minSize += QSize(margin*2, margin*2);
        break;
 
      default:
-       minSize = QToolBar::sizeHint();
+       minSize = Q3ToolBar::sizeHint();
        break;
     }
     return minSize;
 #endif
 }
 
@@ -1529,25 +1540,25 @@ bool KToolBar::highlight() const
 {
     return d->m_highlight;
 }
 
 void KToolBar::hide()
 {
-    QToolBar::hide();
+    Q3ToolBar::hide();
 }
 
 void KToolBar::show()
 {
-    QToolBar::show();
+    Q3ToolBar::show();
 }
 
 void KToolBar::resizeEvent( QResizeEvent *e )
 {
     bool b = isUpdatesEnabled();
     setUpdatesEnabled( FALSE );
-    QToolBar::resizeEvent( e );
+    Q3ToolBar::resizeEvent( e );
     if (b)
        d->repaintTimer.start( 100, true );
 }
 
 void KToolBar::slotIconChanged(int group)
 {
@@ -1723,13 +1734,13 @@ void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGr
     // ...and check if the icon size has changed
     if (iconsize != d->m_iconSize) {
         setIconSize(iconsize, false);
         doUpdate = true;
     }
 
-    QMainWindow *mw = mainWindow();
+    Q3MainWindow *mw = mainWindow();
 
     // ...and if we should highlight
     if ( highlight != d->m_highlight ) {
         d->m_highlight = highlight;
         doUpdate = true;
     }
@@ -1802,35 +1813,35 @@ void KToolBar::applySettings(KConfig *config, const QString &_configGroup)
             pos = DockRight;
         else if ( position == "Floating" )
             pos = DockTornOff;
         else if ( position == "Flat" )
             pos = DockMinimized;
 */
-        QMainWindow::ToolBarDock pos(QMainWindow::Top);
+        Qt::ToolBarDock pos(Qt::DockTop);
         if ( position == "Top" )
-            pos = QMainWindow::Top;
+            pos = Qt::Top;
         else if ( position == "Bottom" )
-            pos = QMainWindow::Bottom;
+            pos = Qt::Bottom;
         else if ( position == "Left" )
-            pos = QMainWindow::Left;
+            pos = Qt::Left;
         else if ( position == "Right" )
-            pos = QMainWindow::Right;
+            pos = Qt::Right;
         else if ( position == "Floating" )
-            pos = QMainWindow::TornOff;
+            pos = Qt::TornOff;
         else if ( position == "Flat" )
-            pos = QMainWindow::Minimized;
+            pos = Qt::Minimized;
             
         //kdDebug(220) << "KToolBar::applySettings hidden=" << hidden << endl;
         if (hidden)
             hide();
         else
             show();
 
         if ( mainWindow() )
         {
-            QMainWindow *mw = mainWindow();
+            Q3MainWindow *mw = mainWindow();
 
             //kdDebug(220) << "KToolBar::applySettings updating ToolbarInfo" << endl;
             d->toolBarInfo = KToolBarPrivate::ToolBarInfo( pos, index, newLine, offset );
 
             // moveDockWindow calls QDockArea which does a reparent() on us with
             // showIt = true, so we loose our visibility status
@@ -1859,13 +1870,13 @@ bool KToolBar::event( QEvent *e )
        // it will show() the inserted child and we don't want to
        // do that until we have rebuild the layout.
        childEvent((QChildEvent *)e);
        return true;
     }
 
-    return QToolBar::event( e );
+    return Q3ToolBar::event( e );
 }
 
 void KToolBar::slotRepaint()
 {
     setUpdatesEnabled( FALSE );
     // Send a resizeEvent to update the "toolbar extension arrow"
@@ -1877,20 +1888,20 @@ void KToolBar::slotRepaint()
     QApplication::sendPostedEvents( this, QEvent::LayoutHint );
     //#endif //DESKTOP_VERSION   
     setUpdatesEnabled( TRUE );
     repaint( TRUE );
 }
 
-void KToolBar::toolBarPosChanged( QToolBar *tb )
+void KToolBar::toolBarPosChanged( Q3ToolBar *tb )
 {
     if ( tb != this )
         return;
 //US    if ( d->oldPos == DockMinimized )
-    if ( d->oldPos == QMainWindow::Minimized )
+    if ( d->oldPos == Qt::Minimized )
         rebuildLayout();
-    d->oldPos = (QMainWindow::ToolBarDock)barPos();
+    d->oldPos = (Qt::ToolBarDock)barPos();
 /*US    
     if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) )
         static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
 */        
 }
 
@@ -2028,13 +2039,13 @@ void KToolBar::getAttributes( QString &position, QString &icontext, int &index )
     default:
         position = "Top";
         break;
     }
 
     if ( mainWindow() ) {
-        QMainWindow::ToolBarDock dock;
+        Qt::ToolBarDock dock;
         bool newLine;
         int offset;
         mainWindow()->getLocation( this, dock, index, newLine, offset );
     }
 
     switch (d->m_iconText) {
@@ -2097,58 +2108,58 @@ void KToolBar::positionYourself( bool force )
         hide();
     // This method can only have an effect once - unless force is set
     d->positioned = TRUE;
 }
 
 //US KPopupMenu *KToolBar::contextMenu()
-QPopupMenu *KToolBar::contextMenu()
+Q3PopupMenu *KToolBar::contextMenu()
 {
   if ( context )
     return context;
 
   // Construct our context popup menu. Name it qt_dockwidget_internal so it
   // won't be deleted by QToolBar::clear().
 //US  context = new KPopupMenu( this, "qt_dockwidget_internal" );
-  context = new QPopupMenu( this, "qt_dockwidget_internal" );
+  context = new Q3PopupMenu( this, "qt_dockwidget_internal" );
 //US  context->insertTitle(i18n("Toolbar Menu"));
 
 //US  KPopupMenu *orient = new KPopupMenu( context, "orient" );
-  QPopupMenu *orient = new QPopupMenu( context, "orient" );
+  Q3PopupMenu *orient = new Q3PopupMenu( context, "orient" );
   orient->insertItem( i18n("toolbar position string","Top"),  CONTEXT_TOP );
   orient->insertItem( i18n("toolbar position string","Left"), CONTEXT_LEFT );
   orient->insertItem( i18n("toolbar position string","Right"), CONTEXT_RIGHT );
   orient->insertItem( i18n("toolbar position string","Bottom"), CONTEXT_BOTTOM );
   orient->insertSeparator(-1);
   //orient->insertItem( i18n("toolbar position string","Floating"), CONTEXT_FLOAT );
   orient->insertItem( i18n("min toolbar", "Flat"), CONTEXT_FLAT );
 
 //US  KPopupMenu *mode = new KPopupMenu( context, "mode" );
-  QPopupMenu *mode = new QPopupMenu( context, "mode" );
+  Q3PopupMenu *mode = new Q3PopupMenu( context, "mode" );
   mode->insertItem( i18n("Icons Only"), CONTEXT_ICONS );
   mode->insertItem( i18n("Text Only"), CONTEXT_TEXT );
   mode->insertItem( i18n("Text Alongside Icons"), CONTEXT_TEXTRIGHT );
   mode->insertItem( i18n("Text Under Icons"), CONTEXT_TEXTUNDER );
 
 //US  KPopupMenu *size = new KPopupMenu( context, "size" );
-  QPopupMenu *size = new QPopupMenu( context, "size" );
+  Q3PopupMenu *size = new Q3PopupMenu( context, "size" );
   size->insertItem( i18n("Default"), CONTEXT_ICONSIZES );
   // Query the current theme for available sizes
-  QValueList<int> avSizes;
+  Q3ValueList<int> avSizes;
 /*US  
   KIconTheme *theme = KGlobal::instance()->iconLoader()->theme();
   if (!::qstrcmp(QObject::name(), "mainToolBar"))
       avSizes = theme->querySizes( KIcon::MainToolbar);
   else
       avSizes = theme->querySizes( KIcon::Toolbar);
 */
   avSizes << 16;
   avSizes << 32;
   
   d->iconSizes = avSizes;
 
-  QValueList<int>::Iterator it;
+  Q3ValueList<int>::Iterator it;
   for (it=avSizes.begin(); it!=avSizes.end(); it++) {
       QString text;
       if ( *it < 19 )
           text = i18n("Small (%1x%2)").arg(*it).arg(*it);
       else if (*it < 25)
           text = i18n("Medium (%1x%2)").arg(*it).arg(*it);
@@ -2215,14 +2226,14 @@ void KToolBar::slotContextAboutToShow()
             break;
         case IconTextBottom:
             context->setItemChecked(CONTEXT_TEXTUNDER, true);
             break;
   }
 
-  QValueList<int>::ConstIterator iIt = d->iconSizes.begin();
-  QValueList<int>::ConstIterator iEnd = d->iconSizes.end();
+  Q3ValueList<int>::ConstIterator iIt = d->iconSizes.begin();
+  Q3ValueList<int>::ConstIterator iEnd = d->iconSizes.end();
   for (; iIt != iEnd; ++iIt )
       context->setItemChecked( CONTEXT_ICONSIZES + *iIt, false );
 
   context->setItemChecked( CONTEXT_ICONSIZES, false );
 
   context->setItemChecked( CONTEXT_ICONSIZES + d->m_iconSize, true );
diff --git a/microkde/kdeui/ktoolbar.h b/microkde/kdeui/ktoolbar.h
index 3319fa8..4e00abd 100644
--- a/microkde/kdeui/ktoolbar.h
+++ b/microkde/kdeui/ktoolbar.h
@@ -23,33 +23,41 @@
 
 #ifndef KTOOLBAR_H
 #define KTOOLBAR_H
 
 #ifndef DESKTOP_VERSION
 #define private public
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #undef private
 #include <qpe/qpetoolbar.h>
 #else
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #endif
 
 
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 #include <qcombobox.h>
 #include <qmap.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QResizeEvent>
+#include <Q3PopupMenu>
+#include <QMouseEvent>
+#include <QChildEvent>
+#include <QEvent>
+#include <QShowEvent>
 #include <kglobal.h>
-#include <qguardedptr.h>
-#include <qframe.h>
-#include <qiconset.h>
+#include <qpointer.h>
+#include <q3frame.h>
+#include <qicon.h>
 
 class QDomElement;
 class QSize;
 class QPixmap;
-class QPopupMenu;
+class Q3PopupMenu;
 class QStringList;
 class QDomDocument;
 class QTimer;
 
 class KLineEdit;
 class KToolBar;
@@ -60,28 +68,28 @@ class KToolBoxManager;
 //US class KInstance;
 class KComboBox;
 class KXMLGUIClient;
 
 class KToolBarPrivate;
 
-class KToolBarSeparator : public QFrame
+class KToolBarSeparator : public Q3Frame
 {
     Q_OBJECT
 public:
-    KToolBarSeparator( Orientation, bool l, QToolBar *parent, const char* name=0 );
+    KToolBarSeparator( Qt::Orientation, bool l, Q3ToolBar *parent, const char* name=0 );
 
     QSize sizeHint() const;
-    Orientation orientation() const { return orient; }
+    Qt::Orientation orientation() const { return orient; }
     QSizePolicy sizePolicy() const;
     bool showLine() const { return line; }
 public slots:
-   void setOrientation( Orientation );
+   void setOrientation( Qt::Orientation );
 protected:
     void styleChange( QStyle& );
 private:
-    Orientation orient;
+    Qt::Orientation orient;
     bool line;
 };
 
 
  /**
   * A KDE-style toolbar.
@@ -108,29 +116,29 @@ private:
   */
 
 // strange things are happening ... so I have to use strange define methods ...
 // porting KToolBar back to Qt2 really needs some strange hacks
 
 #ifndef DESKTOP_VERSION
-#define QToolBar QPEToolBar
+#define Q3ToolBar QPEToolBar
 #endif
 
- class KToolBar : public QToolBar
+ class KToolBar : public Q3ToolBar
 {
     Q_OBJECT
 
 
     Q_ENUMS( IconText BarPosition )
      
     Q_PROPERTY( IconText iconText READ iconText WRITE setIconText )
     Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos )
     Q_PROPERTY( bool fullSize READ fullSize WRITE setFullSize )
     Q_PROPERTY( int iconSize READ iconSize WRITE setIconSize )
     Q_PROPERTY( QString text READ text WRITE setText )
 #ifndef DESKTOP_VERSION
-#undef QToolBar
+#undef Q3ToolBar
 #endif    
 public:
     enum IconText{IconOnly = 0, IconTextRight, TextOnly, IconTextBottom};
     /**
      * The state of the status bar.
      * @deprecated
@@ -172,13 +180,13 @@ public:
    * @param dock        The position of the toolbar. Usually QMainWindow::Top.
    * @param newLine     If true, start a new line in the dock for this toolbar.
    * @param name        The standard internal name
    * @param honor_style If true, then global settings for IconSize and IconText will be honored
    * @param readConfig  whether to apply the configuration (global and application-specific)
    */
-    KToolBar( QMainWindow *parentWindow, QMainWindow::ToolBarDock dock /*= QMainWindow::Top*/, bool newLine = false,
+    KToolBar( Q3MainWindow *parentWindow, Qt::ToolBarDock dock /*= QMainWindow::Top*/, bool newLine = false,
               const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
 
   /**
    * Constructor for non-XML-GUI applications.
    *
    * The toolbar will read in various global config settings for
@@ -190,13 +198,13 @@ public:
    * @param dock        Another widget than the mainwindow to dock toolbar to.
    * @param newLine     If true, start a new line in the dock for this toolbar.
    * @param name        The standard internal name
    * @param honor_style If true, then global settings for IconSize and IconText will be honored
    * @param readConfig  whether to apply the configuration (global and application-specific)
    */
-    KToolBar( QMainWindow *parentWindow, QWidget *dock, bool newLine = false,
+    KToolBar( Q3MainWindow *parentWindow, QWidget *dock, bool newLine = false,
               const char *name = 0, bool honor_style = FALSE, bool readConfig = TRUE );
 
     virtual ~KToolBar();
 
   /**
    * Insert a button (a @ref KToolBarButton) with a pixmap.  The
@@ -300,13 +308,13 @@ public:
    * @ref KButton::clicked() or @ref KButton::doubleClicked() are @p not
    * emmited by
    * this button (see @ref setDelayedPopup() for that).
    * You can add custom popups which inherit @ref QPopupMenu to get popups
    * with tables, drawings etc. Just don't fiddle with events there.
    */
-    int insertButton(const QString& icon, int id, QPopupMenu *popup,
+    int insertButton(const QString& icon, int id, Q3PopupMenu *popup,
                      bool enabled, const QString&_text, int index=-1);
 
   /**
    * Inserts a button with popupmenu.
    *
    * Button will have small
@@ -315,13 +323,13 @@ public:
    * @ref KButton::clicked() or @ref KButton::doubleClicked() are @p not
    * emmited by
    * this button (see @ref setDelayedPopup() for that).
    * You can add custom popups which inherit @ref QPopupMenu to get popups
    * with tables, drawings etc. Just don't fiddle with events there.
    */
-    int insertButton(const QPixmap& pixmap, int id, QPopupMenu *popup,
+    int insertButton(const QPixmap& pixmap, int id, Q3PopupMenu *popup,
                      bool enabled, const QString&_text, int index=-1);
 
   /**
    * Inserts a @ref KLineEdit. You have to specify signals and slots to
    * which KLineEdit will be connected. KLineEdit has all slots QLineEdit
    * has, plus signals @ref KLineEdit::completion and @ref KLineEdit::textRotation
@@ -356,13 +364,13 @@ public:
    */
     int insertCombo (const QStringList &list, int id, bool writable,
                      const char *signal, const QObject *receiver,
                      const char *slot, bool enabled=true,
                      const QString& tooltiptext=QString::null,
                      int size=70, int index=-1,
-                     QComboBox::Policy policy = QComboBox::AtBottom);
+                     QComboBox::Policy policy = QComboBox::InsertAtBottom);
 
   /**
    * Insert a @ref KComboBox with text.
    *
    *  The rest is the same as above.
    * @see setItemAutoSized()
@@ -372,13 +380,13 @@ public:
    */
     int insertCombo (const QString& text, int id, bool writable,
                      const char *signal, QObject *recevier,
                      const char *slot, bool enabled=true,
                      const QString& tooltiptext=QString::null,
                      int size=70, int index=-1,
-                     QComboBox::Policy policy = QComboBox::AtBottom);
+                     QComboBox::Policy policy = QComboBox::InsertAtBottom);
 
     /**
      * Inserts a separator into the toolbar with the given id.
      * Returns the separator's index
      */
     int insertSeparator( int index = -1, int id = -1 );
@@ -462,13 +470,13 @@ public:
 
   /**
    * Sets a button icon from a QIconSet.
    *
    * Can be used while button is visible.
    */
-    void setButtonIconSet( int id, const QIconSet& iconset );
+    void setButtonIconSet( int id, const QIcon& iconset );
 
   /**
    * Sets a delayed popup for a button.
    *
    * Delayed popup is what you see in
    * Netscape Navigator's Previous and Next buttons: If you click them you
@@ -488,13 +496,13 @@ public:
    * Don't add delayed popups to buttons which have normal popups.
    *
    * You may add popups which are derived from @ref QPopupMenu. You may
    * add popups that are already in the menu bar or are submenus of
    * other popups.
    */
-    void setDelayedPopup (int id , QPopupMenu *_popup, bool toggle = false);
+    void setDelayedPopup (int id , Q3PopupMenu *_popup, bool toggle = false);
 
   /**
    * Turns a button into an autorepeat button.
    *
    * Toggle buttons, buttons with menus, or
    * buttons with delayed menus cannot be made into autorepeat buttons.
@@ -1057,13 +1065,13 @@ public:
      * @return global setting for "Icon Text"
      */
     static IconText iconTextSetting();
 
 public slots:
     virtual void setIconText( const QString &txt )
-    { QToolBar::setIconText( txt ); }
+    { Q3ToolBar::setIconText( txt ); }
     void slotRepaint();
 
 protected:
     void mousePressEvent( QMouseEvent * );
     void childEvent( QChildEvent *e );
     void showEvent( QShowEvent *e );
@@ -1074,35 +1082,35 @@ protected:
 
 private slots:
     void rebuildLayout();
     void slotReadConfig ();
     void slotAppearanceChanged();
     void slotIconChanged(int);
-    void toolBarPosChanged( QToolBar *tb );
+    void toolBarPosChanged( Q3ToolBar *tb );
     void slotContextAboutToShow();
     void widgetDestroyed();
 
 private: 
     int sizeHintW;
     int sizeHintH;
     void init( bool readConfig = true, bool honorStyle = false );
     void doConnections( KToolBarButton *button );
     void insertWidgetInternal( QWidget *w, int &index, int id );
     void removeWidgetInternal( QWidget *w );
     void getAttributes( QString &position, QString &icontext, int &index );
 //US    KPopupMenu *contextMenu();
-    QPopupMenu *contextMenu();
+    Q3PopupMenu *contextMenu();
 
     QMap<QWidget*, int > widget2id;
     typedef QMap<int, QWidget* > Id2WidgetMap;
     Id2WidgetMap id2widget;
 //US    KPopupMenu *context;
-    QPopupMenu *context;
-    QPtrList<QWidget> widgets;
+    Q3PopupMenu *context;
+    Q3PtrList<QWidget> widgets;
     QTimer *layoutTimer;
-    QGuardedPtr<QWidget> stretchableWidget, rightAligned;
+    QPointer<QWidget> stretchableWidget, rightAligned;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
     KToolBarPrivate *d;
     bool inshutdownprocess;
 };
diff --git a/microkde/kdeui/ktoolbarbutton.cpp b/microkde/kdeui/ktoolbarbutton.cpp
index 1d5d0e5..7b98b32 100644
--- a/microkde/kdeui/ktoolbarbutton.cpp
+++ b/microkde/kdeui/ktoolbarbutton.cpp
@@ -30,28 +30,32 @@
 #include <qstyle.h>
 #include <qimage.h>
 #include <qtimer.h>
 #include <qdrawutil.h>
 #include <qtooltip.h>
 #include <qbitmap.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcursor.h>
 #include <qpainter.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QEvent>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 //US #include <kiconeffect.h>
 #include <kiconloader.h>
 
 // needed to get our instance
 #include <kmainwindow.h>
 
-template class QIntDict<KToolBarButton>;
+template class Q3IntDict<KToolBarButton>;
 
 class KToolBarButtonPrivate
 {
 public:
   KToolBarButtonPrivate()
   {
@@ -112,13 +116,13 @@ KToolBarButton::KToolBarButton( const QString& _icon, int _id,
 
   d->m_id     = _id;
   d->m_parent = (KToolBar*)_parent;
   QToolButton::setTextLabel(_txt);
 //US  d->m_instance = _instance;
 
-  setFocusPolicy( NoFocus );
+  setFocusPolicy( Qt::NoFocus );
 
   // connect all of our slots and start trapping events
   connect(d->m_parent, SIGNAL( modechange() ),
           this,         SLOT( modeChange() ));
 
   connect(this, SIGNAL( clicked() ),
@@ -143,13 +147,13 @@ KToolBarButton::KToolBarButton( const QPixmap& pixmap, int _id,
   d = new KToolBarButtonPrivate;
 
   d->m_id       = _id;
   d->m_parent   = (KToolBar *) _parent;
   QToolButton::setTextLabel(txt);
 
-  setFocusPolicy( NoFocus );
+  setFocusPolicy( Qt::NoFocus );
 
   // connect all of our slots and start trapping events
   connect(d->m_parent, SIGNAL( modechange()),
           this,        SLOT(modeChange()));
 
   connect(this, SIGNAL( clicked() ),
@@ -158,13 +162,13 @@ KToolBarButton::KToolBarButton( const QPixmap& pixmap, int _id,
           this, SLOT( slotPressed() ));
   connect(this, SIGNAL( released() ),
           this, SLOT( slotReleased() ));
   installEventFilter(this);
 
   // set our pixmap and do our initial setup
-  setIconSet( QIconSet( pixmap ));
+  setIconSet( QIcon( pixmap ));
   modeChange();
 }
 
 KToolBarButton::~KToolBarButton()
 {
   delete d; d = 0;
@@ -289,87 +293,87 @@ void KToolBarButton::setIcon( const QString &icon )
 /*US    QToolButton::setIconSet(d->m_instance->iconLoader()->loadIconSet(
         d->m_iconName, KIcon::Toolbar, d->m_iconSize ));
 */        
     QToolButton::setIconSet(KGlobal::iconLoader()->loadIconSet(d->m_iconName));
 }
 
-void KToolBarButton::setIconSet( const QIconSet &iconset )
+void KToolBarButton::setIconSet( const QIcon &iconset )
 {
   QToolButton::setIconSet( iconset );
 }
 
 // remove?
 void KToolBarButton::setPixmap( const QPixmap &pixmap )
 {
   if( pixmap.isNull()) // called by QToolButton
   {
     QToolButton::setPixmap( pixmap );
     return;
   }
-  QIconSet set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Active );
+  QIcon set = iconSet();
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Active );
   QToolButton::setIconSet( set );
 }
 
 void KToolBarButton::setDefaultPixmap( const QPixmap &pixmap )
 {
-  QIconSet set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Normal );
+  QIcon set = iconSet();
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Normal );
   QToolButton::setIconSet( set );
 }
 
 void KToolBarButton::setDisabledPixmap( const QPixmap &pixmap )
 {
-  QIconSet set = iconSet();
-  set.setPixmap( pixmap, QIconSet::Automatic, QIconSet::Disabled );
+  QIcon set = iconSet();
+  set.setPixmap( pixmap, QIcon::Automatic, QIcon::Disabled );
   QToolButton::setIconSet( set );
 }
 
 void KToolBarButton::setDefaultIcon( const QString& icon )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
   QPixmap pm;
   if (!strcmp(d->m_parent->name(), "mainToolBar"))
     pm = /*US d->m_instance->iconLoader()*/KGlobal::iconLoader()->loadIcon( icon, KIcon::MainToolbar,
         d->m_iconSize );
   else
     pm = /*US d->m_instance->iconLoader()*/KGlobal::iconLoader()->loadIcon( icon, KIcon::Toolbar,
         d->m_iconSize );
-  set.setPixmap( pm, QIconSet::Automatic, QIconSet::Normal );
+  set.setPixmap( pm, QIcon::Automatic, QIcon::Normal );
   QToolButton::setIconSet( set );
 }
 
 void KToolBarButton::setDisabledIcon( const QString& icon )
 {
-  QIconSet set = iconSet();
+  QIcon set = iconSet();
   QPixmap pm;
   if (!strcmp(d->m_parent->name(), "mainToolBar"))
     pm = /*US d->m_instance->iconLoader()*/ KGlobal::iconLoader()->loadIcon( icon, KIcon::MainToolbar,
         d->m_iconSize );
   else
     pm = /*US d->m_instance->iconLoader()*/ KGlobal::iconLoader()->loadIcon( icon, KIcon::Toolbar,
         d->m_iconSize );
-  set.setPixmap( pm, QIconSet::Automatic, QIconSet::Disabled );
+  set.setPixmap( pm, QIcon::Automatic, QIcon::Disabled );
   QToolButton::setIconSet( set );
 }
 
-QPopupMenu *KToolBarButton::popup()
+QMenu *KToolBarButton::popup()
 {
   // obsolete
   // KDE4: remove me
   return QToolButton::popup();
 }
 
-void KToolBarButton::setPopup(QPopupMenu *p, bool)
+void KToolBarButton::setPopup(Q3PopupMenu *p, bool)
 {
   QToolButton::setPopup(p);
   QToolButton::setPopupDelay(1);
 }
 
 
-void KToolBarButton::setDelayedPopup (QPopupMenu *p, bool)
+void KToolBarButton::setDelayedPopup (Q3PopupMenu *p, bool)
 {
   QToolButton::setPopup(p);
 //US  QToolButton::setPopupDelay(QApplication::startDragTime());
 }
 
 void KToolBarButton::leaveEvent(QEvent *)
@@ -448,27 +452,33 @@ bool KToolBarButton::eventFilter(QObject *o, QEvent *ev)
   return QToolButton::eventFilter(o, ev);
 }
 
 void KToolBarButton::drawButton( QPainter *_painter )
 {
 #ifdef DESKTOP_VERSION
-  QStyle::SFlags flags   = QStyle::Style_Default;
-  QStyle::SCFlags active = QStyle::SC_None;
+  QStyle::State flags   = QStyle::State_None;
+  QStyle::SubControls active = QStyle::SC_None;
 
   if (isDown()) {
-    flags  |= QStyle::Style_Down;
+    flags  |= QStyle::State_DownArrow;
     active |= QStyle::SC_ToolButton;
   }
-          if (isEnabled()) flags |= QStyle::Style_Enabled;
-          if (isOn())   flags |= QStyle::Style_On;
-          if (isEnabled() && d->m_isRaised)flags |= QStyle::Style_Raised;
-          if (hasFocus())flags |= QStyle::Style_HasFocus;
+          if (isEnabled()) flags |= QStyle::State_Enabled;
+          if (isOn())   flags |= QStyle::State_On;
+          if (isEnabled() && d->m_isRaised)flags |= QStyle::State_Raised;
+          if (hasFocus())flags |= QStyle::State_HasFocus;
+
+  QStyleOptionToolButton qsotb;
+  qsotb.initFrom(this);
+  qsotb.state = flags;
+  qsotb.activeSubControls = active;
+  qsotb.rect = rect();
+  qsotb.palette = palette();
 
   // Draw a styled toolbutton
-  style().drawComplexControl(QStyle::CC_ToolButton, _painter, this, rect(),
-        colorGroup(), flags, QStyle::SC_ToolButton, active, QStyleOption());
+  style()->drawComplexControl(QStyle::CC_ToolButton, &qsotb, _painter, this);
 
 #else
   style().drawToolButton(_painter, rect().x(), rect().y(), rect().width(), rect().height(), colorGroup());
 #endif
   int dx, dy;
   QFont tmp_font(KGlobalSettings::toolBarFont());
@@ -481,15 +491,15 @@ void KToolBarButton::drawButton( QPainter *_painter )
 /*US  
     QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
         isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
                     QIconSet::Disabled,
         isOn() ? QIconSet::On : QIconSet::Off );
 */        
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
-                    QIconSet::Disabled);
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
+                    QIcon::Disabled);
     
     if( !pixmap.isNull())
     {
       dx = ( width() - pixmap.width() ) / 2;
       dy = ( height() - pixmap.height() ) / 2;
       if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
@@ -505,15 +515,15 @@ void KToolBarButton::drawButton( QPainter *_painter )
 /*US    
     QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
         isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
                     QIconSet::Disabled,
         isOn() ? QIconSet::On : QIconSet::Off );
 */        
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
-                    QIconSet::Disabled);
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
+                    QIcon::Disabled);
     
     if( !pixmap.isNull())
     {
       dx = 4;
       dy = ( height() - pixmap.height() ) / 2;
       if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
@@ -523,13 +533,13 @@ void KToolBarButton::drawButton( QPainter *_painter )
       }
       _painter->drawPixmap( dx, dy, pixmap );
     }
 
     if (!textLabel().isNull())
     {
-      textFlags = AlignVCenter|AlignLeft;
+      textFlags = Qt::AlignVCenter|Qt::AlignLeft;
       if (!pixmap.isNull())
         dx = 4 + pixmap.width() + 2;
       else
         dx = 4;
       dy = 0;
       if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
@@ -541,13 +551,13 @@ void KToolBarButton::drawButton( QPainter *_painter )
     }
   }
   else if (d->m_iconText == KToolBar::TextOnly)
   {
     if (!textLabel().isNull())
     {
-      textFlags = AlignVCenter|AlignLeft;
+      textFlags = Qt::AlignVCenter|Qt::AlignLeft;
       dx = (width() - fm.width(textLabel())) / 2;
       dy = (height() - fm.lineSpacing()) / 2;
       if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
       {
         ++dx;
         ++dy;
@@ -560,15 +570,15 @@ void KToolBarButton::drawButton( QPainter *_painter )
 /*US    
     QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
         isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
                     QIconSet::Disabled,
         isOn() ? QIconSet::On : QIconSet::Off );
 */    
-    QPixmap pixmap = iconSet().pixmap( QIconSet::Automatic,
-        isEnabled() ? (d->m_isActive ? QIconSet::Active : QIconSet::Normal) :
-                    QIconSet::Disabled);
+    QPixmap pixmap = iconSet().pixmap( QIcon::Automatic,
+        isEnabled() ? (d->m_isActive ? QIcon::Active : QIcon::Normal) :
+                    QIcon::Disabled);
     
     if( !pixmap.isNull())
     {
       dx = (width() - pixmap.width()) / 2;
       dy = (height() - fm.lineSpacing() - pixmap.height()) / 2;
       if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
@@ -578,13 +588,13 @@ void KToolBarButton::drawButton( QPainter *_painter )
       }
       _painter->drawPixmap( dx, dy, pixmap );
     }
 
     if (!textLabel().isNull())
     {
-      textFlags = AlignBottom|AlignHCenter;
+      textFlags = Qt::AlignBottom|Qt::AlignHCenter;
       dx = (width() - fm.width(textLabel())) / 2;
       dy = height() - fm.lineSpacing() - 4;
 
       if ( isDown() /*US && style().styleHint(QStyle::SH_GUIStyle) == WindowsStyle*/ )
       {
         ++dx;
@@ -607,20 +617,24 @@ void KToolBarButton::drawButton( QPainter *_painter )
       _painter->drawText(textRect, textFlags, textLabel());
   }
 
   if (QToolButton::popup())
   {
 #ifdef DESKTOP_VERSION
-    QStyle::SFlags arrowFlags = QStyle::Style_Default;
+    QStyle::State arrowFlags = QStyle::State_None;
+
+            if (isDown())arrowFlags |= QStyle::State_DownArrow;
+            if (isEnabled()) arrowFlags |= QStyle::State_Enabled;
 
-            if (isDown())arrowFlags |= QStyle::Style_Down;
-            if (isEnabled()) arrowFlags |= QStyle::Style_Enabled;
+    QStyleOption qso;
+    qso.initFrom(this);
+    qso.state = arrowFlags;
+    qso.rect = QRect(width()-7, height()-7, 7, 7);
+    qso.palette = palette();
 
-      style().drawPrimitive(QStyle::PE_ArrowDown, _painter,
-          QRect(width()-7, height()-7, 7, 7), colorGroup(),
-          arrowFlags, QStyleOption() );
+      style()->drawPrimitive(QStyle::PE_IndicatorArrowDown, &qso, _painter);
 #else  
       style().drawArrow(_painter, Qt::DownArrow, isDown(),
           width()-7, height()-7, 7, 7, colorGroup(), isEnabled() );
 #endif
           
   }
diff --git a/microkde/kdeui/ktoolbarbutton.h b/microkde/kdeui/ktoolbarbutton.h
index 9aaa13c..ad02e4e 100644
--- a/microkde/kdeui/ktoolbarbutton.h
+++ b/microkde/kdeui/ktoolbarbutton.h
@@ -23,21 +23,24 @@
 // $Id$
 #ifndef _KTOOLBARBUTTON_H
 #define _KTOOLBARBUTTON_H
 
 #include <qpixmap.h>
 #include <qtoolbutton.h>
-#include <qintdict.h>
+#include <q3intdict.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <Q3PopupMenu>
 #include <kglobal.h>
 
 class KToolBar;
 class KToolBarButtonPrivate;
 //USclass KInstance;
 class QEvent;
-class QPopupMenu;
+class Q3PopupMenu;
 class QPainter;
 
 /**
  * A toolbar button. This is used internally by @ref KToolBar, use the
  * KToolBar methods instead.
  * @internal
@@ -147,13 +150,13 @@ public:
   /**
    * Set the pixmaps for this toolbar button from a QIconSet.
    * If you call this you don't need to call any of the other methods
    * that set icons or pixmaps.
    * @param iconset  The iconset to use
    */
-  virtual void setIconSet( const QIconSet &iconset );
+  virtual void setIconSet( const QIcon &iconset );
 
 #ifndef KDE_NO_COMPAT
   /**
    * @deprecated
    * Set the active icon for this button.  The pixmap itself is loaded
    * internally based on the icon size...  .. the disabled and default
@@ -206,13 +209,13 @@ public:
    */
   void setToggle(bool toggle = true);
 
   /**
    * Return a pointer to this button's popup menu (if it exists)
    */
-  QPopupMenu *popup();
+  QMenu *popup();
 
   /**
    * Returns the button's id.
    * @since 3.2
    */
   int id() const;
@@ -221,24 +224,24 @@ public:
    * Give this button a popup menu.  There will not be a delay when
    * you press the button.  Use @ref setDelayedPopup if you want that
    * behavior. 
    *
    * @param p The new popup menu
    */
-  void setPopup (QPopupMenu *p, bool unused = false);
+  void setPopup (Q3PopupMenu *p, bool unused = false);
 
   /**
    * Gives this button a delayed popup menu.
    *
    * This function allows you to add a delayed popup menu to the button.
    * The popup menu is then only displayed when the button is pressed and
    * held down for about half a second.
    *
    * @param p the new popup menu
    */
-  void setDelayedPopup(QPopupMenu *p, bool unused = false);
+  void setDelayedPopup(Q3PopupMenu *p, bool unused = false);
 
   /**
    * Turn this button into a radio button
    *
    * @param f true or false
    */
@@ -300,13 +303,13 @@ private:
 
 /**
 * List of @ref KToolBarButton objects.
 * @internal
 * @version $Id$
 */
-class KToolBarButtonList : public QIntDict<KToolBarButton>
+class KToolBarButtonList : public Q3IntDict<KToolBarButton>
 {
 public:
    KToolBarButtonList();
    ~KToolBarButtonList() {}
 };
 
diff --git a/microkde/kdeui/ktoolbarhandler.cpp b/microkde/kdeui/ktoolbarhandler.cpp
index 7b97233..4d3ace7 100644
--- a/microkde/kdeui/ktoolbarhandler.cpp
+++ b/microkde/kdeui/ktoolbarhandler.cpp
@@ -15,13 +15,15 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
 #include "ktoolbarhandler.h"
 
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #include <kapplication.h>
 #include <ktoolbar.h>
 #include <kmainwindow.h>
 #include <klocale.h>
 #include <kaction.h>
 #include <assert.h>
@@ -41,13 +43,13 @@ namespace
 
     const char *resourceFileName = "barhandler.rc";
 
     class BarActionBuilder
     {
     public:
-        BarActionBuilder( KActionCollection *actionCollection, KMainWindow *mainWindow, QPtrList<KToolBar> &oldToolBarList )
+        BarActionBuilder( KActionCollection *actionCollection, KMainWindow *mainWindow, Q3PtrList<KToolBar> &oldToolBarList )
             : m_actionCollection( actionCollection ), m_mainWindow( mainWindow ), m_needsRebuild( false )
         {
 /*US        
             QPtrList<QDockWindow> dockWindows = m_mainWindow->dockWindows();
             QPtrListIterator<QDockWindow> dockWindowIt( dockWindows );
             for ( ; dockWindowIt.current(); ++dockWindowIt ) {
@@ -67,42 +69,42 @@ namespace
                 m_needsRebuild = ( oldToolBarList.count() != m_toolBars.count() );
                 
         }
 
         bool needsRebuild() const { return m_needsRebuild; }
 
-        QPtrList<KAction> create()
+        Q3PtrList<KAction> create()
         {
             if ( !m_needsRebuild )
-                return QPtrList<KAction>();
+                return Q3PtrList<KAction>();
 
-            QPtrListIterator<KToolBar> toolBarIt( m_toolBars );
+            Q3PtrListIterator<KToolBar> toolBarIt( m_toolBars );
             for ( ; toolBarIt.current(); ++toolBarIt ) 
                 handleToolBar( toolBarIt.current() );
 
-            QPtrList<KAction> actions;
+            Q3PtrList<KAction> actions;
 
             if ( m_toolBarActions.count() == 0 )
                 return actions;
 
             if ( m_toolBarActions.count() == 1 ) {
                 m_toolBarActions.getFirst()->setText( i18n( "Show Toolbar" ) );
                 return m_toolBarActions;
             }
 
             KActionMenu *menuAction = new KActionMenu( i18n( "Toolbars" ), m_actionCollection, "toolbars_submenu_action" );
 
-            QPtrListIterator<KAction> actionIt( m_toolBarActions );
+            Q3PtrListIterator<KAction> actionIt( m_toolBarActions );
             for ( ; actionIt.current(); ++actionIt )
                 menuAction->insert( actionIt.current() );
 
             actions.append( menuAction );
             return actions;
         }
 
-        const QPtrList<KToolBar> &toolBars() const { return m_toolBars; }
+        const Q3PtrList<KToolBar> &toolBars() const { return m_toolBars; }
 
     private:
         void handleToolBar( KToolBar *toolBar )
         {
             KAction *action = new KToggleToolBarAction( toolBar,
                                                         i18n( "Show %1" ).arg( toolBar->label() ),
@@ -112,14 +114,14 @@ namespace
             m_toolBarActions.append( action );
         }
 
         KActionCollection *m_actionCollection;
         KMainWindow *m_mainWindow;
 
-        QPtrList<KToolBar> m_toolBars; 
-        QPtrList<KAction> m_toolBarActions;
+        Q3PtrList<KToolBar> m_toolBars; 
+        Q3PtrList<KAction> m_toolBarActions;
 
         bool m_needsRebuild : 1;
     };
 }
 
 using namespace KDEPrivate;
@@ -221,13 +223,13 @@ void ToolBarHandler::init( KMainWindow *mainWindow )
     }
 */    
 }
 
 void ToolBarHandler::connectToActionContainers()
 {
-    QPtrListIterator<KAction> actionIt( m_actions );
+    Q3PtrListIterator<KAction> actionIt( m_actions );
     for ( ; actionIt.current(); ++actionIt ) 
         connectToActionContainer( actionIt.current() );
 }
 
 void ToolBarHandler::connectToActionContainer( KAction *action )
 {
@@ -236,13 +238,13 @@ void ToolBarHandler::connectToActionContainer( KAction *action )
         connectToActionContainer( action->container( i ) );
 }
 
 void ToolBarHandler::connectToActionContainer( QWidget *container )
 {
 //US    QPopupMenu *popupMenu = dynamic_cast<QPopupMenu *>( container );
-    QPopupMenu *popupMenu = (QPopupMenu *)( container );
+    Q3PopupMenu *popupMenu = (Q3PopupMenu *)( container );
     if ( !popupMenu )
         return;
 
     connect( popupMenu, SIGNAL( aboutToShow() ),
              this, SLOT( setupActions() ) );
 }
diff --git a/microkde/kdeui/ktoolbarhandler.h b/microkde/kdeui/ktoolbarhandler.h
index a1340ae..35f0d18 100644
--- a/microkde/kdeui/ktoolbarhandler.h
+++ b/microkde/kdeui/ktoolbarhandler.h
@@ -17,14 +17,14 @@
 */
 
 #ifndef KBARHANDLER_H
 #define KBARHANDLER_H
 
 #include <qobject.h>
-#include <qguardedptr.h>
-#include <qptrlist.h>
+#include <qpointer.h>
+#include <q3ptrlist.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
 
 class KMainWindow;
 class KToolBar;
 
@@ -54,15 +54,15 @@ private:
     void connectToActionContainer( KAction *action );
     void connectToActionContainer( QWidget *container );
 
     struct Data;
     Data *d;
 
-    QGuardedPtr<KMainWindow> m_mainWindow;
-    QPtrList<KAction> m_actions;
-    QPtrList<KToolBar> m_toolBars;
+    QPointer<KMainWindow> m_mainWindow;
+    Q3PtrList<KAction> m_actions;
+    Q3PtrList<KToolBar> m_toolBars;
 };
 
 } // namespace KDEPrivate
 
 #endif // KBARHANDLER_H
 
diff --git a/microkde/kdeui/kxmlguiclient.cpp b/microkde/kdeui/kxmlguiclient.cpp
index 073e30b..8740bde 100644
--- a/microkde/kdeui/kxmlguiclient.cpp
+++ b/microkde/kdeui/kxmlguiclient.cpp
@@ -36,12 +36,14 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kapplication.h>
 
 #include <assert.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 class KXMLGUIClientPrivate
 {
 public:
   KXMLGUIClientPrivate()
   {
@@ -60,13 +62,13 @@ public:
 //US  QDomDocument m_doc;
   KActionCollection *m_actionCollection;
 //US  QDomDocument m_buildDocument;
 //US  KXMLGUIFactory *m_factory;
   KXMLGUIClient *m_parent;
   //QPtrList<KXMLGUIClient> m_supers;
-  QPtrList<KXMLGUIClient> m_children;
+  Q3PtrList<KXMLGUIClient> m_children;
 //US  KXMLGUIBuilder *m_builder;
 //US  QString m_xmlFile;
 //US  QString m_localXMLFile;
 };
 
 KXMLGUIClient::KXMLGUIClient()
@@ -82,13 +84,13 @@ KXMLGUIClient::KXMLGUIClient( KXMLGUIClient *parent )
 
 KXMLGUIClient::~KXMLGUIClient()
 {
   if ( d->m_parent )
     d->m_parent->removeChildClient( this );
 
-  QPtrListIterator<KXMLGUIClient> it( d->m_children );
+  Q3PtrListIterator<KXMLGUIClient> it( d->m_children );
   for ( ; it.current(); ++it ) {
       assert( it.current()->d->m_parent == this );
       it.current()->d->m_parent = 0;
   }
 
   delete d->m_actionCollection;
@@ -96,13 +98,13 @@ KXMLGUIClient::~KXMLGUIClient()
 }
 
 KAction *KXMLGUIClient::action( const char *name ) const
 {
   KAction* act = actionCollection()->action( name );
   if ( !act ) {
-    QPtrListIterator<KXMLGUIClient> childIt( d->m_children );
+    Q3PtrListIterator<KXMLGUIClient> childIt( d->m_children );
     for (; childIt.current(); ++childIt ) {
       act = childIt.current()->actionCollection()->action( name );
       if ( act )
         break;
     }
   }
@@ -585,13 +587,13 @@ void KXMLGUIClient::removeChildClient( KXMLGUIClient *child )
   if ( d->m_supers.contains( super ) )
     return false;
   d->m_supers.append( super );
   return true;
 }*/
 
-const QPtrList<KXMLGUIClient> *KXMLGUIClient::childClients()
+const Q3PtrList<KXMLGUIClient> *KXMLGUIClient::childClients()
 {
   return &d->m_children;
 }
 /*US
 void KXMLGUIClient::setClientBuilder( KXMLGUIBuilder *builder )
 {
@@ -603,13 +605,13 @@ void KXMLGUIClient::setClientBuilder( KXMLGUIBuilder *builder )
 KXMLGUIBuilder *KXMLGUIClient::clientBuilder() const
 {
   return d->m_builder;
 }
 */
 
-void KXMLGUIClient::plugActionList( const QString &name, const QPtrList<KAction> &actionList )
+void KXMLGUIClient::plugActionList( const QString &name, const Q3PtrList<KAction> &actionList )
 {
 /*US  
   if ( !d->m_factory )
     return;
 
   d->m_factory->plugActionList( this, name, actionList );
diff --git a/microkde/kdeui/kxmlguiclient.h b/microkde/kdeui/kxmlguiclient.h
index cd74c8e..b9d7b09 100644
--- a/microkde/kdeui/kxmlguiclient.h
+++ b/microkde/kdeui/kxmlguiclient.h
@@ -18,13 +18,13 @@
 */
 #ifndef _KXMLGUICLIENT_H
 #define _KXMLGUICLIENT_H
 
 
 //US #include <qdom.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qmap.h>
 #include <qstringlist.h>
 
 class QWidget;
 class KAction;
 class KActionCollection;
@@ -158,13 +158,13 @@ public:
    */
   void removeChildClient( KXMLGUIClient *child );
 
   /**
    * Retrieves a list of all child clients.
    */
-  const QPtrList<KXMLGUIClient> *childClients();
+  const Q3PtrList<KXMLGUIClient> *childClients();
 
   /**
    * A client can have an own @ref KXMLGUIBuilder.
    * Use this method to assign your builder instance to the client (so that the
    * @ref KXMLGUIFactory can use it when building the client's GUI)
    *
@@ -225,13 +225,13 @@ public:
    *       function.  In fact, that would remove the newly added
    *       actionlists again...
    * \note Forgetting to call unplugActionList() before
    *       plugActionList() would leave the previous actions in the
    *       menu too..
    */
-  void plugActionList( const QString &name, const QPtrList<KAction> &actionList );
+  void plugActionList( const QString &name, const Q3PtrList<KAction> &actionList );
 
   /**
    * The complement of \ref plugActionList() ...
    */
   void unplugActionList( const QString &name );
 
diff --git a/microkde/kdialog.cpp b/microkde/kdialog.cpp
index 8398956..57e7ea6 100644
--- a/microkde/kdialog.cpp
+++ b/microkde/kdialog.cpp
@@ -1,13 +1,15 @@
 
 #include <kdialog.h>
-#include <qapp.h>
+#include <qapplication.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <klocale.h>
     
 KDialog::KDialog( QWidget *parent, const char *name, bool modal ) :
       QDialog( parent, name, modal ) 
 {
     ;
@@ -27,15 +29,15 @@ int KDialog::marginHint() { return 3; }
 int KDialog::spacingHintSmall() { return 1; }
 int KDialog::marginHintSmall() { return 1; }
 #endif
 KProgressDialog::KProgressDialog( QWidget *parent, const char *name, bool modal ) :
       QDialog( parent, name, modal ) 
 {
-    QVBoxLayout* lay= new QVBoxLayout ( this ); 
+    Q3VBoxLayout* lay= new Q3VBoxLayout ( this ); 
     mLabel = new QLabel ( "abc",this );
-    mBar = new QProgressBar ( this );
+    mBar = new Q3ProgressBar ( this );
     mButton = new QPushButton ( i18n("Cancel"),this );
     lay->addWidget ( mLabel );
     lay->addWidget ( mBar );
     lay->addWidget ( mButton  );
     connect ( mButton , SIGNAL ( clicked () ), this, SIGNAL ( cancelled () ));
     resize ( 220, sizeHint().height() +mLabel->sizeHint().height());
diff --git a/microkde/kdialog.h b/microkde/kdialog.h
index bc80689..5f9bf0e 100644
--- a/microkde/kdialog.h
+++ b/microkde/kdialog.h
@@ -1,12 +1,14 @@
 #ifndef MINIKDE_KDIALOG_H
 #define MINIKDE_KDIALOG_H
 
 #include <qdialog.h>
+//Added by qt3to4:
+#include <QLabel>
 class QLabel;
-class QProgressBar;
+class Q3ProgressBar;
 class QPushButton ;
 
 class KDialog : public QDialog
 { 
     Q_OBJECT
   public:
@@ -26,13 +28,13 @@ class KProgressDialog : public QDialog
     void setTotalSteps ( int totalSteps );
     void setProgress ( int progress );
     void accept();
     void reject();
  private:
     QLabel * mLabel;
-    QProgressBar *mBar;
+    Q3ProgressBar *mBar;
     QPushButton *mButton;
  signals:
     void cancelled (); 
 };
 
 #endif
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index d5c7e61..a40bad6 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -1,10 +1,14 @@
 #include <qtabwidget.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qframe.h>
+#include <q3frame.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 
 #include "klocale.h"
 #include "kdebug.h"
 
 #include "kdialogbase.h"
@@ -132,19 +136,19 @@ void KDialogBase::hideButtons()
 
 }
 void KDialogBase::initLayout()
 {
 
   delete mTopLayout;
-  mTopLayout = new QVBoxLayout( this );
+  mTopLayout = new Q3VBoxLayout( this );
   mTopLayout->setMargin( marginHintSmall() );
   mTopLayout->setSpacing( spacingHintSmall() );
 
   mTopLayout->addWidget( mMainWidget );
 
-  QBoxLayout *buttonLayout = new QHBoxLayout;
+  Q3BoxLayout *buttonLayout = new Q3HBoxLayout;
   mTopLayout->addLayout( buttonLayout );
 
   if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
   if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
   if ( mOkButton ) buttonLayout->addWidget( mOkButton );
   if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
@@ -152,21 +156,21 @@ void KDialogBase::initLayout()
   if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
   if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
   buttonLayout->setMargin( marginHintSmall()  );
   buttonLayout->setSpacing( spacingHintSmall() );
 }
 
-QFrame *KDialogBase::addPage( const QString &name )
+Q3Frame *KDialogBase::addPage( const QString &name )
 {
 //  kdDebug() << "KDialogBase::addPage(): " << name << endl;
-  QFrame *frame = new QFrame( tabWidget() );
+  Q3Frame *frame = new Q3Frame( tabWidget() );
   tabWidget()->addTab( frame, name );
   return frame;
 }
 
-QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
+Q3Frame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
 {
   return addPage( name );
 }
 
 
 void KDialogBase::setMainWidget( QWidget *widget )
@@ -251,16 +255,16 @@ int KDialogBase::pageIndex( QWidget *widget ) const
 
 bool KDialogBase::showPage( int index )
 {
     tabWidget()->setCurrentPage( index );return false;
 }
 
-QFrame *KDialogBase::plainPage()
+Q3Frame *KDialogBase::plainPage()
 {
   if ( !mPlainPage ) {
-    mPlainPage = new QFrame( this );
+    mPlainPage = new Q3Frame( this );
     setMainWidget( mPlainPage );
   }
   return mPlainPage;
 }
 
 void KDialogBase::slotOk()
diff --git a/microkde/kdialogbase.h b/microkde/kdialogbase.h
index 17c186b..64cbd17 100644
--- a/microkde/kdialogbase.h
+++ b/microkde/kdialogbase.h
@@ -1,17 +1,19 @@
 #ifndef MINIKDE_KDIALOGBASE_H
 #define MINIKDE_KDIALOGBASE_H
 
-#include <qframe.h>
+#include <q3frame.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 #include "kdialog.h"
 
 class QPushButton;
 class QLayout;
 class QTabWidget;
-class QBoxLayout;
+class Q3BoxLayout;
 
 class KDialogBase : public KDialog
 {
     Q_OBJECT
   public:
     enum ButtonCode
@@ -56,14 +58,14 @@ class KDialogBase : public KDialog
                  bool separator=false,
                  const QString &user1=QString::null,
                  const QString &user2=QString::null,
                  const QString &user3=QString::null);
     virtual ~KDialogBase();
     
-    QFrame *addPage( const QString & );
-    QFrame *addPage( const QString &, int, const QPixmap & );
+    Q3Frame *addPage( const QString & );
+    Q3Frame *addPage( const QString &, int, const QPixmap & );
 
     void setMainWidget( QWidget *widget );
 
     void setButtonText( ButtonCode id, const QString &text );
 
     void enableButton( ButtonCode id, bool state );
@@ -74,13 +76,13 @@ class KDialogBase : public KDialog
 
     int pageIndex( QWidget *widget ) const;
 
     bool showPage( int index );
     void hideButtons();
 
-    QFrame *plainPage();
+    Q3Frame *plainPage();
 
   signals:
     void user1Clicked();
     void user2Clicked();
  /**
      * The Apply button was pressed. This signal is only emitted if
@@ -125,14 +127,14 @@ class KDialogBase : public KDialog
     void init( const QString &caption, int buttonMask,
                const QString &user1=QString::null, const QString &user2=QString::null );
     void initLayout();
 
     QWidget *mMainWidget;
     QTabWidget *mTabWidget;
-    QFrame *mPlainPage;
-    QBoxLayout *mTopLayout;
+    Q3Frame *mPlainPage;
+    Q3BoxLayout *mTopLayout;
     
     QPushButton *mUser1Button;
     QPushButton *mUser2Button;
     QPushButton *mCloseButton;
     QPushButton *mOkButton;
     QPushButton *mApplyButton;
diff --git a/microkde/keditlistbox.cpp b/microkde/keditlistbox.cpp
index 55b7784..257a44a 100644
--- a/microkde/keditlistbox.cpp
+++ b/microkde/keditlistbox.cpp
@@ -18,16 +18,19 @@
    Boston, MA 02111-1307, USA.
 */
 
 #include <qstringlist.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qgroupbox.h>
-#include <qlistbox.h>
-#include <qwhatsthis.h>
+#include <q3groupbox.h>
+#include <q3listbox.h>
+#include <q3whatsthis.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3StrList>
 
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -44,28 +47,28 @@ public:
     bool m_checkAtEntering;
     int buttons;
 };
 
 KEditListBox::KEditListBox(QWidget *parent, const char *name,
                            bool checkAtEntering, int buttons )
-    :QGroupBox(parent, name )
+    :Q3GroupBox(parent, name )
 {
     init( checkAtEntering, buttons );
 }
 
 KEditListBox::KEditListBox(const QString& title, QWidget *parent,
                            const char *name, bool checkAtEntering, int buttons)
-    :QGroupBox(title, parent, name )
+    :Q3GroupBox(title, parent, name )
 {
     init( checkAtEntering, buttons );
 }
 
 KEditListBox::KEditListBox(const QString& title, const CustomEditor& custom,
                            QWidget *parent, const char *name,
                            bool checkAtEntering, int buttons)
-    :QGroupBox(title, parent, name )
+    :Q3GroupBox(title, parent, name )
 {
     m_lineEdit = custom.lineEdit();
     init( checkAtEntering, buttons, custom.representationWidget() );
 }
 
 KEditListBox::~KEditListBox()
@@ -92,13 +95,13 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
 
     servNewButton = servRemoveButton = servUpButton = servDownButton = 0L;
     setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
                               QSizePolicy::MinimumExpanding));
 
     QWidget * gb = this;
-    QGridLayout * grid = new QGridLayout(gb, 7 - lostButtons, 2,
+    Q3GridLayout * grid = new Q3GridLayout(gb, 7 - lostButtons, 2,
                                          KDialog::marginHint(),
                                          KDialog::spacingHint());
     grid->addRowSpacing(0, fontMetrics().lineSpacing());
     for ( int i = 1; i < 7 - lostButtons; i++ )
         grid->setRowStretch(i, 1);
 
@@ -106,13 +109,13 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
 
     if ( representationWidget )
         representationWidget->reparent( gb, QPoint(0,0) );
     else
         m_lineEdit=new KLineEdit(gb);
 
-    m_listBox = new QListBox(gb);
+    m_listBox = new Q3ListBox(gb);
 
     QWidget *editingWidget = representationWidget ?
                              representationWidget : m_lineEdit;
     grid->addMultiCellWidget(editingWidget,1,1,0,1);
     grid->addMultiCellWidget(m_listBox, 2, 6 - lostButtons, 0, 0);
     int row = 2;
@@ -201,13 +204,13 @@ void KEditListBox::moveItemUp()
     if (selIndex == 0)
     {
         KNotifyClient::beep();
         return;
     }
 
-    QListBoxItem *selItem = m_listBox->item(selIndex);
+    Q3ListBoxItem *selItem = m_listBox->item(selIndex);
     m_listBox->takeItem(selItem);
     m_listBox->insertItem(selItem, selIndex-1);
     m_listBox->setCurrentItem(selIndex - 1);
 
     emit changed();
 }
@@ -224,13 +227,13 @@ void KEditListBox::moveItemDown()
     if (selIndex == m_listBox->count() - 1)
     {
         KNotifyClient::beep();
         return;
     }
 
-    QListBoxItem *selItem = m_listBox->item(selIndex);
+    Q3ListBoxItem *selItem = m_listBox->item(selIndex);
     m_listBox->takeItem(selItem);
     m_listBox->insertItem(selItem, selIndex+1);
     m_listBox->setCurrentItem(selIndex + 1);
 
     emit changed();
 }
@@ -346,20 +349,22 @@ void KEditListBox::clear()
 
 void KEditListBox::insertStringList(const QStringList& list, int index)
 {
     m_listBox->insertStringList(list,index);
 }
 
-void KEditListBox::insertStrList(const QStrList* list, int index)
+void KEditListBox::insertStrList(const Q3StrList* list, int index)
 {
-    m_listBox->insertStrList(list,index);
+    for(Q3StrList::const_iterator i=list->begin();i!=list->end();++i)
+        m_listBox->insertItem(*i,index++);
 }
 
-void KEditListBox::insertStrList(const QStrList& list, int index)
+void KEditListBox::insertStrList(const Q3StrList& list, int index)
 {
-    m_listBox->insertStrList(list,index);
+    for(Q3StrList::const_iterator i=list.begin();i!=list.end();++i)
+        m_listBox->insertItem(*i,index++);
 }
 
 void KEditListBox::insertStrList(const char ** list, int numStrings, int index)
 {
     m_listBox->insertStrList(list,numStrings,index);
 }
diff --git a/microkde/keditlistbox.h b/microkde/keditlistbox.h
index 130d933..e43d958 100644
--- a/microkde/keditlistbox.h
+++ b/microkde/keditlistbox.h
@@ -17,14 +17,16 @@
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KEDITLISTBOX_H
 #define KEDITLISTBOX_H
 
-#include <qgroupbox.h>
-#include <qlistbox.h>
+#include <q3groupbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <Q3StrList>
 
 class KLineEdit;
 class KComboBox;
 class QPushButton;
 
 class KEditListBoxPrivate;
@@ -33,13 +35,13 @@ class KEditListBoxPrivate;
  *
  * This class provides a editable listbox ;-), this means
  * a listbox which is accompanied by a line edit to enter new
  * items into the listbox and pushbuttons to add and remove
  * items from the listbox and two buttons to move items up and down.
  */
-class KEditListBox : public QGroupBox
+class KEditListBox : public Q3GroupBox
 {
    Q_OBJECT
 
 public:
     /// @since 3.1
     class CustomEditor
@@ -123,13 +125,13 @@ public:
 
       virtual ~KEditListBox();
 
       /**
        * Return a pointer to the embedded QListBox.
        */
-      QListBox* listBox() const     { return m_listBox; }
+      Q3ListBox* listBox() const     { return m_listBox; }
       /**
        * Return a pointer to the embedded QLineEdit.
        */
       KLineEdit* lineEdit() const     { return m_lineEdit; }
       /**
        * Return a pointer to the Add button
@@ -156,17 +158,17 @@ public:
        * See @ref QListBox::insertStringList()
        */
       void insertStringList(const QStringList& list, int index=-1);
       /**
        * See @ref QListBox::insertStringList()
        */
-      void insertStrList(const QStrList* list, int index=-1);
+      void insertStrList(const Q3StrList* list, int index=-1);
       /**
        * See @ref QListBox::insertStrList()
        */
-      void insertStrList(const QStrList& list, int index=-1);
+      void insertStrList(const Q3StrList& list, int index=-1);
       /**
        * See @ref QListBox::insertStrList()
        */
       void insertStrList(const char ** list, int numStrings=-1, int index=-1);
       /**
        * See @ref QListBox::insertItem()
@@ -204,13 +206,13 @@ public:
       void addItem();
       void removeItem();
       void enableMoveButtons(int index);
       void typedSomething(const QString& text);
 
    private:
-      QListBox *m_listBox;
+      Q3ListBox *m_listBox;
       QPushButton *servUpButton, *servDownButton;
       QPushButton *servNewButton, *servRemoveButton;
       KLineEdit *m_lineEdit;
 
       //this is called in both ctors, to avoid code duplication
       void init( bool checkAtEntering, int buttons,
diff --git a/microkde/kfiledialog.cpp b/microkde/kfiledialog.cpp
index 383e711..c1bfdef 100644
--- a/microkde/kfiledialog.cpp
+++ b/microkde/kfiledialog.cpp
@@ -1,22 +1,24 @@
 #include <kfiledialog.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #ifndef DESKTOP_VERSION
 //US orig#include <ofileselector.h>
 #include <ofileselector_p.h>
 QString KFileDialog::getSaveFileName( const QString & fn,
                                              const QString & cap , QWidget * par )
 {
     QString retfile = "";
     QDialog dia ( par, "input-dialog", true ); 
-    QVBoxLayout lay( &dia );
+    Q3VBoxLayout lay( &dia );
     lay.setMargin(7); 
     lay.setSpacing(7); 
     QString file = fn;
     if ( file.isEmpty() )
         file = QDir::homeDirPath()+"/*";
     QFileInfo fi ( file );
@@ -39,13 +41,13 @@ QString KFileDialog::getSaveFileName( const QString & fn,
 QString KFileDialog::getOpenFileName( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
    QString retfile = "";
     QDialog dia ( par, "input-dialog", true ); 
     // QLineEdit lab ( &dia ); 
-    QVBoxLayout lay( &dia );
+    Q3VBoxLayout lay( &dia );
     lay.setMargin(7); 
     lay.setSpacing(7);
     QString file = fn;
     if ( file.isEmpty() )
         file = QDir::homeDirPath()+"/*";;
     QFileInfo fi ( file );
@@ -63,26 +65,26 @@ QString KFileDialog::getExistingDirectory( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
     return KFileDialog::getSaveFileName( fn, cap, par );
 }
 #else
 
-#include <qfiledialog.h> 
+#include <q3filedialog.h> 
 
 QString KFileDialog::getSaveFileName( const QString & fn,
                                              const QString & cap , QWidget * par )
 {
-    return QFileDialog::getSaveFileName( fn, QString::null, par, "openfile", cap );
+    return Q3FileDialog::getSaveFileName( fn, QString::null, par, "openfile", cap );
 }
 QString KFileDialog::getOpenFileName( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
 
-    return QFileDialog::getOpenFileName( fn, QString::null, par, "openfile", cap );
+    return Q3FileDialog::getOpenFileName( fn, QString::null, par, "openfile", cap );
 }
 QString KFileDialog::getExistingDirectory( const QString & fn,
                                              const QString & cap, QWidget * par )
 {
-    return QFileDialog::getExistingDirectory( fn, par, "exidtingdir", cap );
+    return Q3FileDialog::getExistingDirectory( fn, par, "exidtingdir", cap );
 }
 #endif
 
diff --git a/microkde/kfontdialog.cpp b/microkde/kfontdialog.cpp
index 174123c..f83c2a8 100644
--- a/microkde/kfontdialog.cpp
+++ b/microkde/kfontdialog.cpp
@@ -4,18 +4,20 @@
 #else
 #include <qfontdialog.h>
 #endif
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 QFont KFontDialog::getFont( const QFont & f, bool & ok )
 {
 #ifndef DESKTOP_VERSION
     QDialog d( 0, "fd", true );;
     OFontSelector s ( true,  &d, "fontsel");
-    QVBoxLayout l ( &d );
+    Q3VBoxLayout l ( &d );
     l.addWidget( &s );
     s.setSelectedFont (  f );
     QPushButton b ( "OK",  &d );
     l.addWidget( &b );
     qDebug("size %d ", f.bold());
     QObject::connect( &b, SIGNAL( clicked () ), &d, SLOT ( accept () ) );
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp
index 53edd08..9cc5835 100644
--- a/microkde/kglobal.cpp
+++ b/microkde/kglobal.cpp
@@ -1,22 +1,23 @@
 #include "kglobal.h"
 #include "kstandarddirs.h"
-#include <qkeycode.h>
+#include <qnamespace.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 KLocale *KGlobal::mLocale = 0;
 KConfig *KGlobal::mConfig = 0;
 KIconLoader *KGlobal::mIconLoader = 0;
 KStandardDirs *KGlobal::mDirs = 0;
 
 QString KGlobal::mAppName = "godot";
 
 KLocale *KGlobal::locale()
 {
   if ( !mLocale ) {
-    ASSERT(mAppName);
+    Q_ASSERT(!mAppName.isEmpty());
 
     mLocale = new KLocale();//mAppName);
   }
 
   return mLocale;
 }
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 2e483e9..1f08255 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -1,12 +1,13 @@
 #include "kglobalsettings.h"
 #include "kconfig.h"
 #include "kglobal.h"
 #include "kconfigbase.h"
 
 #include <qapplication.h>
+#include <QDesktopWidget>
 
 #ifdef DESKTOP_VERSION
   QColor KGlobalSettings::mAlternate = QColor( 235, 235, 235 );
 #else
   QColor KGlobalSettings::mAlternate =  QColor( 210, 210, 210 );
 #endif 
diff --git a/microkde/kiconloader.cpp b/microkde/kiconloader.cpp
index 4842d71..e7f657d 100644
--- a/microkde/kiconloader.cpp
+++ b/microkde/kiconloader.cpp
@@ -1,30 +1,32 @@
 
 #include "kiconloader.h"
 #include "kglobal.h"
 
 #ifndef DESKTOP_VERSION_OEGEL
 #include <qdir.h>
+//Added by qt3to4:
+#include <QPixmap>
 QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
                                int, QString *, bool ) const
 {
     QPixmap pix; 
     QString file;
     file = iconPath() + name+".png";
     pix.load (  file );
     // qDebug("KIconLoader::loadIcon %s -----------",  file.latin1());
     return pix;
 }
-QIconSet KIconLoader::loadIconSet( const QString& name) const
+QIcon KIconLoader::loadIconSet( const QString& name) const
 {
     QPixmap pixmapLoader; 
     QString file;
     file = iconPath() + name+".png";
     pixmapLoader.load( file ); 
     //qDebug("KIconLoader::loadIconSet: %s ************", file.latin1() );
-    QIconSet is ( pixmapLoader );
+    QIcon is ( pixmapLoader );
   return is;
 }
 
 QPixmap BarIcon( const QString &name )
 { 
     QPixmap pix;
@@ -74,18 +76,18 @@ QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
   if (pPtr == 0)
     qDebug("KIconLoader::loadIcon: %s not found", px.latin1());
   
   return p;
 }
 
-QIconSet KIconLoader::loadIconSet( const QString& name) const
+QIcon KIconLoader::loadIconSet( const QString& name) const
 {
   QString px = this->iconPath() + "/" + name;
   
-  QIconSet is ;//= Resource::loadIconSet( px );
-  QIconSet* isPtr = 0;//LR&is;
+  QIcon is ;//= Resource::loadIconSet( px );
+  QIcon* isPtr = 0;//LR&is;
   if (isPtr == 0)
     qDebug("KIconLoader::loadIconSet: %s not foun", px.latin1());
   
   return is;
 }
 
diff --git a/microkde/kiconloader.h b/microkde/kiconloader.h
index 68fec4e..2abb667 100644
--- a/microkde/kiconloader.h
+++ b/microkde/kiconloader.h
@@ -1,13 +1,13 @@
 #ifndef MINIKDE_KICONLOADER_H
 #define MINIKDE_KICONLOADER_H
 
 #include <qpixmap.h>
 #include <qstring.h>
 //US
-#include <qiconset.h>
+#include <qicon.h>
 
 class KIcon
 {
   public:
     enum Group { NoGroup=-1, Desktop=0, Toolbar, MainToolbar, Small,
                  Panel, LastGroup, User };
@@ -31,13 +31,13 @@ class KIconLoader
                      bool canReturnNull=false) const;
 
 //US    
     QString setIconPath( const QString &);
     QString iconPath( /*US const QString &, int */) const;
     QString iconPath( const QString &, int ) const;
-    QIconSet loadIconSet( const QString &name) const; 
+    QIcon loadIconSet( const QString &name) const; 
     
 //US to make this class usable for different applications, we have to add a iconpathvariable
   private:
     QString mIconpath;
 };
 
diff --git a/microkde/kio/kfile/kurlrequester.cpp b/microkde/kio/kfile/kurlrequester.cpp
index ca94570..ce62da7 100644
--- a/microkde/kio/kfile/kurlrequester.cpp
+++ b/microkde/kio/kfile/kurlrequester.cpp
@@ -24,12 +24,14 @@
 #include <unistd.h>
 #endif
 #include <qstring.h>
 //US #include <qtooltip.h>
 
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 //US #include <kaccel.h>
 //US #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kfiledialog.h>
@@ -179,22 +181,22 @@ KURLRequester::KURLRequester( QWidget *editWidget, QWidget *parent,
 
     init();
 }
 */
 
 KURLRequester::KURLRequester( QWidget *parent, const char *name )
-  : QHBox( parent, name )
+  : Q3HBox( parent, name )
 {
     d = new KURLRequesterPrivate;
     init();
 }
 
 
 KURLRequester::KURLRequester( const QString& url, QWidget *parent,
                               const char *name )
-  : QHBox( parent, name )
+  : Q3HBox( parent, name )
 {
     d = new KURLRequesterPrivate;
     init();
     setURL( url );
 }
 
@@ -213,14 +215,14 @@ void KURLRequester::init()
     myShowLocalProt = false;
     mPathIsDir = false;
     if (/*US !d->combo && */ !d->edit )
         d->edit = new KLineEdit( this, "KURLRequester::KLineEdit" );
 
     myButton = new KURLDragPushButton( this, "kfile button");
-    QIconSet iconSet = SmallIconSet("fileopen");
-    QPixmap pixMap = iconSet.pixmap( QIconSet::Small, QIconSet::Normal );
+    QIcon iconSet = SmallIconSet("fileopen");
+    QPixmap pixMap = iconSet.pixmap( QIcon::Small, QIcon::Normal );
     myButton->setIconSet( iconSet );
     myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
 //US    QToolTip::add(myButton, i18n("Open file dialog"));
 
     connect( myButton, SIGNAL( pressed() ), SLOT( slotUpdateURL() ));
 
diff --git a/microkde/kio/kfile/kurlrequester.h b/microkde/kio/kfile/kurlrequester.h
index faa3326..5d4fa11 100644
--- a/microkde/kio/kfile/kurlrequester.h
+++ b/microkde/kio/kfile/kurlrequester.h
@@ -17,13 +17,13 @@
 */
 
 
 #ifndef KURLREQUESTER_H
 #define KURLREQUESTER_H
 
-#include <qhbox.h>
+#include <q3hbox.h>
 
 #include <keditlistbox.h>
 //US #include <kfile.h>
 //US #include <kpushbutton.h>
 #include <kurl.h>
 
@@ -50,13 +50,13 @@ class QTimer;
  *
  * You can change this behavior by using @ref setMode() or @ref setFilter().
  *
  * @short A widget to request a filename/url from the user
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class KURLRequester : public QHBox
+class KURLRequester : public Q3HBox
 {
     Q_OBJECT
     Q_PROPERTY( QString url READ url WRITE setURL )
 
 public:
     /**
diff --git a/microkde/kio/kio/kdirwatch.cpp b/microkde/kio/kio/kdirwatch.cpp
index 1596d1f..5f07c54 100644
--- a/microkde/kio/kio/kdirwatch.cpp
+++ b/microkde/kio/kio/kdirwatch.cpp
@@ -49,17 +49,19 @@ $Id$
 #endif
 
 #include <sys/stat.h>
 #include <assert.h>
 #include <qdir.h>
 #include <qfile.h>
-#include <qintdict.h>
-#include <qptrlist.h>
+#include <q3intdict.h>
+#include <q3ptrlist.h>
 #include <qsocketnotifier.h>
 #include <qstringlist.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kconfigbase.h>
 #include <kglobal.h>
@@ -181,13 +183,13 @@ KDirWatchPrivate::KDirWatchPrivate()
   m_ref = 0;
 
 //US  KConfigGroup config(KGlobal::config(), QCString("DirWatch"));
 //US  m_nfsPollInterval = config.readNumEntry("NFSPollInterval", 5000);
 //US  m_PollInterval = config.readNumEntry("PollInterval", 500);
   KConfig *config = KGlobal::config();
-  KConfigGroupSaver saver( config, QCString("DirWatch") );
+  KConfigGroupSaver saver( config, Q3CString("DirWatch") );
   
   m_nfsPollInterval = config->readNumEntry("NFSPollInterval", 5000);
   m_PollInterval = config->readNumEntry("PollInterval", 500);
   
 
   QString available("Stat");
@@ -728,13 +730,13 @@ void KDirWatchPrivate::removeEntry( KDirWatch* instance,
 
 /* Called from KDirWatch destructor:
  * remove <instance> as client from all entries
  */
 void KDirWatchPrivate::removeEntries( KDirWatch* instance )
 {
-  QPtrList<Entry> list;
+  Q3PtrList<Entry> list;
   int minfreq = 3600000;
 
   // put all entries where instance is a client in list
   EntryMap::Iterator it = m_mapEntries.begin();
   for( ; it != m_mapEntries.end(); ++it ) {
     Client* c = (*it).m_clients.first();
@@ -1004,13 +1006,13 @@ void KDirWatchPrivate::slotRescan()
 
   // We delay deletions of entries this way.
   // removeDir(), when called in slotDirty(), can cause a crash otherwise
   delayRemove = true;
 
 #ifdef HAVE_DNOTIFY
-  QPtrList<Entry> dList, cList;
+  Q3PtrList<Entry> dList, cList;
 
   // for DNotify method,
   if (rescan_all)
   {
     // mark all as dirty
     it = m_mapEntries.begin();
diff --git a/microkde/kio/kio/kdirwatch_p.h b/microkde/kio/kio/kdirwatch_p.h
index 0ab482f..be74f2a 100644
--- a/microkde/kio/kio/kdirwatch_p.h
+++ b/microkde/kio/kio/kdirwatch_p.h
@@ -15,13 +15,13 @@ $Id$
 #define _KDIRWATCH_P_H
 
 #ifdef HAVE_FAM
 #include <fam.h>
 #endif
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <kdirwatch.h>
 
 #include <ctime>
 
 #define invalid_ctime ((time_t)-1)
@@ -55,15 +55,15 @@ public:
     // the last observed link count
     int m_nlink; 
     entryStatus m_status;
     entryMode m_mode;
     bool isDir;
     // instances interested in events
-    QPtrList<Client> m_clients;
+    Q3PtrList<Client> m_clients;
     // nonexistent entries of this directory
-    QPtrList<Entry> m_entries;
+    Q3PtrList<Entry> m_entries;
     QString path;
 
     int msecLeft, freq;
 
     void addClient(KDirWatch*);
     void removeClient(KDirWatch*);
@@ -121,13 +121,13 @@ private:
   int statEntries;
   int m_nfsPollInterval, m_PollInterval;
   int m_ref;
   bool useStat(Entry*);
 
   bool delayRemove;
-  QPtrList<Entry> removeList;
+  Q3PtrList<Entry> removeList;
 
 #ifdef HAVE_FAM
   QSocketNotifier *sn;
   FAMConnection fc;
   bool use_fam;
 
@@ -138,13 +138,13 @@ private:
 #ifdef HAVE_DNOTIFY
   bool supports_dnotify;
   bool rescan_all;
   int mPipe[2];
   QTimer mTimer;
   QSocketNotifier *mSn;
-  QIntDict<Entry> fd_Entry;
+  Q3IntDict<Entry> fd_Entry;
 
   static void dnotify_handler(int, siginfo_t *si, void *);
   static void dnotify_sigio_handler(int, siginfo_t *si, void *);
   bool useDNotify(Entry*);
 #endif
 };
diff --git a/microkde/klineedit.h b/microkde/klineedit.h
index 70c72d1..9eb749d 100644
--- a/microkde/klineedit.h
+++ b/microkde/klineedit.h
@@ -1,10 +1,12 @@
 #ifndef MINIKDE_KLINEEDIT_H
 #define MINIKDE_KLINEEDIT_H
 
 #include <qlineedit.h>
+//Added by qt3to4:
+#include <QKeyEvent>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 
 
diff --git a/microkde/klineeditdlg.h b/microkde/klineeditdlg.h
index 68e9252..d0004cd 100644
--- a/microkde/klineeditdlg.h
+++ b/microkde/klineeditdlg.h
@@ -4,21 +4,23 @@
 #include "kdialogbase.h"
 #include <klineedit.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 class KLineEditDlg : public QDialog
 {
   public:
     KLineEditDlg( const QString & text, const QString & editText, QWidget *parent ) :
       QDialog( parent,"lineedit", true ) {
         QLabel* lab = new QLabel( text, this );
         mEdit = new KLineEdit( this );
-        QVBoxLayout* vl = new QVBoxLayout( this );
+        Q3VBoxLayout* vl = new Q3VBoxLayout( this );
         vl->setSpacing(5);
         vl->setMargin(7);
         vl->addWidget( lab );
         vl->addWidget( mEdit );
         mEdit->setText( editText );
         QPushButton * p = new QPushButton (" OK ", this );
diff --git a/microkde/kresources/configdialog.cpp b/microkde/kresources/configdialog.cpp
index 55253c0..4820faf 100644
--- a/microkde/kresources/configdialog.cpp
+++ b/microkde/kresources/configdialog.cpp
@@ -22,20 +22,23 @@
 */
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 
 #include <qcheckbox.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
 
 #include <kbuttonbox.h>
 #include <kdialog.h>
 #include <klineedit.h>
 
 #include "factory.h"
@@ -52,20 +55,20 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
 
   Factory *factory = Factory::self( resourceFamily );
 
 //US  resize( 250, 240 );
   resize( KMIN(KGlobal::getDesktopWidth(), 250), KMIN(KGlobal::getDesktopHeight(), 240));
 
-  QFrame *main;
+  Q3Frame *main;
 
   main = plainPage();
 
-  QVBoxLayout *mainLayout = new QVBoxLayout( main, 0, spacingHint() );
+  Q3VBoxLayout *mainLayout = new Q3VBoxLayout( main, 0, spacingHint() );
 
 
-  QGroupBox *generalGroupBox = new QGroupBox( 2, Qt::Horizontal, main );
+  Q3GroupBox *generalGroupBox = new Q3GroupBox( 2, Qt::Horizontal, main );
   generalGroupBox->layout()->setSpacing( spacingHint() );
   generalGroupBox->setTitle( i18n( "General Settings" ) );
 
   new QLabel( i18n( "Name:" ), generalGroupBox );
 
   mName = new KLineEdit( generalGroupBox );
@@ -79,13 +82,13 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
   mIncludeInSync->setChecked( mResource->includeInSync() );
 
   mName->setText( mResource->resourceName() );
 
   mainLayout->addWidget( generalGroupBox );
 
-  QGroupBox *resourceGroupBox = new QGroupBox( 2, Qt::Horizontal,  main );
+  Q3GroupBox *resourceGroupBox = new Q3GroupBox( 2, Qt::Horizontal,  main );
   resourceGroupBox->layout()->setSpacing( spacingHint());
   resourceGroupBox->setTitle( i18n( "%1 Resource Settings" )
                               .arg( factory->typeName( resource->type() ) ) );
   mainLayout->addWidget( resourceGroupBox );
 
   mainLayout->addStretch();
diff --git a/microkde/kresources/configpage.cpp b/microkde/kresources/configpage.cpp
index fc7a42e..1a9d063 100644
--- a/microkde/kresources/configpage.cpp
+++ b/microkde/kresources/configpage.cpp
@@ -25,21 +25,25 @@
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 
 #ifdef DESKTOP_VERSION
 #include <qinputdialog.h>
 #else
 #include <qtcompat/qinputdialog.h>
 #endif
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
@@ -58,17 +62,17 @@ $Id$
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <kglobal.h>
 
 using namespace KRES;
 
-class ConfigViewItem : public QCheckListItem
+class ConfigViewItem : public Q3CheckListItem
 {
   public:
-    ConfigViewItem( QListView *parent, Resource* resource ) :
-      QCheckListItem( parent, resource->resourceName(), CheckBox ),
+    ConfigViewItem( Q3ListView *parent, Resource* resource ) :
+      Q3CheckListItem( parent, resource->resourceName(), CheckBox ),
       mResource( resource ),
       mIsStandard( false )
     {
       setText( 1, mResource->type() );
       setOn( mResource->isActive() );
     }
@@ -94,19 +98,19 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
   : QWidget( parent, name ),
     mCurrentManager( 0 ),
     mCurrentConfig( 0 )
 {
   setCaption( i18n( "Resource Configuration" ) );
 
-  QVBoxLayout *mainLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *mainLayout = new Q3VBoxLayout( this );
 
-  QGroupBox *groupBox = new QGroupBox( i18n( "Resources" ), this );
+  Q3GroupBox *groupBox = new Q3GroupBox( i18n( "Resources" ), this );
   groupBox->setColumnLayout(0, Qt::Vertical );
   groupBox->layout()->setSpacing( 3 );
   groupBox->layout()->setMargin( 5 );
-  QGridLayout *groupBoxLayout = new QGridLayout( groupBox->layout(), 4, 2 );
+  Q3GridLayout *groupBoxLayout = new Q3GridLayout( groupBox->layout(), 4, 2 );
 
 //US  mFamilyCombo = new KComboBox( false, groupBox );
   mFamilyCombo = new KComboBox( groupBox );
   groupBoxLayout->addMultiCellWidget( mFamilyCombo, 0, 0, 0, 1 );
 
   mListView = new KListView( groupBox );
@@ -142,27 +146,27 @@ ConfigPage::ConfigPage( QWidget *parent, const char *name )
   mainLayout->addWidget( groupBox );
 
   connect( mFamilyCombo, SIGNAL( activated( int ) ),
            SLOT( slotFamilyChanged( int ) ) );
   connect( mListView, SIGNAL( selectionChanged() ),
            SLOT( slotSelectionChanged() ) );
-  connect( mListView, SIGNAL( clicked( QListViewItem * ) ),
-           SLOT( slotItemClicked( QListViewItem * ) ) );
+  connect( mListView, SIGNAL( clicked( Q3ListViewItem * ) ),
+           SLOT( slotItemClicked( Q3ListViewItem * ) ) );
 
   mLastItem = 0;
 
 //US  mConfig = new KConfig( "kcmkresourcesrc" );
   mConfig = new KConfig( locateLocal( "config", "kcmkresourcesrc")   );
   mConfig->setGroup( "General" );
 
   load();
 }
 
 ConfigPage::~ConfigPage()
 {
-  QValueList<ResourcePageInfo>::Iterator it;
+  Q3ValueList<ResourcePageInfo>::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it ) {
     (*it).mManager->removeListener( this );
     delete (*it).mManager;
     delete (*it).mConfig;
   }
 
@@ -227,13 +231,13 @@ void ConfigPage::load()
 }
 
 void ConfigPage::save()
 {
   saveResourceSettings();
 
-  QValueList<ResourcePageInfo>::Iterator it;
+  Q3ValueList<ResourcePageInfo>::Iterator it;
   for ( it = mInfoMap.begin(); it != mInfoMap.end(); ++it )
     (*it).mManager->writeConfig( (*it).mConfig );
 
   emit changed( false );
 }
 
@@ -338,13 +342,13 @@ void ConfigPage::slotAdd()
     mLastItem = item;
 
     // if there are only read-only resources we'll set this resource
     // as standard resource
     if ( !resource->readOnly() ) {
       bool onlyReadOnly = true;
-      QListViewItem *it = mListView->firstChild();
+      Q3ListViewItem *it = mListView->firstChild();
       while ( it != 0 ) {
         ConfigViewItem *confIt = static_cast<ConfigViewItem*>( it );
         if ( !confIt->readOnly() && confIt != item )
           onlyReadOnly = false;
 
         it = it->itemBelow();
@@ -363,13 +367,13 @@ void ConfigPage::slotAdd()
 
 void ConfigPage::slotRemove()
 {
   if ( !mCurrentManager )
     return;
 
-  QListViewItem *item = mListView->currentItem();
+  Q3ListViewItem *item = mListView->currentItem();
   ConfigViewItem *confItem = static_cast<ConfigViewItem*>( item );
 
   if ( !confItem )
     return;
 
   if ( confItem->standard() ) {
@@ -390,13 +394,13 @@ void ConfigPage::slotRemove()
 
 void ConfigPage::slotEdit()
 {
   if ( !mCurrentManager )
     return;
 
-  QListViewItem *item = mListView->currentItem();
+  Q3ListViewItem *item = mListView->currentItem();
   ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
   if ( !configItem )
     return;
 
   Resource *resource = configItem->resource();
 
@@ -432,13 +436,13 @@ void ConfigPage::slotStandard()
 
   if ( !item->isOn() ) {
     KMessageBox::sorry( this, i18n( "You cannot use an inactive<br>resource as standard!" ) );
     return;
   }
 
-  QListViewItem *it = mListView->firstChild();
+  Q3ListViewItem *it = mListView->firstChild();
   while ( it != 0 ) {
     ConfigViewItem *configItem = static_cast<ConfigViewItem*>( it );
     if ( configItem->standard() )
       configItem->setStandard( false );
     it = it->itemBelow();
   }
@@ -479,13 +483,13 @@ void ConfigPage::resourceModified( Resource* resource )
 
 void ConfigPage::resourceDeleted( Resource* resource )
 {
   qDebug("ConfigPage::resourceDeleted  : %s", resource->resourceName().latin1());
 }
 
-void ConfigPage::slotItemClicked( QListViewItem *item )
+void ConfigPage::slotItemClicked( Q3ListViewItem *item )
 {
   ConfigViewItem *configItem = static_cast<ConfigViewItem *>( item );
   if ( !configItem ) return;
 
   if ( configItem->standard() && !configItem->isOn() ) {
     KMessageBox::sorry( this, i18n( "You cannot deactivate the<br>standard resource. Choose<br>another standard resource first." ) );
@@ -501,13 +505,13 @@ void ConfigPage::slotItemClicked( QListViewItem *item )
 void ConfigPage::saveResourceSettings()
 {
     //qDebug("ConfigPage::saveResourceSettings() begin");
 
   if ( mCurrentManager ) {
 
-    QListViewItem *item = mListView->firstChild();
+    Q3ListViewItem *item = mListView->firstChild();
     while ( item ) {
       ConfigViewItem *configItem = static_cast<ConfigViewItem*>( item );
 
       // check if standard resource
       if ( configItem->standard() && !configItem->readOnly() &&
            configItem->isOn() ) {
diff --git a/microkde/kresources/configpage.h b/microkde/kresources/configpage.h
index be9239e..dc1aa50 100644
--- a/microkde/kresources/configpage.h
+++ b/microkde/kresources/configpage.h
@@ -22,19 +22,21 @@
 
 #ifndef KRESOURCES_CONFIGPAGE_H
 #define KRESOURCES_CONFIGPAGE_H
 
 #include <qstringlist.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include "manager.h"
 
 class KComboBox;
 class KListView;
 
-class QListViewItem;
+class Q3ListViewItem;
 class QPushButton;
 
 
 namespace KRES {
 
 class ResourcePageInfo
@@ -70,35 +72,35 @@ class ConfigPage : public QWidget, public ManagerListener<Resource>
   public:
     virtual void resourceAdded( Resource* resource );
     virtual void resourceModified( Resource* resource );
     virtual void resourceDeleted( Resource* resource );
 
   protected slots:
-    void slotItemClicked( QListViewItem * );
+    void slotItemClicked( Q3ListViewItem * );
 
   signals:
     void changed( bool );
 
   private:
     void saveResourceSettings();
 
     Manager<Resource>* mCurrentManager;
     KConfig* mCurrentConfig;
     KConfig* mConfig;
     QString mFamily;
     QStringList mFamilyMap;
-    QValueList<ResourcePageInfo> mInfoMap;
+    Q3ValueList<ResourcePageInfo> mInfoMap;
 
     KComboBox* mFamilyCombo;
     KListView* mListView;
     QPushButton* mAddButton;
     QPushButton* mRemoveButton;
     QPushButton* mEditButton;
     QPushButton* mStandardButton;
 
-    QListViewItem* mLastItem;
+    Q3ListViewItem* mLastItem;
     static const QString syncfamily;
 };
 
 }
 
 #endif
diff --git a/microkde/kresources/factory.cpp b/microkde/kresources/factory.cpp
index 86b22b2..4f286d1 100644
--- a/microkde/kresources/factory.cpp
+++ b/microkde/kresources/factory.cpp
@@ -38,23 +38,23 @@
 #include <file/resourcefile.h>
 #include <dir/resourcedir.h>
 #include <qtopia/resourceqtopia.h>
 #endif 
 using namespace KRES;
 
-QDict<Factory> *Factory::mSelves = 0;
-static KStaticDeleter< QDict<Factory> > staticDeleter;
+Q3Dict<Factory> *Factory::mSelves = 0;
+static KStaticDeleter< Q3Dict<Factory> > staticDeleter;
 
 Factory *Factory::self( const QString& resourceFamily)
 {
 
 
   Factory *factory = 0;
   if ( !mSelves )
   {
-    mSelves = staticDeleter.setObject( new QDict<Factory> );
+    mSelves = staticDeleter.setObject( new Q3Dict<Factory> );
   }
 
   factory = mSelves->find( resourceFamily );
 
   if ( !factory ) {
     factory = new Factory( resourceFamily);
diff --git a/microkde/kresources/factory.h b/microkde/kresources/factory.h
index ea01b23..709fde0 100644
--- a/microkde/kresources/factory.h
+++ b/microkde/kresources/factory.h
@@ -21,13 +21,13 @@
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KRESOURCES_FACTORY_H
 #define KRESOURCES_FACTORY_H
 
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 
 #include <kconfig.h>
 
 
 #include "resource.h"
@@ -111,13 +111,13 @@ class Factory
     QString typeDescription( const QString &type ) const;
 
   protected:
     Factory( const QString& resourceFamily);
 
   private:
-    static QDict<Factory> *mSelves;
+    static Q3Dict<Factory> *mSelves;
 
     QString mResourceFamily;
 //US    QMap<QString, KService::Ptr> mTypeMap;
 //US lets store the pluginfo struct as value instead of a KService
     QMap<QString, PluginInfo*> mTypeMap;
 };
diff --git a/microkde/kresources/kcmkresources.cpp b/microkde/kresources/kcmkresources.cpp
index d600a31..f5eb826 100644
--- a/microkde/kresources/kcmkresources.cpp
+++ b/microkde/kresources/kcmkresources.cpp
@@ -17,12 +17,15 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
 
 //US #include <kaboutdata.h>
 //US #include <kgenericfactory.h>
 #include <klocale.h>
 
 #include "configpage.h"
@@ -37,15 +40,15 @@ using namespace KRES;
 //US KCMKResources::KCMKResources( QWidget *parent, const char *name, const QStringList& )
 //US  : KCModule( ResourcesFactory::instance(), parent, name )
 KCMKResources::KCMKResources( QWidget *parent, const char *name, const QStringList& )
   : KDialogBase( parent, name, true, i18n( "Configure Resources" ),
     Ok|Cancel, Ok, true )
 {
-  QFrame *main = plainPage();
+  Q3Frame *main = plainPage();
 
-  QVBoxLayout *layout = new QVBoxLayout( main );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( main );
   mConfigPage = new KRES::ConfigPage( main );
   layout->addWidget( mConfigPage );
 
 
   connect( mConfigPage, SIGNAL( changed( bool ) ), SLOT( changed( bool ) ) );
 #ifndef DESKTOP_VERSION
diff --git a/microkde/kresources/manager.h b/microkde/kresources/manager.h
index 69062da..88705d4 100644
--- a/microkde/kresources/manager.h
+++ b/microkde/kresources/manager.h
@@ -29,14 +29,16 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KRESOURCES_MANAGER_H
 #define KRESOURCES_MANAGER_H
 
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include "factory.h"
 #include "managerimpl.h"
 
 namespace KRES {
 
@@ -172,13 +174,13 @@ class Manager : private ManagerImplListener
       mFactory = Factory::self( family );
       // The managerimpl will use the same Factory object as the manager
       // because of the Factory::self() pattern
       mImpl = new ManagerImpl( family );
       mImpl->setListener( this );
 
-      mListeners = new QPtrList<ManagerListener<T> >;
+      mListeners = new Q3PtrList<ManagerListener<T> >;
     }
 
     virtual ~Manager()
     {
       mImpl->setListener( 0 );
       delete mListeners;
@@ -327,12 +329,12 @@ class Manager : private ManagerImplListener
       }
     }
 
   private:
     ManagerImpl *mImpl;
     Factory *mFactory;
-    QPtrList<ManagerListener<T> > *mListeners;
+    Q3PtrList<ManagerListener<T> > *mListeners;
 };
 
 }
 
 #endif
diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp
index a6d2007..4c0751c 100644
--- a/microkde/kresources/managerimpl.cpp
+++ b/microkde/kresources/managerimpl.cpp
@@ -32,12 +32,14 @@ $Id$
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include "resource.h"
 #include "factory.h"
 #include "managerimpl.h"
 
 
@@ -229,26 +231,26 @@ QStringList ManagerImpl::resourceNames()
 
 Resource::List *ManagerImpl::resourceList()
 {
   return &mResources;
 }
 
-QPtrList<Resource> ManagerImpl::resources()
+Q3PtrList<Resource> ManagerImpl::resources()
 {
-  QPtrList<Resource> result;
+  Q3PtrList<Resource> result;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     result.append( *it );
   }
   return result;
 }
 
-QPtrList<Resource> ManagerImpl::resources( bool active )
+Q3PtrList<Resource> ManagerImpl::resources( bool active )
 {
-  QPtrList<Resource> result;
+  Q3PtrList<Resource> result;
 
   Resource::List::ConstIterator it;
   for ( it = mResources.begin(); it != mResources.end(); ++it ) {
     if ( (*it)->isActive() == active ) {
       result.append( *it );
     }
diff --git a/microkde/kresources/managerimpl.h b/microkde/kresources/managerimpl.h
index 56a2db6..1f728e5 100644
--- a/microkde/kresources/managerimpl.h
+++ b/microkde/kresources/managerimpl.h
@@ -29,14 +29,14 @@ $Id$
 */
 
 #ifndef KRESOURCES_MANAGERIMPL_H
 #define KRESOURCES_MANAGERIMPL_H
 
 #include <qstring.h>
-#include <qptrlist.h>
-#include <qdict.h>
+#include <q3ptrlist.h>
+#include <q3dict.h>
 //US
 #include <qobject.h>
 
 #include "resource.h"
 
 
@@ -78,16 +78,16 @@ class ManagerImpl : public QObject
     void setStandardResource( Resource *resource );
 
     void setActive( Resource *resource, bool active );
 
     Resource::List *resourceList();
 
-    QPtrList<Resource> resources();
+    Q3PtrList<Resource> resources();
 
     // Get only active or passive resources
-    QPtrList<Resource> resources( bool active );
+    Q3PtrList<Resource> resources( bool active );
 
     QStringList resourceNames();
 
     void setListener( ManagerImplListener *listener );
 
   public slots:
diff --git a/microkde/kresources/resource.h b/microkde/kresources/resource.h
index ed5af96..1f9527c 100644
--- a/microkde/kresources/resource.h
+++ b/microkde/kresources/resource.h
@@ -25,13 +25,13 @@
 
 //US
 #ifdef QT_THREAD_SUPPORT
 #include <qmutex.h>
 #endif //QT_THREAD_SUPPORT
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qwidget.h>
 
 #include <qobject.h>
 
 #include <klibloader.h>
 
@@ -236,13 +236,13 @@ k * @ref writeConfig method.
    */
 class Resource : public QObject
 {
   Q_OBJECT
 
   public:
-    typedef QValueList<Resource *> List;
+    typedef Q3ValueList<Resource *> List;
 
     /**
      * Constructor. Construct resource from config.
      * @param config Configuration to read persistence information from.
      *               If config==0, create object using default settings.
      */
diff --git a/microkde/kresources/selectdialog.cpp b/microkde/kresources/selectdialog.cpp
index fba8648..d5b83e9 100644
--- a/microkde/kresources/selectdialog.cpp
+++ b/microkde/kresources/selectdialog.cpp
@@ -31,52 +31,56 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
 //US
 #include <kglobal.h>
 
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qlayout.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3PtrList>
 
 #include "resource.h"
 
 #include "selectdialog.h"
 
 using namespace KRES;
 
 //US I am using KBaseDialog instead of KDialog
 //US  : KDialog( parent, name, true )
-SelectDialog::SelectDialog( QPtrList<Resource> list, QWidget *parent,
+SelectDialog::SelectDialog( Q3PtrList<Resource> list, QWidget *parent,
                             const char *name )
   : KDialogBase( parent, name, true, i18n( "Resource Selection" ), Help | Ok | Cancel,
                  Ok, true)
 
 {
 //US  setCaption( i18n( "Resource Selection" ) );
 //US  resize( 300, 200 );
   resize( KMIN(KGlobal::getDesktopWidth(), 300), KMIN(KGlobal::getDesktopHeight(), 200) );
 
 //US  
-  QFrame *main = plainPage();
+  Q3Frame *main = plainPage();
 /*US
   QVBoxLayout *layout = new QVBoxLayout( main );
   mConfigPage = new KRES::ConfigPage( main );
   layout->addWidget( mConfigPage );
 */
 
 //US  QVBoxLayout *mainLayout = new QVBoxLayout( this );
-  QVBoxLayout *mainLayout = new QVBoxLayout( main );
+  Q3VBoxLayout *mainLayout = new Q3VBoxLayout( main );
   mainLayout->setMargin( marginHint() );
     
 //US  QGroupBox *groupBox = new QGroupBox( 2, Qt::Horizontal,  this );
-  QGroupBox *groupBox = new QGroupBox( 2, Qt::Horizontal,  main );
+  Q3GroupBox *groupBox = new Q3GroupBox( 2, Qt::Horizontal,  main );
   groupBox->setTitle( i18n( "Resources" ) );
 
 //US  mResourceId = new KListBox( groupBox );
-  mResourceId = new QListBox( groupBox );
+  mResourceId = new Q3ListBox( groupBox );
 
   mainLayout->addWidget( groupBox );
 
   mainLayout->addSpacing( 40 );
 
 /*US 
@@ -98,25 +102,25 @@ SelectDialog::SelectDialog( QPtrList<Resource> list, QWidget *parent,
       mResourceId->insertItem( resource->resourceName() );
       counter++;
     }
   }
 
   mResourceId->setCurrentItem( 0 );
-  connect( mResourceId, SIGNAL(returnPressed(QListBoxItem*)), 
+  connect( mResourceId, SIGNAL(returnPressed(Q3ListBoxItem*)), 
            SLOT(accept()) );
 }
 
 Resource *SelectDialog::resource()
 {
   if ( mResourceId->currentItem() != -1 )
     return mResourceMap[ mResourceId->currentItem() ];
   else
     return 0;
 }
 
-Resource *SelectDialog::getResource( QPtrList<Resource> list, QWidget *parent )
+Resource *SelectDialog::getResource( Q3PtrList<Resource> list, QWidget *parent )
 {
   if ( list.count() == 0 ) {
     KMessageBox::error( parent, i18n( "There is no resource available!" ) );
     return 0;
   }
 
diff --git a/microkde/kresources/selectdialog.h b/microkde/kresources/selectdialog.h
index 7026212..be5152b 100644
--- a/microkde/kresources/selectdialog.h
+++ b/microkde/kresources/selectdialog.h
@@ -22,19 +22,19 @@
 */
 
 #ifndef KRESOURCES_SELECTDIALOG_H
 #define KRESOURCES_SELECTDIALOG_H
 
 #include <qobject.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qmap.h>
 
 #include <kdialogbase.h>
 
 //US class KListBox;
-class QListBox;
+class Q3ListBox;
 
 namespace KRES {
 
 class Resource;
 
 /**
@@ -59,13 +59,13 @@ class SelectDialog : KDialogBase
     /**
      * Constructor.
      * @param ab     The address book you want to select the resource from
      * @param parent The parent widget
      * @param name   The name of the dialog
      */
-    SelectDialog( QPtrList<Resource> list, QWidget *parent = 0,
+    SelectDialog( Q3PtrList<Resource> list, QWidget *parent = 0,
         const char *name = 0);
 
   //  ~SelectDialog();
 
     /**
      * Return selected resource.
@@ -73,17 +73,17 @@ class SelectDialog : KDialogBase
     Resource *resource();
 
     /**
      * Open a dialog showing the available resources and return the resource the
      * user has selected. Returns 0, if the dialog was canceled.
      */
-    static Resource *getResource( QPtrList<Resource> list, QWidget *parent = 0 );
+    static Resource *getResource( Q3PtrList<Resource> list, QWidget *parent = 0 );
 
   private:
 //US    KListBox *mResourceId;
-    QListBox *mResourceId;
+    Q3ListBox *mResourceId;
 
     QMap<int, Resource*> mResourceMap;
 };
 
 
 
diff --git a/microkde/ksystemtray.cpp b/microkde/ksystemtray.cpp
index 4f81d02..0d0045f 100644
--- a/microkde/ksystemtray.cpp
+++ b/microkde/ksystemtray.cpp
@@ -1,7 +1,10 @@
 #include "ksystemtray.h"
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QLabel>
 
 void KSystemTray::mousePressEvent( QMouseEvent *)
 {
    ; //qDebug("hallo");
 }
 
diff --git a/microkde/ksystemtray.h b/microkde/ksystemtray.h
index f3e4f6a..6708c86 100644
--- a/microkde/ksystemtray.h
+++ b/microkde/ksystemtray.h
@@ -1,10 +1,12 @@
 #ifndef MICROKDE_KSYSTEMTRAY_H
 #define MICROKDE_KSYSTEMTRAY_H
 
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QMouseEvent>
 
 class KSystemTray : public QLabel
 { 
     Q_OBJECT
   public:
     KSystemTray( QWidget *parent = 0 );
diff --git a/microkde/ktempfile.cpp b/microkde/ktempfile.cpp
index b9166bd..d61d22e 100644
--- a/microkde/ktempfile.cpp
+++ b/microkde/ktempfile.cpp
@@ -1,7 +1,7 @@
-#include <qtextstream.h>
+#include <q3textstream.h>
 
 #include "ktempfile.h"
 
 KTempFile::KTempFile()
 {
 }
@@ -16,10 +16,10 @@ void KTempFile::setAutoDelete( bool )
 
 QString KTempFile::name()
 {
   return QString::null;
 }
 
-QTextStream *KTempFile::textStream()
+Q3TextStream *KTempFile::textStream()
 {
   return 0;
 }
diff --git a/microkde/ktempfile.h b/microkde/ktempfile.h
index 20dfa82..1ac7258 100644
--- a/microkde/ktempfile.h
+++ b/microkde/ktempfile.h
@@ -1,20 +1,20 @@
 #ifndef MINIKDE_KTEMPFILE_H
 #define MINIKDE_KTEMPFILE_H
 
 #include <qstring.h>
 
-class QTextStream;
+class Q3TextStream;
 
 class KTempFile
 {
   public:
     KTempFile();
     KTempFile( const QString &filename, const QString &extension );
   
     void setAutoDelete( bool );
     QString name();
     
-    QTextStream *textStream();
+    Q3TextStream *textStream();
 };
 
 #endif
diff --git a/microkde/ktextedit.cpp b/microkde/ktextedit.cpp
index 4dd6875..d74706b 100644
--- a/microkde/ktextedit.cpp
+++ b/microkde/ktextedit.cpp
@@ -1,53 +1,55 @@
 
 #include <ktextedit.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
+//Added by qt3to4:
+#include <QMouseEvent>
 #endif
 
 
-KTextEdit::KTextEdit ( QWidget *parent ) : QMultiLineEdit( parent ) 
+KTextEdit::KTextEdit ( QWidget *parent ) : Q3MultiLineEdit( parent ) 
 {
     mAllowPopupMenu = false; 
     mMouseDown = false; 
     mIgnoreMark = false; 
 #ifndef DESKTOP_VERSION 
     QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 #endif 
 }
 
 void KTextEdit::mousePressEvent(QMouseEvent *e)
 {
-    if (  e->button() == LeftButton ) {
+    if (  e->button() == Qt::LeftButton ) {
         mAllowPopupMenu = true;
         mYMousePos = mapToGlobal( (e->pos())).y();
         mXMousePos = mapToGlobal( (e->pos())).x();
     }
-     if (  e->button() == RightButton &&  !mAllowPopupMenu   )
+     if (  e->button() == Qt::RightButton &&  !mAllowPopupMenu   )
       return;
-    if (  e->button() == LeftButton ) {
+    if (  e->button() == Qt::LeftButton ) {
         if ( hasMarkedText () )
             mIgnoreMark = !mIgnoreMark;
         if ( mIgnoreMark && hasMarkedText () ) {
             mMouseDown = false;
             return ;
         }
     }
-    QMultiLineEdit::mousePressEvent( e );
+    Q3MultiLineEdit::mousePressEvent( e );
 }
 
 void KTextEdit::mouseReleaseEvent(QMouseEvent *e)
 {
-    QMultiLineEdit::mouseReleaseEvent(e);
+    Q3MultiLineEdit::mouseReleaseEvent(e);
 }
 
 void KTextEdit::mouseMoveEvent(QMouseEvent *e)
 {
     int diff = mYMousePos - mapToGlobal( (e->pos())).y();
     if ( diff < 0 ) diff = -diff;
     int diff2 = mXMousePos - mapToGlobal( (e->pos())).x();
     if ( diff2 < 0 ) diff2 = -diff2;
     if ( diff+ diff2 > 20 )
         mAllowPopupMenu = false;
-    QMultiLineEdit::mouseMoveEvent(e);
+    Q3MultiLineEdit::mouseMoveEvent(e);
 }
 
diff --git a/microkde/ktextedit.h b/microkde/ktextedit.h
index 87c0602..b7c8924 100644
--- a/microkde/ktextedit.h
+++ b/microkde/ktextedit.h
@@ -1,12 +1,14 @@
 #ifndef MICROKDE_KTEXTEDIT_H
 #define MICROKDE_KTEXTEDIT_H
 
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
+//Added by qt3to4:
+#include <QMouseEvent>
 
-class KTextEdit : public QMultiLineEdit
+class KTextEdit : public Q3MultiLineEdit
 {
   public:
     KTextEdit( QWidget *parent )  ;
     void setIgnoreMark( bool b ) { mIgnoreMark = b; }
 
  private:
diff --git a/microkde/kurl.cpp b/microkde/kurl.cpp
index 2574e25..122ad71 100644
--- a/microkde/kurl.cpp
+++ b/microkde/kurl.cpp
@@ -31,19 +31,21 @@
 #include <stdlib.h>
 #ifdef _WIN32_
 
 #else
 #include <unistd.h>
 #endif
-#include <qurl.h>
+#include <q3url.h>
 #include <qdir.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 //US#include <qstylesheet.h>
 #include <qmap.h>
 #include <qtextcodec.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 static const QString fileProt = "file";
 
 static QTextCodec * codecForHint( int encoding_hint /* not 0 ! */ )
 {
     return QTextCodec::codecForMib( encoding_hint );
@@ -54,13 +56,13 @@ static QString encode( const QString& segment, bool encode_slash, int encoding_h
   const char *encode_string;
   if (encode_slash)
     encode_string = "<>#@\"&%?={}|^~[]\'`\\:+/";
   else
     encode_string = "<>#@\"&%?={}|^~[]\'`\\:+";
 
-  QCString local;
+  Q3CString local;
   if (encoding_hint==0)
     local = segment.local8Bit();
   else
   {
       QTextCodec * textCodec = codecForHint( encoding_hint );
       if (!textCodec)
@@ -97,13 +99,13 @@ static QString encode( const QString& segment, bool encode_slash, int encoding_h
       c = character % 16;
       c += (c > 9) ? ('A' - 10) : '0';
       new_segment[ new_length++ ] = c;
 
     }
     else
-      new_segment[ new_length++ ] = local[i];
+      new_segment[ new_length++ ] = character;
   }
 
   QString result = QString(new_segment, new_length);
   delete [] new_segment;
   return result;
 }
@@ -202,13 +204,13 @@ static void decode( const QString& segment, QString &decoded, QString &encoded,
   if (encoding_hint)
       textCodec = codecForHint( encoding_hint );
 
   if (!textCodec)
       textCodec = QTextCodec::codecForLocale();
 
-  QCString csegment = textCodec->fromUnicode(segment);
+  Q3CString csegment = textCodec->fromUnicode(segment);
   // Check if everything went ok
   if (textCodec->toUnicode(csegment) != segment)
   {
       // Uh oh
       textCodec = codecForHint( 106 ); // Fall back to utf-8
       csegment = textCodec->fromUnicode(segment);
@@ -275,13 +277,13 @@ static void decode( const QString& segment, QString &decoded, QString &encoded,
   if (updateDecoded)
   {
      QByteArray array;
      array.setRawData(new_segment, new_length);
      decoded = textCodec->toUnicode( array, new_length );
      array.resetRawData(new_segment, new_length);
-     QCString validate = textCodec->fromUnicode(decoded);
+     Q3CString validate = textCodec->fromUnicode(decoded);
 
      if (strcmp(validate.data(), new_segment) != 0)
      {
         decoded = QString::fromLocal8Bit(new_segment, new_length);
      }
   }
@@ -416,13 +418,13 @@ KURL::KURL( const QString &url, int encoding_hint )
 KURL::KURL( const char * url, int encoding_hint )
 {
   reset();
   parse( QString::fromLatin1(url), encoding_hint );
 }
 
-KURL::KURL( const QCString& url, int encoding_hint )
+KURL::KURL( const Q3CString& url, int encoding_hint )
 {
   reset();
   parse( QString::fromLatin1(url), encoding_hint );
 }
 
 KURL::KURL( const KURL& _u )
@@ -457,13 +459,13 @@ QDataStream & operator>> (QDataStream & s, KURL & a)
       a.m_strQuery_encoded = QueryFromWire.mid(1);
 
     return s;
 }
 
 #ifndef QT_NO_NETWORKPROTOCOL
-KURL::KURL( const QUrl &u )
+KURL::KURL( const Q3Url &u )
 {
   *this = u;
 }
 #endif
 
 KURL::KURL( const KURL& _u, const QString& _rel_url, int encoding_hint )
@@ -586,19 +588,19 @@ void KURL::parse( const QString& _url, int encoding_hint )
   uint pos = 0;
 
   // Node 1: Accept alpha or slash
   QChar x = buf[pos++];
   if ( x == '/' )
     goto Node9;
-  if ( !isalpha( (int)x ) )
+  if ( !x.isLetter() )
     goto NodeErr;
 
   // Node 2: Accept any amount of (alpha|digit|'+'|'-')
   // '.' is not currently accepted, because current KURL may be confused.
   // Proceed with :// :/ or :
-  while( pos < len && (isalpha((int)buf[pos]) || isdigit((int)buf[pos]) ||
+  while( pos < len && ( buf[pos].isLetter() || buf[pos].isDigit() ||
           buf[pos] == '+' || buf[pos] == '-')) pos++;
 
   if ( pos+2 < len && buf[pos] == ':' && buf[pos+1] == '/' && buf[pos+2] == '/' )
     {
       m_strProtocol = QString( orig, pos ).lower();
       pos += 3;
@@ -766,17 +768,17 @@ void KURL::parse( const QString& _url, int encoding_hint )
   pos++;
 
   // Node 8a: Accept at least one digit
   if ( pos == len )
     goto NodeErr;
   start = pos;
-  if ( !isdigit( buf[pos++] ) )
+  if ( !buf[pos++].isDigit() )
     goto NodeErr;
 
   // Node 8b: Accept any amount of digits
-  while( pos < len && isdigit( buf[pos] ) ) pos++;
+  while( pos < len && buf[pos].isDigit() ) pos++;
   port = QString( buf + start, pos - start );
   m_iPort = port.toUShort();
   if ( pos == len )
     goto NodeOk;
   start = pos++;
 
@@ -845,13 +847,13 @@ KURL& KURL::operator=( const char * _url )
   parse( QString::fromLatin1(_url) );
 
   return *this;
 }
 
 #ifndef QT_NO_NETWORKPROTOCOL
-KURL& KURL::operator=( const QUrl & u )
+KURL& KURL::operator=( const Q3Url & u )
 {
   m_strProtocol = u.protocol();
   m_strUser = u.user();
   m_strPass = u.password();
   m_strHost = u.host();
   m_strPath = u.path( FALSE );
@@ -1371,13 +1373,13 @@ KURL KURL::join( const KURL::List & lst )
   KURL::List::ConstIterator first = lst.fromLast();
   for( KURL::List::ConstIterator it = first; it != lst.end(); --it )
   {
      KURL u(*it);
      if (it != first)
      {
-        if (!u.m_strRef_encoded) u.m_strRef_encoded = tmp.url();
+        if (u.m_strRef_encoded.isEmpty()) u.m_strRef_encoded = tmp.url();
         else u.m_strRef_encoded += "#" + tmp.url(); // Support more than one suburl thingy
      }
      tmp = u;
   }
 
   return tmp;
@@ -1415,13 +1417,13 @@ QString KURL::fileName( bool _strip_trailing_slash ) const
   {
      // This is hairy, we need the last unencoded slash.
      // Count in the encoded string how many encoded slashes follow the last
      // unencoded one.
      int i = m_strPath_encoded.findRev( '/', len - 1 );
      QString fileName_encoded = m_strPath_encoded.mid(i+1);
-     n += fileName_encoded.contains("%2f", false);
+     n += fileName_encoded.count("%2f", Qt::CaseInsensitive);
   }
   int i = len;
   do {
     i = path.findRev( '/', i - 1 );
   }
   while (--n && (i > 0));
diff --git a/microkde/kurl.h b/microkde/kurl.h
index cd65a1c..016eb24 100644
--- a/microkde/kurl.h
+++ b/microkde/kurl.h
@@ -18,15 +18,17 @@
  **/
 
 #ifndef __kurl_h__
 #define __kurl_h__ "$Id$"
 
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
-class QUrl;
+class Q3Url;
 class QStringList;
 template <typename K, typename V> class QMap;
 
 class KURLPrivate;
 /**
  * Represents and parses a URL.
@@ -61,13 +63,13 @@ public:
   /**
    * KURL::List is a QValueList that contains KURLs with a few
    * convenience methods.
    * @see KURL
    * @see QValueList
    */
-  class List : public QValueList<KURL>
+  class List : public Q3ValueList<KURL>
   {
   public:
     /**
      * Creates an empty List.
      */
       List() { }
@@ -132,23 +134,23 @@ public:
    * then URL, in its encoded form, is strictly ascii.
    * @param url A encoded URL. If the URL does not have a protocol part,
    *            "file:" is assumed.
    * @param encoding_hint MIB of original encoding of URL.
    * @see QTextCodec::mibEnum()
    */
-  KURL( const QCString& url, int encoding_hint = 0 );
+  KURL( const Q3CString& url, int encoding_hint = 0 );
   /**
    * Copy constructor.
    * @param u the KURL to copy
    */
   KURL( const KURL& u );
   /**
    * Converts from a @ref QUrl.
    * @param u the QUrl
    */
-  KURL( const QUrl &u );
+  KURL( const Q3Url &u );
   /**
    * Constructor allowing relative URLs.
    *
    * @param _baseurl The base url.
    * @param _rel_url A relative or absolute URL.
    * If this is an absolute URL then @p _baseurl will be ignored.
@@ -655,13 +657,13 @@ public:
    */
   KURL upURL( ) const;
 
   KURL& operator=( const KURL& _u );
   KURL& operator=( const QString& _url );
   KURL& operator=( const char * _url );
-  KURL& operator=( const QUrl & u );
+  KURL& operator=( const Q3Url & u );
 
   bool operator==( const KURL& _u ) const;
   bool operator==( const QString& _u ) const;
   bool operator!=( const KURL& _u ) const { return !( *this == _u ); }
   bool operator!=( const QString& _u ) const { return !( *this == _u ); }
 
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index 9c87682..88f17e5 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -16,16 +16,18 @@
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 
 */
 
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qcursor.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
@@ -70,13 +72,13 @@ KCMultiDialog::~KCMultiDialog()
 
 void KCMultiDialog::slotDefault()
 {
 
     int curPageIndex = activePageIndex();
 
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
     {
        if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
        {
           (*it)->defaults();
           clientChanged(true);
@@ -88,13 +90,13 @@ void KCMultiDialog::slotDefault()
 void KCMultiDialog::accept()
 {
     slotOk();
 }
 void KCMultiDialog::slotApply()
 {
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
       (*it)->save();
     clientChanged(false);
 
     emit applyClicked();
 
@@ -102,13 +104,13 @@ void KCMultiDialog::slotApply()
 
 
 void KCMultiDialog::slotOk()
 {
 qDebug("KCMultiDialog::slotOk clicked");
 
-    QPtrListIterator<KCModule> it(modules);
+    Q3PtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
       (*it)->save();
     QDialog::accept();
 
     emit okClicked();
 }
@@ -150,15 +152,15 @@ void KCMultiDialog::addModule(const QString& path, bool withfallback)
     }
     moduleDict.insert(page, new LoadInfo(path, withfallback));
     if (modules.isEmpty())
        slotAboutToShow(page);
 }
 */
-QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename )
+Q3VBox * KCMultiDialog::getNewVBoxPage( const QString & modulename )
 {
-    QVBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() );
+    Q3VBox *page = mMainWidget->addVBoxPage(modulename , QString::null,QPixmap() );
     return page;
 
 }
 //US special method for microkde. We dop noty want to load everything dynamically.
 void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname)
 {
diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h
index 66412ac..78f8a00 100644
--- a/microkde/kutils/kcmultidialog.h
+++ b/microkde/kutils/kcmultidialog.h
@@ -19,14 +19,14 @@
 
 */
 
 #ifndef KCMULTIDIALOG_H
 #define KCMULTIDIALOG_H
 
-#include <qptrlist.h>
-#include <qptrdict.h>
+#include <q3ptrlist.h>
+#include <q3ptrdict.h>
 
 #include <kdialogbase.h>
 #include <kjanuswidget.h>
 #include <kcmodule.h>
 
 /**
@@ -72,13 +72,13 @@ public:
      **/
 //US    void addModule(const QString& module, bool withfallback=true);
 
 
 //US special method for microkde. We do not want to load everything dynamically.
    void addModule(KCModule* module );//, const QString& modulename, const QString& iconname);
-    QVBox* getNewVBoxPage(const QString & modulename) ;
+    Q3VBox* getNewVBoxPage(const QString & modulename) ;
 
 
     bool showPage( int index );
     int activePageIndex() const;
     int pageIndex( QWidget *widget ) const;
 
@@ -130,13 +130,13 @@ private:
          : path(_path), withfallback(_withfallback)
          { }
       QString path;
       bool withfallback;
     };
 */
-    QPtrList<KCModule> modules;
+    Q3PtrList<KCModule> modules;
 /*
     QPtrDict<LoadInfo> moduleDict;
     QString _docPath;
 */
     QString _baseGroup;
 
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 7120bdd..4ff06a3 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -3,13 +3,13 @@ CONFIG		+= qt warn_on
 include( ../variables.pri )
 #INCLUDEPATH     += $(QTDIR)/include .
 #DEPENDPATH      += $(QTDIR)/include
 INCLUDEPATH     += .  ../  ../kabc ./kdecore ./kdeui ./kio/kfile ./kio/kio
 #LIBS            += -lqtcompat
 
-        TARGET  = microkde
+        TARGET  = xmicrokde
 DESTDIR= ../bin
 DEFINES += DESKTOP_VERSION KDE_QT_ONLY
 unix : {
 staticlib: {
 INCLUDEPATH += ../kabc/plugins
 DEFINES += STATIC_RESOURCES
@@ -175,6 +175,8 @@ KDGanttMinimizeSplitter.cpp \
  kdeui/ktoolbarhandler.cpp \
  kdeui/kstdaction.cpp \
  kdeui/kxmlguiclient.cpp \
  kdecore/kprefs.cpp \
  kdecore/klibloader.cpp \
  kidmanager.cpp 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index 8fe2bd5..514e7b3 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -4,13 +4,13 @@ INCLUDEPATH     += . .. $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/kabc kdecore kdeui ki
 
 DEPENDPATH      += $(QPEDIR)/include
 LIBS            += -lmicroqtcompat -L$(QPEDIR)/lib
 
 DEFINES += KDE_QT_ONLY
 
-        TARGET  = microkde
+        TARGET  = xmicrokde
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/lib
 
 
 INTERFACES = \
diff --git a/microkde/ofileselector_p.cpp b/microkde/ofileselector_p.cpp
index f4f112e..0f95c84 100644
--- a/microkde/ofileselector_p.cpp
+++ b/microkde/ofileselector_p.cpp
@@ -262,13 +262,13 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
             selector(), SIGNAL(closeMe() ) );
 
     btn = new QToolButton( box );
     btn->setIconSet( Resource::loadPixmap("cardmon/pcmcia") );
 
     /* let's fill device parts */
-    QPopupMenu* pop = new QPopupMenu(this);
+    Q3PopupMenu* pop = new Q3PopupMenu(this);
     connect(pop, SIGNAL( activated(int) ),
             this, SLOT(slotFSActivated(int) ) );
 
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it(fs);
diff --git a/microkde/ofileselector_p.h b/microkde/ofileselector_p.h
index 834fd70..a7d97fe 100644
--- a/microkde/ofileselector_p.h
+++ b/microkde/ofileselector_p.h
@@ -134,13 +134,13 @@ protected:
     OFileSelector* selector();
 
 private:
     QMap<QString, QString> m_dev;
     bool m_all : 1;
     OFileSelector* m_sel;
-    QPopupMenu* m_fsPop;
+    Q3PopupMenu* m_fsPop;
     bool compliesMime( const QString& );
     QStringList m_mimes; // used in compy mime
     QString m_currentDir;
     QToolButton *m_btnNew, *m_btnClose;
     void connectSlots();
     void addFile( QFileInfo* info, bool symlink = FALSE );
diff --git a/microkde/qlayoutengine_p.h b/microkde/qlayoutengine_p.h
index 2d6a556..e782703 100644
--- a/microkde/qlayoutengine_p.h
+++ b/microkde/qlayoutengine_p.h
@@ -1,6 +1,8 @@
+//Added by qt3to4:
+#include <Q3MemArray>
 // THIS IS A COPY OF THE FILE FOUND IN $QTDIR/src/kernel. Needed to modify qsplitter
 
 /****************************************************************************
 ** $Id$
 **
 ** Internal header file.
@@ -52,16 +54,12 @@
 //
 // We mean it.
 //
 //
 
 
-#ifndef QT_H
-#include "qabstractlayout.h"
-#endif // QT_H
-
 #ifndef QT_NO_LAYOUT
 struct QLayoutStruct
 {
     void initParameters() { minimumSize = sizeHint = 0;
     maximumSize = QWIDGETSIZE_MAX; expansive = FALSE; empty = TRUE; }
     void init() { stretch = 0; initParameters(); }
@@ -78,13 +76,13 @@ struct QLayoutStruct
     //result:
     int pos;
     int size;
 };
 
 
-void qGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos,
+void qGeomCalc( Q3MemArray<QLayoutStruct> &chain, int start, int count, int pos,
                       int space, int spacer );
 
 
 
 /*
   Modify total maximum (max) and total expansion (exp)
diff --git a/pwmanager/libcrypt/cipher/cipher.pro b/pwmanager/libcrypt/cipher/cipher.pro
index ad96201..7e1a330 100644
--- a/pwmanager/libcrypt/cipher/cipher.pro
+++ b/pwmanager/libcrypt/cipher/cipher.pro
@@ -65,6 +65,8 @@ SOURCES += ../crypt/ath.c \
 
 
 
 
 #LIBS += -L../$(PLATFORM)
 #LIBS +=  -lgcrypt -lmpi -lerror
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/libcrypt/error/error.pro b/pwmanager/libcrypt/error/error.pro
index 8c5f667..e96bcee 100644
--- a/pwmanager/libcrypt/error/error.pro
+++ b/pwmanager/libcrypt/error/error.pro
@@ -26,7 +26,9 @@ SOURCES += code-from-errno.c \
            strsource-sym.c \
            strsource.c
 
      #      gpg-error.c \
        #    gpg-error.h \
       #     mkerrcodes.h
-     #      mkerrcodes.c \
\ No newline at end of file
+     #      mkerrcodes.c \
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/libcrypt/mpi/mpi.pro b/pwmanager/libcrypt/mpi/mpi.pro
index 4eb6346..d213bc3 100644
--- a/pwmanager/libcrypt/mpi/mpi.pro
+++ b/pwmanager/libcrypt/mpi/mpi.pro
@@ -37,6 +37,8 @@ SOURCES += mpi-add.c \
            generic/mpih-mul1.c \
            generic/mpih-mul2.c \
            generic/mpih-mul3.c \
            generic/mpih-rshift.c \
            generic/mpih-sub1.c \
            generic/udiv-w-sdiv.c
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/libcrypt/zlib/zlib.pro b/pwmanager/libcrypt/zlib/zlib.pro
index 2841aaf..7ba44e3 100644
--- a/pwmanager/libcrypt/zlib/zlib.pro
+++ b/pwmanager/libcrypt/zlib/zlib.pro
@@ -31,6 +31,8 @@ SOURCES += adler32.c \
            inflate.c \
            inftrees.c \
            infutil.c \
            trees.c \
            uncompr.c \
            zutil.c
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/pwmanager/addentrywnd_emb.cpp b/pwmanager/pwmanager/addentrywnd_emb.cpp
index 2fa9e8a..f76d33b 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.cpp
+++ b/pwmanager/pwmanager/addentrywnd_emb.cpp
@@ -26,18 +26,21 @@ $Id$
 #include "addentrywnd_emb.h"
 #include "pwmdoc.h"
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <qpushbutton.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 
 /*
  *  Constructs a addEntryWnd as a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
@@ -46,22 +49,22 @@ $Id$
 addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
   : KDialogBase( KDialogBase::Plain, i18n( "edit/add a password entry" ), 
                  KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, parent, name, true ), doc(d)
 {
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
     QTabWidget* mTabWidget = new QTabWidget( page );
     pageLayout->addWidget( mTabWidget );
 
     ////////////////////////////////////////////////////////////////////
     // This is the Password tab
     QWidget *tab1 = new QWidget( mTabWidget );
 
-    QGridLayout *layout = new QGridLayout( tab1, 3, 1 );
+    Q3GridLayout *layout = new Q3GridLayout( tab1, 3, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
 
 
     int i = 0;
@@ -74,13 +77,13 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
     categoryComboBox = new KComboBox( tab1  );
     QLabel* label = new QLabel( categoryComboBox, i18n("Category:"), tab1 );
     layout->addWidget( label, i, 0 );
     layout->addWidget( categoryComboBox, i, 1 );
     i++;
     categoryComboBox->setEditable( TRUE );
-    categoryComboBox->setSizeLimit( 8 );
+    categoryComboBox->setMaxVisibleItems( 8 );
     categoryComboBox->setAutoCompletion( TRUE );
     categoryComboBox->setDuplicatesEnabled( FALSE );
     connect(categoryComboBox,SIGNAL(activated(const QString&)), SLOT(categorySelected(const QString&))); 
 
 
     usernameLineEdit = new KLineEdit( tab1, "usernameLineEdit" );
@@ -114,30 +117,30 @@ addEntryWnd::addEntryWnd( PwMDoc* d, QWidget* parent, const char* name)
 
 
     ////////////////////////////////////////////////////////////////////
     // This is the Comment tab
     QWidget *tab2 = new QWidget( mTabWidget );
 
-    layout = new QGridLayout( tab2, 3, 1 );
+    layout = new Q3GridLayout( tab2, 3, 1 );
     layout->setMargin( KDialogBase::marginHintSmall() );
     layout->setSpacing( KDialogBase::spacingHintSmall() );
     i = 0;
 
-    commentTextEdit = new QMultiLineEdit(tab2);
+    commentTextEdit = new Q3MultiLineEdit(tab2);
     layout->addMultiCellWidget( commentTextEdit, i, i, 0, 0 );
     i++;
 
 
     mTabWidget->addTab( tab2, i18n( "&Comments" ) );
 
 
     ////////////////////////////////////////////////////////////////////
     // This is the Launcher tab
     QWidget *tab3 = new QWidget( mTabWidget );
 
-    layout = new QGridLayout( tab3, 3, 1 );
+    layout = new Q3GridLayout( tab3, 3, 1 );
     layout->setMargin( KDialogBase::marginHintSmall() );
     layout->setSpacing( KDialogBase::spacingHintSmall() );
     i = 0;
 
     launcherLineEdit = new KLineEdit( tab3, "launcherLineEdit" );
     label = new QLabel( launcherLineEdit, i18n("Launcher:"), tab3 );
diff --git a/pwmanager/pwmanager/addentrywnd_emb.h b/pwmanager/pwmanager/addentrywnd_emb.h
index 966d9d2..ad7d30c 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.h
+++ b/pwmanager/pwmanager/addentrywnd_emb.h
@@ -24,24 +24,29 @@ $Id$
 */                                                                      
 
 #ifndef ADDENTRYWND_EMB_H
 #define ADDENTRYWND_EMB_H
 
 #include <qvariant.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
 #include <kdialogbase.h>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
 class QSpacerItem;
 class KLineEdit;
 class QPushButton;
 class KComboBox;
 class QLabel;
-class QGroupBox;
-class QMultiLineEdit;
+class Q3GroupBox;
+class Q3MultiLineEdit;
 class PwMDoc;
 
 class addEntryWnd : public KDialogBase
 {
     Q_OBJECT
 
@@ -58,13 +63,13 @@ public:
     KLineEdit* urlLineEdit;
     QLabel* descLineLabel;
     QLabel* usernameLineLabel;
     QLabel* pwLineLabel;
 
     QPushButton* revealButton;
-    QMultiLineEdit* commentTextEdit;
+    Q3MultiLineEdit* commentTextEdit;
     PwMDoc* doc;
 
 public slots:
     virtual void revealButton_slot();
     virtual void generateButton_slot();
     virtual void advancedCommentButton_slot(bool on);
diff --git a/pwmanager/pwmanager/addentrywndimpl.cpp b/pwmanager/pwmanager/addentrywndimpl.cpp
index 09efd1c..c952ead 100644
--- a/pwmanager/pwmanager/addentrywndimpl.cpp
+++ b/pwmanager/pwmanager/addentrywndimpl.cpp
@@ -193,13 +193,13 @@ void AddEntryWndImpl::switchComment(bool toAdvanced)
                 editAdvCommentButton->show();
         } else {
                 delete_ifnot_null(editAdvCommentButton);
                 if (commentTextEdit)
                         return;
 
-                commentTextEdit = new QTextEdit(commentDummy);
+                commentTextEdit = new Q3TextEdit(commentDummy);
                 commentTextEdit->setTextFormat(Qt::PlainText);
                 commentTextEdit->resize(commentDummy->size());
                 commentTextEdit->setText(savedCommentText);
                 commentTextEdit->show();
         }
 #endif
@@ -213,9 +213,9 @@ void AddEntryWndImpl::editAdvCommentButton_slot()
         if (editor.exec())
                 return;
         advCommentDta = editor.getHtmlDta();
 #endif
 }
 
-#ifndef PWM_EMBEDDED
-#include "addentrywndimpl.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_addentrywndimpl.cpp"
 #endif
diff --git a/pwmanager/pwmanager/addentrywndimpl.h b/pwmanager/pwmanager/addentrywndimpl.h
index e13eb54..c5f4bb1 100644
--- a/pwmanager/pwmanager/addentrywndimpl.h
+++ b/pwmanager/pwmanager/addentrywndimpl.h
@@ -20,19 +20,19 @@
 #ifndef __ADDENTRYWNDIMPL_H
 #define __ADDENTRYWNDIMPL_H
 
 
 #ifndef PWM_EMBEDDED
 #include <qlineedit.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
 #include <qcombobox.h>
 #include "addentrywnd.h"
 #else
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include "addentrywnd_emb.h"
 #endif
 
 #include <qpushbutton.h>
 
 class PwGenWndImpl;
@@ -83,18 +83,18 @@ public:
         /** are we using an advanced comment */
         bool isAdvancedComment()
                         { return useAdvComment; }
 
 public slots:
 #ifndef PWM_EMBEDDED 
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
         /** OK button pressed */
         void okButton_slot();
         /** cancel button pressed */
         void cancelButton_slot();
-//MOC_SKIP_END
+#endif
 #else
         virtual void slotOk();
 #endif
         /** Reveal button pressed */
         void revealButton_slot();
         /** Generate button pressed */
@@ -107,13 +107,13 @@ public slots:
 protected:
         void switchComment(bool toAdvanced);
 
 protected:
         QPushButton *editAdvCommentButton;
 #ifndef PWM_EMBEDDED
-        QTextEdit *commentTextEdit;
+        Q3TextEdit *commentTextEdit;
 #else
         //nothing here 
 #endif
         /** saved data from normal comment text edit box */
         QString savedCommentText;
         /** use an advanced comment? */
diff --git a/pwmanager/pwmanager/binentrygen.h b/pwmanager/pwmanager/binentrygen.h
index 49288aa..9263cdc 100644
--- a/pwmanager/pwmanager/binentrygen.h
+++ b/pwmanager/pwmanager/binentrygen.h
@@ -18,13 +18,13 @@
  **************************************************************************/  
 
 #ifndef __BINENTRYGEN_H
 #define __BINENTRYGEN_H
 
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include "pwmdoc.h"
 
 /** Binary entry generator.
   * This generator generates a normal struct PwMDataItem
   * from binary data (using base64 encoding).
diff --git a/pwmanager/pwmanager/commentbox.cpp b/pwmanager/pwmanager/commentbox.cpp
index 5416856..a60440d 100644
--- a/pwmanager/pwmanager/commentbox.cpp
+++ b/pwmanager/pwmanager/commentbox.cpp
@@ -23,15 +23,15 @@
 
 #include <klocale.h>
 
 #ifndef PWM_EMBEDDED
 #include <khtml_part.h>
 #include <khtmlview.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif
 
 
 
 #ifndef PWM_EMBEDDED
 CommentBox::CommentBox(QWidget *_parentWidget)
@@ -134,13 +134,13 @@ void CommentBox::switchTo(commentBoxMode newMode)
                 break;
         }
 
         // setup new mode
         switch (newMode) {
         case mode_text:
-                textDta = new QTextEdit(parentWidget);
+                textDta = new Q3TextEdit(parentWidget);
                 textDta->setTextFormat(Qt::PlainText);
                 textDta->setReadOnly(true);
                 textDta->show();
                 break;
         case mode_html:
                 htmlDta = new KHTMLPart(parentWidget, 0,
@@ -226,17 +226,17 @@ QSize CommentBox::size()
 
 ////////////////////////////////////////////////////////////////////////
 
 #else
 
 CommentBox::CommentBox(QWidget *_parentWidget)
-  : QTextBrowser(_parentWidget) 
+  : Q3TextBrowser(_parentWidget) 
 
 {
     //this->setReadOnly(true);
-  setFocusPolicy( QWidget::ClickFocus );
+  setFocusPolicy( Qt::ClickFocus );
 }
 
 CommentBox::~CommentBox()
 {
 }
 
@@ -245,13 +245,13 @@ void CommentBox::clear()
         this->hide();
 }
 
 
 void CommentBox::setText(const QString &text)
 {
-        QTextBrowser::setText( text);
+        Q3TextBrowser::setText( text);
         if (!isVisible())
                 show();
 }
 
 bool CommentBox::getText(QString *text)
 {
diff --git a/pwmanager/pwmanager/commentbox.h b/pwmanager/pwmanager/commentbox.h
index 3103353..d14ba13 100644
--- a/pwmanager/pwmanager/commentbox.h
+++ b/pwmanager/pwmanager/commentbox.h
@@ -20,13 +20,13 @@
 #ifndef COMMENTBOX_H
 #define COMMENTBOX_H
 
 #include <qstring.h>
 #include <qsize.h>
 class QWidget;
-class QTextEdit;
+class Q3TextEdit;
 class KHTMLPart;
 
 #ifndef PWM_EMBEDDED
 
 class CommentBox 
 {
@@ -82,24 +82,24 @@ protected:
 protected:
         /** parent widget for this comment box */
         QWidget *parentWidget;
         /** current comment box usage type */
         commentBoxMode mode;
         /** if the comment box is a normal textbox, data is stored here */
-        QTextEdit *textDta;
+        Q3TextEdit *textDta;
         /** if the comment box is a HTML box, data is stored here */
         KHTMLPart *htmlDta;
 };
 
 #else
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 /** Implementation of the advanced HTML comment box */
 //US ENH: CommentBox must be derived from QWidget, to allow the splitter to set a initial size
 // without conflicting with the two display modes 
 
-class CommentBox : public QTextBrowser 
+class CommentBox : public Q3TextBrowser 
 {
 public:
         CommentBox(QWidget *_parentWidget);
         ~CommentBox();
 
         /** clear all data in the comment box */
diff --git a/pwmanager/pwmanager/csv.cpp b/pwmanager/pwmanager/csv.cpp
index 194edf2..226cc08 100644
--- a/pwmanager/pwmanager/csv.cpp
+++ b/pwmanager/pwmanager/csv.cpp
@@ -20,12 +20,14 @@
 #include "csv.h"
 #include "pwmdoc.h"
 #include "pwmexception.h"
 
 #include <kmessagebox.h>
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3CString>
 
         #define MAX_CSV_FILE_SIZE(50 * 1024 * 1024) // bytes
 
 
 Csv::Csv(QWidget *_parent)
  : parent (_parent)
@@ -39,13 +41,13 @@ Csv::~Csv()
 bool Csv::importData(const QString &filepath,
                      PwMDoc *doc)
 {
         bool ret = true;
         QByteArray d;
         QFile f(filepath);
-        if (!f.open(IO_ReadOnly)) {
+        if (!f.open(QIODevice::ReadOnly)) {
                 KMessageBox::error(parent,
                                    i18n("Could not open file.\n"
                                         "Does the file exist?"),
                                    i18n("Open error."));
                 ret = false;
                 goto out;
@@ -86,13 +88,13 @@ bool Csv::doImport(const QByteArray &d,
         PwMDataItem di;
         //US ENH: initialize all members:
         di.clear();
 
         int refIndex = 0;
         int ret;
-        QCString s, curCat;
+        Q3CString s, curCat;
         int fieldIndex = 0;
         bool inRecord = false;
         /* fieldIndex is a reference count to see which
          * value we are attaching to di.
          * Valid counts are:
          * 0 -> category
@@ -118,46 +120,46 @@ bool Csv::doImport(const QByteArray &d,
                                          */
                                         ++fieldIndex;
                                 } else
                                         curCat = s;
                                 break;
                                 case 1:// desc
-                                di.desc = s;
+                                di.desc = std::string(s);
                                 ++fieldIndex;
                                 break;
                         case 2: // name
-                                di.name = s;
+                                di.name = std::string(s);
                                 ++fieldIndex;
                                 break;
                         case 3: // pw
-                                di.pw = s;
+                                di.pw = std::string(s);
                                 ++fieldIndex;
                                 break;
                         case 4: // url
-                                di.url = s;
+                                di.url = std::string(s);
                                 ++fieldIndex;
                                 break;
                         case 5: // launcher
-                                di.launcher = s;
+                                di.launcher = std::string(s);
                                 ++fieldIndex;
                                 break;
                         case 6: // comment
-                                di.comment = s;
+                                di.comment = std::string(s);
                                 ++fieldIndex;
                                 break;
                         default:
                                 /* Too many fields in a record.
                                  * We simply throw it away.
                                  */
                                 break;
                         }
                         break;
                 case 1:
                         // record complete.
                         if (fieldIndex == 6)
-                                di.comment = s;
+                                di.comment = std::string(s);
                         inRecord = false;
                         fieldIndex = 0;
                         doc->addEntry(curCat, &di, true);
                         //US ENH: clear di for the next row
                         di.clear();
                         break;
@@ -172,13 +174,13 @@ bool Csv::doImport(const QByteArray &d,
                 }
         }
         BUG();
         return false;
 }
 
-int Csv::nextField(QCString *ret,
+int Csv::nextField(Q3CString *ret,
                    const QByteArray &in,
                    bool inRecord,
                    int *_refIndex)
 {
         int rv = -2;
         char c;
@@ -350,13 +352,13 @@ bool Csv::exportData(const QString &filepath,
                                            i18n("Could not delete the old file."),
                                            i18n("Delete error."));
                         return false;
                 }
         }
         QFile f(filepath);
-        if (!f.open(IO_ReadWrite)) {
+        if (!f.open(QIODevice::ReadWrite)) {
                 KMessageBox::error(parent,
                                    i18n("Could not open file for writing."),
                                    i18n("Open error."));
                 ret = false;
                 goto out;
         }
@@ -373,13 +375,13 @@ bool Csv::doExport(QFile &f,
                    PwMDoc *doc)
 {
         unsigned int numCat = doc->numCategories();
         unsigned int numEntr;
         unsigned int i, j;
         PwMDataItem d;
-        QCString s, catName;
+        Q3CString s, catName;
         QByteArray b;
 
         for (i = 0; i < numCat; ++i) {
                 numEntr = doc->numEntries(i);
                 catName = newField(doc->getCategory(i)->c_str());
                 for (j = 0; j < numEntr; ++j) {
@@ -398,31 +400,31 @@ bool Csv::doExport(QFile &f,
                         s += ",";
                         s += newField(d.comment.c_str());
                         s += "\r\n";
                         b = s;
                         // remove \0 termination
 #ifndef PWM_EMBEDDED
-                        b.resize(b.size() - 1, QGArray::SpeedOptim);
+                        b.resize(b.size() - 1, Q3GArray::SpeedOptim);
 #else
                         b.resize(b.size() - 1);
 #endif
                         if (!f.writeBlock(b))
                                 return false;
                 }
         }
         return true;
 }
 
-QCString Csv::newField(QCString s)
+Q3CString Csv::newField(Q3CString s)
 {
         if (s.isEmpty())
-                return QCString();
-        QCString ret("\"");
+                return Q3CString();
+        Q3CString ret("\"");
 #ifndef PWM_EMBEDDED
         s.replace('\"', "\"\"");
 #else
-        s.replace(QRegExp("\""), "\"\"");
+        s.replace("\"", "\"\"");
 #endif
         ret += s;
         ret += "\"";
         return ret;
 }
diff --git a/pwmanager/pwmanager/csv.h b/pwmanager/pwmanager/csv.h
index 6f3c1e1..8049122 100644
--- a/pwmanager/pwmanager/csv.h
+++ b/pwmanager/pwmanager/csv.h
@@ -18,13 +18,13 @@
  **************************************************************************/  
 
 
 #ifndef __PWMANAGER_CSV_H
 #define __PWMANAGER_CSV_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qfile.h>
 
 
 class PwMDoc;
 class QString;
 class QWidget;
@@ -70,21 +70,21 @@ protected:
           * @return Return values are:
           *         0  -> successfully got the next field.
           *         1  -> record end.
           *         2  -> data end.
           *         -1 -> parser error.
           */
-        int nextField(QCString *ret,
+        int nextField(Q3CString *ret,
                       const QByteArray &in,
                       bool inRecord,
                       int *_refIndex);
         /** do the export process. */
         bool doExport(QFile &f,
                       PwMDoc *doc);
         /** generate a new data field string. */
-        QCString newField(QCString s);
+        Q3CString newField(Q3CString s);
 
 protected:
         /** current parent widget. */
         QWidget *parent;
 };
 
diff --git a/pwmanager/pwmanager/editcategory.cpp b/pwmanager/pwmanager/editcategory.cpp
index 4e2378c..4f19299 100644
--- a/pwmanager/pwmanager/editcategory.cpp
+++ b/pwmanager/pwmanager/editcategory.cpp
@@ -25,13 +25,15 @@ $Id$
 
 #include "editcategory.h"
 #include "pwmdoc.h"
 
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <qpushbutton.h>
 
 
@@ -52,24 +54,24 @@ editCategoryWnd::editCategoryWnd( PwMDoc* d, QWidget* parent, const char* name)
     findButton( User2 )->setText (i18n("Cancel" )) ;
     connect(this,SIGNAL(user2Clicked()), SLOT(cancel_slot())); 
     enableButton( KDialogBase::Apply, false );
 
 
     QWidget *page = plainPage();
-    QGridLayout *layout = new QGridLayout( page, 3, 1 );
+    Q3GridLayout *layout = new Q3GridLayout( page, 3, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
     int i = 0;
     categoryComboBox = new KComboBox( page  );
     QLabel* label = new QLabel( categoryComboBox, i18n("Category:"), page );
     layout->addWidget( label, i, 0 );
     layout->addWidget( categoryComboBox, i, 1 );
     i++;
     categoryComboBox->setEditable( FALSE );
-    categoryComboBox->setSizeLimit( 100 );
+    categoryComboBox->setMaxVisibleItems( 100 );
     connect(categoryComboBox,SIGNAL(activated(const QString&)), SLOT(categorySelected(const QString&))); 
 
 
     descLineEdit = new KLineEdit( page, "descLineEdit" );
     label = new QLabel( descLineEdit, i18n("Text1 (Description):"), page );
     layout->addWidget( label, i, 0 );
diff --git a/pwmanager/pwmanager/editcategory.h b/pwmanager/pwmanager/editcategory.h
index 90b685b..10a012b 100644
--- a/pwmanager/pwmanager/editcategory.h
+++ b/pwmanager/pwmanager/editcategory.h
@@ -24,24 +24,29 @@ $Id$
 */                                                                      
 
 #ifndef EDITCATEGORY_H
 #define EDITCATEGORY_H
 
 #include <qvariant.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
+#include <QLabel>
 #include <kdialogbase.h>
 
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
+class Q3VBoxLayout;
+class Q3HBoxLayout;
+class Q3GridLayout;
 class QSpacerItem;
 class KLineEdit;
 class QPushButton;
 class KComboBox;
 class QLabel;
-class QGroupBox;
-class QMultiLineEdit;
+class Q3GroupBox;
+class Q3MultiLineEdit;
 class PwMDoc;
 
 class editCategoryWnd : public KDialogBase
 {
     Q_OBJECT
 
diff --git a/pwmanager/pwmanager/findwnd_emb.cpp b/pwmanager/pwmanager/findwnd_emb.cpp
index 6dcabe8..03d4e38 100644
--- a/pwmanager/pwmanager/findwnd_emb.cpp
+++ b/pwmanager/pwmanager/findwnd_emb.cpp
@@ -25,15 +25,17 @@ $Id$
 
 #include "findwnd_emb.h"
 
 #include <klocale.h>
 
 #include <qcheckbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <klineedit.h>
 #include <qlabel.h>
 
 /*
 #include <qvariant.h>
 #include <qlabel.h>
@@ -54,24 +56,24 @@ $Id$
 findWnd::findWnd( QWidget* parent, const char* name )
   : KDialogBase( KDialogBase::Plain, i18n( "Find" ), 
                  KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
-    QVBoxLayout *layout = new QVBoxLayout( page );
+    Q3VBoxLayout *layout = new Q3VBoxLayout( page );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
     exactCheckBox = new QCheckBox( i18n( "&Exact match" ), page );
     layout->addWidget( exactCheckBox );
 
     caseSensCheckBox = new QCheckBox( i18n( "&Case sensitive" ), page );
     layout->addWidget( caseSensCheckBox );
 
 
-    QButtonGroup* buttonGroup1 = new QButtonGroup(1, Qt::Horizontal, i18n( "Search in Column" ), page );
+    Q3ButtonGroup* buttonGroup1 = new Q3ButtonGroup(1, Qt::Horizontal, i18n( "Search in Column" ), page );
     layout->addWidget( buttonGroup1 );
 
     descRadioButton = new QRadioButton( i18n( "&Description" ), buttonGroup1  );
     pwRadioButton = new QRadioButton( i18n( "&Password" ), buttonGroup1 );
     commentRadioButton = new QRadioButton( i18n( "C&omment" ), buttonGroup1 );
     nameRadioButton = new QRadioButton( i18n( "&Username" ), buttonGroup1 );
diff --git a/pwmanager/pwmanager/findwndimpl.cpp b/pwmanager/pwmanager/findwndimpl.cpp
index 059219f..d323133 100644
--- a/pwmanager/pwmanager/findwndimpl.cpp
+++ b/pwmanager/pwmanager/findwndimpl.cpp
@@ -130,9 +130,9 @@ void FindWndImpl::selectionChanged_slot()
 {
         fAt = 0;
         refVal = 0;
         currFoundPos = -1;
 }
 
-#ifndef PWM_EMBEDDED
-#include "findwndimpl.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_findwndimpl.cpp"
 #endif
diff --git a/pwmanager/pwmanager/genpasswd.cpp b/pwmanager/pwmanager/genpasswd.cpp
index 41078b3..82f0c06 100644
--- a/pwmanager/pwmanager/genpasswd.cpp
+++ b/pwmanager/pwmanager/genpasswd.cpp
@@ -18,12 +18,14 @@
  **************************************************************************/  
 
 #include "genpasswd.h"
 #include "pwmexception.h"
 #include "randomizer.h"
 #include "globalstuff.h"
+//Added by qt3to4:
+#include <Q3PtrList>
 
 
 /* how often can a char of the same charset be reused in order */
         #define FILTER_MAX_CHARSET_REUSE3
 /* re-randomize all charsets on every iteration (0/1) */
         #define RERAND_CHARSET          0
@@ -155,13 +157,13 @@ GenPasswd::dynCharset_element * GenPasswd::selectNextCharset()
         BUG_ON(numCharsets <= 0);
         if (numCharsets == 1)
                 return dynCharset.at(0);
         Randomizer *rnd = Randomizer::obj();
         if (useFilter) {
                 // find out which charsets are allowed (filtering)
-                QPtrList<dynCharset_element> allowedCharsets;
+                Q3PtrList<dynCharset_element> allowedCharsets;
                 // QPtrList<dynCharset_element>::iterator is not available in QT-3.1
                 unsigned int i, cnt = dynCharset.count();
                 dynCharset_element *p;
                 for (i = 0; i < cnt; ++i) {
                         p = dynCharset.at(i);
                         PWM_ASSERT(p);
diff --git a/pwmanager/pwmanager/genpasswd.h b/pwmanager/pwmanager/genpasswd.h
index 3fa1607..5493891 100644
--- a/pwmanager/pwmanager/genpasswd.h
+++ b/pwmanager/pwmanager/genpasswd.h
@@ -18,13 +18,13 @@
  **************************************************************************/  
 
 #ifndef __GENPASSWD_H
 #define __GENPASSWD_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 /** internal password generator of PwManager */
 class GenPasswd
 {
 protected:
         struct dynCharset_element
@@ -67,10 +67,10 @@ protected:
 protected:
         /** password length to generate */
         int length;
         /** use the filter? */
         bool useFilter;
         /** dynamic charset used for generating the password */
-        QPtrList<dynCharset_element> dynCharset;
+        Q3PtrList<dynCharset_element> dynCharset;
 };
 
 #endif // __GENPASSWD_H
diff --git a/pwmanager/pwmanager/getkeycardwnd.cpp b/pwmanager/pwmanager/getkeycardwnd.cpp
index 89dada2..b8e6174 100644
--- a/pwmanager/pwmanager/getkeycardwnd.cpp
+++ b/pwmanager/pwmanager/getkeycardwnd.cpp
@@ -17,23 +17,26 @@
  * $Id$
  **************************************************************************/  
 
 #include "getkeycardwnd.h"
 
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
 #include <klocale.h>
 
 
 GetKeyCardWnd::GetKeyCardWnd(QWidget *parent,
-                         const char *name, bool modal, WFlags f)
+                         const char *name, bool modal, Qt::WFlags f)
  : QDialog(parent, name, modal, f)
 {
-        vbox1 = new QVBox(this);
+        vbox1 = new Q3VBox(this);
         text_label = new QLabel(vbox1);
-        hbox1 = new QHBox(vbox1);
+        hbox1 = new Q3HBox(vbox1);
         okButton = new QPushButton(i18n("&Ok"), hbox1);
         cancelButton = new QPushButton(i18n("&Cancel"), hbox1);
 
         vbox1->setSpacing(10);
         vbox1->setMargin(10);
         hbox1->setSpacing(10);
@@ -59,9 +62,9 @@ void GetKeyCardWnd::resizeEvent(QResizeEvent *)
 
 void GetKeyCardWnd::okButton_slot()
 {
         done(1);
 }
 
-#ifndef PWM_EMBEDDED
-#include "getkeycardwnd.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_getkeycardwnd.cpp"
 #endif
diff --git a/pwmanager/pwmanager/getkeycardwnd.h b/pwmanager/pwmanager/getkeycardwnd.h
index fbe46ee..202e920 100644
--- a/pwmanager/pwmanager/getkeycardwnd.h
+++ b/pwmanager/pwmanager/getkeycardwnd.h
@@ -17,34 +17,36 @@
  * $Id$
  **************************************************************************/  
 
 #ifndef GETKEYCARDWND_H
 #define GETKEYCARDWND_H
 
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
 /** The equivalent to GetMasterPwWndImpl for chipcards */
 class GetKeyCardWnd : public QDialog
 {
         Q_OBJECT
 public:
         GetKeyCardWnd(QWidget *parent = 0, const char *name = 0,
-                      bool modal = FALSE, WFlags f = 0);
+                      bool modal = FALSE, Qt::WFlags f = 0);
         ~GetKeyCardWnd();
 
 protected slots:
         void okButton_slot();
 
 protected:
-        QVBox *vbox1;
-        QHBox *hbox1;
+        Q3VBox *vbox1;
+        Q3HBox *hbox1;
         QLabel *text_label;
         QPushButton *okButton;
         QPushButton *cancelButton;
 
 protected:
         void resizeEvent(QResizeEvent *);
diff --git a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
index 678f05f..7e4bbb7 100644
--- a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
+++ b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp
@@ -40,30 +40,33 @@ $Id$
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 
 /*
  *  Constructs a getMasterPwWnd as a child of 'parent', with the
  *  name 'name' 
  */
 getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
   : KDialogBase( KDialogBase::Plain, i18n( "Master-password" ), 
                  KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
     pwLineEdit = new QLineEdit( page, "pwLineEdit" );
     pwLineEdit->setEchoMode( QLineEdit::Password );
 
     QLabel* textLabel1 = new QLabel( pwLineEdit, i18n("Please enter the master-password:"), page, "textLabel1" );
-    textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
+    textLabel1->setAlignment( int( Qt::WordBreak | Qt::AlignCenter ) );
     pageLayout->addWidget(textLabel1);
     pageLayout->addWidget(pwLineEdit);
     
     QWidget* numberBox = new QWidget( page );
 #ifndef DESKTOP_VERSION
     if ( QApplication::desktop()->width() > 320 ) {
@@ -73,13 +76,13 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name)
     else{
         numberBox->setFixedHeight(150);
         numberBox->setFixedWidth(150);
     }
 #endif
 
-    QGridLayout* numberLayout = new QGridLayout( numberBox, 4, 3 );
+    Q3GridLayout* numberLayout = new Q3GridLayout( numberBox, 4, 3 );
     numberLayout->setMargin( 0 );
     numberLayout->setSpacing( 0 );
 
     QPushButton* p1 = new QPushButton( i18n("1"), numberBox );
     numberLayout->addWidget( p1, 0, 0 );
     QPushButton* p2 = new QPushButton( i18n("2"), numberBox );
diff --git a/pwmanager/pwmanager/getmasterpwwndimpl.cpp b/pwmanager/pwmanager/getmasterpwwndimpl.cpp
index 6be9618..f741f72 100644
--- a/pwmanager/pwmanager/getmasterpwwndimpl.cpp
+++ b/pwmanager/pwmanager/getmasterpwwndimpl.cpp
@@ -52,9 +52,9 @@ void GetMasterPwWndImpl::slotOk()
           getMasterPwWnd::slotOk();
         else
           return;
 }
 #endif
 
-#ifndef PWM_EMBEDDED
-#include "getmasterpwwndimpl.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_getmasterpwwndimpl.cpp"
 #endif
diff --git a/pwmanager/pwmanager/globalstuff.h b/pwmanager/pwmanager/globalstuff.h
index 090fcda..2e8f287 100644
--- a/pwmanager/pwmanager/globalstuff.h
+++ b/pwmanager/pwmanager/globalstuff.h
@@ -31,13 +31,13 @@
 #include <string>
 
 #ifndef PWM_EMBEDDED
 #include <sstream>
 #else
 #include <qstring.h>
-#include <qtextstream.h>
+#include <QTextOStream>
 #endif
 
 #ifndef CONFIG_KEYCARD
 class QWidget;
 void no_keycard_support_msg_box(QWidget *parentWidget);
 #endif // CONFIG_KEYCARD
@@ -94,13 +94,13 @@ std::string tostr(const T &t)
 #else
 /** convert something to string using ostringstream */
 template <class T> inline
 std::string tostr(const T &t)
 {
   QString result;
-  QTextOStream(&result) << t;
+  QTextOStream tmp(&result); tmp << t;
   return result.latin1();
 }
 #endif
 
 /** delete the memory and NULL the pointer */
 template<class T> inline
diff --git a/pwmanager/pwmanager/htmlgen.cpp b/pwmanager/pwmanager/htmlgen.cpp
index bee8198..be3406a 100644
--- a/pwmanager/pwmanager/htmlgen.cpp
+++ b/pwmanager/pwmanager/htmlgen.cpp
@@ -57,13 +57,13 @@ HtmlGen::~HtmlGen()
 QString HtmlGen::escapeHtmlText(const QString &str)
 {
         QString ret;
         unsigned int len = str.length(), i;
         char c;
         for (i = 0; i < len; ++i) {
-                c = str.at(i);
+                c = str.at(i).toLatin1();
                 switch (c) {
                 case '<':
                         ret.append("&lt;");
                         break;
                 case '>':
                         ret.append("&gt;");
diff --git a/pwmanager/pwmanager/ipc.cpp b/pwmanager/pwmanager/ipc.cpp
index 643b022..4c65f1d 100644
--- a/pwmanager/pwmanager/ipc.cpp
+++ b/pwmanager/pwmanager/ipc.cpp
@@ -25,13 +25,13 @@
 #include <sys/socket.h>
 #endif
 #ifndef PWM_EMBEDDED
 #include <sys/types.h>
 #include <stdio.h>
 #else
-#include <qsocket.h>
+#include <q3socket.h>
 #endif
 
         #define END_OF_LINE     '\n'
         #define INIT_LINEBUF_LEN64 /* byte */
 
 #ifndef PWM_EMBEDDED
@@ -74,24 +74,24 @@ Ipc::Ipc()
 {
 #ifndef _WIN32_
         if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sock)) {
           qDebug("Ipc: socketpair() failed");
         }
 #endif
-        QSocket* qsock = new QSocket();
+        Q3Socket* qsock = new Q3Socket();
         qsock->setSocket(sock[0]);
 
         rdBufSize = INIT_LINEBUF_LEN;
         rdBuf = (char *)(malloc(rdBufSize));
         if (!rdBuf) {
                 close(sock[0]);
                 close(sock[1]);
                 qDebug("Ipc: OOM");
         }
 
-        qsock = new QSocket();
+        qsock = new Q3Socket();
         qsock->setSocket(sock[0]);
 
         /*US
         stream = fdopen(sock[0], "r");
         if (!stream) {
                 close(sock[0]);
@@ -149,13 +149,13 @@ Ipc::Ipc(const Ipc *ipc)
         if (!rdBuf) {
           qDebug("Ipc: OOM");
         }
         sock[0] = ipc->sock[1];
         sock[1] = ipc->sock[0];
 
-        qSock = new QSocket();
+        qSock = new Q3Socket();
         qSock->setSocket(sock[0]);
 
         /*US
         stream = fdopen(sock[0], "r");
         if (!stream) {
                 free(rdBuf);
@@ -209,9 +209,9 @@ void Ipc::receiveData(int s)
         }
 #endif
         qDebug("void Ipc::receiveData(int s) has to be implemented.");
 
 }
 
-#ifndef PWM_EMBEDDED
-#include "ipc.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_ipc.cpp"
 #endif
diff --git a/pwmanager/pwmanager/ipc.h b/pwmanager/pwmanager/ipc.h
index 7bfca02..3248283 100644
--- a/pwmanager/pwmanager/ipc.h
+++ b/pwmanager/pwmanager/ipc.h
@@ -26,13 +26,13 @@
 #else
 #include <io.h>
 #endif
 #ifndef PWM_EMBEDDED
 #include <stdio.h>
 #else
-#include <qsocket.h>
+#include <q3socket.h>
 #endif
 
 class QSocketNotifier;
 
 /** very simple interprocess communication class */
 class Ipc : public QObject
@@ -71,13 +71,13 @@ protected:
 #ifndef PWM_EMBEDDED
         /** stream on "this" end of the socket (sock[0]) */
         FILE *stream;
         /** current receive buffer size */
         size_t rdBufSize;
 #else
-        QSocket* qSock;
+        Q3Socket* qSock;
         /** current receive buffer size */
         unsigned int rdBufSize;
 #endif
 
         /** full-duplex socket file desciptors */
         int sock[2];
diff --git a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp
index b7944c3..1804e88 100644
--- a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp
+++ b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp
@@ -19,12 +19,14 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
 #include <kdebug.h>
 
 #include "pwmconfigwidget.h"
 
 #include "kcmpwmconfig.h"
@@ -39,13 +41,13 @@ extern "C"
   }
 }
 
 KCMPwmConfig::KCMPwmConfig(QWidget *parent, const char *name )
   : KCModule( PWMPrefs::instance(), parent, name )
 {
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
   mConfigWidget = new PWMConfigWidget( (PWMPrefs*)getPreferences(), this, "mConfigWidget" );
   layout->addWidget( mConfigWidget );
   layout->setSpacing( 0 );
   layout->setMargin( 0 );
 
   connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
index 2c5189c..04771b3 100644
--- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
+++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
@@ -19,23 +19,26 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qcheckbox.h>
-#include <qframe.h>
-#include <qgroupbox.h>
+#include <q3frame.h>
+#include <q3groupbox.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qlabel.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3VBoxLayout>
 
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
@@ -49,22 +52,22 @@
 #include "pwmconfigwidget.h"
 #include "pwmexception.h"
 
 PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *name )
   : KPrefsWidget(prefs,  parent, name )
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0,
                                             KDialog::spacingHint() );
 
   QTabWidget *tabWidget = new QTabWidget( this );
   topLayout->addWidget( tabWidget );
 
   // windowsStyle page
   //////////////////////////////////////////////////////
   QWidget *windowStylePage = new QWidget( this );
-  QGridLayout *windowStyleLayout = new QGridLayout( windowStylePage, 3, 3);
+  Q3GridLayout *windowStyleLayout = new Q3GridLayout( windowStylePage, 3, 3);
   
   int i = 0;
   KPrefsWidRadios * windowStyle = addWidRadios(i18n("Window-style:") ,&(prefs->mMainViewStyle), windowStylePage);
   windowStyle->addRadio(i18n("Category on top"));
   windowStyle->addRadio(i18n("Category-list left/top")); 
   windowStyleLayout->addMultiCellWidget( (QWidget*)windowStyle->groupBox(),i,i,0,2);
@@ -95,13 +98,13 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   lab = new QLabel(i18n(""), windowStylePage);
    windowStyleLayout->addMultiCellWidget( lab,i,i,0,2);
 
   // File page
   //////////////////////////////////////////////////////
   QWidget *filePage = new QWidget( this );
-  QGridLayout *fileLayout = new QGridLayout( filePage, 3, 2);
+  Q3GridLayout *fileLayout = new Q3GridLayout( filePage, 3, 2);
   
   i = 0;
   QLabel* kcfg_compression_label = new QLabel(i18n("Compression:"), filePage);
   fileLayout->addWidget(kcfg_compression_label,i,0);
   kcfg_compression = new QComboBox(filePage, "kcfg_compression");
   kcfg_compression->insertItem(i18n("None"));
@@ -151,13 +154,13 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   fileLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
   // Timeout page
   //////////////////////////////////////////////////////
   QWidget *timeoutPage = new QWidget( this );
-  QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2);
+  Q3GridLayout *timeoutLayout = new Q3GridLayout( timeoutPage, 3, 2);
 
   i = 0;
   pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" );
   QLabel* timeoutLabel = new QLabel(pwTimeoutSpinBox, i18n("<b>Password timeout</b> (timeout to hold password in memory,so you don't have to re-enter it,if you already have entered it) [set to 0 to disable]:"), timeoutPage);
   timeoutLayout->addMultiCellWidget(timeoutLabel, i, i, 0 ,1);
   ++i;
@@ -180,13 +183,13 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
   // Autostart page
   //////////////////////////////////////////////////////
   QWidget *autostartPage = new QWidget( this );
-  QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2);
+  Q3GridLayout *autostartLayout = new Q3GridLayout( autostartPage, 3, 2);
 
   i = 0;
 
   autostartLineEdit = new KURLRequester(autostartPage, "autoStartLineEdit");
   QLabel* autostartLineLabel = new QLabel(autostartLineEdit, "Open this file automatically on startup:",autostartPage);
   autostartLayout->addMultiCellWidget(autostartLineLabel,i,i,0,1);
@@ -200,13 +203,13 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   ++i;   
 
 
   // external app page
   //////////////////////////////////////////////////////
   QWidget *externalappPage = new QWidget( this );
-  QGridLayout *externalappLayout = new QGridLayout( externalappPage, 3, 2);
+  Q3GridLayout *externalappLayout = new Q3GridLayout( externalappPage, 3, 2);
 
   i = 0;
 
   browserLineEdit = new QLineEdit(externalappPage);
   QLabel* browserLineLabel = new QLabel(browserLineEdit, i18n("Favourite browser:"), externalappPage);
   externalappLayout->addWidget(browserLineLabel,i,0);
@@ -220,13 +223,13 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   ++i;
 
 #if 0
   // miscelaneous page
   //////////////////////////////////////////////////////
   QWidget *miscPage = new QWidget( this );
-  QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2);
+  Q3GridLayout *miscLayout = new Q3GridLayout( miscPage, 3, 2);
 
   i = 0;
 
   /*US ENH: PWM/Pi has no tray and con be minimized
   sb = addWidBool(i18n("Show icon in system-tray"),&(prefs->mTray),miscPage);
   miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
@@ -356,10 +359,10 @@ void PWMConfigWidget::setFilePermissions(int perm)
         sprintf(tmpBuf, "%o", perm);
         permissionLineEdit->setText(tmpBuf);
 }
 
 
 
-#ifndef PWM_EMBEDDED
-#include "pwmconfigwidget.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmconfigwidget.cpp"
 #endif //PWM_EMBEDDED
 
diff --git a/pwmanager/pwmanager/listobjselectwnd.cpp b/pwmanager/pwmanager/listobjselectwnd.cpp
index 59729f1..7da7e95 100644
--- a/pwmanager/pwmanager/listobjselectwnd.cpp
+++ b/pwmanager/pwmanager/listobjselectwnd.cpp
@@ -17,38 +17,41 @@
  * $Id$
  **************************************************************************/  
 
 #include "listobjselectwnd.h"
 
 #include <klocale.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
 
 ListObjSelectWnd::ListObjSelectWnd(const QString &caption, const QString &titleText,
                                    QWidget *parent, bool multiSel, const char *name,
-                                   bool modal, WFlags f)
+                                   bool modal, Qt::WFlags f)
  : QDialog(parent, name, modal, f)
 {
-        vbox1 = new QVBox(this);
+        vbox1 = new Q3VBox(this);
         title = new QLabel(vbox1);
-        list = new QListBox(vbox1);
+        list = new Q3ListBox(vbox1);
         if (multiSel) {
-                hbox2 = new QHBox(vbox1);
+                hbox2 = new Q3HBox(vbox1);
                 selAllButton = new QPushButton(i18n("&Select all"), hbox2);
                 unselAllButton = new QPushButton(i18n("&Unselect all"), hbox2);
         }
-        hbox1 = new QHBox(vbox1);
+        hbox1 = new Q3HBox(vbox1);
         okButton = new QPushButton(i18n("&Ok"), hbox1);
         cancelButton = new QPushButton(i18n("&Cancel"), hbox1);
 
         vbox1->setSpacing(10);
         vbox1->setMargin(10);
         hbox1->setSpacing(10);
         resize(250, 300);
         setCaption(caption);
         if (multiSel) {
-                list->setSelectionMode(QListBox::Multi);
+                list->setSelectionMode(Q3ListBox::Multi);
         }
 
         title->setAlignment(Qt::AlignHCenter | Qt::WordBreak);
         title->setText(titleText);
 
         connect(okButton, SIGNAL(clicked()),
@@ -123,9 +126,9 @@ QStringList ListObjSelectWnd::getSelectedList()
 void ListObjSelectWnd::setList(const QStringList &_list)
 {
         list->clear();
         list->insertStringList(_list);
 }
 
-#ifndef PWM_EMBEDDED
-#include "listobjselectwnd.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_listobjselectwnd.cpp"
 #endif
diff --git a/pwmanager/pwmanager/listobjselectwnd.h b/pwmanager/pwmanager/listobjselectwnd.h
index 3b5f1eb..df3da93 100644
--- a/pwmanager/pwmanager/listobjselectwnd.h
+++ b/pwmanager/pwmanager/listobjselectwnd.h
@@ -18,29 +18,31 @@
  **************************************************************************/  
 
 #ifndef LISTOBJSELECTWND_H
 #define LISTOBJSELECTWND_H
 
 #include <qdialog.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
 
 /** Display a list-window for selection of some objects */
 class ListObjSelectWnd : public QDialog
 {
         Q_OBJECT
 public:
         ListObjSelectWnd(const QString &caption, const QString &titleText,
                          QWidget *parent = 0, bool multiSel = false,
                          const char *name = 0,
-                         bool modal = FALSE, WFlags f = 0);
+                         bool modal = FALSE, Qt::WFlags f = 0);
         ~ListObjSelectWnd();
 
         void setList(const QStringList &_list);
         void addObj(const QString &name)
                         { list->insertItem(name); }
         void selectObj(const QString &name)
@@ -59,17 +61,17 @@ public:
 #endif
         QStringList getSelectedList();
         void clearObjs()
                         { list->clear(); }
 
 protected:
-        QVBox *vbox1;
-        QHBox *hbox1;
-        QHBox *hbox2;
+        Q3VBox *vbox1;
+        Q3HBox *hbox1;
+        Q3HBox *hbox2;
         QLabel *title;
-        QListBox *list;
+        Q3ListBox *list;
         QPushButton *okButton;
         QPushButton *cancelButton;
         QPushButton *selAllButton;
         QPushButton *unselAllButton;
 
 protected:
diff --git a/pwmanager/pwmanager/listviewpwm.cpp b/pwmanager/pwmanager/listviewpwm.cpp
index 0df9431..4253ab1 100644
--- a/pwmanager/pwmanager/listviewpwm.cpp
+++ b/pwmanager/pwmanager/listviewpwm.cpp
@@ -20,12 +20,15 @@
 #include "listviewpwm.h"
 #include "pwmexception.h"
 #include "pwmview.h"
 
 #include <qpainter.h>
 #include <qpixmap.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QKeyEvent>
 
 #include <kiconloader.h>
 
 #ifdef PWM_EMBEDDED
 #include <kglobal.h>
 #endif 
@@ -36,13 +39,13 @@ ListViewPwM::ListViewPwM(QWidget *parent, const char *name)
         //setResizeMode(QListView::AllColumns);
   setAllColumnsShowFocus (true );
 }
 
 bool ListViewPwM::event(QEvent *e)
 {
-        if (e->type() == QEvent::LayoutHint)
+        if (e->type() == QEvent::LayoutRequest)
                 emit layoutChanged();
         if (e->type() == QEvent::KeyPress) {
         QKeyEvent* ke = (QKeyEvent*) e;
         if ( ke->key() == Qt::Key_Space) {
             emit toggleOverview();
             return true;
@@ -61,14 +64,14 @@ bool ListViewPwM::event(QEvent *e)
 }
 
 
 QPixmap * ListViewItemPwM::onPix = 0;
 QPixmap * ListViewItemPwM::offPix = 0;
 
-ListViewItemPwM::ListViewItemPwM(QListView *parent)
- : QCheckListItem(parent, "", QCheckListItem::CheckBox)
+ListViewItemPwM::ListViewItemPwM(Q3ListView *parent)
+ : Q3CheckListItem(parent, "", Q3CheckListItem::CheckBox)
 {
         if (!onPix) {
                 PWM_ASSERT(!offPix);
                 KIconLoader* picons;
 #ifndef PWM_EMBEDDED
                 KIconLoader il;
@@ -94,13 +97,13 @@ void ListViewItemPwM::paintCell(QPainter *p, const QColorGroup &cg,
 {
   //  qDebug("ListViewItemPwM::paintCell column=%i", column);
         if (!p)
                 return;
         //US BUG: 
         if (column != COLUMN_DESC) {
-                QCheckListItem::paintCell(p, cg, column, width, align);
+                Q3CheckListItem::paintCell(p, cg, column, width, align);
                 return;
         }
         QPixmap *curPix = isOn() ? onPix : offPix;
         int pixSpace = curPix->width();
         pixSpace += 4;
 #ifndef PWM_EMBEDDED
@@ -117,13 +120,13 @@ void ListViewItemPwM::paintCell(QPainter *p, const QColorGroup &cg,
         // now draw the pixmap
         int y = (height() - curPix->height()) / 2;
         p->drawPixmap(1, y, *curPix);
         p->translate( pixSpace, 0 );
 
 #endif
-        QListViewItem::paintCell(p, cg, column, width - pixSpace, align);
+        Q3ListViewItem::paintCell(p, cg, column, width - pixSpace, align);
 
 }
 
-#ifndef PWM_EMBEDDED
-#include "listviewpwm.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_listviewpwm.cpp"
 #endif
diff --git a/pwmanager/pwmanager/listviewpwm.h b/pwmanager/pwmanager/listviewpwm.h
index 51008b8..2652939 100644
--- a/pwmanager/pwmanager/listviewpwm.h
+++ b/pwmanager/pwmanager/listviewpwm.h
@@ -18,12 +18,15 @@
  **************************************************************************/  
 
 #ifndef __LISTVIEW_H
 #define __LISTVIEW_H
 
 #include <klistview.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QPixmap>
 
 /** PwManager implementation of the list view.
   * Derived from KListView.
   */
 class ListViewPwM : public KListView
 {
@@ -38,16 +41,16 @@ signals:
     void deletePW(   );
 
 protected:
         virtual bool event(QEvent *e);
 };
 
-class ListViewItemPwM : public QCheckListItem
+class ListViewItemPwM : public Q3CheckListItem
 {
 public:
-        ListViewItemPwM(QListView *parent);
+        ListViewItemPwM(Q3ListView *parent);
 
 protected:
         void paintCell(QPainter *p, const QColorGroup &cg,
                        int column, int width, int align);
 
 protected:
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index ee26082..acb0011 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -139,12 +139,13 @@ static void addAuthors(KAboutData *aboutData)
                              "original documentation author."));
 }
 #endif
 
 int main(int argc, char *argv[])
 {
+    if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
         printDebugConfigureInfo();
 #ifndef PWM_EMBEDDED
         KAboutData aboutData(PACKAGE_NAME, PROG_NAME,
                              PACKAGE_VER, description, KAboutData::License_File,
                              "(c) 2003, 2004 Michael Buesch and the PwManager Team", 0,
                              "http://passwordmanager.sourceforge.net/",
diff --git a/pwmanager/pwmanager/printtext.h b/pwmanager/pwmanager/printtext.h
index 82e31b0..71bc2e0 100644
--- a/pwmanager/pwmanager/printtext.h
+++ b/pwmanager/pwmanager/printtext.h
@@ -12,13 +12,13 @@
 #ifndef PRINTTEXT_H
 #define PRINTTEXT_H
 
 #include <kprinter.h>
 
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #include <qrect.h>
 #include <qpoint.h>
 
 /** prints text "raw" to a printer */
 class PrintText : public KPrinter
 {
@@ -39,13 +39,13 @@ public:
         void getHeader(QString *left, QString *middle);
 
 protected:
         /** painter object */
         QPainter *paint;
         /** metrics */
-        QPaintDeviceMetrics *metrics;
+        Q3PaintDeviceMetrics *metrics;
         /** left field of header */
         QString headerLeft;
         /** middle field of header */
         QString headerMiddle;
         /** right field of header */
         QString headerRight;
diff --git a/pwmanager/pwmanager/pwgenwnd_emb.cpp b/pwmanager/pwmanager/pwgenwnd_emb.cpp
index 429904c..21e0af4 100644
--- a/pwmanager/pwmanager/pwgenwnd_emb.cpp
+++ b/pwmanager/pwmanager/pwgenwnd_emb.cpp
@@ -23,18 +23,21 @@
 $Id$
 */                                                                      
 
 #include "pwgenwnd_emb.h"
 
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 
 #include "klocale.h"
 
 /*
  *  Constructs a pwGenWnd as a child of 'parent', with the
  *  name 'name'.
@@ -43,20 +46,20 @@ $Id$
 pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
   : KDialogBase( KDialogBase::Plain, i18n( "Password generator" ), 
                  KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
-    QVBoxLayout* pwGenWndLayout = new QVBoxLayout( page, 11, 6, "pwGenWndLayout"); 
+    Q3VBoxLayout* pwGenWndLayout = new Q3VBoxLayout( page, 11, 6, "pwGenWndLayout"); 
 
-    QGroupBox* groupBox1 = new QGroupBox( page, "groupBox1" );
+    Q3GroupBox* groupBox1 = new Q3GroupBox( page, "groupBox1" );
     groupBox1->setTitle( i18n( "Character set:" ) );
     groupBox1->setColumnLayout(0, Qt::Vertical );
     groupBox1->layout()->setSpacing( 6 );
     groupBox1->layout()->setMargin( 11 );
-    QVBoxLayout* groupBox1Layout = new QVBoxLayout( groupBox1->layout() );
+    Q3VBoxLayout* groupBox1Layout = new Q3VBoxLayout( groupBox1->layout() );
     groupBox1Layout->setAlignment( Qt::AlignTop );
 
     int_charLowerCheckBox = new QCheckBox( i18n("Lowercase (abc)"), groupBox1, "int_charLowerCheckBox" );
     int_charLowerCheckBox->setChecked( TRUE );
     groupBox1Layout->addWidget( int_charLowerCheckBox );
 
@@ -77,25 +80,25 @@ pwGenWnd::pwGenWnd( QWidget* parent, const char* name)
     textLabel7->setText( st.utf8() );
     groupBox1Layout->addWidget( textLabel7 );
 
     int_charBlankCheckBox = new QCheckBox( i18n( "Spaces (blank characters)"), groupBox1, "int_charBlankCheckBox" );
     groupBox1Layout->addWidget( int_charBlankCheckBox );
 
-    QHBoxLayout* layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 
+    Q3HBoxLayout* layout7 = new Q3HBoxLayout( 0, 0, 6, "layout7"); 
 
     int_charUserCheckBox = new QCheckBox( i18n("User defined:"), groupBox1, "int_charUserCheckBox" );
     layout7->addWidget( int_charUserCheckBox );
 
     int_userDefLineEdit = new QLineEdit( groupBox1, "int_userDefLineEdit" );
     int_userDefLineEdit->setEnabled( FALSE );
     layout7->addWidget( int_userDefLineEdit );
     groupBox1Layout->addLayout( layout7 );
     pwGenWndLayout->addWidget( groupBox1 );
 
 
-    QHBoxLayout* layout8 = new QHBoxLayout( 0, 0, 6, "layout8"); 
+    Q3HBoxLayout* layout8 = new Q3HBoxLayout( 0, 0, 6, "layout8"); 
 
     int_lenSpinBox = new QSpinBox( page, "int_lenSpinBox" );
     QLabel* textLabel2 = new QLabel( int_lenSpinBox, i18n("Password Length:"), page, "textLabel2" );
     layout8->addWidget( textLabel2 );
 
     int_lenSpinBox->setMaxValue( 9999 );
diff --git a/pwmanager/pwmanager/pwgenwndimpl.cpp b/pwmanager/pwmanager/pwgenwndimpl.cpp
index 5313060..0eb7043 100644
--- a/pwmanager/pwmanager/pwgenwndimpl.cpp
+++ b/pwmanager/pwmanager/pwgenwndimpl.cpp
@@ -31,13 +31,13 @@
 
 
 #ifndef PWM_EMBEDDED
 PwGenWndImpl::PwGenWndImpl(QWidget *parent,
                            const char *name,
                            bool modal,
-                           WFlags fl)
+                           Qt::WFlags fl)
  : pwGenWnd(parent, name, modal, fl)
 {
 }
 
 #else
 PwGenWndImpl::PwGenWndImpl( QWidget* parent, const char* name)
diff --git a/pwmanager/pwmanager/pwgenwndimpl.h b/pwmanager/pwmanager/pwgenwndimpl.h
index 994ff2f..1e706a1 100644
--- a/pwmanager/pwmanager/pwgenwndimpl.h
+++ b/pwmanager/pwmanager/pwgenwndimpl.h
@@ -30,13 +30,13 @@ class PwGenWndImpl : public pwGenWnd
 {
 public:
 #ifndef PWM_EMBEDDED
         PwGenWndImpl(QWidget *parent = 0,
                      const char *name = 0,
                      bool modal = FALSE,
-                     WFlags fl = 0);
+                     Qt::WFlags fl = 0);
 #else
         PwGenWndImpl( QWidget* parent = 0, const char* name = 0);
 #endif
 
         ~PwGenWndImpl();
 
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 8373850..694fb13 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -22,12 +22,18 @@
 #include <ktoolbar.h>
 #include <kfiledialog.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
 #include <qstatusbar.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <QHideEvent>
+#include <QFocusEvent>
+#include <QCloseEvent>
 
 #ifndef PWM_EMBEDDED
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <dcopclient.h>
 #include "configwndimpl.h"
@@ -183,13 +189,13 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
         connect(doc, SIGNAL(docClosed(PwMDoc *)),
                 this, SLOT(docClosed(PwMDoc *)));
         initMenubar();
         initToolbar();
         initMetrics();
         setVirgin(virginity);
-        setFocusPolicy(QWidget::WheelFocus);
+        setFocusPolicy(Qt::WheelFocus);
 #ifndef PWM_EMBEDDED
         statusBar()->show();
 #endif
         view = makeNewListView(doc);
         setCentralWidget(view);
         updateCaption();
@@ -237,26 +243,26 @@ void PwM::initMenubar()
         chipcardPopup = new KPopupMenu(this);
 #endif // CONFIG_KEYCARD
         viewPopup = new KPopupMenu(this);
         optionsPopup = new KPopupMenu(this);
 
 // "file" popup menu
-        filePopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("filenew", KIcon::Small)),
                               i18n("&New"), this,
                               SLOT(new_slot()), 0, BUTTON_POPUP_FILE_NEW);
-        filePopup->insertItem(QIconSet(picons->loadIcon("fileopen", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("fileopen", KIcon::Small)),
                               i18n("&Open"), this,
                               SLOT(open_slot()), 0, BUTTON_POPUP_FILE_OPEN);
-        filePopup->insertItem(QIconSet(picons->loadIcon("fileclose", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("fileclose", KIcon::Small)),
                               i18n("&Close"), this,
                               SLOT(close_slot()), 0, BUTTON_POPUP_FILE_CLOSE);
         filePopup->insertSeparator();
-        filePopup->insertItem(QIconSet(picons->loadIcon("filesave", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("filesave", KIcon::Small)),
                               i18n("&Save"), this,
                               SLOT(save_slot()), 0, BUTTON_POPUP_FILE_SAVE);
-        filePopup->insertItem(QIconSet(picons->loadIcon("filesaveas", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("filesaveas", KIcon::Small)),
                               i18n("Save &as..."),
                               this, SLOT(saveAs_slot()), 0,
                               BUTTON_POPUP_FILE_SAVEAS);
         filePopup->insertSeparator();
         // "file/export" popup menu
         exportPopup->insertItem(i18n("&Text-file..."), this,
@@ -266,13 +272,13 @@ void PwM::initMenubar()
         exportPopup->insertItem(i18n("&CSV (Comma Separated Value) ..."), this,
                                 SLOT(exportToCsv()), 0, BUTTON_POPUP_EXPORT_CSV);
 #ifdef CONFIG_KWALLETIF
         exportPopup->insertItem(i18n("&KWallet..."), this,
                                 SLOT(exportToKWallet()), 0, BUTTON_POPUP_EXPORT_KWALLET);
 #endif
-        filePopup->insertItem(QIconSet(picons->loadIcon("fileexport", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("fileexport", KIcon::Small)),
                               i18n("E&xport"), exportPopup,
                               BUTTON_POPUP_FILE_EXPORT);
         // "file/import" popup menu
         importPopup->insertItem(i18n("&Text-file..."), this,
                                 SLOT(importFromText()), 0, BUTTON_POPUP_IMPORT_TEXT);
         importPopup->insertItem(i18n("&Gpasman / Kpasman ..."), this,
@@ -280,106 +286,106 @@ void PwM::initMenubar()
         importPopup->insertItem(i18n("&CSV (Comma Separated Value) ..."), this,
                                 SLOT(importCsv()), 0, BUTTON_POPUP_IMPORT_CSV);
 #ifdef CONFIG_KWALLETIF
         importPopup->insertItem(i18n("&KWallet..."), this,
                                 SLOT(importKWallet()), 0, BUTTON_POPUP_IMPORT_KWALLET);
 #endif
-        filePopup->insertItem(QIconSet(picons->loadIcon("fileimport", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("fileimport", KIcon::Small)),
                               i18n("I&mport"), importPopup,
                               BUTTON_POPUP_FILE_IMPORT);
         filePopup->insertSeparator();
 #if 0
-        filePopup->insertItem(QIconSet(picons->loadIcon("fileprint", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("fileprint", KIcon::Small)),
                               i18n("&Print..."), this,
                               SLOT(print_slot()), 0, BUTTON_POPUP_FILE_PRINT);
         filePopup->insertSeparator();
 #endif
-        filePopup->insertItem(QIconSet(picons->loadIcon("exit", KIcon::Small)),
+        filePopup->insertItem(QIcon(picons->loadIcon("exit", KIcon::Small)),
                               i18n("&Quit"), this,
                               SLOT(quitButton_slot()), 0, BUTTON_POPUP_FILE_QUIT);
         menuBar()->insertItem(i18n("&File"), filePopup);
 // "manage" popup menu
-        managePopup->insertItem(QIconSet(picons->loadIcon("pencil", KIcon::Small)),
+        managePopup->insertItem(QIcon(picons->loadIcon("pencil", KIcon::Small)),
                                 i18n("&Add password"), this,
                                 SLOT(addPwd_slot()), 0,
                                 BUTTON_POPUP_MANAGE_ADD);
         managePopup->insertSeparator();
-        managePopup->insertItem(QIconSet(picons->loadIcon("edit", KIcon::Small)),
+        managePopup->insertItem(QIcon(picons->loadIcon("edit", KIcon::Small)),
                                 i18n("&Edit"), this, SLOT(editPwd_slot()), 0,
                                 BUTTON_POPUP_MANAGE_EDIT);
-        managePopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
+        managePopup->insertItem(QIcon(picons->loadIcon("editdelete", KIcon::Small)),
                                 i18n("&Delete"), this, SLOT(deletePwd_slot()),
                                 0, BUTTON_POPUP_MANAGE_DEL);
         managePopup->insertSeparator();
-        managePopup->insertItem(QIconSet(picons->loadIcon("rotate", KIcon::Small)),
+        managePopup->insertItem(QIcon(picons->loadIcon("rotate", KIcon::Small)),
                                 i18n("Change &Master Password"), this,
                                 SLOT(changeMasterPwd_slot()), 0,
                                 BUTTON_POPUP_MANAGE_CHANGEMP);
         menuBar()->insertItem(i18n("&Manage"), managePopup);
 // "chipcard" popup menu
 #ifdef CONFIG_KEYCARD
-        chipcardPopup->insertItem(QIconSet(picons->loadIcon("filenew", KIcon::Small)),
+        chipcardPopup->insertItem(QIcon(picons->loadIcon("filenew", KIcon::Small)),
                                   i18n("&Generate new key-card"), this,
                                   SLOT(genNewCard_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_GENNEW);
-        chipcardPopup->insertItem(QIconSet(picons->loadIcon("editdelete", KIcon::Small)),
+        chipcardPopup->insertItem(QIcon(picons->loadIcon("editdelete", KIcon::Small)),
                                   i18n("&Erase key-card"), this,
                                   SLOT(eraseCard_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_DEL);
-        chipcardPopup->insertItem(QIconSet(picons->loadIcon("", KIcon::Small)),
+        chipcardPopup->insertItem(QIcon(picons->loadIcon("", KIcon::Small)),
                                   i18n("Read card-&ID"), this,
                                   SLOT(readCardId_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_READID);
         chipcardPopup->insertSeparator();
-        chipcardPopup->insertItem(QIconSet(picons->loadIcon("2rightarrow", KIcon::Small)),
+        chipcardPopup->insertItem(QIcon(picons->loadIcon("2rightarrow", KIcon::Small)),
                                   i18n("&Make card backup-image"), this,
                                   SLOT(makeCardBackup_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_SAVEBACKUP);
-        chipcardPopup->insertItem(QIconSet(picons->loadIcon("2leftarrow", KIcon::Small)),
+        chipcardPopup->insertItem(QIcon(picons->loadIcon("2leftarrow", KIcon::Small)),
                                   i18n("&Replay card backup-image"), this,
                                   SLOT(replayCardBackup_slot()), 0,
                                   BUTTON_POPUP_CHIPCARD_REPLAYBACKUP);
         menuBar()->insertItem(i18n("&Chipcard manager"), chipcardPopup);
 #endif // CONFIG_KEYCARD
 // "view" popup menu
-        viewPopup->insertItem(QIconSet(picons->loadIcon("find", KIcon::Small)),
+        viewPopup->insertItem(QIcon(picons->loadIcon("find", KIcon::Small)),
                                 i18n("&Find"), this,
                                 SLOT(find_slot()), 0, BUTTON_POPUP_VIEW_FIND);
         viewPopup->insertSeparator();
-        viewPopup->insertItem(QIconSet(picons->loadIcon("halfencrypted", KIcon::Small)),
+        viewPopup->insertItem(QIcon(picons->loadIcon("halfencrypted", KIcon::Small)),
                                 i18n("&Lock all entries"), this,
                                 SLOT(lockWnd_slot()), 0,
                                 BUTTON_POPUP_VIEW_LOCK);
-        viewPopup->insertItem(QIconSet(picons->loadIcon("encrypted", KIcon::Small)),
+        viewPopup->insertItem(QIcon(picons->loadIcon("encrypted", KIcon::Small)),
                                 i18n("&Deep-lock all entries"), this,
                                 SLOT(deepLockWnd_slot()), 0,
                                 BUTTON_POPUP_VIEW_DEEPLOCK);
-        viewPopup->insertItem(QIconSet(picons->loadIcon("decrypted", KIcon::Small)),
+        viewPopup->insertItem(QIcon(picons->loadIcon("decrypted", KIcon::Small)),
                                 i18n("&Unlock all entries"), this,
                                 SLOT(unlockWnd_slot()), 0,
                                 BUTTON_POPUP_VIEW_UNLOCK);
         menuBar()->insertItem(i18n("&View"), viewPopup);
 // "options" popup menu
-        optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+        optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
                                  i18n("&Configure PwM/Pi..."), this,
                  SLOT(config_slot()),0,
                                  BUTTON_POPUP_OPTIONS_CONFIG);
-        optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+        optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
                                  i18n("Global Settings..."), this,
                  SLOT(config_global_slot()),0,
                                  BUTTON_POPUP_OPTIONS_GLOBAL_CONFIG);
     if ( QApplication::desktop()->width() <= 240 ) {
         managePopup->insertSeparator();
         managePopup->insertItem(i18n("&Options"), optionsPopup);
     } else
         menuBar()->insertItem(i18n("&Options"), optionsPopup);
 // "help" popup menu
 #ifndef PWM_EMBEDDED
         helpPopup = helpMenu(QString::null, false);
 #else
-        optionsPopup->insertItem(QIconSet(picons->loadIcon("configure", KIcon::Small)),
+        optionsPopup->insertItem(QIcon(picons->loadIcon("configure", KIcon::Small)),
                                  i18n("C&ategories..."), this,
                  SLOT(category_slot()),0,
                                  BUTTON_POPUP_OPTIONS_CATEGORY);
 
 
         menuBar()->insertItem(i18n("&Sync"), syncPopup);
@@ -919,18 +925,18 @@ void PwM::config_slot()
                 doc->timer()->start(DocTimer::id_mpwTimer);
                 // auto-lock timeout
                 doc->timer()->start(DocTimer::id_autoLockTimer);
                 ++i;
         }
 
-        const QValueList<PwM *> *ml = init->mainWndList();
+        const Q3ValueList<PwM *> *ml = init->mainWndList();
 #ifndef PWM_EMBEDDED
-        QValueList<PwM *>::const_iterator i2 = ml->begin(),
+        Q3ValueList<PwM *>::const_iterator i2 = ml->begin(),
                                           end2 = ml->end();
 #else
-        QValueList<PwM *>::ConstIterator i2 = ml->begin(),
+        Q3ValueList<PwM *>::ConstIterator i2 = ml->begin(),
                                           end2 = ml->end();
 #endif
         PwM *pwm;
         while (i2 != end2) {
                 pwm = *i2;
                 // reinitialize the window style.
@@ -1591,9 +1597,9 @@ void PwM::removeSyncInfo( QString syncProfile)
     //US curDoc()->removeSyncInfo sets the dirtyFlag.
 }
 
 #endif
 
 
-#ifndef PWM_EMBEDDED
-#include "pwm.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwm.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index c4bbb4e..450d13f 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -33,12 +33,17 @@
 #include <ksyncmanager.h>
 #endif
 
 #include <kaction.h>
 
 #include <qglobal.h>
+//Added by qt3to4:
+#include <QCloseEvent>
+#include <QFocusEvent>
+#include <Q3PopupMenu>
+#include <QHideEvent>
 
 #include "pwmview.h"
 #include "pwmexception.h"
 
 
 /** timeout for displaying a message on the status-bar (in seconds) */
@@ -47,15 +52,15 @@
 
 class PwMInit;
 class KSyncManager;
 
 /** PwM is the base class of the project */
 #ifndef PWM_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwM : public KMainWindow
-//MOC_SKIP_END
+#endif
 #else
 class PwM : public KMainWindow, public KSyncInterface
 #endif
 {
         Q_OBJECT
 public:
@@ -281,13 +286,13 @@ protected:
     //this are the overwritten callbackmethods from the syncinterface
     virtual bool sync(KSyncManager* manager, QString filename, int mode,QString resource); 
     virtual void removeSyncInfo( QString syncProfile);
 
     // LR *******************************
     // sync stuff!
-    QPopupMenu *syncPopup;
+    Q3PopupMenu *syncPopup;
     KSyncManager* syncManager;
 #endif
 
 
 
 
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
index 7efe45c..d6d8dbe 100644
--- a/pwmanager/pwmanager/pwmanager.pro
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -8,14 +8,14 @@ INCLUDEPATH += . ../../  ../../libkdepim ../../microkde ../../microkde/kdecore .
 DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION
 
 #enable this setting if you want debugoutput for pwmanager
 #DEFINES += CONFIG_DEBUG
 LIBS += -L../libcrypt/
 LIBS += -L../../bin/
-LIBS += -lmicrokde
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokde
+LIBS += -lxmicrokdepim
 LIBS += -lzlib
 LIBS += -lkpmicrocipher
 LIBS += -lkpmicroerror
 LIBS += -lkpmicrompi
 LIBS += -lstdc++
 
@@ -172,6 +172,8 @@ sha1.cpp \
 waitwnd.cpp \
 kcmconfigs/kcmpwmconfig.cpp \ 
 kcmconfigs/pwmconfigwidget.cpp
 
 
 
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro
index 6b68514..e80d1ae 100644
--- a/pwmanager/pwmanager/pwmanagerE.pro
+++ b/pwmanager/pwmanager/pwmanagerE.pro
@@ -11,15 +11,15 @@ INCLUDEPATH += . ../../ ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../
 DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY
 
 #enable this setting if you want debugoutput for pwmanager
 #DEFINES += CONFIG_DEBUG
 
 LIBS += -L../libcrypt/$(PLATFORM)
-LIBS += -lmicrokde
+LIBS += -lxmicrokde
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokdepim
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 LIBS += -lzlib
 #LIBS += -lbz2
 #LIBS += -lkpmicrogcrypt
 LIBS += -ljpeg
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index b58d7e2..9213360 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -45,12 +45,13 @@
 #endif // CONFIG_KWALLETIF
 
 #include <qdatetime.h>
 #include <qsize.h>
 #include <qfileinfo.h>
 #include <qfile.h>
+#include  <QDesktopWidget>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 //US#include <iostream>
@@ -478,23 +479,24 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file)
                  * move tmp file back. See below.
                  */
                 Randomizer *rnd = Randomizer::obj();
                 char rnd_buf[5];
                 sprintf(rnd_buf, "%X%X%X%X", rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF,
                         rnd->genRndChar() & 0xFF, rnd->genRndChar() & 0xFF);
-                tmpFileMoved = filename + "." + rnd_buf + ".mv";
+                tmpFileMoved = filename; tmpFileMoved += '.';
+                tmpFileMoved += rnd_buf; tmpFileMoved += ".mv";
                 if (!copyFile(filename, tmpFileMoved))
                         return e_openFile;
                 if (!QFile::remove(filename)) {
                         printWarn(string("removing orig file ")
                                   + filename.latin1()
                                   + " failed!");
                 }
         }
         f.setName(filename);
-        if (!f.open(IO_ReadWrite)) {
+        if (!f.open(QIODevice::ReadWrite)) {
                 ret = e_openFile;
                 goto out_moveback;
         }
         e = writeFileHeader(hashAlgo, hashAlgo,
                             cryptAlgo, compress,
                             &currentPw, &f);
@@ -631,13 +633,13 @@ PwMerror PwMDoc::openDoc(const QString *file, int openLocked)
                         return e_openFile;
                 if (deepLock(true, false) != e_success)
                         return e_openFile;
                 goto out_success;
         }
 
-        if (!f.open(IO_ReadOnly))
+        if (!f.open(QIODevice::ReadOnly))
                 return e_openFile;
 
         ret = checkHeader(&cryptAlgo, &currentPw, &compress, &headerLen,
                           &dataHashType, &dataHash, &f);
         if (ret != e_success) {
                 printDebug("PwMDoc::openDoc(): checkHeader() failed");
@@ -1000,16 +1002,16 @@ bool PwMDoc::copyFile(const QString &src, const QString &dst)
                 return false;
         if (QFile::exists(dst)) {
                 if (!QFile::remove(dst))
                         return false;
         }
         QFile srcFd(src);
-        if (!srcFd.open(IO_ReadOnly))
+        if (!srcFd.open(QIODevice::ReadOnly))
                 return false;
         QFile dstFd(dst);
-        if (!dstFd.open(IO_ReadWrite)) {
+        if (!dstFd.open(QIODevice::ReadWrite)) {
                 srcFd.close();
                 return false;
         }
         const int tmpBuf_size = 512;
         char tmpBuf[tmpBuf_size];
         Q_LONG bytesRead, bytesWritten;
@@ -1482,13 +1484,13 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
                          QFile *f)
 {
         PWM_ASSERT(d);
         PWM_ASSERT(pw);
         PWM_ASSERT(f);
 
-        unsigned int cryptLen = f->size() - pos;
+        size_t cryptLen = f->size() - pos;
         byte *encrypted = new byte[cryptLen];
         byte *decrypted = new byte[cryptLen];
 
         f->at(pos);
 #ifndef PWM_EMBEDDED
         if (f->readBlock(reinterpret_cast<char *>(encrypted),
@@ -1522,15 +1524,15 @@ PwMerror PwMDoc::decrypt(string *d, unsigned int pos, const QString *pw,
         case PWM_CRYPT_TWOFISH:
         case PWM_CRYPT_TWOFISH128: {
                 if (!LibGCryptIf::available())
                         return e_cryptNotImpl;
                 LibGCryptIf gc;
                 PwMerror err;
-                err = gc.decrypt(&decrypted,
+                err = gc.decrypt((unsigned char **)&decrypted,
                                  &cryptLen,
-                                 encrypted,
+                                 (unsigned char*)encrypted,
                                  cryptLen,
                                  reinterpret_cast<const unsigned char *>(pw->latin1()),
                                  pw->length(),
                                  algo,
                                  hashalgo //US BUG: pass _hashalgo because we need it in hashPassphrase
 );
@@ -2430,13 +2432,13 @@ PwMerror PwMDoc::exportToText(const QString *file)
         PWM_ASSERT(file);
         if (QFile::exists(*file)) {
                 if (!QFile::remove(*file))
                         return e_accessFile;
         }
         QFile f(*file);
-        if (!f.open(IO_ReadWrite))
+        if (!f.open(QIODevice::ReadWrite))
                 return e_openFile;
 
         if (!unlockAll_tempoary()) {
                 f.close();
                 return e_lock;
         }
@@ -2704,13 +2706,13 @@ PwMerror PwMDoc::importText_PwM(const QString *file)
         QFile f(file->latin1());
         int tmp;
         ssize_t ret;
         string curCat;
         unsigned int entriesRead = 0;
         PwMDataItem currItem;
-        bool res = f.open(IO_ReadOnly);
+        bool res = f.open(QIODevice::ReadOnly);
         if (res == false)
           return e_openFile;
 
         unsigned int ch_tmp_size = 1024;
         char *ch_tmp = (char*)malloc(ch_tmp_size);
         if (!ch_tmp) {
@@ -3626,9 +3628,9 @@ QStringList PwMDoc::getIDEntryList()
 }
 
 
 
 
 
-#ifndef PWM_EMBEDDED
-#include "pwmdoc.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmdoc.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 144831f..07c97a9 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -209,13 +209,13 @@ struct PwMDataItem
                 if (clearMeta)
                         meta.clear();
         }
   //US ENH: we need this operator to compare two items if we have no unique ids
   //available. Generaly this happens before the first sync
 
-        bool PwMDataItem::operator==( const PwMDataItem &a ) const
+        bool operator==( const PwMDataItem &a ) const
         {
           //qDebug("oper==%s", a.desc.c_str());
           if ( desc != a.desc ) return false;
           if ( name != a.name ) return false;
           if ( pw != a.pw ) return false;
           if ( comment != a.comment ) return false;
@@ -224,13 +224,13 @@ struct PwMDataItem
           //all other field will not be checked.
           return true;
         }
 
   //US ENH: this sync method actually copies all values from the parameter like the =operator
   //does with two exceptions: listViewPos will not be changed, and the launcher only if required.
-  bool PwMDataItem::syncItem(const PwMDataItem &a, bool syncLauncher=true )
+  bool syncItem(const PwMDataItem &a, bool syncLauncher=true )
   {
     desc = a.desc;
     name = a.name;
     pw = a.pw;
     comment = a.comment;
     url = a.url;
diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp
index a9916c2..ea96509 100644
--- a/pwmanager/pwmanager/pwmdocui.cpp
+++ b/pwmanager/pwmanager/pwmdocui.cpp
@@ -462,9 +462,9 @@ QString PwMDocUi::string_deepLockedLong()
 
 QString PwMDocUi::string_defaultTitle()
 {
         return i18n("Untitled");
 }
 
-#ifndef PWM_EMBEDDED
-#include "pwmdocui.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmdocui.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index d59d4d8..15e21ee 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -17,12 +17,14 @@
  * $Id$
  **************************************************************************/  
 
 #include "pwminit.h"
 #include "randomizer.h"
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #ifndef PWM_EMBEDDED
 #include "selftest.h"
 #include "configuration.h"
 #else
 #include "pwmprefs.h"
@@ -89,18 +91,18 @@ PwMInit::PwMInit(PwMApplication *_app)
 PwMInit::~PwMInit()
 {
     //qDebug("PwMInit::~PwMInit() ");
 #ifndef PWM_EMBEDDED
         SelfTest::cancel();
         // close all open mainwnds
-        QValueList<PwM *>::iterator i = _mainWndList.begin(),
+        Q3ValueList<PwM *>::iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 
 #else
         // close all open mainwnds
-        QValueList<PwM *>::Iterator i = _mainWndList.begin(),
+        Q3ValueList<PwM *>::Iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #endif
         while (i != end) {
                 disconnect(*i, SIGNAL(closed(PwM *)),
                            this, SLOT(mainWndClosed(PwM *)));
                 delete *i;
@@ -423,17 +425,17 @@ again:
                         createMainWnd(QString::null, false,
                                       false, wnd->curDoc());
                 }
         }
 #ifndef PWM_EMBEDDED
         // find the closed window in the "mainWndList" and delete it.
-        QValueList<PwM *>::iterator i = _mainWndList.begin(),
+        Q3ValueList<PwM *>::iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #else
         // find the closed window in the "mainWndList" and delete it.
-        QValueList<PwM *>::Iterator i = _mainWndList.begin(),
+        Q3ValueList<PwM *>::Iterator i = _mainWndList.begin(),
                                     end = _mainWndList.end();
 #endif
         while (i != end) {
         //qDebug("iii %x  end %x  wnd %x",  (*i), (*end), wnd);
                 if (*i == wnd) {
 #ifndef PWM_EMBEDDED
@@ -570,18 +572,18 @@ void PwMInit::minimizeAllMainWnd(bool toTray)
         if (!_mainWndList.size())
                 return;
 #else
         if (!_mainWndList.count())
                 return;
 #endif
-        const QValueList<PwM *> *ml = mainWndList();
+        const Q3ValueList<PwM *> *ml = mainWndList();
 #ifndef PWM_EMBEDDED
-        QValueList<PwM *>::const_iterator it = ml->begin(),
+        Q3ValueList<PwM *>::const_iterator it = ml->begin(),
                                           end = ml->end();
 #else
-        QValueList<PwM *>::ConstIterator it = ml->begin(),
+        Q3ValueList<PwM *>::ConstIterator it = ml->begin(),
                                           end = ml->end();
 #endif
         PwM *wnd;
         if (toTray && _tray) {
                 /* minimize to tray.
                  * close all mainWnd.
@@ -621,13 +623,12 @@ PwMApplication::~PwMApplication()
 #else //DESKTOP_VERSION
 
 PwMApplication::PwMApplication(int & argc, char ** argv)
            : QApplication( argc, argv )
           , init (0)
 { 
-  setStyle( new QPlatinumStyle ());
   QString hdir = QDir::homeDirPath();
   // there is a bug when creating dirs for WIN 98
   // it is difficult to fix, because we have no WIN 98 runnung
   // such that we try it to create the dirs at startup here
   if ( hdir == "C:\\" )
     {
@@ -653,9 +654,9 @@ PwMApplication::~PwMApplication()
 
 #endif //PWM_EMBEDDED
 
 
 
 
-#ifndef PWM_EMBEDDED
-#include "pwminit.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwminit.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwminit.h b/pwmanager/pwmanager/pwminit.h
index bf72093..32d1b4f 100644
--- a/pwmanager/pwmanager/pwminit.h
+++ b/pwmanager/pwmanager/pwminit.h
@@ -17,23 +17,22 @@
  * $Id$
  **************************************************************************/  
 
 #ifndef __PWMINIT_H
 #define __PWMINIT_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qobject.h>
 #ifndef PWM_EMBEDDED 
 #include <kuniqueapplication.h>
 #else //PWM_EMBEDDED
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else //DESKTOP_VERSION
 #include <qapplication.h>
-#include <qplatinumstyle.h>
 #endif //DESKTOP_VERSION
 
 #include <kapplication.h>
 #endif //PWM_EMBEDDED
 
 #include "globalstuff.h"
@@ -47,13 +46,13 @@ class PwM;
 class PwMTray;
 class PwMDoc;
 class PwMInit;
 
 /** main application class */
 #ifndef PWM_EMBEDDED 
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwMApplication : public KUniqueApplication
 {
 public:
         PwMApplication(bool allowStyles=true,
                        bool GUIenabled=true,
                        bool configUnique=false)
@@ -65,13 +64,13 @@ public:
 
         int newInstance();
 
 protected:
         PwMInit *init;
 };
-//MOC_SKIP_END
+#endif
 #else //PWM_EMBEDDED
 
 #ifndef DESKTOP_VERSION
 class PwMApplication : public QPEApplication
 {
 public:
@@ -151,13 +150,13 @@ public:
         PwMKeyCard * keycard()
                         { return _keycard; }
         /** returns a pointer to the tray icon */
         PwMTray * tray()
                         { return _tray; }
         /** returns a list of all open main windows */
-        const QValueList<PwM *> * mainWndList()
+        const Q3ValueList<PwM *> * mainWndList()
                         { return &_mainWndList; }
         /** create a new document */
         PwMDoc * createDoc();
         /** create a new PwM main window */
         PwM * createMainWnd(const QString &loadFile = QString::null,
                             bool loadFileDeepLocked = false,
@@ -211,12 +210,12 @@ protected:
         KWalletEmu *_kwalletEmu;
         /** pointer to the keycard interface */
         PwMKeyCard *_keycard;
         /** pointer to the tray icon */
         PwMTray *_tray;
         /** list of all open main windows */
-        QValueList<PwM *> _mainWndList;
+        Q3ValueList<PwM *> _mainWndList;
         /** saved command line options. */
         savedCmd_t savedCmd;
 };
 
 #endif // __PWMINIT_H
diff --git a/pwmanager/pwmanager/pwmprefs.h b/pwmanager/pwmanager/pwmprefs.h
index 1f6a35c..42f7c2e 100644
--- a/pwmanager/pwmanager/pwmprefs.h
+++ b/pwmanager/pwmanager/pwmprefs.h
@@ -25,12 +25,14 @@
 
 #ifndef PWMPREFS_H
 #define PWMPREFS_H
 
 #include <qstringlist.h>
 #include <qsize.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <kpimprefs.h>
 
 class KConfig;
 
 #define conf() PWMPrefs::instance()
@@ -147,14 +149,14 @@ public:
   QSize mMainWndSize;
   int mMainViewStyle;
   bool mAutoMinimizeOnStart;
   bool mClose;
 
   //US ENH
-  QValueList<int> mCommentSplitter;
-  QValueList<int> mCategorySplitter;
+  Q3ValueList<int> mCommentSplitter;
+  Q3ValueList<int> mCategorySplitter;
 
 
     // US introduce a nonconst way to return the config object.
     KConfig* getConfig();
 
   private:
diff --git a/pwmanager/pwmanager/pwmtray.cpp b/pwmanager/pwmanager/pwmtray.cpp
index fe074ca..478116f 100644
--- a/pwmanager/pwmanager/pwmtray.cpp
+++ b/pwmanager/pwmanager/pwmtray.cpp
@@ -29,12 +29,15 @@
 #include "configuration.h"
 #else
 #include "pwmprefs.h"
 #endif
 
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <QMouseEvent>
 
 
 void ActiveTreeItem::execIt()
 {
 #ifndef PWM_EMBEDDED
         unsigned int entr = static_cast<unsigned int>(entry);
@@ -84,18 +87,18 @@ void ActiveTreeItem::execIt()
                         break;
                 } case goToURL: {
                         doc->goToURL(cat, entr);
                         break;
                 } case openMainWnd: {
                         // search if there is already an open window.
-                        const QValueList<PwM *> *wl = tray->init->mainWndList();
+                        const Q3ValueList<PwM *> *wl = tray->init->mainWndList();
 #ifndef PWM_EMBEDDED
-                        QValueList<PwM *>::const_iterator i = wl->begin(),
+                        Q3ValueList<PwM *>::const_iterator i = wl->begin(),
                                                           end = wl->end();
 #else
-                        QValueList<PwM *>::ConstIterator i = wl->begin(),
+                        Q3ValueList<PwM *>::ConstIterator i = wl->begin(),
                                                           end = wl->end();
 #endif
                         PwM *wnd;
                         while (i != end) {
                                 wnd = *i;
                                 if (wnd->curDoc() == doc) {
@@ -175,13 +178,13 @@ void PwMTray::buildMain()
                             SLOT(undock()));
 }
 
 void PwMTray::insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
                                    ActiveTreeItem::Task task, PwMDoc *doc,
                                    int docCategory, int docEntry,
-                                   QValueList<int> *activeItemsList)
+                                   Q3ValueList<int> *activeItemsList)
 {
         ActiveTreeItem *activeItem;
         int id;
 
         activeItem = new ActiveTreeItem(text, insertIn->font(), task,
                                         doc, docCategory, docEntry,
@@ -193,13 +196,13 @@ void PwMTray::insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
 #else
         activeItemsList->append(id);
 #endif
 }
 
 void PwMTray::rebuildTree(KPopupMenu *popup, PwMDoc *doc,
-                          QValueList<int> *activeItems)
+                          Q3ValueList<int> *activeItems)
 {
         PWM_ASSERT(doc);
         PWM_ASSERT(popup);
         activeItems->clear();
         popup->clear();
 #ifndef PWM_EMBEDDED
@@ -331,17 +334,17 @@ void PwMTray::updateTree(PwMDoc *document)
                 // tree-entry doesn't exist, yet.
                 id = insertTreeEntry(document, &treeEntry);
         }
         if (treeItemNum != -1) {
                 // delete all *old* active items
                 KPopupMenu *ctxMenu = contextMenu();
-                QValueList<int> *oldItems = &tree[treeItemNum].activeItems;
+                Q3ValueList<int> *oldItems = &tree[treeItemNum].activeItems;
 #ifndef PWM_EMBEDDED
-                QValueList<int>::iterator i = oldItems->begin();
+                Q3ValueList<int>::iterator i = oldItems->begin();
 #else
-                QValueList<int>::Iterator i = oldItems->begin();
+                Q3ValueList<int>::Iterator i = oldItems->begin();
 #endif
                 while (i != oldItems->end()) {
                         ctxMenu->removeItem(*i);
                         ++i;
                 }
                 oldItems->clear();
@@ -478,9 +481,9 @@ void PwMTray::undock()
 {
         conf()->confGlobTray(false);
         init->initTray();
         // Attention! "this" is already deleted here!
 }
 
-#ifndef PWM_EMBEDDED
-#include "pwmtray.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmtray.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmtray.h b/pwmanager/pwmanager/pwmtray.h
index ffb625e..b1145e0 100644
--- a/pwmanager/pwmanager/pwmtray.h
+++ b/pwmanager/pwmanager/pwmtray.h
@@ -24,23 +24,25 @@
 #include <ksystemtray.h>
 #endif
 
 #include <kpopupmenu.h>
 
 #include <qpainter.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QMenuItem>
 
 //#include "pwmexception.h"
 
 class PwMInit;
 class PwMDoc;
 class PwMTray;
 
 /* wrapper to workaround MOC problems */
-class __ActiveTreeItem : public QCustomMenuItem
-                       , public QObject
+class __ActiveTreeItem : public QMenuItem
 {
 public:
         __ActiveTreeItem() {}
 };
 
 /** implements the "active" part of the tree */
@@ -84,20 +86,20 @@ public:
                 { cout << "deleted \"" << text << "\"" << endl; } */
 
         void paint(QPainter *p, const QColorGroup & /*cg*/, bool /*act*/,
                    bool /*enabled*/, int x, int y, int w, int h)
                 {
                         p->setFont(font);
-                        p->drawText(x, y, w, h, AlignLeft | AlignVCenter |
-                                    DontClip | ShowPrefix, text);
+                        p->drawText(x, y, w, h, Qt::AlignLeft | Qt::AlignVCenter |
+                                    Qt::DontClip | Qt::ShowPrefix, text);
                 }
 
         QSize sizeHint()
                 {
-                        return QFontMetrics(font).size(AlignLeft | AlignVCenter |
-                                                       ShowPrefix | DontClip,  text);
+                        return QFontMetrics(font).size(Qt::AlignLeft | Qt::AlignVCenter |
+                                                       Qt::ShowPrefix | Qt::DontClip,  text);
                 }
 
         bool fullSpan() const
                         { return false; }
 
         bool isSeparator() const
@@ -119,25 +121,25 @@ protected:
         int entry;
         PwMTray *tray;
 };
 
 /** tray icon implementation */
 #ifndef PWM_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class PwMTray : public KSystemTray
 {
         Q_OBJECT
 
         friend class ActiveTreeItem;
 
         struct treeItem
         {
                 int menuId;
                 PwMDoc *doc;
                 KPopupMenu *menu;
-                QValueList<int> activeItems; // ids of all active items
+                Q3ValueList<int> activeItems; // ids of all active items
         };
 
 public: 
         PwMTray(PwMInit *_init, QWidget* parent = 0, const char* name = 0);
         ~PwMTray();
 
@@ -167,13 +169,13 @@ signals:
         void clickedIcon(PwMTray *);
 
 protected:
         /** holds a list of all open files, its documents and
           * its menuIDs
           */
-        QValueList<struct treeItem> tree;
+        Q3ValueList<struct treeItem> tree;
         /** pointer to init */
         PwMInit *init;
 
 protected:
         /** search if an entry with for the given document
           * exists and resturn its ID and a pointer to the main
@@ -182,43 +184,43 @@ protected:
           */
         int findTreeEntry(PwMDoc *doc, KPopupMenu **menu, int *treeItem);
         /** build the main menu-items */
         void buildMain();
         /** rebuilds the tree for the given KPopupMenu entry */
         void rebuildTree(KPopupMenu *popup, PwMDoc *doc,
-                         QValueList<int> *activeItems);
+                         Q3ValueList<int> *activeItems);
         /** insert a new tree-entry for the given doc and returns the ID.*/
         int insertTreeEntry(PwMDoc *doc, KPopupMenu **popup);
         /** removes a tree entry */
         void removeTreeEntry(int menuId, int treeItem, KPopupMenu **menu);
         /** inserts a new active-tree-item into the given tree entry */
         void insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
                                   ActiveTreeItem::Task task, PwMDoc *doc,
                                   int docCategory, int docEntry,
-                                  QValueList<int> *activeItemsList);
+                                  Q3ValueList<int> *activeItemsList);
         /** mouse event on icon */
         void mouseReleaseEvent(QMouseEvent *e);
         /** inserts the items for the main window control
           * into the popup menu.
           */
         void insertMainWndCtrl(KPopupMenu *menu, PwMDoc *doc);
 };
-//MOC_SKIP_END
+#endif
 #else
 class PwMTray : public QWidget 
 {
         Q_OBJECT
 
         friend class ActiveTreeItem;
 
         struct treeItem
         {
                 int menuId;
                 PwMDoc *doc;
                 KPopupMenu *menu;
-                QValueList<int> activeItems; // ids of all active items
+                Q3ValueList<int> activeItems; // ids of all active items
         };
 
 public: 
         PwMTray(PwMInit *_init, QWidget* parent = 0, const char* name = 0);
         ~PwMTray();
 
@@ -252,13 +254,13 @@ signals:
         void clickedIcon(PwMTray *);
 
 protected:
         /** holds a list of all open files, its documents and
           * its menuIDs
           */
-        QValueList<struct treeItem> tree;
+        Q3ValueList<struct treeItem> tree;
         /** pointer to init */
         PwMInit *init;
 
 protected:
         /** search if an entry with for the given document
           * exists and resturn its ID and a pointer to the main
@@ -267,22 +269,22 @@ protected:
           */
         int findTreeEntry(PwMDoc *doc, KPopupMenu **menu, int *treeItem);
         /** build the main menu-items */
         void buildMain();
         /** rebuilds the tree for the given KPopupMenu entry */
         void rebuildTree(KPopupMenu *popup, PwMDoc *doc,
-                         QValueList<int> *activeItems);
+                         Q3ValueList<int> *activeItems);
         /** insert a new tree-entry for the given doc and returns the ID.*/
         int insertTreeEntry(PwMDoc *doc, KPopupMenu **popup);
         /** removes a tree entry */
         void removeTreeEntry(int menuId, int treeItem, KPopupMenu **menu);
         /** inserts a new active-tree-item into the given tree entry */
         void insertActiveTreeItem(KPopupMenu *insertIn, const QString &text,
                                   ActiveTreeItem::Task task, PwMDoc *doc,
                                   int docCategory, int docEntry,
-                                  QValueList<int> *activeItemsList);
+                                  Q3ValueList<int> *activeItemsList);
         /** mouse event on icon */
         void mouseReleaseEvent(QMouseEvent *e);
         /** inserts the items for the main window control
           * into the popup menu.
           */
         void insertMainWndCtrl(KPopupMenu *menu, PwMDoc *doc);
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index 2533487..68500d0 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -32,13 +32,21 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 
 #include <qlineedit.h>
 #include <qpoint.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QResizeEvent>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
 //US ENH: wouldn't it be a good idea if we could use this consts everywhere else.
 //US ENH: for examle in listviewpwm.cpp
 //US ENH: Because of that I transfer them into the headerfile.
 /*
         #define COLUMN_DESC     0
@@ -73,13 +81,13 @@ PwMView::PwMView(PwM *_mainClass,
 PwMView::~PwMView()
 {
 }
 
 void PwMView::initCtxMenu()
 {
-        ctxMenu = new QPopupMenu(this);
+        ctxMenu = new Q3PopupMenu(this);
         ctxMenu->insertItem(i18n("&Add password"), mainClass, SLOT(addPwd_slot()));
         ctxMenu->insertSeparator();
         ctxMenu->insertItem(i18n("&Edit"), mainClass, SLOT(editPwd_slot()));
         ctxMenu->insertItem(i18n("&Delete"), mainClass, SLOT(deletePwd_slot()));
         ctxMenu->insertSeparator();
         ctxMenu->insertItem(i18n("copy password to clipboard"),
@@ -103,13 +111,13 @@ void PwMView::initCtxMenu()
 
 void PwMView::resizeEvent(QResizeEvent *)
 {
         resizeView(size());
 }
 
-void PwMView::refreshCommentTextEdit(QListViewItem *curItem)
+void PwMView::refreshCommentTextEdit(Q3ListViewItem *curItem)
 {
         PWM_ASSERT(commentBox);
         if (!curItem)
                 return;
         string comment;
         PwMerror ret;
@@ -133,20 +141,20 @@ void PwMView::keyReleaseEvent(QKeyEvent * /*e*/)
 {
         refreshCommentTextEdit(lv->currentItem());
 }
 
 bool PwMView::getCurEntryIndex(unsigned int *index)
 {
-        QListViewItem *current = lv->currentItem();
+        Q3ListViewItem *current = lv->currentItem();
         if (!current)
                 return false;
         return getDocEntryIndex(index, current);
 }
 
 bool PwMView::getDocEntryIndex(unsigned int *index,
-                               const QListViewItem *item)
+                               const Q3ListViewItem *item)
 {
         vector<unsigned int> foundPositions;
         PwMDataItem curItem;
         curItem.desc = item->text(COLUMN_DESC).latin1();
         curItem.name = item->text(COLUMN_NAME).latin1();
         document()->getCommentByLvp(getCurrentCategory(),
@@ -163,18 +171,18 @@ bool PwMView::getDocEntryIndex(unsigned int *index,
                 return true;
         }
 
         return false;
 }
 
-void PwMView::handleToggle(QListViewItem *item)
+void PwMView::handleToggle(Q3ListViewItem *item)
 {
         PWM_ASSERT(doc);
         if (!item)
                 return;
-        QCheckListItem *clItem = (QCheckListItem *)item;
+        Q3CheckListItem *clItem = (Q3CheckListItem *)item;
         QString curCat(getCurrentCategory());
 
         // find document position of this entry.
         unsigned int curEntryDocIndex;
         if (!getDocEntryIndex(&curEntryDocIndex, item))
                 return;
@@ -192,13 +200,13 @@ void PwMView::handleToggle(QListViewItem *item)
                         clItem->setOn(false);
                 return;
         }
         doc->lockAt(curCat, curEntryDocIndex, !clItem->isOn());
 }
 
-void PwMView::handleRightClick(QListViewItem *item, const QPoint &point, int)
+void PwMView::handleRightClick(Q3ListViewItem *item, const QPoint &point, int)
 {
         if (!item)
                 return;
         ctxMenu->move(point);
         /* don't use ctxMenu->exec() here, as it generates race conditions
          * with the card interface code. Believe it or not. :)
@@ -271,13 +279,13 @@ void PwMView::shiftToView()
                   //  qDebug("PwMView::ShiftToView CAT: %i, %s", catDocIndex, catItem->name.c_str());
           lv->setColumnText(COLUMN_DESC, catItem->desc_text.c_str());
           lv->setColumnText(COLUMN_NAME, catItem->name_text.c_str());
           lv->setColumnText(COLUMN_PW, catItem->pw_text.c_str());
         }
 
-        QCheckListItem *newItem;
+        Q3CheckListItem *newItem;
         vector<PwMDataItem>::iterator it = tmpSorted.begin(),
                                       end = tmpSorted.end();
         while (it != end) {
                 newItem = new ListViewItemPwM(lv);
                 newItem->setText(COLUMN_DESC, (*it).desc.c_str());
                 if ((*it).binary) {
@@ -310,13 +318,13 @@ void PwMView::shiftToView()
 void PwMView::reorgLp()
 {
         if (!lv->childCount())
                 return;
         PWM_ASSERT(doc);
         PWM_ASSERT(!doc->isDocEmpty());
-        QListViewItem *currItem;
+        Q3ListViewItem *currItem;
         vector<unsigned int> foundPos;
         /* This searchIn _should_ be:
                  *const unsigned int searchIn = SEARCH_IN_DESC;
          * But we want backward compatibility (see comment in PwMDoc::addEntry()).
          * So we need to search again, if we don't find the entry. (see below)
          */
@@ -352,13 +360,13 @@ void PwMView::reorgLp()
                 doc->setListViewPos(curCat, foundPos[0], cnt - i - 1);
         }
 }
 
 void PwMView::selAt(int index)
 {
-        QListViewItem *item = lv->itemAtIndex(index);
+        Q3ListViewItem *item = lv->itemAtIndex(index);
         if (!item)
                 return;
         lv->setCurrentItem(item);
         lv->ensureItemVisible(item);
 }
 
@@ -476,13 +484,13 @@ void PwMView::copyCommentToClip()
  *
  *
  ************************************************************************/
 
 
 PwMDataItemView::PwMDataItemView( QWidget *parent, const char *name )
-  : QTextBrowser( parent, name )
+  : Q3TextBrowser( parent, name )
 
 
 {
 //US  setWrapPolicy( QTextEdit::AtWordBoundary );
   setLinkUnderline( false );
   // setVScrollBarMode( QScrollView::AlwaysOff );
@@ -563,30 +571,30 @@ PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool t
 {
     findButton( Close )->setText( i18n("Cancel Sync"));
     findButton( Ok )->setText( i18n("Remote"));
     findButton( User1 )->setText( i18n("Local"));
     QWidget* topframe = new QWidget( this );
     setMainWidget( topframe );
-    QBoxLayout* bl;
+    Q3BoxLayout* bl;
     if ( QApplication::desktop()->width() < 640 ) {
-        bl = new QVBoxLayout( topframe  );
+        bl = new Q3VBoxLayout( topframe  );
     } else {
-        bl = new QHBoxLayout( topframe  );
+        bl = new Q3HBoxLayout( topframe  );
     }
-    QVBox* subframe = new QVBox( topframe );
+    Q3VBox* subframe = new Q3VBox( topframe );
     bl->addWidget(subframe  );
     QLabel* lab = new QLabel( i18n("Local Entry"), subframe ); 
     if ( takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     PwMDataItemView * av = new PwMDataItemView( subframe );
     av->setPwMDataItem( loc );
-    subframe = new QVBox( topframe );
+    subframe = new Q3VBox( topframe );
     bl->addWidget(subframe  );
     lab = new QLabel( i18n("Remote Entry"), subframe  ); 
     if ( !takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     av = new PwMDataItemView( subframe );
     av->setPwMDataItem( rem );
     QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); 
     QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); 
 #ifndef DESKTOP_VERSION
     showMaximized();
@@ -615,9 +623,9 @@ void PwMDataItemChooser::slot_local()
     mSyncResult = 1;
     accept();
 }
 
 
 
-#ifndef PWM_EMBEDDED
-#include "pwmview.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmview.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmview.h b/pwmanager/pwmanager/pwmview.h
index e42b17a..8f60063 100644
--- a/pwmanager/pwmanager/pwmview.h
+++ b/pwmanager/pwmanager/pwmview.h
@@ -38,13 +38,17 @@
 #include <klocale.h>
 #include <kdialogbase.h>
 
 #include <qevent.h>
 #include <qfont.h>
 #include <qobject.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QKeyEvent>
+#include <Q3PopupMenu>
 
 #include <vector>
 #include <string>
 
 using std::string;
 using std::vector;
@@ -74,37 +78,37 @@ public:
           */
         bool getCurEntryIndex(unsigned int *index);
         /** returns the position of the given item in the document
           * Note: This func only serches in the current category.
           */
         bool getDocEntryIndex(unsigned int *index,
-                              const QListViewItem *item);
+                              const Q3ListViewItem *item);
 
 public slots:
         /** update the view (call if dirty) */
         void updateView()
                 {
                         updateCategories();
                         shiftToView();
                 }
         /** (re)sort all items and (re)shift them to listView. */
         void shiftToView();
         /** handle clicking on an item */
-        void handleToggle(QListViewItem *item);
+        void handleToggle(Q3ListViewItem *item);
         /** handle right-clicking on an item */
-        void handleRightClick(QListViewItem *item, const QPoint &point, int);
+        void handleRightClick(Q3ListViewItem *item, const QPoint &point, int);
         /** selects the item at "index" */
         void selAt(int index);
         /** rename category button pressed */
         void renCatButton_slot();
         /** delete category button pressed */
         void delCatButton_slot();
 
 protected:
         /** right-click context-menu */
-        QPopupMenu *ctxMenu;
+        Q3PopupMenu *ctxMenu;
 
 protected:
         /** update the categories from document */
         void updateCategories();
         /** widget resize event */
         void resizeEvent(QResizeEvent *);
@@ -121,13 +125,13 @@ protected:
                 }
         /** The user pressed and released a key. */
         void keyReleaseEvent(QKeyEvent *e);
 
 protected slots:
         /** changes the comment text-edit, because a new item has been selected */
-        void refreshCommentTextEdit(QListViewItem *curItem);
+        void refreshCommentTextEdit(Q3ListViewItem *curItem);
         /** copy pw to clipboard */
         void copyPwToClip();
         /** copy name to clipboard */
         void copyNameToClip();
         /** copy desc to clipboard */
         void copyDescToClip();
@@ -149,13 +153,13 @@ private:
         PwM *mainClass;
 };
 
 
 //US ENH basic widget to view an password entry. We need it for the sync stuff.
 //But might be oif interest for other functionalities as well.
-class PwMDataItemView : public QTextBrowser
+class PwMDataItemView : public Q3TextBrowser
 {
   public:
     PwMDataItemView( QWidget *parent = 0, const char *name = 0 );
 
     /**
       Sets the PwMDataItem object. It is displayed immediately.
diff --git a/pwmanager/pwmanager/pwmviewstyle.cpp b/pwmanager/pwmanager/pwmviewstyle.cpp
index ee35472..b6d930f 100644
--- a/pwmanager/pwmanager/pwmviewstyle.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle.cpp
@@ -58,13 +58,13 @@ PwMViewStyle::~PwMViewStyle()
         PWMPrefs::instance()->writeConfig();
 
         delete_ifnot_null(s0);
         delete_ifnot_null(s1);
 }
 
-void PwMViewStyle::editPassWord( QListViewItem * i )
+void PwMViewStyle::editPassWord( Q3ListViewItem * i )
 {
     if ( !i )
         return;
     emit editPW();
 }
 void PwMViewStyle::initStyle(style_t style)
@@ -90,22 +90,22 @@ void PwMViewStyle::initStyle(style_t style)
                 break;
         default:
                 BUG();
                 return;
         }
         curStyle = style;
-        connect(lv, SIGNAL(pressed(QListViewItem *)),
-                v, SLOT(handleToggle(QListViewItem *)));
-        connect(lv, SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, int)),
-                v, SLOT(handleRightClick(QListViewItem *, const QPoint &, int)));
-        connect(lv, SIGNAL(clicked(QListViewItem *)),
-                v, SLOT(refreshCommentTextEdit(QListViewItem *)));
-        connect(lv, SIGNAL(returnPressed(QListViewItem *)),
-                this, SLOT(editPassWord(QListViewItem *)));
-        connect(lv, SIGNAL(doubleClicked(QListViewItem *)),
-                this, SLOT(editPassWord(QListViewItem *)));
+        connect(lv, SIGNAL(pressed(Q3ListViewItem *)),
+                v, SLOT(handleToggle(Q3ListViewItem *)));
+        connect(lv, SIGNAL(rightButtonClicked(Q3ListViewItem *, const QPoint &, int)),
+                v, SLOT(handleRightClick(Q3ListViewItem *, const QPoint &, int)));
+        connect(lv, SIGNAL(clicked(Q3ListViewItem *)),
+                v, SLOT(refreshCommentTextEdit(Q3ListViewItem *)));
+        connect(lv, SIGNAL(returnPressed(Q3ListViewItem *)),
+                this, SLOT(editPassWord(Q3ListViewItem *)));
+        connect(lv, SIGNAL(doubleClicked(Q3ListViewItem *)),
+                this, SLOT(editPassWord(Q3ListViewItem *)));
         connect(lv, SIGNAL(insertPW()),
                 this, SIGNAL( insertPW() ));
         connect(lv, SIGNAL(deletePW()),
                 this, SIGNAL( deletePW() ));
 
         lv->addColumn(i18n("Description"), 180);
@@ -246,9 +246,9 @@ int PwMViewStyle::numCategories()
         default:
                 BUG();
         }
         return 0;
 }
 
-#ifndef PWM_EMBEDDED
-#include "pwmviewstyle.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmviewstyle.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmviewstyle.h b/pwmanager/pwmanager/pwmviewstyle.h
index 6c2d81c..a7dccbe 100644
--- a/pwmanager/pwmanager/pwmviewstyle.h
+++ b/pwmanager/pwmanager/pwmviewstyle.h
@@ -20,32 +20,32 @@
 
 #ifndef PWMVIEWSTYLE_H
 #define PWMVIEWSTYLE_H
 
 #include <qwidget.h>
 #include <qsplitter.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qpushbutton.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #ifndef PWM_EMBEDDED
-#include <qtextedit.h>
+#include <q3textedit.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif
 
 #include <qlabel.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qcombobox.h>
 #include <qsize.h>
 
 class ListViewPwM;
 class PwMViewStyle_0;
 class PwMViewStyle_1;
 class PwMView;
-class QListViewItem;
+class Q3ListViewItem;
 class CommentBox;
 
 class PwMViewStyle : public QWidget
 {
         Q_OBJECT
 
@@ -91,13 +91,13 @@ protected:
         /** resize the view */
         void resizeView(const QSize &size);
         ListViewPwM *lv;
         CommentBox *commentBox;
 
 protected slots:
-    void editPassWord( QListViewItem * );
+    void editPassWord( Q3ListViewItem * );
 
 private:
         /** which style has the view?
           * KListBox on the left,
           * or QComboBox on the top?
           */
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.cpp b/pwmanager/pwmanager/pwmviewstyle_0.cpp
index 1d88a34..3d1f41f 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_0.cpp
@@ -23,19 +23,22 @@
 #include "commentbox.h"
 
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include "pwmprefs.h"
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3ValueList>
 
 PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
  : QObject()
 {
-        vbox1 = new QVBox(view);
+        vbox1 = new Q3VBox(view);
         vbox1->setSpacing(0);
-        hbox1 = new QHBox(vbox1);
+        hbox1 = new Q3HBox(vbox1);
         hbox1->setSpacing(0);
         categoriesTitle = new QLabel(hbox1);
         categoriesTitle->setText(i18n("Category:"));
         categoriesCombo = new QComboBox(hbox1);
         categoriesCombo->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred ));
         renCatButton = new QPushButton( hbox1);
@@ -43,14 +46,14 @@ PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
     int maxsi = renCatButton->sizeHint().height()+4;
     renCatButton->setMinimumSize( maxsi, maxsi );
         delCatButton = new QPushButton( hbox1);
     delCatButton->setPixmap (KGlobal::iconLoader()->loadIcon("editdelete", KIcon::Small) );
     maxsi = delCatButton->sizeHint().height()+4;
     delCatButton->setMinimumSize( maxsi, maxsi );
-    delCatButton->setFocusPolicy( QWidget::NoFocus );
-    renCatButton->setFocusPolicy( QWidget::NoFocus );
+    delCatButton->setFocusPolicy( Qt::NoFocus );
+    renCatButton->setFocusPolicy( Qt::NoFocus );
     
 #ifndef PWM_EMBEDDED
         splitter1 = new QSplitter(vbox1);
         splitter1->setOrientation(Qt::Vertical);
 #else
         splitter1 = new KDGanttMinimizeSplitter( Qt::Vertical, vbox1);
@@ -78,15 +81,15 @@ PwMViewStyle_0::~PwMViewStyle_0()
 {
         delete vbox1;
 }
 void PwMViewStyle_0::toggleSplitter()
 { 
     
-    QValueList<int> si = splitter1->sizes();
+    Q3ValueList<int> si = splitter1->sizes();
     splitter1->toggle();
-    QValueList<int> si2 = splitter1->sizes();
+    Q3ValueList<int> si2 = splitter1->sizes();
     //qDebug("PwMViewStyle_0::toggleSplitter() %d %d %d %d", si[0],si[1],si2[0],si2[1] );
     if ( si[0] == si2[0] && si[1] == si2[1] && si2[1] == 1 ) {
         int diff = si[0]/2;
         if ( diff > 200 )
             diff = 200;
         si[0] -= diff;
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.h b/pwmanager/pwmanager/pwmviewstyle_0.h
index 6d3c1d1..f144eec 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.h
+++ b/pwmanager/pwmanager/pwmviewstyle_0.h
@@ -17,20 +17,20 @@
  * $Id$
  **************************************************************************/  
 
 #ifndef PWMVIEWSTYLE_0_H
 #define PWMVIEWSTYLE_0_H
 
-#include <qhbox.h>
-#include <qvbox.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
 #include <qpushbutton.h>
 #ifndef PWM_EMBEDDED
-#include <qtextedit.h>
+#include <q3textedit.h>
 #include <qsplitter.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <KDGanttMinimizeSplitter.h>
 #endif
 #include <qlabel.h>
 #include <qcombobox.h>
 
 class PwMView;
@@ -84,15 +84,15 @@ protected:
         ListViewPwM *lv;
         /** categories combo-box */
         QComboBox *categoriesCombo;
         /** title string for the categories combo or list box */
         QLabel *categoriesTitle;
         /** hbox1 for widget style */
-        QHBox *hbox1;
+        Q3HBox *hbox1;
         /** vbox1 for widget style */
-        QVBox *vbox1;
+        Q3VBox *vbox1;
         /** splitter for commentTextEdit */
         #ifndef PWM_EMBEDDED
         QSplitter *splitter1;
 #else
         KDGanttMinimizeSplitter * splitter1;
 #endif
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.cpp b/pwmanager/pwmanager/pwmviewstyle_1.cpp
index e335a3f..83eed97 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_1.cpp
@@ -26,12 +26,18 @@
 #include "pwmprefs.h"
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QLabel>
+#include <Q3ValueList>
+#include <Q3Frame>
+#include <Q3PopupMenu>
 #endif
         #define INITIAL_CATEGORIES_WIDTH100
 
 PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
  : QObject()
 {
@@ -51,15 +57,15 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
           //      mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
           //      mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
         }
         //US  topLayout->addWidget(mMiniSplitter );
 #endif
 
-        vbox1 = new QVBox(splitter);
+        vbox1 = new Q3VBox(splitter);
         categoriesTitle = new QLabel(vbox1);
-        categoriesList = new QListBox(vbox1);
+        categoriesList = new Q3ListBox(vbox1);
 #ifndef PWM_EMBEDDED
         splitter2 = new QSplitter(splitter);
         splitter2->setOrientation(Qt::Vertical);
 #else
         splitter2 = new KDGanttMinimizeSplitter( Qt::Vertical, splitter);
         splitter2->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
@@ -67,29 +73,29 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
         //US  topLayout->addWidget(mMiniSplitter );
 #endif
         lv = new ListViewPwM(splitter2);
         commentBox = new CommentBox(splitter2);
         // set sizes and styles
                 //UScommentBox->resize(commentBox->size().width(), 60);
-        QValueList<int> sizes;
+        Q3ValueList<int> sizes;
 #ifndef PWM_EMBEDDED
         sizes.push_back(INITIAL_CATEGORIES_WIDTH);
         sizes.push_back(view->height() - INITIAL_CATEGORIES_WIDTH);
 #else
         sizes.append(INITIAL_CATEGORIES_WIDTH);
         sizes.append(view->height() - INITIAL_CATEGORIES_WIDTH);
 #endif
                 //USsplitter->setSizes(sizes);
         categoriesTitle->setAlignment(Qt::AlignHCenter);
 #ifndef PWM_EMBEDDED
-        categoriesTitle->setFrameShape(QFrame::MenuBarPanel);
+        categoriesTitle->setFrameShape(Q3Frame::MenuBarPanel);
 #else
         //categoriesTitle->setFrameShape(QFrame::StyledPanel);
 #endif
         categoriesTitle->setText(i18n("Category:"));
-        catCtxMenu = new QPopupMenu(view);
+        catCtxMenu = new Q3PopupMenu(view);
         catCtxMenu->insertItem(i18n("&Rename"),
                                view, SLOT(renCatButton_slot()));
         catCtxMenu->insertItem(i18n("&Delete"),
                                view, SLOT(delCatButton_slot()));
 
 #ifndef DESKTOP_VERSION
@@ -97,43 +103,43 @@ PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
 #endif
 
         // connections
         connect(categoriesList, SIGNAL(highlighted(int)),
                 view, SLOT(shiftToView()));
         connect(categoriesList,
-                SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)),
+                SIGNAL(rightButtonClicked(Q3ListBoxItem *, const QPoint &)),
                 this,
-                SLOT(catRightClick(QListBoxItem *, const QPoint &)));
+                SLOT(catRightClick(Q3ListBoxItem *, const QPoint &)));
 
         connect(lv, SIGNAL(toggleOverview()),
                 this, SLOT(toggleSplitter()));
 }
 
 PwMViewStyle_1::~PwMViewStyle_1()
 {
         delete catCtxMenu;
         delete splitter;
 }
 void PwMViewStyle_1::toggleSplitter()
 {
-    QValueList<int> si = splitter2->sizes();
+    Q3ValueList<int> si = splitter2->sizes();
     splitter2->toggle();
-    QValueList<int> si2 = splitter2->sizes();
+    Q3ValueList<int> si2 = splitter2->sizes();
     //qDebug("PwMViewStyle_1::toggleSplitter() %d %d %d %d", si[0],si[1],si2[0],si2[1] );
     if ( si[0] == si2[0] && si[1] == si2[1] && si2[1] == 1 ) {
         int diff = si[0]/2;
         if ( diff > 200 )
             diff = 200;
         si[0] -= diff;
         si[1] += diff;
         splitter2->toggle();
         splitter2->setSizes( si );
     }
 }
 
-void PwMViewStyle_1::catRightClick(QListBoxItem *item, const QPoint &point)
+void PwMViewStyle_1::catRightClick(Q3ListBoxItem *item, const QPoint &point)
 {
         if (!item)
                 return;
         catCtxMenu->move(point);
         catCtxMenu->show();
 }
@@ -184,9 +190,9 @@ void PwMViewStyle_1::saveSettings(PWMPrefs* prefs)
   prefs->mCategorySplitter = splitter->sizes();
   prefs->mCommentSplitter = splitter2->sizes();
 
 }
 
 
-#ifndef PWM_EMBEDDED
-#include "pwmviewstyle_1.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_pwmviewstyle_1.cpp"
 #endif
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.h b/pwmanager/pwmanager/pwmviewstyle_1.h
index 4f7a256..66cba03 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.h
+++ b/pwmanager/pwmanager/pwmviewstyle_1.h
@@ -17,25 +17,25 @@
  * $Id$
  **************************************************************************/  
 
 #ifndef PWMVIEWSTYLE_1_H
 #define PWMVIEWSTYLE_1_H
 
-#include <qvbox.h>
+#include <q3vbox.h>
 
 #ifndef PWM_EMBEDDED
-#include <qtextedit.h>
+#include <q3textedit.h>
 #include <qsplitter.h>
 #else
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #include <KDGanttMinimizeSplitter.h>
 #endif
 
 #include <qlabel.h>
-#include <qlistbox.h>
-#include <qpopupmenu.h>
+#include <q3listbox.h>
+#include <q3popupmenu.h>
 
 class PwMView;
 class ListViewPwM;
 class CommentBox;
 class PWMPrefs;
 
@@ -79,13 +79,13 @@ public:
         void saveSettings(PWMPrefs* prefs);
 
 public slots:
     void toggleSplitter();
 protected slots:
         /** user clicked right button in category list */
-        void catRightClick(QListBoxItem *item, const QPoint &point);
+        void catRightClick(Q3ListBoxItem *item, const QPoint &point);
 
 protected:
         /** main list view */
         ListViewPwM *lv;
 #ifndef PWM_EMBEDDED
         /** main splitter widget */
@@ -97,18 +97,18 @@ protected:
         KDGanttMinimizeSplitter *splitter;
         /** commentTextEdit splitter */
         KDGanttMinimizeSplitter *splitter2;
 #endif
 
         /** categories list-box */
-        QListBox *categoriesList;
+        Q3ListBox *categoriesList;
         /** title string for the categories combo or list box */
         QLabel *categoriesTitle;
         /** hbox1 for widget style */
-        QVBox *vbox1;
+        Q3VBox *vbox1;
         /** text-edit to display the comment */
         CommentBox *commentBox;
         /** category list context menu */
-        QPopupMenu *catCtxMenu;
+        Q3PopupMenu *catCtxMenu;
 };
 
 #endif
diff --git a/pwmanager/pwmanager/randomizer.cpp b/pwmanager/pwmanager/randomizer.cpp
index da4df78..24f9926 100644
--- a/pwmanager/pwmanager/randomizer.cpp
+++ b/pwmanager/pwmanager/randomizer.cpp
@@ -50,31 +50,31 @@ Randomizer::Randomizer()
 
 #if 1 // set to 0 to test rand_r() fallback
 
         // probe for /dev/urandom
         rndDev->setName("/dev/urandom");
         if (rndDev->exists() &&
-            rndDev->open(IO_ReadOnly)) {
+            rndDev->open(QIODevice::ReadOnly)) {
                 printDebug("Randomizer: using /dev/urandom");
                 return;
         }
 
         // probe for /dev/random
         rndDev->setName("/dev/random");
         if (rndDev->exists() &&
-            rndDev->open(IO_ReadOnly)) {
+            rndDev->open(QIODevice::ReadOnly)) {
                 printDebug("Randomizer: using /dev/random");
                 return;
         }
 
         // probe for EGD
         char *fn = getenv("RANDFILE");
         if (fn) {
                 rndDev->setName(fn);
                 if (rndDev->exists() &&
-                    rndDev->open(IO_ReadOnly)) {
+                    rndDev->open(QIODevice::ReadOnly)) {
                         printDebug(string("Randomizer: using $RANDFILE \"")
                                    + fn
                                    + "\" (aka EGD)");
                         return;
                 }
         }
diff --git a/pwmanager/pwmanager/rencatwnd.cpp b/pwmanager/pwmanager/rencatwnd.cpp
index 3c4de27..3ca758c 100644
--- a/pwmanager/pwmanager/rencatwnd.cpp
+++ b/pwmanager/pwmanager/rencatwnd.cpp
@@ -17,22 +17,25 @@
  * $Id$
  **************************************************************************/  
 
 #include "rencatwnd.h"
 
 #include <klocale.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
 
 
 RenCatWnd::RenCatWnd(QWidget *parent,
-                       const char *name, bool modal, WFlags f)
+                       const char *name, bool modal, Qt::WFlags f)
  : QDialog(parent, name, true, f)
 {
-        vbox1 = new QVBox(this);
+        vbox1 = new Q3VBox(this);
         label = new QLabel(vbox1);
         newName = new QLineEdit(vbox1);
-        hbox1 = new QHBox(vbox1);
+        hbox1 = new Q3HBox(vbox1);
         okButton = new QPushButton(i18n("&Ok"), hbox1);
         cancelButton = new QPushButton(i18n("&Cancel"), hbox1);
 
         vbox1->setSpacing(10);
         vbox1->setMargin(10);
         hbox1->setSpacing(10);
@@ -62,9 +65,9 @@ void RenCatWnd::okButton_slot()
 
 void RenCatWnd::cancelButton_slot()
 {
         done(2);
 }
 
-#ifndef PWM_EMBEDDED
-#include "rencatwnd.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_rencatwnd.cpp"
 #endif
diff --git a/pwmanager/pwmanager/rencatwnd.h b/pwmanager/pwmanager/rencatwnd.h
index 37b6725..1773136 100644
--- a/pwmanager/pwmanager/rencatwnd.h
+++ b/pwmanager/pwmanager/rencatwnd.h
@@ -17,40 +17,42 @@
  * $Id$
  **************************************************************************/  
 
 #ifndef RENCATWND_H
 #define RENCATWND_H
 
-#include <qvbox.h>
-#include <qhbox.h>
+#include <q3vbox.h>
+#include <q3hbox.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
 
 
 /** rename category window */
 class RenCatWnd : public QDialog
 {
         Q_OBJECT
 public:
         RenCatWnd(QWidget *parent = 0, const char *name = 0,
-                    bool modal = FALSE, WFlags f = 0);
+                    bool modal = FALSE, Qt::WFlags f = 0);
         ~RenCatWnd();
 
         QString getNewName()
                         { return newName->text(); }
 
 protected slots:
         void okButton_slot();
         void cancelButton_slot();
 
 protected:
-        QVBox *vbox1;
-        QHBox *hbox1;
+        Q3VBox *vbox1;
+        Q3HBox *hbox1;
         QLabel *label;
         QLineEdit *newName;
         QPushButton *okButton;
         QPushButton *cancelButton;
 
 protected:
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 507fa30..6c6512e 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -21,12 +21,14 @@
 #include "serializer.h"
 #include "pwmexception.h"
 
 #ifdef PWM_EMBEDDED
 #include <kglobal.h>
 #include <klocale.h>
+//Added by qt3to4:
+#include <Q3CString>
 #endif
 
 /* enable/disable serializer debugging (0/1) */
         #define SERIALIZER_DEBUG0
 /* use the old xml tags for writing (0/1) */
         #define USE_OLD_TAGS    0
@@ -143,13 +145,13 @@ Serializer::Serializer()
         domDoc = new QDomDocument;
 #else
         domDoc = new QDomDocument("mydoc");
 #endif
 }
 
-Serializer::Serializer(const QCString &buffer)
+Serializer::Serializer(const Q3CString &buffer)
 {
         defaultLockStat = true;
 //US BUG: I needed to specify a document name. Otherwise impl will not be created for serializing
 #ifndef PWM_EMBEDDED
         domDoc = new QDomDocument;
 #else
@@ -174,13 +176,13 @@ Serializer::~Serializer()
 void Serializer::clear()
 {
         delete_ifnot_null(domDoc);
         domDoc = new QDomDocument;
 }
 
-bool Serializer::parseXml(const QCString &buffer)
+bool Serializer::parseXml(const Q3CString &buffer)
 {
     //abort();
     //qDebug("parse %s ", buffer.data());
         PWM_ASSERT(domDoc);
 #ifndef PWM_EMBEDDED
         if (!domDoc->setContent(buffer, true))
@@ -195,39 +197,39 @@ bool Serializer::parseXml(const QCString &buffer)
 #endif
         if (!checkValid())
                 return false;
         return true;
 }
 
-QCString Serializer::getXml()
+Q3CString Serializer::getXml()
 {
         PWM_ASSERT(domDoc);
 
 #ifndef PWM_EMBEDDED
 #if defined(PWM_DEBUG) && SERIALIZER_DEBUG != 0
-        QCString tmp(domDoc->toCString(8));
+        Q3CString tmp(domDoc->toCString(8));
         printDebug("<BEGIN Serializer::getXml() dump>\n");
         cout << tmp << endl;
         printDebug("<END Serializer::getXml() dump>");
 #endif // DEBUG
 
-        QCString ret(domDoc->toCString(0));
+        Q3CString ret(domDoc->toCString(0));
         ret.replace('\n', "");
         return ret;
 #else
 
 #if defined(PWM_DEBUG) && SERIALIZER_DEBUG != 0
-        QCString tmp("        " + domDoc->toCString());
+        Q3CString tmp("        " + domDoc->toCString());
         printDebug("<BEGIN Serializer::getXml() dump>\n");
         qDebug(tmp);
         cout << tmp << endl;
         printDebug("<END Serializer::getXml() dump>");
 #endif // DEBUG
 
-        QCString ret(domDoc->toCString());
-        ret.replace(QRegExp("\n"), "");
+        Q3CString ret(domDoc->toByteArray());
+        ret.replace("\n", "");
         return ret;
 
 #endif
 }
 
 bool Serializer::serialize(PwMItem &dta)
diff --git a/pwmanager/pwmanager/serializer.h b/pwmanager/pwmanager/serializer.h
index df50e42..e085ade 100644
--- a/pwmanager/pwmanager/serializer.h
+++ b/pwmanager/pwmanager/serializer.h
@@ -20,13 +20,13 @@
 
 #ifndef __SERIALIZER_H
 #define __SERIALIZER_H
 
 #include "pwmdoc.h"
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdom.h>
 
 #include <vector>
 
 using std::vector;
 
@@ -37,22 +37,22 @@ using std::vector;
 class Serializer
 {
 public:
         /** construct an empty serializer document */
         Serializer();
         /** construct a serializer document and parse "buffer" */
-        Serializer(const QCString &buffer);
+        Serializer(const Q3CString &buffer);
         /** destructor */
         virtual ~Serializer();
 
         /** clears all data */
         void clear();
         /** parse the given data buffer */
-        bool parseXml(const QCString &buffer);
+        bool parseXml(const Q3CString &buffer);
         /** returns the current XML data */
-        QCString getXml();
+        Q3CString getXml();
         /** serialize "dta" and store it as XML data */
         //US ENH: we need to serialize and deserialize not only categories, but also synctargets
         bool serialize(PwMItem &dta);
         /** deserialize the (parsed) XML data and store it in "dta" */
         bool deSerialize(PwMItem *dta);
         /** sets the initial default lockStat we should assign */
diff --git a/pwmanager/pwmanager/setmasterpwwnd_emb.cpp b/pwmanager/pwmanager/setmasterpwwnd_emb.cpp
index e6471e6..c5fd4e4 100644
--- a/pwmanager/pwmanager/setmasterpwwnd_emb.cpp
+++ b/pwmanager/pwmanager/setmasterpwwnd_emb.cpp
@@ -28,12 +28,15 @@ $Id$
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
 
 #include <klocale.h>
 
 /*US
 #include <qvariant.h>
 #include <qpushbutton.h>
@@ -54,31 +57,31 @@ $Id$
 setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
   : KDialogBase( KDialogBase::Plain, i18n( "Set master-password" ), 
                  KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
-    QVBoxLayout *pageLayout = new QVBoxLayout( page );
+    Q3VBoxLayout *pageLayout = new Q3VBoxLayout( page );
 
     mainTab = new QTabWidget( page );
     pageLayout->addWidget( mainTab );
 
 
     if ( !name )
         setName( "setMasterPwWnd" );
 
     ////////////////////////////////////////////////////////////////////
     // This is the Password tab1
     tab = new QWidget( mainTab );
 
-    QGridLayout *layout = new QGridLayout( tab, 5, 1 );
+    Q3GridLayout *layout = new Q3GridLayout( tab, 5, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
     QLabel* label = new QLabel( i18n( "Using a normal password-string to encrypt the data." ), tab );
-    label->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
+    label->setAlignment( int( Qt::WordBreak | Qt::AlignCenter ) );
     layout->addWidget(label, 0, 0);
 
     pwEdit_1 = new QLineEdit( tab, "pwEdit_1" );
     pwEdit_1->setEchoMode( QLineEdit::Password );
 
     label = new QLabel( pwEdit_1, i18n( "Please enter the new master-password:" ), tab );
@@ -96,22 +99,22 @@ setMasterPwWnd::setMasterPwWnd( QWidget* parent, const char* name )
 
 
     ////////////////////////////////////////////////////////////////////
     // This is the Password tab2
     tab_2 = new QWidget( mainTab );
 
-    layout = new QGridLayout( tab_2, 5, 1 );
+    layout = new Q3GridLayout( tab_2, 5, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
     label = new QLabel( i18n( "Using a PwM key-card to encrypt the data." ), tab_2 );
-    label->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) );
+    label->setAlignment( int( Qt::WordBreak | Qt::AlignCenter ) );
     layout->addWidget(label, 0, 0);
 
     label = new QLabel( i18n( "selected card:" ), tab_2 );
-    label->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) );
+    label->setAlignment( int( Qt::AlignVCenter | Qt::AlignRight ) );
     layout->addWidget(label, 1, 0);
 
     selCardButton = new QPushButton( i18n( "&Select the currently inserted card as key-card" ), tab_2 );
     layout->addWidget(selCardButton, 2, 0);
 
     genCardButton = new QPushButton(  i18n( "&generate new key-card") , tab_2  );
diff --git a/pwmanager/pwmanager/setmasterpwwnd_emb.h b/pwmanager/pwmanager/setmasterpwwnd_emb.h
index c8ddec6..a070fea 100644
--- a/pwmanager/pwmanager/setmasterpwwnd_emb.h
+++ b/pwmanager/pwmanager/setmasterpwwnd_emb.h
@@ -24,12 +24,14 @@ $Id$
 */                                                                      
 
 #ifndef SETMASTERPWWND_EMB_H
 #define SETMASTERPWWND_EMB_H
 
 #include <kdialogbase.h>
+//Added by qt3to4:
+#include <QLabel>
 
 class QLineEdit;
 class QPushButton;
 class QLabel;
 class QTabWidget;
 class QWidget;
diff --git a/pwmanager/pwmanager/setmasterpwwndimpl.cpp b/pwmanager/pwmanager/setmasterpwwndimpl.cpp
index 3482643..7041d2e 100644
--- a/pwmanager/pwmanager/setmasterpwwndimpl.cpp
+++ b/pwmanager/pwmanager/setmasterpwwndimpl.cpp
@@ -185,9 +185,9 @@ string SetMasterPwWndImpl::getPw(bool *useCard)
                 return curCardKey;
 #endif // CONFIG_KEYCARD
         }
         return "";
 }
 
-#ifndef PWM_EMBEDDED
-#include "setmasterpwwndimpl.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_setmasterpwwndimpl.cpp"
 #endif
diff --git a/pwmanager/pwmanager/waitwnd.cpp b/pwmanager/pwmanager/waitwnd.cpp
index a3f25cc..d4676a9 100644
--- a/pwmanager/pwmanager/waitwnd.cpp
+++ b/pwmanager/pwmanager/waitwnd.cpp
@@ -19,24 +19,28 @@
 
 #include "waitwnd.h"
 #include "globalstuff.h"
 #include "pwmexception.h"
 
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QCloseEvent>
+#include <QLabel>
 
 #include <klocale.h>
 
 
 WaitWnd::WaitWnd(QString caption, QString _staticText,
                  bool showCancelButton, bool showGenericText,
                  QWidget *parent,
-                 const char *name, bool modal, WFlags f)
+                 const char *name, bool modal, Qt::WFlags f)
  : QDialog(parent, name, modal, f)
 {
         canClose = false;
-        vbox1 = new QVBox(this);
+        vbox1 = new Q3VBox(this);
         staticText = new QLabel(vbox1);
         if (showGenericText) {
                 genericText = new QLabel(vbox1);
                 genericText->setAlignment(Qt::AlignHCenter | Qt::WordBreak);
         } else {
                 genericText = 0;
@@ -86,9 +90,9 @@ void WaitWnd::cancel_slot()
 void WaitWnd::updateGenericText(const QString &text)
 {
         if (genericText)
                 genericText->setText(text);
 }
 
-#ifndef PWM_EMBEDDED
-#include "waitwnd.moc"
+#ifndef PWM_EMBEDDED_
+#include "moc_waitwnd.cpp"
 #endif
diff --git a/pwmanager/pwmanager/waitwnd.h b/pwmanager/pwmanager/waitwnd.h
index ae86c8b..6a619b9 100644
--- a/pwmanager/pwmanager/waitwnd.h
+++ b/pwmanager/pwmanager/waitwnd.h
@@ -17,39 +17,42 @@
  * $Id$
  **************************************************************************/  
 
 #ifndef WAITWND_H
 #define WAITWND_H
 
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qevent.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QCloseEvent>
 
 /** window to ask the user to wait */
 class WaitWnd : public QDialog
 {
         Q_OBJECT
 public:
         WaitWnd(QString caption, QString _staticText,
                 bool showCancelButton, bool showGenericText,
                 QWidget *parent = 0, const char *name = 0,
-                bool modal = FALSE, WFlags f = 0);
+                bool modal = FALSE, Qt::WFlags f = 0);
         ~WaitWnd();
 
         void updateGenericText(const QString &text);
 
 signals:
         void goingToClose();
 
 protected slots:
         void cancel_slot();
 
 protected:
-        QVBox *vbox1;
+        Q3VBox *vbox1;
         QLabel *staticText;
         QLabel *genericText;
         QPushButton *cancelButton;
         /** can we safely close the widget? */
         bool canClose;
 
diff --git a/qtcompat/qptrlist.h b/qtcompat/qptrlist.h
index 8ce6868..c3d3ca2 100644
--- a/qtcompat/qptrlist.h
+++ b/qtcompat/qptrlist.h
@@ -1,10 +1,14 @@
 #ifndef QTCOMPAT_QPTRLIST_H
 #define QTCOMPAT_QPTRLIST_H
 
+#if 0
+
 #include <qlist.h>
 
 #define QPtrList QList
 #define QPtrListIterator QListIterator
 #define QPtrCollection   QCollection
 
 #endif
+
+#endif
diff --git a/qtcompat/qptrstack.h b/qtcompat/qptrstack.h
index 92070b3..b0afdf1 100644
--- a/qtcompat/qptrstack.h
+++ b/qtcompat/qptrstack.h
@@ -1,9 +1,13 @@
 #ifndef QTCOMPAT_QPTRSTACK_H
 #define QTCOMPAT_QPTRSTACK_H
 
+#if 0
+
 #include <qstack.h>
 
 #define QPtrStack QStack
 #define QPtrStackIterator QStackIterator
 
 #endif
+
+#endif