2 files changed, 5 insertions, 2 deletions

diff --git a/libetpan/libetpan.pro b/libetpan/libetpan.pro
index 10f51da..909d064 100644
--- a/libetpan/libetpan.pro
+++ b/libetpan/libetpan.pro
@@ -1,134 +1,135 @@
+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 \
               src/main \
               src/driver/interface \
               src/driver/tools \
               src/low-level/imap \
               src/low-level/imf \
               src/low-level/maildir \
               src/low-level/mbox \
               src/low-level/mh \
               src/low-level/mime \
               src/low-level/nntp \
               src/low-level/pop3 \
               src/low-level/smtp \
               src/driver/implementation/data-message \
               src/driver/implementation/db \
               src/driver/implementation/hotmail \
               src/driver/implementation/imap \
               src/driver/implementation/maildir \
               src/driver/implementation/mbox \
               src/driver/implementation/mh \
               src/driver/implementation/mime-message \
               src/driver/implementation/nntp \
               src/driver/implementation/pop3
 INCLUDEPATH += . \
                ./include \
                src/data-types \
                src/engine \
                include/libetpan \
                src/main \
                src/driver/interface \
                src/driver/tools \
                src/low-level/imap \
                src/low-level/imf \
                src/low-level/maildir \
                src/low-level/mbox \
                src/low-level/mh \
                src/low-level/mime \
                src/low-level/nntp \
                src/low-level/pop3 \
                src/low-level/smtp \
                src/driver/implementation/data-message \
                src/driver/implementation/db \
                src/driver/implementation/hotmail \
                src/driver/implementation/imap \
                src/driver/implementation/maildir \
                src/driver/implementation/mbox \
                src/driver/implementation/mh \
                src/driver/implementation/mime-message \
                src/driver/implementation/nntp \
                src/driver/implementation/pop3
 
 # Input
 HEADERS += config.h \
            libetpan-config.h \
            include/libetpan/carray.h \
            include/libetpan/charconv.h \
            include/libetpan/chash.h \
            include/libetpan/cinthash.h \
            include/libetpan/clist.h \
            include/libetpan/data_message_driver.h \
            include/libetpan/dbdriver.h \
            include/libetpan/dbdriver_message.h \
            include/libetpan/dbdriver_types.h \
            include/libetpan/dbstorage.h \
            include/libetpan/generic_cache_types.h \
            include/libetpan/hotmailstorage.h \
            include/libetpan/imapdriver.h \
            include/libetpan/imapdriver_cached.h \
            include/libetpan/imapdriver_cached_message.h \
            include/libetpan/imapdriver_message.h \
            include/libetpan/imapdriver_types.h \
            include/libetpan/imapstorage.h \
            include/libetpan/libetpan-config.h \
            include/libetpan/libetpan.h \
            include/libetpan/libetpan_version.h \
            include/libetpan/mail.h \
            include/libetpan/maildir.h \
            include/libetpan/maildir_types.h \
            include/libetpan/maildirdriver.h \
            include/libetpan/maildirdriver_cached.h \
            include/libetpan/maildirdriver_cached_message.h \
            include/libetpan/maildirdriver_message.h \
            include/libetpan/maildirdriver_types.h \
            include/libetpan/maildirstorage.h \
            include/libetpan/maildriver.h \
            include/libetpan/maildriver_errors.h \
            include/libetpan/maildriver_types.h \
            include/libetpan/maildriver_types_helper.h \
            include/libetpan/mailengine.h \
            include/libetpan/mailfolder.h \
            include/libetpan/mailimap.h \
            include/libetpan/mailimap_helper.h \
            include/libetpan/mailimap_socket.h \
            include/libetpan/mailimap_ssl.h \
            include/libetpan/mailimap_types.h \
            include/libetpan/mailimap_types_helper.h \
            include/libetpan/mailimf.h \
            include/libetpan/mailimf_types.h \
            include/libetpan/mailimf_types_helper.h \
            include/libetpan/mailimf_write_file.h \
            include/libetpan/mailimf_write_generic.h \
            include/libetpan/mailimf_write_mem.h \
            include/libetpan/mailmbox.h \
            include/libetpan/mailmbox_types.h \
            include/libetpan/mailmessage.h \
            include/libetpan/mailmessage_types.h \
            include/libetpan/mailmh.h \
            include/libetpan/mailmime.h \
            include/libetpan/mailmime_content.h \
            include/libetpan/mailmime_decode.h \
            include/libetpan/mailmime_disposition.h \
            include/libetpan/mailmime_types.h \
            include/libetpan/mailmime_types_helper.h \
            include/libetpan/mailmime_write_file.h \
            include/libetpan/mailmime_write_generic.h \
            include/libetpan/mailmime_write_mem.h \
            include/libetpan/mailpop3.h \
            include/libetpan/mailpop3_helper.h \
            include/libetpan/mailpop3_socket.h \
            include/libetpan/mailpop3_ssl.h \
            include/libetpan/mailpop3_types.h \
            include/libetpan/mailprivacy.h \
            include/libetpan/mailprivacy_gnupg.h \
@@ -323,128 +324,130 @@ HEADERS += config.h \
            src/driver/implementation/pop3/pop3driver_cached_message.h \
            src/driver/implementation/pop3/pop3driver_message.h \
            src/driver/implementation/pop3/pop3driver_tools.h \
            src/driver/implementation/pop3/pop3driver_types.h \
            src/driver/implementation/pop3/pop3storage.h
 SOURCES += src/data-types/base64.c \
            src/data-types/carray.c \
            src/data-types/charconv.c \
            src/data-types/chash.c \
            src/data-types/cinthash.c \
            src/data-types/clist.c \
            src/data-types/connect.c \
            src/data-types/mail_cache_db.c \
            src/data-types/maillock.c \
            src/data-types/mailsem.c \
            src/data-types/mailstream.c \
            src/data-types/mailstream_helper.c \
            src/data-types/mailstream_low.c \
            src/data-types/mailstream_socket.c \
            src/data-types/mailstream_ssl.c \
            src/data-types/mapping.c \
            src/data-types/md5.c \
            src/data-types/mmapstring.c \
            src/engine/mailengine.c \
            src/engine/mailprivacy.c \
            src/engine/mailprivacy_gnupg.c \
            src/engine/mailprivacy_smime.c \
            src/engine/mailprivacy_tools.c \
            src/main/libetpan_version.c \
            src/driver/interface/maildriver.c \
            src/driver/interface/maildriver_tools.c \
            src/driver/interface/maildriver_types.c \
            src/driver/interface/maildriver_types_helper.c \
            src/driver/interface/mailfolder.c \
            src/driver/interface/mailmessage.c \
            src/driver/interface/mailmessage_tools.c \
            src/driver/interface/mailmessage_types.c \
            src/driver/interface/mailstorage.c \
            src/driver/interface/mailstorage_tools.c \
            src/driver/tools/generic_cache.c \
            src/driver/tools/imfcache.c \
            src/driver/tools/mailthread.c \
            src/driver/tools/mailthread_types.c \
            src/low-level/imap/mailimap.c \
            src/low-level/imap/mailimap_helper.c \
            src/low-level/imap/mailimap_keywords.c \
            src/low-level/imap/mailimap_parser.c \
            src/low-level/imap/mailimap_print.c \
            src/low-level/imap/mailimap_sender.c \
            src/low-level/imap/mailimap_socket.c \
            src/low-level/imap/mailimap_ssl.c \
            src/low-level/imap/mailimap_types.c \
            src/low-level/imap/mailimap_types_helper.c \
            src/low-level/imf/mailimf.c \
            src/low-level/imf/mailimf_types.c \
            src/low-level/imf/mailimf_types_helper.c \
            src/low-level/imf/mailimf_write.c \
            src/low-level/imf/mailimf_write_file.c \
            src/low-level/imf/mailimf_write_generic.c \
            src/low-level/imf/mailimf_write_mem.c \
            src/low-level/maildir/maildir.c \
            src/low-level/mbox/mailmbox.c \
            src/low-level/mbox/mailmbox_parse.c \
            src/low-level/mbox/mailmbox_types.c \
            src/low-level/mh/mailmh.c \
            src/low-level/mime/mailmime.c \
            src/low-level/mime/mailmime_content.c \
            src/low-level/mime/mailmime_decode.c \
            src/low-level/mime/mailmime_disposition.c \
            src/low-level/mime/mailmime_types.c \
            src/low-level/mime/mailmime_types_helper.c \
            src/low-level/mime/mailmime_write.c \
            src/low-level/mime/mailmime_write_file.c \
            src/low-level/mime/mailmime_write_generic.c \
            src/low-level/mime/mailmime_write_mem.c \
            src/low-level/nntp/newsnntp.c \
            src/low-level/nntp/newsnntp_socket.c \
            src/low-level/nntp/newsnntp_ssl.c \
            src/low-level/pop3/mailpop3.c \
            src/low-level/pop3/mailpop3_helper.c \
            src/low-level/pop3/mailpop3_socket.c \
            src/low-level/pop3/mailpop3_ssl.c \
            src/low-level/smtp/mailsmtp.c \
            src/low-level/smtp/mailsmtp_helper.c \
            src/low-level/smtp/mailsmtp_socket.c \
            src/low-level/smtp/mailsmtp_ssl.c \
            src/driver/implementation/data-message/data_message_driver.c \
            src/driver/implementation/db/dbdriver.c \
            src/driver/implementation/db/dbdriver_message.c \
            src/driver/implementation/db/dbstorage.c \
            src/driver/implementation/hotmail/hotmailstorage.c \
            src/driver/implementation/imap/imapdriver.c \
            src/driver/implementation/imap/imapdriver_cached.c \
            src/driver/implementation/imap/imapdriver_cached_message.c \
            src/driver/implementation/imap/imapdriver_message.c \
            src/driver/implementation/imap/imapdriver_tools.c \
            src/driver/implementation/imap/imapstorage.c \
            src/driver/implementation/maildir/maildirdriver.c \
            src/driver/implementation/maildir/maildirdriver_cached.c \
            src/driver/implementation/maildir/maildirdriver_cached_message.c \
            src/driver/implementation/maildir/maildirdriver_message.c \
            src/driver/implementation/maildir/maildirdriver_tools.c \
            src/driver/implementation/maildir/maildirstorage.c \
            src/driver/implementation/mbox/mboxdriver.c \
            src/driver/implementation/mbox/mboxdriver_cached.c \
            src/driver/implementation/mbox/mboxdriver_cached_message.c \
            src/driver/implementation/mbox/mboxdriver_message.c \
            src/driver/implementation/mbox/mboxdriver_tools.c \
            src/driver/implementation/mbox/mboxstorage.c \
            src/driver/implementation/mh/mhdriver.c \
            src/driver/implementation/mh/mhdriver_cached.c \
            src/driver/implementation/mh/mhdriver_cached_message.c \
            src/driver/implementation/mh/mhdriver_message.c \
            src/driver/implementation/mh/mhdriver_tools.c \
            src/driver/implementation/mh/mhstorage.c \
            src/driver/implementation/mime-message/mime_message_driver.c \
            src/driver/implementation/nntp/nntpdriver.c \
            src/driver/implementation/nntp/nntpdriver_cached.c \
            src/driver/implementation/nntp/nntpdriver_cached_message.c \
            src/driver/implementation/nntp/nntpdriver_message.c \
            src/driver/implementation/nntp/nntpdriver_tools.c \
            src/driver/implementation/nntp/nntpstorage.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,134 +1,134 @@
 ######################################################################
 # 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 \
               src/main \
               src/driver/interface \
               src/driver/tools \
               src/low-level/imap \
               src/low-level/imf \
               src/low-level/maildir \
               src/low-level/mbox \
               src/low-level/mh \
               src/low-level/mime \
               src/low-level/nntp \
               src/low-level/pop3 \
               src/low-level/smtp \
               src/driver/implementation/data-message \
               src/driver/implementation/db \
               src/driver/implementation/hotmail \
               src/driver/implementation/imap \
               src/driver/implementation/maildir \
               src/driver/implementation/mbox \
               src/driver/implementation/mh \
               src/driver/implementation/mime-message \
               src/driver/implementation/nntp \
               src/driver/implementation/pop3
 INCLUDEPATH += . \
                ./include \
                src/data-types \
                src/engine \
                include/libetpan \
                src/main \
                src/driver/interface \
                src/driver/tools \
                src/low-level/imap \
                src/low-level/imf \
                src/low-level/maildir \
                src/low-level/mbox \
                src/low-level/mh \
                src/low-level/mime \
                src/low-level/nntp \
                src/low-level/pop3 \
                src/low-level/smtp \
                src/driver/implementation/data-message \
                src/driver/implementation/db \
                src/driver/implementation/hotmail \
                src/driver/implementation/imap \
                src/driver/implementation/maildir \
                src/driver/implementation/mbox \
                src/driver/implementation/mh \
                src/driver/implementation/mime-message \
                src/driver/implementation/nntp \
                src/driver/implementation/pop3
 
 # Input
 HEADERS += config.h \
            libetpan-config.h \
            include/libetpan/carray.h \
            include/libetpan/charconv.h \
            include/libetpan/chash.h \
            include/libetpan/cinthash.h \
            include/libetpan/clist.h \
            include/libetpan/data_message_driver.h \
            include/libetpan/dbdriver.h \
            include/libetpan/dbdriver_message.h \
            include/libetpan/dbdriver_types.h \
            include/libetpan/dbstorage.h \
            include/libetpan/generic_cache_types.h \
            include/libetpan/hotmailstorage.h \
            include/libetpan/imapdriver.h \
            include/libetpan/imapdriver_cached.h \
            include/libetpan/imapdriver_cached_message.h \
            include/libetpan/imapdriver_message.h \
            include/libetpan/imapdriver_types.h \
            include/libetpan/imapstorage.h \
            include/libetpan/libetpan-config.h \
            include/libetpan/libetpan.h \
            include/libetpan/libetpan_version.h \
            include/libetpan/mail.h \
            include/libetpan/maildir.h \
            include/libetpan/maildir_types.h \
            include/libetpan/maildirdriver.h \
            include/libetpan/maildirdriver_cached.h \
            include/libetpan/maildirdriver_cached_message.h \
            include/libetpan/maildirdriver_message.h \
            include/libetpan/maildirdriver_types.h \
            include/libetpan/maildirstorage.h \
            include/libetpan/maildriver.h \
            include/libetpan/maildriver_errors.h \
            include/libetpan/maildriver_types.h \
            include/libetpan/maildriver_types_helper.h \
            include/libetpan/mailengine.h \
            include/libetpan/mailfolder.h \
            include/libetpan/mailimap.h \
            include/libetpan/mailimap_helper.h \
            include/libetpan/mailimap_socket.h \
            include/libetpan/mailimap_ssl.h \
            include/libetpan/mailimap_types.h \
            include/libetpan/mailimap_types_helper.h \
            include/libetpan/mailimf.h \
            include/libetpan/mailimf_types.h \
            include/libetpan/mailimf_types_helper.h \
            include/libetpan/mailimf_write_file.h \
            include/libetpan/mailimf_write_generic.h \
            include/libetpan/mailimf_write_mem.h \
            include/libetpan/mailmbox.h \
            include/libetpan/mailmbox_types.h \
            include/libetpan/mailmessage.h \
            include/libetpan/mailmessage_types.h \
            include/libetpan/mailmh.h \
            include/libetpan/mailmime.h \
            include/libetpan/mailmime_content.h \
            include/libetpan/mailmime_decode.h \
            include/libetpan/mailmime_disposition.h \
            include/libetpan/mailmime_types.h \
            include/libetpan/mailmime_types_helper.h \
            include/libetpan/mailmime_write_file.h \
            include/libetpan/mailmime_write_generic.h \
            include/libetpan/mailmime_write_mem.h \
            include/libetpan/mailpop3.h \
            include/libetpan/mailpop3_helper.h \
            include/libetpan/mailpop3_socket.h \
            include/libetpan/mailpop3_ssl.h \
            include/libetpan/mailpop3_types.h \
            include/libetpan/mailprivacy.h \
            include/libetpan/mailprivacy_gnupg.h \