Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

98 files changed, 1152 insertions, 1152 deletions

diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index 65830782e..b52a09824 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -67,7 +67,7 @@ extern "C"
 }
 
 ResourceKABC::ResourceKABC( const KConfig* config )
-  : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
+  : ResourceCalendar( config ), mCalendar( TQString::tqfromLatin1( "UTC" ) ),
     mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
 {
   if ( config ) {
@@ -80,7 +80,7 @@ ResourceKABC::ResourceKABC( const KConfig* config )
 }
 
 ResourceKABC::ResourceKABC()
-  : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ),
+  : ResourceCalendar( 0 ), mCalendar( TQString::tqfromLatin1( "UTC" ) ),
     mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
 {
   init();
@@ -151,7 +151,7 @@ bool ResourceKABC::doLoad()
       bool hasCategory = false;
       TQStringList categories = (*it).categories();
       for ( strIt = mCategories.begin(); strIt != endStrIt; ++strIt )
-        if ( categories.contains( *strIt ) ) {
+        if ( categories.tqcontains( *strIt ) ) {
           hasCategory = true;
           break;
         }
diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp
index 2f7671dc7..ec33aaba6 100644
--- a/kresources/birthdays/resourcekabcconfig.cpp
+++ b/kresources/birthdays/resourcekabcconfig.cpp
@@ -92,7 +92,7 @@ void ResourceKABCConfig::loadSettings( KRES::Resource *resource )
     const TQStringList categories = res->categories();
     TQListViewItemIterator it( mCategoryView );
     while ( it.current() ) {
-      if ( categories.contains( it.current()->text( 0 ) ) ) {
+      if ( categories.tqcontains( it.current()->text( 0 ) ) ) {
         TQCheckListItem *item = static_cast<TQCheckListItem*>( it.current() );
         item->setOn( true );
       }
diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui
index 6dbb64b03..15f2ab9b0 100644
--- a/kresources/blogging/resourcebloggingsettings.ui
+++ b/kresources/blogging/resourcebloggingsettings.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>ResourceBloggingSettings</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout12</cstring>
+                <cstring>tqlayout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -291,7 +291,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>84</height>
@@ -313,7 +313,7 @@
     <tabstop>mOpenCategory</tabstop>
     <tabstop>mCloseCategory</tabstop>
 </tabstops>
-<layoutdefaults spacing="5" margin="5"/>
+<tqlayoutdefaults spacing="5" margin="5"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp
index 84a4798c6..578fd1bba 100644
--- a/kresources/caldav/config.cpp
+++ b/kresources/caldav/config.cpp
@@ -190,7 +190,7 @@ void ResourceCalDavConfig::setupUI() {
     label->hide();
     mPassword->hide();
 
-    // combining layouts
+    // combining tqlayouts
     vertical->addLayout(mainLayout);
     vertical->addLayout(horizontal);
 }
diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp
index b5ef0f496..594edd00f 100644
--- a/kresources/caldav/configwidgets.cpp
+++ b/kresources/caldav/configwidgets.cpp
@@ -114,7 +114,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
   d->mIntervalSpin->setEnabled( false );
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(intervalRadio);
   vbox->addWidget(intervalBox);
   vbox->addWidget(automaticReloadOnStartup);
@@ -207,7 +207,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent )
   intervalBox->hide();
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(delay);
   vbox->addWidget(every);
   vbox->addWidget(intervalRadio);
diff --git a/kresources/caldav/preferences.cpp b/kresources/caldav/preferences.cpp
index 6eb87e450..5259d9877 100644
--- a/kresources/caldav/preferences.cpp
+++ b/kresources/caldav/preferences.cpp
@@ -220,14 +220,14 @@ TQString CalDavPrefs::getFullUrl() {
 
     firstAt = safeURL.find("@") + 1;
     while (safeURL.find("@", firstAt) != -1) {
-        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
+        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.replace("%40", "@");
+    safeURL.tqreplace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.replace(" ", "%20");
+    safeURL.tqreplace(" ", "%20");
 
     return safeURL;
 }
@@ -247,14 +247,14 @@ TQString CalDavPrefs::getFullTasksUrl() {
 
     firstAt = safeURL.find("@") + 1;
     while (safeURL.find("@", firstAt) != -1) {
-        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
+        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.replace("%40", "@");
+    safeURL.tqreplace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.replace(" ", "%20");
+    safeURL.tqreplace(" ", "%20");
 
     return safeURL;
 }
@@ -274,14 +274,14 @@ TQString CalDavPrefs::getFullJournalsUrl() {
 
     firstAt = safeURL.find("@") + 1;
     while (safeURL.find("@", firstAt) != -1) {
-        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
+        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.replace("%40", "@");
+    safeURL.tqreplace("%40", "@");
 
     // Encode any spaces, as libcaldav stupidly fails otherwise
-    safeURL.replace(" ", "%20");
+    safeURL.tqreplace(" ", "%20");
 
     return safeURL;
 }
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index f6ad54752..4293fb5a1 100644
--- a/kresources/caldav/resource.cpp
+++ b/kresources/caldav/resource.cpp
@@ -105,7 +105,7 @@ ResourceCalDav::~ResourceCalDav() {
     while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
         readLockout = true;
         sleep(1);
-        qApp->processEvents(TQEventLoop::ExcludeUserInput);
+        tqApp->processEvents(TQEventLoop::ExcludeUserInput);
     }
 
     if (mWriter) {
@@ -338,7 +338,7 @@ void ResourceCalDav::loadingQueuePop() {
     mLoader->setParent(this);
     mLoader->setType(0);
 
-    TQDateTime dt(TQDate::currentDate());
+    TQDateTime dt(TQDate::tqcurrentDate());
     mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS));
     //mLoader->setGetAll();
 
@@ -403,8 +403,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            data.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            data.replace('\r', '\n');
+            data.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            data.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseData(data)) {
@@ -451,8 +451,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            tasksData.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            tasksData.replace('\r', '\n');
+            tasksData.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            tasksData.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseTasksData(tasksData)) {
@@ -499,8 +499,8 @@ void ResourceCalDav::loadFinished() {
             // TODO: I don't know why, but some schedules on http://caldav-test.ioda.net/ (I used it for testing)
             // have some lines separated by single \r rather than \n or \r\n.
             // ICalFormat fails to parse that.
-            journalsData.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            journalsData.replace('\r', '\n');
+            journalsData.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            journalsData.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseJournalsData(journalsData)) {
@@ -744,9 +744,9 @@ TQString ResourceCalDav::getICalString(const Incidence::List& inc) {
     int nextPos = data.findRev("\n", data.find(":", uidPos));
     TQString uidField = data.mid(uidPos, nextPos-uidPos);
     data.remove(uidPos, nextPos-uidPos);
-    uidField.replace("\n", "");
-    uidField.replace("\r", "");
-    uidField.replace(" ", "");
+    uidField.tqreplace("\n", "");
+    uidField.tqreplace("\r", "");
+    uidField.tqreplace(" ", "");
     data.insert(uidPos, uidField);
     return data;
 }
@@ -888,11 +888,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsAdded = "";
         t->journalsChanged = "";
         t->journalsDeleted = "";
-        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->added = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksAdded = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNAL") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNAL") > 0)
           t->journalsAdded = getICalString(currentIncidence);
 
         writingQueuePush(t);
@@ -916,11 +916,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsChanged = "";
         t->journalsDeleted = "";
 
-        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->changed = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksChanged = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNAL") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNAL") > 0)
           t->journalsChanged = getICalString(currentIncidence);
 
         writingQueuePush(t);
@@ -944,11 +944,11 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl,
         t->journalsChanged = "";
         t->journalsDeleted = "";
 
-        if (getICalString(currentIncidence).contains("BEGIN:VEVENT") > 0)
+        if (getICalString(currentIncidence).tqcontains("BEGIN:VEVENT") > 0)
           t->deleted = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VTODO") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VTODO") > 0)
           t->tasksDeleted = getICalString(currentIncidence);
-        else if (getICalString(currentIncidence).contains("BEGIN:VJOURNALS") > 0)
+        else if (getICalString(currentIncidence).tqcontains("BEGIN:VJOURNALS") > 0)
           t->journalsDeleted = getICalString(currentIncidence);
 
         writingQueuePush(t);
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index fb1ade761..e8d7e25a0 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -158,7 +158,7 @@ void ResourceCardDavConfig::setupUI() {
     label->hide();
     mPassword->hide();
 
-    // combining layouts
+    // combining tqlayouts
     vertical->addLayout(mainLayout);
     vertical->addLayout(horizontal);
 }
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index 90da1831c..fbec299ad 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -113,7 +113,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
   d->mIntervalSpin->setEnabled( false );
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(intervalRadio);
   vbox->addWidget(intervalBox);
   vbox->addWidget(automaticReloadOnStartup);
@@ -206,7 +206,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
   intervalBox->hide();
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
   vbox->addWidget(delay);
   vbox->addWidget(every);
   vbox->addWidget(intervalRadio);
diff --git a/kresources/carddav/preferences.cpp b/kresources/carddav/preferences.cpp
index cf2cdbc5a..61d17e30d 100644
--- a/kresources/carddav/preferences.cpp
+++ b/kresources/carddav/preferences.cpp
@@ -223,14 +223,14 @@ TQString CardDavPrefs::getFullUrl() {
 
     firstAt = safeURL.find("@") + 1;
     while (safeURL.find("@", firstAt) != -1) {
-        safeURL.replace(safeURL.find("@", firstAt), 1, "%40");
+        safeURL.tqreplace(safeURL.find("@", firstAt), 1, "%40");
     }
 
     // Unencode the username, as Zimbra stupidly rejects the %40
-    safeURL.replace("%40", "@");
+    safeURL.tqreplace("%40", "@");
 
     // Encode any spaces, as libcarddav stupidly fails otherwise
-    safeURL.replace(" ", "%20");
+    safeURL.tqreplace(" ", "%20");
 
     return safeURL;
 }
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index a5172d9e5..53bbf034c 100644
--- a/kresources/carddav/resource.cpp
+++ b/kresources/carddav/resource.cpp
@@ -105,7 +105,7 @@ ResourceCardDav::~ResourceCardDav() {
     while ((mWriter->running() == true) || (mWritingQueue.isEmpty() == false) || !mWritingQueueReady) {
         readLockout = true;
         sleep(1);
-        qApp->processEvents(TQEventLoop::ExcludeUserInput);
+        tqApp->processEvents(TQEventLoop::ExcludeUserInput);
     }
 
     if (mWriter) {
@@ -394,8 +394,8 @@ void ResourceCardDav::loadFinished() {
         TQString data = loader->data();
 
         if (!data.isNull() && !data.isEmpty()) {
-            data.replace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
-            data.replace('\r', '\n');
+            data.tqreplace("\r\n", "\n"); // to avoid \r\n becomes \n\n after the next line
+            data.tqreplace('\r', '\n');
 
             log("trying to parse...");
             if (parseData(data)) {
diff --git a/kresources/carddav/writer.cpp b/kresources/carddav/writer.cpp
index 7141bf303..837fca663 100644
--- a/kresources/carddav/writer.cpp
+++ b/kresources/carddav/writer.cpp
@@ -58,7 +58,7 @@ int CardDavWriter::runJob(runtime_info* RT) {
             res = pushObjects(mChanged, carddav_modify_object_by_uri, OK, RT);
         if (OK == res) {
             kdDebug() << "pushing deleted objects";
-            while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
+            while (mDeleted.tqcontains("BEGIN:VCARD", TRUE) > 0) {
                 int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
                 TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
                 mDeleted = mDeleted.remove(0, endLocation+9);
@@ -82,7 +82,7 @@ int CardDavWriter::runJob(runtime_info* RT) {
                 res = pushObjects(mChanged, carddav_add_object, OK, RT);
             if (OK == res) {
                 kdDebug() << "pushing deleted objects";
-                while (mDeleted.contains("BEGIN:VCARD", TRUE) > 0) {
+                while (mDeleted.tqcontains("BEGIN:VCARD", TRUE) > 0) {
                     int endLocation = mDeleted.find("END:VCARD", 0, TRUE);
                     TQString deletedCurSeq = mDeleted.mid(0, endLocation+9);
                     mDeleted = mDeleted.remove(0, endLocation+9);
diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp
index 9d45dab75..1660c85e0 100644
--- a/kresources/egroupware/debugdialog.cpp
+++ b/kresources/egroupware/debugdialog.cpp
@@ -38,10 +38,10 @@ DebugDialog::DebugDialog()
                 User1 | User2 | Ok, Ok, true )
 {
   TQWidget *page = plainPage();
-  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   mView = new KTextBrowser( page );
-  layout->addWidget( mView );
+  tqlayout->addWidget( mView );
 
   setButtonText( User1, "Save As..." );
   setButtonText( User2, "Clear" );
@@ -109,9 +109,9 @@ void DebugDialog::slotUser2()
 void DebugDialog::addText( const TQString &text, Type type )
 {
   TQString htmlCode( text );
-  htmlCode.replace( "<", "&lt;" );
-  htmlCode.replace( ">", "&gt;" );
-  htmlCode.replace( "\n", "<br>" );
+  htmlCode.tqreplace( "<", "&lt;" );
+  htmlCode.tqreplace( ">", "&gt;" );
+  htmlCode.tqreplace( "\n", "<br>" );
 
   mMessages.append( text );
   if ( type == Input )
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 9072b1666..15864a374 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -239,8 +239,8 @@ bool ResourceXMLRPC::doLoad()
   mTodoStateMapper.load();
 
   TQMap<TQString, TQVariant> args, columns;
-  args.insert( "start", TQDateTime( TQDate::currentDate().addDays( -12 ) ) );
-  args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) );
+  args.insert( "start", TQDateTime( TQDate::tqcurrentDate().addDays( -12 ) ) );
+  args.insert( "end", TQDateTime( TQDate::tqcurrentDate().addDays( 2000 ) ) );
 
   mServer->call( SearchEventsCommand, args,
                  this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index 774115d27..6446a833d 100644
--- a/kresources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpc.cpp
@@ -50,7 +50,7 @@ static const TQString DeleteNoteCommand = "infolog.boinfolog.delete";
 static const TQString LoadNoteCategoriesCommand = "infolog.boinfolog.categories";
 
 ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
-  : ResourceNotes( config ),  mCalendar( TQString::fromLatin1("UTC") ),
+  : ResourceNotes( config ),  mCalendar( TQString::tqfromLatin1("UTC") ),
     mServer( 0 )
 {
   init();
@@ -65,7 +65,7 @@ ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
 }
 
 ResourceXMLRPC::ResourceXMLRPC( )
-  : ResourceNotes( 0 ), mCalendar( TQString::fromLatin1("UTC") ),
+  : ResourceNotes( 0 ), mCalendar( TQString::tqfromLatin1("UTC") ),
     mServer( 0 )
 {
   init();
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index e983c3c99..5c8fcf84d 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -139,7 +139,7 @@ int TodoStateMapper::toLocal( const TQString &remoteState )
     return 100;
   else {
     TQString number( remoteState );
-    number.replace( "%", "" );
+    number.tqreplace( "%", "" );
     return number.toInt();
   }
 }
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 2d91edbde..68bade033 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -202,10 +202,10 @@ TQString Query::marshal( const TQVariant &arg ) const
       case TQVariant::CString:
         {
         TQString result = arg.toString();
-        result = result.replace( "&", "&amp;" );
-        result = result.replace( "\"", "&quot;" );
-        result = result.replace( "<", "&lt;" );
-        result = result.replace( ">", "&gt;" );
+        result = result.tqreplace( "&", "&amp;" );
+        result = result.tqreplace( "\"", "&quot;" );
+        result = result.tqreplace( "<", "&lt;" );
+        result = result.tqreplace( ">", "&gt;" );
         return "<value><string>" + result + "</string></value>\r\n";
         }
       case TQVariant::Int:
diff --git a/kresources/exchange/dateset.cpp b/kresources/exchange/dateset.cpp
index a2372c874..2fed82af6 100644
--- a/kresources/exchange/dateset.cpp
+++ b/kresources/exchange/dateset.cpp
@@ -155,24 +155,24 @@ void DateSet::remove( TQDate const& from, TQDate const& to )
   }
 }
 
-bool DateSet::contains( TQDate const& date )
+bool DateSet::tqcontains( TQDate const& date )
 {
   if (mDates->isEmpty()) {
     return false;
   } 
 
   uint i = find( date );
-//  kdDebug() << "contains looking for " << date.toString() << " at range " << i << endl;
+//  kdDebug() << "tqcontains looking for " << date.toString() << " at range " << i << endl;
   if ( i == mDates->count() )
     return false;
 
   QPair<TQDate,TQDate>* item = mDates->at( i );
-  // kdDebug() << "contains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl;
+  // kdDebug() << "tqcontains looking at range " << item->first.toString() << " -- " << item->second.toString() << endl;
   return ( item->first <= date );
 }
 
 // returns true if and only if the whole range is in the set
-bool DateSet::contains( TQDate const& from, TQDate const& to )
+bool DateSet::tqcontains( TQDate const& from, TQDate const& to )
 {
   if (mDates->isEmpty()) {
     return false;
diff --git a/kresources/exchange/dateset.h b/kresources/exchange/dateset.h
index 989d774cb..d4e9a9fef 100644
--- a/kresources/exchange/dateset.h
+++ b/kresources/exchange/dateset.h
@@ -34,8 +34,8 @@ class DateRange {
     DateRange( TQDate const& from, TQDate const& to )
 	    : mFrom( from ), mTo( to ) { }
     bool operator< ( const DateRange& r ) { return mFrom < r.from(); }
-    bool contains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); }
-    bool contains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); }
+    bool tqcontains( TQDate const& d ) { return ( mFrom <= d && d <= mTo ); }
+    bool tqcontains( TQDate const& from, TQDate const& to ) { return ( mFrom <= from && to <= mTo ); }
 
     TQDate from() { return mFrom; }
     TQDate to() { return mTo; }
@@ -68,9 +68,9 @@ class DateSet {
     void remove( TQDate const& date );
     void remove( TQDate const& from, TQDate const& to );
     
-    bool contains( TQDate const& date );
+    bool tqcontains( TQDate const& date );
     // returns true if and only if the whole range is in the set
-    bool contains( TQDate const& from, TQDate const& to );
+    bool tqcontains( TQDate const& from, TQDate const& to );
 
     int find( TQDate const &date );
     void print();
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index 82c0ab07d..ec203b9cd 100644
--- a/kresources/exchange/resourceexchange.cpp
+++ b/kresources/exchange/resourceexchange.cpp
@@ -78,7 +78,7 @@ ResourceExchange::ResourceExchange( const KConfig *config )
 {
   mLock = new KABC::LockNull( true );
 
-  mTimeZoneId = TQString::fromLatin1( "UTC" );
+  mTimeZoneId = TQString::tqfromLatin1( "UTC" );
 
   kdDebug() << "Creating ResourceExchange" << endl;
   if (config ) {
@@ -139,7 +139,7 @@ bool ResourceExchange::doOpen()
   mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 );
 #endif
 
-  TQWidgetList* widgets = TQApplication::topLevelWidgets();
+  TQWidgetList* widgets = TQApplication::tqtopLevelWidgets();
   if ( !widgets->isEmpty() )
     mClient->setWindow( widgets->first() );
   delete widgets;
@@ -477,11 +477,11 @@ Event::List ResourceExchange::rawEventsForDate( const TQDate &qd,
   if (!mCache) return Event::List();
   // If the events for this date are not in the cache, or if they are old,
   // get them again
-  TQDateTime now = TQDateTime::currentDateTime();
+  TQDateTime now = TQDateTime::tqcurrentDateTime();
   // kdDebug() << "Now is " << now.toString() << endl;
   // kdDebug() << "mDates: " << mDates << endl;
   TQDate start = TQDate( qd.year(), qd.month(), 1 ); // First day of month
-  if ( mDates && ( !mDates->contains( start ) ||
+  if ( mDates && ( !mDates->tqcontains( start ) ||
                    (*mCacheDates)[start].secsTo( now ) > mCachedSeconds ) ) {
     TQDate end = start.addMonths( 1 ).addDays( -1 ); // Last day of month
     // Get events that occur in this period from the cache
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index 17b6f443a..10716000d 100644
--- a/kresources/groupdav/groupdavglobals.cpp
+++ b/kresources/groupdav/groupdavglobals.cpp
@@ -230,7 +230,7 @@ bool GroupDavGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *
 kdDebug(5800) << "GroupDavGlobals::interpretCalendarDownloadItemsJob, iCalendar=" << endl;
 kdDebug(5800) << jobData << endl;
   if ( !adaptor || !job ) return false;
-  KCal::CalendarLocal calendar( TQString::fromLatin1("UTC") );
+  KCal::CalendarLocal calendar( TQString::tqfromLatin1("UTC") );
   KCal::ICalFormat ical;
   calendar.setTimeZoneId( adaptor->resource()->timeZoneId() );
   KCal::Incidence::List incidences;
diff --git a/kresources/groupwise/groupwisesettingswidgetbase.ui b/kresources/groupwise/groupwisesettingswidgetbase.ui
index d8054494a..eee04f6fb 100644
--- a/kresources/groupwise/groupwisesettingswidgetbase.ui
+++ b/kresources/groupwise/groupwisesettingswidgetbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>GroupWiseSettingsWidgetBase</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -73,7 +73,7 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index 9aa33ac7f..7c87508e4 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -347,7 +347,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
   }
 
   mJob = KIO::get( url, false, false );  // TODO: make the GW jobs call finished if the URL 
-                                         // contains no address book IDs
+                                         // tqcontains no address book IDs
   kdDebug() << "  Job address: " << mJob << endl;
   connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
            TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) );
@@ -558,7 +558,7 @@ void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &dat
           if ( !local.isEmpty() )
           {
             idMapper().removeRemoteId( remote );
-            KABC::Addressee addrToDelete = findByUid( local );
+            KABC::Addressee addrToDelete = tqfindByUid( local );
             removeAddressee( addrToDelete );
           }
         }
@@ -708,7 +708,7 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns
 
   if ( mode == Update && lastSequenceNumber > 0 && lastPORebuildTime > 0 )
   {
-    query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
+    query += TQString::tqfromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
   }
   url.setQuery( query );
   return url;
@@ -732,9 +732,9 @@ void ResourceGroupwise::storeDeltaInfo()
 
 bool ResourceGroupwise::appIsWhiteListedForSAB()
 {
-  if ( !mPrefs->systemAddressBookWhiteList().contains( qApp->argv()[ 0 ] ) )
+  if ( !mPrefs->systemAddressBookWhiteList().tqcontains( tqApp->argv()[ 0 ] ) )
   {
-    kdDebug() << "Application " << qApp->argv()[ 0 ] << " is _blacklisted_ to load the SAB" << endl;
+    kdDebug() << "Application " << tqApp->argv()[ 0 ] << " is _blacklisted_ to load the SAB" << endl;
     return false;
   }
   return true;
diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index 678ad63e4..3f8c08ef5 100644
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@@ -186,7 +186,7 @@ void ResourceGroupwise::slotJobResult( KIO::Job *job )
     clearCache();
 
     // FIXME: This does not take into account the time zone!
-    CalendarLocal calendar( TQString::fromLatin1("UTC") );
+    CalendarLocal calendar( TQString::tqfromLatin1("UTC") );
     ICalFormat ical;
     if ( !ical.fromString( &calendar, mJobData ) ) {
       loadError( i18n("Error parsing calendar data.") );
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
index 04e1affd9..f9e28008d 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -124,7 +124,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
     if ( s )
     {
       KDialogBase * dialog = new KDialogBase( ::qt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
-//       TQVBoxLayout * layout = new TQVBoxLayout( dialog );
+//       TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog );
       GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog );
       dialog->setMainWidget( settingsWidget );
       // populate dialog
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index 44178fe61..c535e5689 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -106,12 +106,12 @@ void Groupwise::get( const KURL &url )
   TQString path = url.path();
   debugMessage( "Path: " + path );
 
-  if ( path.contains( "/freebusy" ) ) {
+  if ( path.tqcontains( "/freebusy" ) ) {
     getFreeBusy( url );
-  } else if ( path.contains( "/calendar" ) ) {
+  } else if ( path.tqcontains( "/calendar" ) ) {
     getCalendar( url );
-  } else if ( path.contains( "/addressbook" ) ) {
-    if ( url.query().contains( "update=true" ) )
+  } else if ( path.tqcontains( "/addressbook" ) ) {
+    if ( url.query().tqcontains( "update=true" ) )
       updateAddressbook( url );
     else
       getAddressbook( url );
@@ -169,8 +169,8 @@ void Groupwise::getFreeBusy( const KURL &url )
 
     // Sanitise local Nuernberg email addresses
     kdDebug() << "Email before sanitizing: " << email << endl;
-    email = email.replace(TQRegExp("\\.EMEA5-1\\.EMEA5" ), "" );
-    email = email.replace(TQRegExp("\\.Suse.INTERNET" ), "" );
+    email = email.tqreplace(TQRegExp("\\.EMEA5-1\\.EMEA5" ), "" );
+    email = email.tqreplace(TQRegExp("\\.Suse.INTERNET" ), "" );
     kdDebug() << "Email after sanitizing: " << email << endl;
 
     TQString u = soapUrl( url );
@@ -190,8 +190,8 @@ void Groupwise::getFreeBusy( const KURL &url )
       GroupwiseServer server( u, user, pass, 0 );
 
       // FIXME: Read range from configuration or URL parameters.
-      TQDate start = TQDate::currentDate().addDays( -3 );
-      TQDate end = TQDate::currentDate().addDays( 60 );
+      TQDate start = TQDate::tqcurrentDate().addDays( -3 );
+      TQDate end = TQDate::tqcurrentDate().addDays( 60 );
 
       fb->setDtStart( start );
       fb->setDtEnd( end );
@@ -241,7 +241,7 @@ void Groupwise::getCalendar( const KURL &url )
 
   GroupwiseServer server( u, user, pass, 0 );
 
-  KCal::CalendarLocal calendar( TQString::fromLatin1("UTC"));
+  KCal::CalendarLocal calendar( TQString::tqfromLatin1("UTC"));
 
   kdDebug() << "Login" << endl;
   if ( !server.login() ) {
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index 2abb8f452..f0f02bca1 100644
--- a/kresources/groupwise/soap/contactconverter.cpp
+++ b/kresources/groupwise/soap/contactconverter.cpp
@@ -402,8 +402,8 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
       // TODO: map protocol to KDE's set of known protocol names (need to know the set of services in use elsewhere)
       if ( protocol == "nov" )
         protocol = "groupwise";
-      addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ),
-                          TQString::fromLatin1( "All" ),
+      addr.insertCustom( TQString::tqfromLatin1("messaging/%1").arg( protocol ),
+                          TQString::tqfromLatin1( "All" ),
                           addresses.join( TQChar( 0xE000 ) ) );
     }
   }
@@ -573,7 +573,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
   std::vector<class ngwt__ImAddress*> *list = soap_new_std__vectorTemplateOfPointerTongwt__ImAddress( soap(), -1 );
 
   // for each custom
-  // if it contains IM addresses
+  // if it tqcontains IM addresses
   // extract each one and add it to imList
 
   const TQStringList customs = addr.customs();
@@ -583,7 +583,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
     TQString app, name, value;
     splitField( *it, app, name, value );
 
-    if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) && name == TQString::fromLatin1( "All" ) ) {
+    if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) && name == TQString::tqfromLatin1( "All" ) ) {
       // get the protocol for this field
       TQString protocol = app.section( '/', 1, 1 );
       if ( !protocol.isEmpty() ) {
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 28c73b68d..ac62a3640 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -129,7 +129,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
   if (rc != 0 ) {
     kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl;
     TQString errorMessage;
-    errorMessage = TQString::fromLatin1( strerror( errno ) );
+    errorMessage = TQString::tqfromLatin1( strerror( errno ) );
     perror( 0 );
     soap->error = SOAP_TCP_ERROR;
     mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
@@ -141,13 +141,13 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
     kdError() << "gSoapOpen: connect failed " << rc << endl;
     TQString errorMessage;
     if ( rc == -1 ) {
-      errorMessage = TQString::fromLatin1( strerror( errno ) );
+      errorMessage = TQString::tqfromLatin1( strerror( errno ) );
       perror( 0 );
     }
 	//set the soap struct's error here!
     else {
       if ( rc == -3 )
-        errorMessage = TQString::fromLatin1( "Connection timed out.  Check host and port number" );
+        errorMessage = TQString::tqfromLatin1( "Connection timed out.  Check host and port number" );
     }
     mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
     soap->error =SOAP_TCP_ERROR;
@@ -208,7 +208,7 @@ int GroupwiseServer::gSoapSendCallback( struct soap * soap, const char *s, size_
     ret = m_sock->writeBlock( s, n );
     if ( ret < 0 ) {
       kdError() << "Send failed: " << strerror( m_sock->systemError() )
-        << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+        << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
       soap->error = SOAP_TCP_ERROR;
       return SOAP_TCP_ERROR;
     }
@@ -217,7 +217,7 @@ int GroupwiseServer::gSoapSendCallback( struct soap * soap, const char *s, size_
 
   if ( n !=0 ) {
     kdError() << "Send failed: " << strerror( m_sock->systemError() )
-      << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+      << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
     soap->error = SOAP_TCP_ERROR;
   }
 
@@ -246,7 +246,7 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s,
   long ret = m_sock->readBlock( s, n );
   if ( ret < 0 ) {
     kdError() << "Receive failed: " << strerror( m_sock->systemError() )
-      << " " << m_sock->socketStatus() << " " << m_sock->fd() << endl;
+      << " " << m_sock->sockeStatus() << " " << m_sock->fd() << endl;
   } else {
     if ( getenv("DEBUG_GW_RESOURCE") ) {
       qDebug("*************************");
@@ -518,7 +518,7 @@ void GroupwiseServer::dumpCalendarFolder( const std::string &id )
   itemsRequest.container = soap_new_std__string( mSoap, -1 );
   *(itemsRequest.container) = id;
   std::string *str = soap_new_std__string( mSoap, -1 );
-  str->append( "recipients message recipientStatus" );
+  str->append( "recipients message recipienStatus" );
   itemsRequest.view = str;
 
   itemsRequest.filter = 0;
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index ba64cff9a..f51f16b77 100644
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@@ -111,7 +111,7 @@ std::string* GWConverter::qDateToString( const TQDate &date )
 TQDate GWConverter::stringToQDate( std::string* str )
 {
   //NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
-  return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate );
+  return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), Qt::ISODate );
 }
 
 TQDateTime GWConverter::charToQDateTime( const char *str )
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index 43d5d58df..d093497cd 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -160,7 +160,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
 
         TQString remoteUid = converter.stringToQString( (*it)->id );
 
-        KABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
+        KABC::Addressee oldAddressee = mResource->tqfindByUid( mResource->idMapper().localId( remoteUid ) );
         if ( oldAddressee.isEmpty() ) // new addressee
           mResource->idMapper().setRemoteId( addr.uid(), remoteUid );
         else {
@@ -438,7 +438,7 @@ void ReadCalendarJob::run()
   // perform consistency checks
   kdDebug() << "Total count of items of all types in folders we read: " << totalItems << endl;
   kdDebug() << "Folders we read contained " << totals.appointments << " appointments, " << totals.notes << " notes, and " << totals.tasks << " tasks." << endl;
-  kdDebug() << "Local calendar now contains " << mCalendar->rawEvents().count() << " events and " << mCalendar->rawJournals().count() << " journals, and " << mCalendar->rawTodos().count() << " todos." << endl;
+  kdDebug() << "Local calendar now tqcontains " << mCalendar->rawEvents().count() << " events and " << mCalendar->rawJournals().count() << " journals, and " << mCalendar->rawTodos().count() << " todos." << endl;
   if ( totals.appointments == mCalendar->rawEvents().count() )
     kdDebug() << "All events accounted for." << endl;
   else
@@ -465,7 +465,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
 
   itemsRequest.container = id;
   std::string *str = soap_new_std__string( mSoap, -1 );
-  str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipientStatus recurrenceKey" );
+  str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipienStatus recurrenceKey" );
   itemsRequest.view = str;
   itemsRequest.filter = 0;
   itemsRequest.items = 0;
@@ -475,8 +475,8 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
   ngwt__Filter *filter = soap_new_ngwm__Filter( mSoap, -1 );
   ngwt__FilterEntry *filterEntry = soap_new_ngwm__FilterEntry( mSoap, -1 );
   filterEntry->op = gte;
-  filterEntry->field = TQString::fromLatin1( "startDate" ).utf8();
-  filterEntry->value = TQDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
+  filterEntry->field = TQString::tqfromLatin1( "startDate" ).utf8();
+  filterEntry->value = TQDateTime::tqcurrentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
 
   filter->element = filterEntry;
 
@@ -525,7 +525,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
   cursorRequest.container = id;
 #if 1
   cursorRequest.view = soap_new_std__string( mSoap, -1 );
-  cursorRequest.view->append( "default message recipients attachments recipientStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
+  cursorRequest.view->append( "default message recipients attachments recipienStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
 
 #else
   cursorRequest.view = 0;
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index 5e5e4c404..a6a171b87 100644
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@@ -470,7 +470,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
   KCal::Attendee::List::ConstIterator it;
   for( it = attendees.begin(); it != attendees.end(); ++it ) {
     if ( !to.isEmpty() )
-      to += TQString::fromLatin1( ";  %1" ).arg( (*it)->name() );
+      to += TQString::tqfromLatin1( ";  %1" ).arg( (*it)->name() );
     kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
       << endl;
     TQString uuid;
@@ -489,7 +489,7 @@ ngwt__Recipient *IncidenceConverter::createRecipient( const TQString &name,
 {
   ngwt__Recipient *recipient = soap_new_ngwt__Recipient( soap(), -1 );
 
-  recipient->recipientStatus = 0;
+  recipient->recipienStatus = 0;
   if ( !uuid.isEmpty() ) recipient->uuid = qStringToString( uuid );
   else recipient->uuid = 0;
   if ( !name.isEmpty() ) {
@@ -635,7 +635,7 @@ void IncidenceConverter::getAttendees( ngwt__CalendarItem *item, KCal::Incidence
       // set our status
       if ( emailsMatch( stringToQString(recipient->email), mFromEmail ) )
         if ( item->status->accepted )
-          attendee->setStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
+          attendee->seStatus( ( *item->status->accepted ) ? KCal::Attendee::Accepted : KCal::Attendee::NeedsAction );
         else 
           kdDebug() << "---- found ourselves, but not accepted" << endl;
       else
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index 653a55317..e1e48831f 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -82,12 +82,12 @@ KSSLSocket::~KSSLSocket()
 	delete d;
 }
 
-Q_LONG KSSLSocket::readBlock( char* data, Q_ULONG maxLen )
+TQ_LONG KSSLSocket::readBlock( char* data, TQ_ULONG maxLen )
 {
 	return d->kssl->read( data, maxLen );
 }
 
-Q_LONG KSSLSocket::writeBlock( const char* data, Q_ULONG len )
+TQ_LONG KSSLSocket::writeBlock( const char* data, TQ_ULONG len )
 {
 //  kdDebug() << "KSSLSocket::writeBlock() " << (void*)this  << endl;
 //  kdDebug() << "  d->kssl: " << (void*)d->kssl << endl;
@@ -109,7 +109,7 @@ void KSSLSocket::slotConnected()
 			d->kssl->reInitialize();
 		}
 		d->kssl->setPeerHost(host());
-//        kdDebug() << "SOCKET STATUS: " << socketStatus() << endl;
+//        kdDebug() << "SOCKET STATUS: " << sockeStatus() << endl;
 		int rc = d->kssl->connect( sockfd );
                 if ( rc <= 0 ) {
                   kdError() << "Error connecting KSSL: " << rc << endl;
@@ -150,12 +150,12 @@ void KSSLSocket::setMetaData( const TQString &key, const TQVariant &data )
 
 bool KSSLSocket::hasMetaData( const TQString &key )
 {
-	return d->metaData.contains(key);
+	return d->metaData.tqcontains(key);
 }
 
 TQString KSSLSocket::metaData( const TQString &key )
 {
-	if( d->metaData.contains(key) )
+	if( d->metaData.tqcontains(key) )
 		return d->metaData[key];
 	return TQString::null;
 }
diff --git a/kresources/groupwise/soap/ksslsocket.h b/kresources/groupwise/soap/ksslsocket.h
index d58b41918..854cf8f45 100644
--- a/kresources/groupwise/soap/ksslsocket.h
+++ b/kresources/groupwise/soap/ksslsocket.h
@@ -33,8 +33,8 @@ class KSSLSocket : public KExtendedSocket
 		KSSLSocket();
 		~KSSLSocket();
 
-		Q_LONG readBlock( char* data, Q_ULONG maxLen );
-		Q_LONG writeBlock( const char* data, Q_ULONG len );
+		TQ_LONG readBlock( char* data, TQ_ULONG maxLen );
+		TQ_LONG writeBlock( const char* data, TQ_ULONG len );
 
 	signals:
 		void sslFailure();
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index 4d140caef..f426729b5 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -672,8 +672,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__RecurrenceRule(soap, NULL, NULL, "ngwt:RecurrenceRule");
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, "ngwt:RecurrenceDateType");
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return soap_in_ngwt__RecipientStatus(soap, NULL, NULL, "ngwt:RecipientStatus");
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
 	case SOAP_TYPE_ngwt__RecipientList:
 		return soap_in_ngwt__RecipientList(soap, NULL, NULL, "ngwt:RecipientList");
 	case SOAP_TYPE_ngwt__Recipient:
@@ -838,8 +838,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__ContactFolder(soap, NULL, NULL, "ngwt:ContactFolder");
 	case SOAP_TYPE_ngwt__Contact:
 		return soap_in_ngwt__Contact(soap, NULL, NULL, "ngwt:Contact");
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return soap_in_ngwt__CommentStatus(soap, NULL, NULL, "ngwt:CommentStatus");
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return soap_in_ngwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus");
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		return soap_in_ngwt__CategoryRefList(soap, NULL, NULL, "ngwt:CategoryRefList");
 	case SOAP_TYPE_ngwt__CategoryList:
@@ -1290,8 +1290,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__ItemStatus(soap, NULL, NULL, "ngwt:ItemStatus");
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		return soap_in_PointerTongwt__DeltaSyncType(soap, NULL, NULL, "ngwt:DeltaSyncType");
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		return soap_in_PointerTongwt__RecipientStatus(soap, NULL, NULL, "ngwt:RecipientStatus");
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		return soap_in_PointerTongwt__RecipienStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		return soap_in_PointerTongwt__FreeBusyBlockList(soap, NULL, NULL, "ngwt:FreeBusyBlockList");
 	case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute:
@@ -1454,8 +1454,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__DelegateeStatus(soap, NULL, NULL, "ngwt:DelegateeStatus");
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		return soap_in_PointerTongwt__DelegatedStatus(soap, NULL, NULL, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		return soap_in_PointerTongwt__CommentStatus(soap, NULL, NULL, "ngwt:CommentStatus");
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		return soap_in_PointerTongwt__CommenStatus(soap, NULL, NULL, "ngwt:CommenStatus");
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		return soap_in_PointerTongwt__TransferFailedStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus");
 	case SOAP_TYPE_PointerTongwt__Recipient:
@@ -2664,9 +2664,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__RecurrenceDateType;
 			return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:RecipientStatus"))
-		{	*type = SOAP_TYPE_ngwt__RecipientStatus;
-			return soap_in_ngwt__RecipientStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:RecipienStatus"))
+		{	*type = SOAP_TYPE_ngwt__RecipienStatus;
+			return soap_in_ngwt__RecipienStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:RecipientList"))
 		{	*type = SOAP_TYPE_ngwt__RecipientList;
@@ -2996,9 +2996,9 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		{	*type = SOAP_TYPE_ngwt__Contact;
 			return soap_in_ngwt__Contact(soap, NULL, NULL, NULL);
 		}
-		if (!soap_match_tag(soap, t, "ngwt:CommentStatus"))
-		{	*type = SOAP_TYPE_ngwt__CommentStatus;
-			return soap_in_ngwt__CommentStatus(soap, NULL, NULL, NULL);
+		if (!soap_match_tag(soap, t, "ngwt:CommenStatus"))
+		{	*type = SOAP_TYPE_ngwt__CommenStatus;
+			return soap_in_ngwt__CommenStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:CategoryRefList"))
 		{	*type = SOAP_TYPE_ngwt__CategoryRefList;
@@ -3726,8 +3726,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__RecurrenceRule *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceRule");
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return ((ngwt__RecurrenceDateType *)ptr)->soap_out(soap, tag, id, "ngwt:RecurrenceDateType");
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return ((ngwt__RecipientStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientStatus");
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return ((ngwt__RecipienStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipienStatus");
 	case SOAP_TYPE_ngwt__RecipientList:
 		return ((ngwt__RecipientList *)ptr)->soap_out(soap, tag, id, "ngwt:RecipientList");
 	case SOAP_TYPE_ngwt__Recipient:
@@ -3892,8 +3892,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__ContactFolder *)ptr)->soap_out(soap, tag, id, "ngwt:ContactFolder");
 	case SOAP_TYPE_ngwt__Contact:
 		return ((ngwt__Contact *)ptr)->soap_out(soap, tag, id, "ngwt:Contact");
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return ((ngwt__CommentStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommentStatus");
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return ((ngwt__CommenStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommenStatus");
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		return ((ngwt__CategoryRefList *)ptr)->soap_out(soap, tag, id, "ngwt:CategoryRefList");
 	case SOAP_TYPE_ngwt__CategoryList:
@@ -4344,8 +4344,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__ItemStatus(soap, tag, id, (ngwt__ItemStatus *const*)ptr, "ngwt:ItemStatus");
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		return soap_out_PointerTongwt__DeltaSyncType(soap, tag, id, (enum ngwt__DeltaSyncType *const*)ptr, "ngwt:DeltaSyncType");
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		return soap_out_PointerTongwt__RecipientStatus(soap, tag, id, (ngwt__RecipientStatus *const*)ptr, "ngwt:RecipientStatus");
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		return soap_out_PointerTongwt__RecipienStatus(soap, tag, id, (ngwt__RecipienStatus *const*)ptr, "ngwt:RecipienStatus");
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		return soap_out_PointerTongwt__FreeBusyBlockList(soap, tag, id, (ngwt__FreeBusyBlockList *const*)ptr, "ngwt:FreeBusyBlockList");
 	case SOAP_TYPE_PointerTongwt__CalendarFolderAttribute:
@@ -4508,8 +4508,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, (ngwt__DelegateeStatus *const*)ptr, "ngwt:DelegateeStatus");
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		return soap_out_PointerTongwt__DelegatedStatus(soap, tag, id, (ngwt__DelegatedStatus *const*)ptr, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		return soap_out_PointerTongwt__CommentStatus(soap, tag, id, (ngwt__CommentStatus *const*)ptr, "ngwt:CommentStatus");
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		return soap_out_PointerTongwt__CommenStatus(soap, tag, id, (ngwt__CommenStatus *const*)ptr, "ngwt:CommenStatus");
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		return soap_out_PointerTongwt__TransferFailedStatus(soap, tag, id, (ngwt__TransferFailedStatus *const*)ptr, "ngwt:TransferFailedStatus");
 	case SOAP_TYPE_PointerTongwt__Recipient:
@@ -5268,8 +5268,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		((ngwt__RecurrenceDateType *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		((ngwt__RecipientStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		((ngwt__RecipienStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__RecipientList:
 		((ngwt__RecipientList *)ptr)->soap_serialize(soap);
@@ -5517,8 +5517,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__Contact:
 		((ngwt__Contact *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__CommentStatus:
-		((ngwt__CommentStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__CommenStatus:
+		((ngwt__CommenStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__CategoryRefList:
 		((ngwt__CategoryRefList *)ptr)->soap_serialize(soap);
@@ -6444,8 +6444,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		soap_serialize_PointerTongwt__DeltaSyncType(soap, (enum ngwt__DeltaSyncType *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__RecipientStatus:
-		soap_serialize_PointerTongwt__RecipientStatus(soap, (ngwt__RecipientStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__RecipienStatus:
+		soap_serialize_PointerTongwt__RecipienStatus(soap, (ngwt__RecipienStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__FreeBusyBlockList:
 		soap_serialize_PointerTongwt__FreeBusyBlockList(soap, (ngwt__FreeBusyBlockList *const*)ptr);
@@ -6690,8 +6690,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
 		soap_serialize_PointerTongwt__DelegatedStatus(soap, (ngwt__DelegatedStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__CommentStatus:
-		soap_serialize_PointerTongwt__CommentStatus(soap, (ngwt__CommentStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		soap_serialize_PointerTongwt__CommenStatus(soap, (ngwt__CommenStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
 		soap_serialize_PointerTongwt__TransferFailedStatus(soap, (ngwt__TransferFailedStatus *const*)ptr);
@@ -6986,8 +6986,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__QueryTarget(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecipientList:
 		return (void*)soap_instantiate_ngwt__RecipientList(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__RecipientStatus:
-		return (void*)soap_instantiate_ngwt__RecipientStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__RecipienStatus:
+		return (void*)soap_instantiate_ngwt__RecipienStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		return (void*)soap_instantiate_ngwt__RecurrenceDateType(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__RecurrenceRule:
@@ -7400,8 +7400,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__Alarm(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Category:
 		return (void*)soap_instantiate_ngwt__Category(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__CommentStatus:
-		return (void*)soap_instantiate_ngwt__CommentStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__CommenStatus:
+		return (void*)soap_instantiate_ngwt__CommenStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__ContainerItem:
 		return (void*)soap_instantiate_ngwt__ContainerItem(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__ContainerRef:
@@ -8005,11 +8005,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__RecipientList*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__RecipientStatus:
+	case SOAP_TYPE_ngwt__RecipienStatus:
 		if (p->size < 0)
-			delete (ngwt__RecipientStatus*)p->ptr;
+			delete (ngwt__RecipienStatus*)p->ptr;
 		else
-			delete[] (ngwt__RecipientStatus*)p->ptr;
+			delete[] (ngwt__RecipienStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		if (p->size < 0)
@@ -9247,11 +9247,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__Category*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__CommentStatus:
+	case SOAP_TYPE_ngwt__CommenStatus:
 		if (p->size < 0)
-			delete (ngwt__CommentStatus*)p->ptr;
+			delete (ngwt__CommenStatus*)p->ptr;
 		else
-			delete[] (ngwt__CommentStatus*)p->ptr;
+			delete[] (ngwt__CommenStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__ContainerItem:
 		if (p->size < 0)
@@ -10751,7 +10751,7 @@ static const struct soap_code_map soap_codes_ngwe__Field[] =
 	{ (long)PhoneNumber_, "PhoneNumber" },
 	{ (long)Place_, "Place" },
 	{ (long)PostalAddress_, "PostalAddress" },
-	{ (long)RecipientStatus_, "RecipientStatus" },
+	{ (long)RecipienStatus_, "RecipienStatus" },
 	{ (long)Rights_, "Rights" },
 	{ (long)Security_, "Security" },
 	{ (long)SendPriority_, "SendPriority" },
@@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] =
 	{ (long)created, "created" },
 	{ (long)deleteVersion, "deleteVersion" },
 	{ (long)endAccess, "endAccess" },
-	{ (long)resetStatus, "resetStatus" },
+	{ (long)reseStatus, "reseStatus" },
 	{ (long)restore, "restore" },
 	{ (long)retrieve, "retrieve" },
 	{ (long)securityModified, "securityModified" },
@@ -12992,8 +12992,8 @@ static const struct soap_code_map soap_codes_ngwt__FilterOp[] =
 	{ (long)lt, "lt" },
 	{ (long)gte, "gte" },
 	{ (long)lte, "lte" },
-	{ (long)contains, "contains" },
-	{ (long)containsWord, "containsWord" },
+	{ (long)tqcontains, "tqcontains" },
+	{ (long)tqcontainsWord, "tqcontainsWord" },
 	{ (long)begins, "begins" },
 	{ (long)exists, "exists" },
 	{ (long)notExist, "notExist" },
@@ -14261,7 +14261,7 @@ static const struct soap_code_map soap_codes_ngwe__FieldList[] =
 	{ (long)PhoneNumber, "PhoneNumber" },
 	{ (long)Place, "Place" },
 	{ (long)PostalAddress, "PostalAddress" },
-	{ (long)RecipientStatus, "RecipientStatus" },
+	{ (long)RecipienStatus, "RecipienStatus" },
 	{ (long)Rights, "Rights" },
 	{ (long)Security, "Security" },
 	{ (long)SendPriority, "SendPriority" },
@@ -14299,7 +14299,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwe__FieldList(struct soap *soap, const char
 			case 262144: soap_send(soap, "PhoneNumber "); break;
 			case 524288: soap_send(soap, "Place "); break;
 			case 1048576: soap_send(soap, "PostalAddress "); break;
-			case 2097152: soap_send(soap, "RecipientStatus "); break;
+			case 2097152: soap_send(soap, "RecipienStatus "); break;
 			case 4194304: soap_send(soap, "Rights "); break;
 			case 8388608: soap_send(soap, "Security "); break;
 			case 16777216: soap_send(soap, "SendPriority "); break;
@@ -14376,8 +14376,8 @@ SOAP_FMAC3 enum ngwe__FieldList * SOAP_FMAC4 soap_in_ngwe__FieldList(struct soap
 				i |= (LONG64)Place;
 			else if (!strcmp(s, "PostalAddress"))
 				i |= (LONG64)PostalAddress;
-			else if (!strcmp(s, "RecipientStatus"))
-				i |= (LONG64)RecipientStatus;
+			else if (!strcmp(s, "RecipienStatus"))
+				i |= (LONG64)RecipienStatus;
 			else if (!strcmp(s, "Rights"))
 				i |= (LONG64)Rights;
 			else if (!strcmp(s, "Security"))
@@ -41405,51 +41405,51 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap *soap,
 void ngwt__TransferFailedStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -41457,29 +41457,29 @@ void ngwt__TransferFailedStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
 	((ngwt__TransferFailedStatus*)this)->FailureReason = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -41501,29 +41501,29 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap *soap,
 	if (((ngwt__TransferFailedStatus *)a)->FailureReason)
 		soap_set_attr(soap, "FailureReason", ((ngwt__TransferFailedStatus *)a)->FailureReason->c_str());
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__TransferFailedStatus), "ngwt:TransferFailedStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -41581,117 +41581,117 @@ SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedS
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered2 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable2 = 0;
 					continue;
 				}
 			if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred2 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed2 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed2 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded2 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty2 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested2 = 0;
 					continue;
 				}
 			if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted2 = 0;
 					continue;
 				}
 			if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened2 = 0;
 					continue;
 				}
 			if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted2 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted2 = 0;
 					continue;
 				}
 			if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged2 = 0;
 					continue;
 				}
 			if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted2 = 0;
 					continue;
 				}
 			if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined2 = 0;
 					continue;
 				}
 			if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied2 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded2 = 0;
 					continue;
 				}
 			if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared2 = 0;
 					continue;
 				}
 			if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started2 = 0;
 					continue;
 				}
 			if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed2 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete2 = 0;
 					continue;
 				}
 			if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated2 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -47486,159 +47486,159 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap *soap,
 	*(ngwt__RecurrenceDateType*)p = *(ngwt__RecurrenceDateType*)q;
 }
 
-void ngwt__RecipientStatus::soap_serialize(struct soap *soap) const
+void ngwt__RecipienStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__RecipientStatus::soap_default(struct soap *soap)
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
+	/* transient soap skipped */
+}
+
+void ngwt__RecipienStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__RecipientStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
-{
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipientStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
+	/* transient soap skipped */
+}
+
+int ngwt__RecipienStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+{
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__RecipienStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__RecipientStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__RecipienStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__RecipientStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__RecipienStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipientStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipienStatus *a, const char *type)
 {
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipientStatus), type);
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__RecipienStatus), type);
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__RecipientStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__RecipienStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__RecipientStatus(soap, this, tag, type);
+	return soap_get_ngwt__RecipienStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_get_ngwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__RecipientStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__RecipienStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__RecipientStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__RecipientStatus(soap, tag, this, type);
+void *ngwt__RecipienStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__RecipienStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(struct soap *soap, const char *tag, ngwt__RecipientStatus *a, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__RecipientStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipientStatus, sizeof(ngwt__RecipientStatus), soap->type, soap->arrayType);
+	a = (ngwt__RecipienStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__RecipientStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__RecipienStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__RecipientStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__RecipienStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	short soap_flag_delivered1 = 1, soap_flag_undeliverable1 = 1, soap_flag_transferred1 = 1, soap_flag_transferDelayed1 = 1, soap_flag_transferFailed1 = 1, soap_flag_downloaded1 = 1, soap_flag_downloadedByThirdParty1 = 1, soap_flag_retractRequested1 = 1, soap_flag_retracted1 = 1, soap_flag_opened1 = 1, soap_flag_deleted1 = 1, soap_flag_undeleted1 = 1, soap_flag_purged1 = 1, soap_flag_accepted1 = 1, soap_flag_declined1 = 1, soap_flag_replied1 = 1, soap_flag_forwarded1 = 1, soap_flag_shared1 = 1, soap_flag_started1 = 1, soap_flag_completed1 = 1, soap_flag_incomplete1 = 1, soap_flag_delegated1 = 1;
@@ -47647,117 +47647,117 @@ SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered1 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable1 = 0;
 					continue;
 				}
 			if (soap_flag_transferred1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred1 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed1 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed1 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded1 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty1 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested1 = 0;
 					continue;
 				}
 			if (soap_flag_retracted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted1 = 0;
 					continue;
 				}
 			if (soap_flag_opened1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened1 = 0;
 					continue;
 				}
 			if (soap_flag_deleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted1 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted1 = 0;
 					continue;
 				}
 			if (soap_flag_purged1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged1 = 0;
 					continue;
 				}
 			if (soap_flag_accepted1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted1 = 0;
 					continue;
 				}
 			if (soap_flag_declined1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined1 = 0;
 					continue;
 				}
 			if (soap_flag_replied1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied1 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded1 = 0;
 					continue;
 				}
 			if (soap_flag_shared1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared1 = 0;
 					continue;
 				}
 			if (soap_flag_started1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started1 = 0;
 					continue;
 				}
 			if (soap_flag_completed1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed1 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete1 = 0;
 					continue;
 				}
 			if (soap_flag_delegated1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated1 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -47771,25 +47771,25 @@ SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(stru
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipientStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientStatus, 0, sizeof(ngwt__RecipientStatus), 0, soap_copy_ngwt__RecipientStatus);
+	{	a = (ngwt__RecipienStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, 0, sizeof(ngwt__RecipienStatus), 0, soap_copy_ngwt__RecipienStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_new_ngwt__RecipientStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__RecipientStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__RecipienStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipientStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipientStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__RecipienStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipienStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (type && !soap_match_tag(soap, type, "ngwt:DelegateeStatus"))
@@ -47829,26 +47829,26 @@ SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientSt
 		return (ngwt__TransferFailedStatus*)cp->ptr;
 	}
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__RecipientStatus;
+	{	cp->ptr = (void*)new ngwt__RecipienStatus;
 		if (size)
-			*size = sizeof(ngwt__RecipientStatus);
-		((ngwt__RecipientStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__RecipienStatus);
+		((ngwt__RecipienStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__RecipientStatus[n];
+	{	cp->ptr = (void*)new ngwt__RecipienStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__RecipientStatus);
+			*size = n * sizeof(ngwt__RecipienStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__RecipientStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__RecipienStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__RecipientStatus*)cp->ptr;
+	return (ngwt__RecipienStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipientStatus %p -> %p\n", q, p));
-	*(ngwt__RecipientStatus*)p = *(ngwt__RecipientStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__RecipienStatus %p -> %p\n", q, p));
+	*(ngwt__RecipienStatus*)p = *(ngwt__RecipienStatus*)q;
 }
 
 void ngwt__RecipientList::soap_serialize(struct soap *soap) const
@@ -47986,8 +47986,8 @@ void ngwt__Recipient::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((ngwt__Recipient*)this)->distType, SOAP_TYPE_ngwt__DistributionType);
 	soap_embedded(soap, &((ngwt__Recipient*)this)->recipType, SOAP_TYPE_ngwt__RecipientType);
-	soap_embedded(soap, &((ngwt__Recipient*)this)->recipientStatus, SOAP_TYPE_PointerTongwt__RecipientStatus);
-	soap_serialize_PointerTongwt__RecipientStatus(soap, &((ngwt__Recipient*)this)->recipientStatus);
+	soap_embedded(soap, &((ngwt__Recipient*)this)->recipienStatus, SOAP_TYPE_PointerTongwt__RecipienStatus);
+	soap_serialize_PointerTongwt__RecipienStatus(soap, &((ngwt__Recipient*)this)->recipienStatus);
 	soap_embedded(soap, &((ngwt__Recipient*)this)->acceptLevel, SOAP_TYPE_PointerTongwt__AcceptLevel);
 	soap_serialize_PointerTongwt__AcceptLevel(soap, &((ngwt__Recipient*)this)->acceptLevel);
 	soap_embedded(soap, &((ngwt__NameAndEmail*)this)->displayName, SOAP_TYPE_PointerTostd__string);
@@ -48004,7 +48004,7 @@ void ngwt__Recipient::soap_default(struct soap *soap)
 	this->soap = soap;
 	((ngwt__Recipient*)this)->distType = (enum ngwt__DistributionType)0;
 	((ngwt__Recipient*)this)->recipType = (enum ngwt__RecipientType)0;
-	((ngwt__Recipient*)this)->recipientStatus = NULL;
+	((ngwt__Recipient*)this)->recipienStatus = NULL;
 	((ngwt__Recipient*)this)->acceptLevel = NULL;
 	((ngwt__NameAndEmail*)this)->displayName = NULL;
 	((ngwt__NameAndEmail*)this)->email = NULL;
@@ -48034,7 +48034,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Recipient(struct soap *soap, const char
 	/* transient soap skipped */
 	soap_out_ngwt__DistributionType(soap, "ngwt:distType", -1, &(((ngwt__Recipient*)a)->distType), "");
 	soap_out_ngwt__RecipientType(soap, "ngwt:recipType", -1, &(((ngwt__Recipient*)a)->recipType), "");
-	soap_out_PointerTongwt__RecipientStatus(soap, "ngwt:recipientStatus", -1, &(((ngwt__Recipient*)a)->recipientStatus), "");
+	soap_out_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", -1, &(((ngwt__Recipient*)a)->recipienStatus), "");
 	soap_out_PointerTongwt__AcceptLevel(soap, "ngwt:acceptLevel", -1, &(((ngwt__Recipient*)a)->acceptLevel), "");
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -48071,7 +48071,7 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa
 			return (ngwt__Recipient *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipientStatus1 = 1, soap_flag_acceptLevel1 = 1;
+	short soap_flag_displayName2 = 1, soap_flag_email2 = 1, soap_flag_uuid2 = 1, soap_flag_distType1 = 1, soap_flag_recipType1 = 1, soap_flag_recipienStatus1 = 1, soap_flag_acceptLevel1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -48102,9 +48102,9 @@ SOAP_FMAC3 ngwt__Recipient * SOAP_FMAC4 soap_in_ngwt__Recipient(struct soap *soa
 				{	soap_flag_recipType1 = 0;
 					continue;
 				}
-			if (soap_flag_recipientStatus1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__RecipientStatus(soap, "ngwt:recipientStatus", &(((ngwt__Recipient*)a)->recipientStatus), "ngwt:RecipientStatus"))
-				{	soap_flag_recipientStatus1 = 0;
+			if (soap_flag_recipienStatus1 && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerTongwt__RecipienStatus(soap, "ngwt:recipienStatus", &(((ngwt__Recipient*)a)->recipienStatus), "ngwt:RecipienStatus"))
+				{	soap_flag_recipienStatus1 = 0;
 					continue;
 				}
 			if (soap_flag_acceptLevel1 && soap->error == SOAP_TAG_MISMATCH)
@@ -61043,51 +61043,51 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap *soap, int st,
 void ngwt__DelegateeStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
-	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipientStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__RecipientStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
-	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipientStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delivered, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeliverable, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferred, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferDelayed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	soap_serialize_PointerTongwt__TransferFailedStatus(soap, &((ngwt__RecipienStatus*)this)->transferFailed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloaded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retractRequested, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->retracted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->opened, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->deleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->undeleted, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->purged, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__RecipienStatus*)this)->declined);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->replied, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->forwarded, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->shared, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->started, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->completed, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->incomplete, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	soap_embedded(soap, &((ngwt__RecipienStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	soap_serialize_PointerTongwt__DelegatedStatus(soap, &((ngwt__RecipienStatus*)this)->delegated);
+	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -61095,29 +61095,29 @@ void ngwt__DelegateeStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
 	((ngwt__DelegateeStatus*)this)->userid = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->transferDelayed);
-	((ngwt__RecipientStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->purged);
-	((ngwt__RecipientStatus*)this)->accepted = NULL;
-	((ngwt__RecipientStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientStatus*)this)->incomplete);
-	((ngwt__RecipientStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipientStatus*)this)->delegateeStatus);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->delivered);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeliverable);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferred);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->transferDelayed);
+	((ngwt__RecipienStatus*)this)->transferFailed = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloaded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->downloadedByThirdParty);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retractRequested);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->retracted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->opened);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->deleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->undeleted);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->purged);
+	((ngwt__RecipienStatus*)this)->accepted = NULL;
+	((ngwt__RecipienStatus*)this)->declined = NULL;
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->replied);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->forwarded);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->shared);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->started);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->completed);
+	soap_default_string(soap, &((ngwt__RecipienStatus*)this)->incomplete);
+	((ngwt__RecipienStatus*)this)->delegated = NULL;
+	soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, &((ngwt__RecipienStatus*)this)->delegateeStatus);
 	/* transient soap skipped */
 }
 
@@ -61139,29 +61139,29 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap *soap, cons
 	if (((ngwt__DelegateeStatus *)a)->userid)
 		soap_set_attr(soap, "userid", ((ngwt__DelegateeStatus *)a)->userid->c_str());
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__DelegateeStatus), "ngwt:DelegateeStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientStatus*)a)->delegateeStatus), "");
+	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipienStatus*)a)->delivered), "");
+	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipienStatus*)a)->undeliverable), "");
+	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipienStatus*)a)->transferred), "");
+	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipienStatus*)a)->transferDelayed), "");
+	soap_out_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipienStatus*)a)->transferFailed), "");
+	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipienStatus*)a)->downloaded), "");
+	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), "");
+	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipienStatus*)a)->retractRequested), "");
+	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipienStatus*)a)->retracted), "");
+	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipienStatus*)a)->opened), "");
+	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipienStatus*)a)->deleted), "");
+	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipienStatus*)a)->undeleted), "");
+	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipienStatus*)a)->purged), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipienStatus*)a)->accepted), "");
+	soap_out_PointerTongwt__CommenStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipienStatus*)a)->declined), "");
+	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipienStatus*)a)->replied), "");
+	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipienStatus*)a)->forwarded), "");
+	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipienStatus*)a)->shared), "");
+	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipienStatus*)a)->started), "");
+	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipienStatus*)a)->completed), "");
+	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipienStatus*)a)->incomplete), "");
+	soap_out_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipienStatus*)a)->delegated), "");
+	soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipienStatus*)a)->delegateeStatus), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -61219,117 +61219,117 @@ SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_delivered2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipientStatus*)a)->delivered), ""))
+				if (soap_in_string(soap, "ngwt:delivered", &(((ngwt__RecipienStatus*)a)->delivered), ""))
 				{	soap_flag_delivered2 = 0;
 					continue;
 				}
 			if (soap_flag_undeliverable2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipientStatus*)a)->undeliverable), ""))
+				if (soap_in_string(soap, "ngwt:undeliverable", &(((ngwt__RecipienStatus*)a)->undeliverable), ""))
 				{	soap_flag_undeliverable2 = 0;
 					continue;
 				}
 			if (soap_flag_transferred2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipientStatus*)a)->transferred), ""))
+				if (soap_in_string(soap, "ngwt:transferred", &(((ngwt__RecipienStatus*)a)->transferred), ""))
 				{	soap_flag_transferred2 = 0;
 					continue;
 				}
 			if (soap_flag_transferDelayed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipientStatus*)a)->transferDelayed), ""))
+				if (soap_in_string(soap, "ngwt:transferDelayed", &(((ngwt__RecipienStatus*)a)->transferDelayed), ""))
 				{	soap_flag_transferDelayed2 = 0;
 					continue;
 				}
 			if (soap_flag_transferFailed2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
+				if (soap_in_PointerTongwt__TransferFailedStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipienStatus*)a)->transferFailed), "ngwt:TransferFailedStatus"))
 				{	soap_flag_transferFailed2 = 0;
 					continue;
 				}
 			if (soap_flag_downloaded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipientStatus*)a)->downloaded), ""))
+				if (soap_in_string(soap, "ngwt:downloaded", &(((ngwt__RecipienStatus*)a)->downloaded), ""))
 				{	soap_flag_downloaded2 = 0;
 					continue;
 				}
 			if (soap_flag_downloadedByThirdParty2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipientStatus*)a)->downloadedByThirdParty), ""))
+				if (soap_in_string(soap, "ngwt:downloadedByThirdParty", &(((ngwt__RecipienStatus*)a)->downloadedByThirdParty), ""))
 				{	soap_flag_downloadedByThirdParty2 = 0;
 					continue;
 				}
 			if (soap_flag_retractRequested2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipientStatus*)a)->retractRequested), ""))
+				if (soap_in_string(soap, "ngwt:retractRequested", &(((ngwt__RecipienStatus*)a)->retractRequested), ""))
 				{	soap_flag_retractRequested2 = 0;
 					continue;
 				}
 			if (soap_flag_retracted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipientStatus*)a)->retracted), ""))
+				if (soap_in_string(soap, "ngwt:retracted", &(((ngwt__RecipienStatus*)a)->retracted), ""))
 				{	soap_flag_retracted2 = 0;
 					continue;
 				}
 			if (soap_flag_opened2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipientStatus*)a)->opened), ""))
+				if (soap_in_string(soap, "ngwt:opened", &(((ngwt__RecipienStatus*)a)->opened), ""))
 				{	soap_flag_opened2 = 0;
 					continue;
 				}
 			if (soap_flag_deleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipientStatus*)a)->deleted), ""))
+				if (soap_in_string(soap, "ngwt:deleted", &(((ngwt__RecipienStatus*)a)->deleted), ""))
 				{	soap_flag_deleted2 = 0;
 					continue;
 				}
 			if (soap_flag_undeleted2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipientStatus*)a)->undeleted), ""))
+				if (soap_in_string(soap, "ngwt:undeleted", &(((ngwt__RecipienStatus*)a)->undeleted), ""))
 				{	soap_flag_undeleted2 = 0;
 					continue;
 				}
 			if (soap_flag_purged2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipientStatus*)a)->purged), ""))
+				if (soap_in_string(soap, "ngwt:purged", &(((ngwt__RecipienStatus*)a)->purged), ""))
 				{	soap_flag_purged2 = 0;
 					continue;
 				}
 			if (soap_flag_accepted2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:accepted", &(((ngwt__RecipientStatus*)a)->accepted), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:accepted", &(((ngwt__RecipienStatus*)a)->accepted), "ngwt:CommenStatus"))
 				{	soap_flag_accepted2 = 0;
 					continue;
 				}
 			if (soap_flag_declined2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__CommentStatus(soap, "ngwt:declined", &(((ngwt__RecipientStatus*)a)->declined), "ngwt:CommentStatus"))
+				if (soap_in_PointerTongwt__CommenStatus(soap, "ngwt:declined", &(((ngwt__RecipienStatus*)a)->declined), "ngwt:CommenStatus"))
 				{	soap_flag_declined2 = 0;
 					continue;
 				}
 			if (soap_flag_replied2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipientStatus*)a)->replied), ""))
+				if (soap_in_string(soap, "ngwt:replied", &(((ngwt__RecipienStatus*)a)->replied), ""))
 				{	soap_flag_replied2 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipientStatus*)a)->forwarded), ""))
+				if (soap_in_string(soap, "ngwt:forwarded", &(((ngwt__RecipienStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded2 = 0;
 					continue;
 				}
 			if (soap_flag_shared2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipientStatus*)a)->shared), ""))
+				if (soap_in_string(soap, "ngwt:shared", &(((ngwt__RecipienStatus*)a)->shared), ""))
 				{	soap_flag_shared2 = 0;
 					continue;
 				}
 			if (soap_flag_started2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipientStatus*)a)->started), ""))
+				if (soap_in_string(soap, "ngwt:started", &(((ngwt__RecipienStatus*)a)->started), ""))
 				{	soap_flag_started2 = 0;
 					continue;
 				}
 			if (soap_flag_completed2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipientStatus*)a)->completed), ""))
+				if (soap_in_string(soap, "ngwt:completed", &(((ngwt__RecipienStatus*)a)->completed), ""))
 				{	soap_flag_completed2 = 0;
 					continue;
 				}
 			if (soap_flag_incomplete2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipientStatus*)a)->incomplete), ""))
+				if (soap_in_string(soap, "ngwt:incomplete", &(((ngwt__RecipienStatus*)a)->incomplete), ""))
 				{	soap_flag_incomplete2 = 0;
 					continue;
 				}
 			if (soap_flag_delegated2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipientStatus*)a)->delegated), "ngwt:DelegatedStatus"))
+				if (soap_in_PointerTongwt__DelegatedStatus(soap, "ngwt:delegated", &(((ngwt__RecipienStatus*)a)->delegated), "ngwt:DelegatedStatus"))
 				{	soap_flag_delegated2 = 0;
 					continue;
 				}
 			if (soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
+				if (soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipienStatus*)a)->delegateeStatus), "ngwt:DelegateeStatus"))
 					continue;
 			/* transient soap skipped */
 			if (soap->error == SOAP_TAG_MISMATCH)
@@ -61390,8 +61390,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap *soap, in
 void ngwt__DelegatedStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__DelegatedStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommentStatus);
-	soap_serialize_PointerTongwt__CommentStatus(soap, &((ngwt__DelegatedStatus*)this)->__item);
+	soap_embedded(soap, &((ngwt__DelegatedStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommenStatus);
+	soap_serialize_PointerTongwt__CommenStatus(soap, &((ngwt__DelegatedStatus*)this)->__item);
 	/* transient soap skipped */
 }
 
@@ -61420,7 +61420,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap *soap, cons
 {
 	if (((ngwt__DelegatedStatus *)a)->userid)
 		soap_set_attr(soap, "userid", ((ngwt__DelegatedStatus *)a)->userid->c_str());
-	soap_out_PointerTongwt__CommentStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), "");
+	soap_out_PointerTongwt__CommenStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
@@ -61469,7 +61469,7 @@ SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(stru
 		}
 		}
 	}
-	if (!soap_in_PointerTongwt__CommentStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus"))
+	if (!soap_in_PointerTongwt__CommenStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus"))
 		return NULL;
 	return a;
 }
@@ -63703,76 +63703,76 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap *soap, int st, in
 	*(ngwt__Contact*)p = *(ngwt__Contact*)q;
 }
 
-void ngwt__CommentStatus::soap_serialize(struct soap *soap) const
+void ngwt__CommenStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__CommentStatus*)this)->__item, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__CommentStatus*)this)->__item);
+	soap_embedded(soap, &((ngwt__CommenStatus*)this)->__item, SOAP_TYPE_string);
+	soap_serialize_string(soap, &((ngwt__CommenStatus*)this)->__item);
 	/* transient soap skipped */
 }
 
-void ngwt__CommentStatus::soap_default(struct soap *soap)
+void ngwt__CommenStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__CommentStatus*)this)->__item);
-	((ngwt__CommentStatus*)this)->comment = NULL;
+	soap_default_string(soap, &((ngwt__CommenStatus*)this)->__item);
+	((ngwt__CommenStatus*)this)->comment = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__CommentStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__CommenStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
 {
-	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommentStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__CommenStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__CommentStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__CommenStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__CommentStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__CommenStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentStatus(struct soap *soap, const char *tag, int id, const ngwt__CommentStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap *soap, const char *tag, int id, const ngwt__CommenStatus *a, const char *type)
 {
-	if (((ngwt__CommentStatus *)a)->comment)
-		soap_set_attr(soap, "comment", ((ngwt__CommentStatus *)a)->comment->c_str());
-	soap_out_string(soap, tag, id, &(((ngwt__CommentStatus*)a)->__item), "");
+	if (((ngwt__CommenStatus *)a)->comment)
+		soap_set_attr(soap, "comment", ((ngwt__CommenStatus *)a)->comment->c_str());
+	soap_out_string(soap, tag, id, &(((ngwt__CommenStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
-void *ngwt__CommentStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__CommenStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__CommentStatus(soap, this, tag, type);
+	return soap_get_ngwt__CommenStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_get_ngwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__CommentStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__CommenStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__CommentStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__CommentStatus(soap, tag, this, type);
+void *ngwt__CommenStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__CommenStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct soap *soap, const char *tag, ngwt__CommentStatus *a, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus *a, const char *type)
 {
 	if (soap_peek_element(soap))
 		return NULL;
-	if (!(a = (ngwt__CommentStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommentStatus, sizeof(ngwt__CommentStatus), soap->type, soap->arrayType)))
+	if (!(a = (ngwt__CommenStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), soap->type, soap->arrayType)))
 	{	soap->error = SOAP_TAG_MISMATCH;
 		return NULL;
 	}
 	*soap->id = '\0';
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__CommentStatus)
-			return (ngwt__CommentStatus *)a->soap_in(soap, tag, type);
+		if (soap->clist->type != SOAP_TYPE_ngwt__CommenStatus)
+			return (ngwt__CommenStatus *)a->soap_in(soap, tag, type);
 	}
 	{	const char *t = soap_attr_value(soap, "comment", 0);
 		if (t)
-		{	if (!(((ngwt__CommentStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__CommenStatus *)a)->comment = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -63780,51 +63780,51 @@ SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct s
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__CommentStatus *)a)->comment = soap_new_std__string(soap, -1);
-			((ngwt__CommentStatus *)a)->comment->assign(s);
+		{	((ngwt__CommenStatus *)a)->comment = soap_new_std__string(soap, -1);
+			((ngwt__CommenStatus *)a)->comment->assign(s);
 		}
 		}
 	}
-	if (!soap_in_string(soap, tag, &(((ngwt__CommentStatus*)a)->__item), "ngwt:CommentStatus"))
+	if (!soap_in_string(soap, tag, &(((ngwt__CommenStatus*)a)->__item), "ngwt:CommenStatus"))
 		return NULL;
 	return a;
 }
 
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_new_ngwt__CommentStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__CommentStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__CommenStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommentStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommentStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__CommenStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommenStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__CommentStatus;
+	{	cp->ptr = (void*)new ngwt__CommenStatus;
 		if (size)
-			*size = sizeof(ngwt__CommentStatus);
-		((ngwt__CommentStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__CommenStatus);
+		((ngwt__CommenStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__CommentStatus[n];
+	{	cp->ptr = (void*)new ngwt__CommenStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__CommentStatus);
+			*size = n * sizeof(ngwt__CommenStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__CommentStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__CommenStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__CommentStatus*)cp->ptr;
+	return (ngwt__CommenStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommentStatus %p -> %p\n", q, p));
-	*(ngwt__CommentStatus*)p = *(ngwt__CommentStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__CommenStatus %p -> %p\n", q, p));
+	*(ngwt__CommenStatus*)p = *(ngwt__CommenStatus*)q;
 }
 
 void ngwt__CategoryRefList::soap_serialize(struct soap *soap) const
@@ -84797,53 +84797,53 @@ SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSy
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipientStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipienStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipientStatus);
-	if (soap_out_PointerTongwt__RecipientStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__RecipienStatus);
+	if (soap_out_PointerTongwt__RecipienStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientStatus(struct soap *soap, const char *tag, int id, ngwt__RecipientStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, int id, ngwt__RecipienStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipientStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__RecipienStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientStatus(struct soap *soap, ngwt__RecipientStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__RecipientStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__RecipienStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientStatus(struct soap *soap, const char *tag, ngwt__RecipientStatus **a, const char *type)
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap *soap, const char *tag, ngwt__RecipienStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__RecipientStatus **)soap_malloc(soap, sizeof(ngwt__RecipientStatus *))))
+		if (!(a = (ngwt__RecipienStatus **)soap_malloc(soap, sizeof(ngwt__RecipienStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__RecipientStatus *)soap_instantiate_ngwt__RecipientStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__RecipienStatus *)soap_instantiate_ngwt__RecipienStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipientStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientStatus, sizeof(ngwt__RecipientStatus), 0);
+	{	a = (ngwt__RecipienStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipienStatus, sizeof(ngwt__RecipienStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -89073,53 +89073,53 @@ SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedS
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommentStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommenStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommentStatus);
-	if (soap_out_PointerTongwt__CommentStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__CommenStatus);
+	if (soap_out_PointerTongwt__CommenStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentStatus(struct soap *soap, const char *tag, int id, ngwt__CommentStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, int id, ngwt__CommenStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommentStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__CommenStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentStatus(struct soap *soap, ngwt__CommentStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap *soap, ngwt__CommenStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__CommentStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__CommenStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentStatus(struct soap *soap, const char *tag, ngwt__CommentStatus **a, const char *type)
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap *soap, const char *tag, ngwt__CommenStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__CommentStatus **)soap_malloc(soap, sizeof(ngwt__CommentStatus *))))
+		if (!(a = (ngwt__CommenStatus **)soap_malloc(soap, sizeof(ngwt__CommenStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__CommentStatus *)soap_instantiate_ngwt__CommentStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__CommenStatus *)soap_instantiate_ngwt__CommenStatus(soap, -1, soap->type, soap->arrayType, NULL)))
 			return NULL;
 		(*a)->soap_default(soap);
 		if (!(*a)->soap_in(soap, tag, NULL))
 			return NULL;
 	}
 	else
-	{	a = (ngwt__CommentStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommentStatus, sizeof(ngwt__CommentStatus), 0);
+	{	a = (ngwt__CommenStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommenStatus, sizeof(ngwt__CommenStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
diff --git a/kresources/groupwise/soap/soapH.h b/kresources/groupwise/soap/soapH.h
index 41b9a0ff1..750554590 100644
--- a/kresources/groupwise/soap/soapH.h
+++ b/kresources/groupwise/soap/soapH.h
@@ -3302,17 +3302,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecurrenceDateType(struct soap*, ng
 SOAP_FMAC5 ngwt__RecurrenceDateType * SOAP_FMAC6 soap_instantiate_ngwt__RecurrenceDateType(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__RecipientStatus
-#define SOAP_TYPE_ngwt__RecipientStatus (123)
+#ifndef SOAP_TYPE_ngwt__RecipienStatus
+#define SOAP_TYPE_ngwt__RecipienStatus (123)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientStatus(struct soap*, const char*, int, const ngwt__RecipientStatus *, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_get_ngwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus * SOAP_FMAC4 soap_in_ngwt__RecipientStatus(struct soap*, const char*, ngwt__RecipientStatus *, const char*);
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_new_ngwt__RecipientStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientStatus(struct soap*, ngwt__RecipientStatus*);
-SOAP_FMAC5 ngwt__RecipientStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipienStatus(struct soap*, const char*, int, const ngwt__RecipienStatus *, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_get_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus * SOAP_FMAC4 soap_in_ngwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus *, const char*);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_new_ngwt__RecipienStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap*, ngwt__RecipienStatus*);
+SOAP_FMAC5 ngwt__RecipienStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipienStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipienStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__RecipientList
 #define SOAP_TYPE_ngwt__RecipientList (122)
@@ -4298,17 +4298,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Contact(struct soap*, ngwt__Contact
 SOAP_FMAC5 ngwt__Contact * SOAP_FMAC6 soap_instantiate_ngwt__Contact(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Contact(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__CommentStatus
-#define SOAP_TYPE_ngwt__CommentStatus (40)
+#ifndef SOAP_TYPE_ngwt__CommenStatus
+#define SOAP_TYPE_ngwt__CommenStatus (40)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentStatus(struct soap*, const char*, int, const ngwt__CommentStatus *, const char*);
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_get_ngwt__CommentStatus(struct soap*, ngwt__CommentStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__CommentStatus * SOAP_FMAC4 soap_in_ngwt__CommentStatus(struct soap*, const char*, ngwt__CommentStatus *, const char*);
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_new_ngwt__CommentStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentStatus(struct soap*, ngwt__CommentStatus*);
-SOAP_FMAC5 ngwt__CommentStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommenStatus(struct soap*, const char*, int, const ngwt__CommenStatus *, const char*);
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_get_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__CommenStatus * SOAP_FMAC4 soap_in_ngwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus *, const char*);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_new_ngwt__CommenStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap*, ngwt__CommenStatus*);
+SOAP_FMAC5 ngwt__CommenStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommenStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommenStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__CategoryRefList
 #define SOAP_TYPE_ngwt__CategoryRefList (39)
@@ -7344,14 +7344,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DeltaSyncType(struct soap*, co
 SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_get_PointerTongwt__DeltaSyncType(struct soap*, enum ngwt__DeltaSyncType **, const char*, const char*);
 SOAP_FMAC3 enum ngwt__DeltaSyncType ** SOAP_FMAC4 soap_in_PointerTongwt__DeltaSyncType(struct soap*, const char*, enum ngwt__DeltaSyncType **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__RecipientStatus
-#define SOAP_TYPE_PointerTongwt__RecipientStatus (570)
+#ifndef SOAP_TYPE_PointerTongwt__RecipienStatus
+#define SOAP_TYPE_PointerTongwt__RecipienStatus (570)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientStatus(struct soap*, const char *, int, ngwt__RecipientStatus *const*, const char *);
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientStatus(struct soap*, ngwt__RecipientStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipientStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientStatus(struct soap*, const char*, ngwt__RecipientStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipienStatus(struct soap*, const char *, int, ngwt__RecipienStatus *const*, const char *);
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipienStatus(struct soap*, ngwt__RecipienStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__RecipienStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipienStatus(struct soap*, const char*, ngwt__RecipienStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__FreeBusyBlockList
 #define SOAP_TYPE_PointerTongwt__FreeBusyBlockList (569)
@@ -8082,14 +8082,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap*,
 SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus **, const char*, const char*);
 SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedStatus(struct soap*, const char*, ngwt__DelegatedStatus **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__CommentStatus
-#define SOAP_TYPE_PointerTongwt__CommentStatus (472)
+#ifndef SOAP_TYPE_PointerTongwt__CommenStatus
+#define SOAP_TYPE_PointerTongwt__CommenStatus (472)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentStatus(struct soap*, const char *, int, ngwt__CommentStatus *const*, const char *);
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentStatus(struct soap*, ngwt__CommentStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__CommentStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentStatus(struct soap*, const char*, ngwt__CommentStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommenStatus(struct soap*, const char *, int, ngwt__CommenStatus *const*, const char *);
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommenStatus(struct soap*, ngwt__CommenStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__CommenStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommenStatus(struct soap*, const char*, ngwt__CommenStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__TransferFailedStatus
 #define SOAP_TYPE_PointerTongwt__TransferFailedStatus (471)
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index d7f3d6bca..a5977c1c0 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -18,25 +18,25 @@
 
 #ifndef SOAP_TYPE_ngwt__ItemSourceList
 #define SOAP_TYPE_ngwt__ItemSourceList (336)
-/* Bitmask ngwt:ItemSourceList */
+/* Bitqmask ngwt:ItemSourceList */
 enum ngwt__ItemSourceList {received = 1, sent = 2, draft = 4, personal = 8};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__MessageTypeList
 #define SOAP_TYPE_ngwt__MessageTypeList (337)
-/* Bitmask ngwt:MessageTypeList */
+/* Bitqmask ngwt:MessageTypeList */
 enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference = 4, Mail = 8, Note = 16, PhoneMessage = 32, Task = 64};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__FieldList
 #define SOAP_TYPE_ngwe__FieldList (339)
-/* Bitmask ngwe:FieldList */
-enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipientStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
+/* Bitqmask ngwe:FieldList */
+enum ngwe__FieldList {AcceptLevel = 1, Alarm = 2, AllDayEvent = 4, Attachment = 8, Category = 16, Classification = 32, Contact = 64, DueDate = 128, Duration = 256, EmailAddress = 512, ExpirationDate = 1024, Hidden = 2048, IMAddress = 4096, MessageBody = 8192, Name = 16384, Organization = 32768, Owner = 65536, PersonalSubject = 131072, PhoneNumber = 262144, Place = 524288, PostalAddress = 1048576, RecipienStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__ItemTypeList
 #define SOAP_TYPE_ngwe__ItemTypeList (340)
-/* Bitmask ngwe:ItemTypeList */
+/* Bitqmask ngwe:ItemTypeList */
 enum ngwe__ItemTypeList {AddressBookItem = 1, Appointment_ = 2, CalendarItem_ = 4, Contact_ = 8, Group = 16, Mail_ = 32, Note_ = 64, Organization_ = 128, PhoneMessage_ = 256, Resource = 512, Task_ = 1024, DocumentRef = 2048};
 #endif
 
@@ -115,7 +115,7 @@ enum ngwt__FilterDate {Today = 0, Tomorrow = 1, ThisMonth = 2, ThisWeek = 3, Thi
 #ifndef SOAP_TYPE_ngwt__FilterOp
 #define SOAP_TYPE_ngwt__FilterOp (357)
 /* ngwt:FilterOp */
-enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, contains = 9, containsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
+enum ngwt__FilterOp {and_ = 0, or_ = 1, not_ = 2, eq = 3, ne = 4, gt = 5, lt = 6, gte = 7, lte = 8, tqcontains = 9, tqcontainsWord = 10, begins = 11, exists = 12, notExist = 13, isOf = 14, isNotOf = 15, fieldEqual = 16, fieldGTE = 17, fieldGT = 18, fieldLTE = 19, fieldLT = 20, fieldNE = 21, fieldDateEqual = 22};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__FolderACLStatus
@@ -241,7 +241,7 @@ enum ngwt__StatusTrackingOptions {None = 0, Delivered = 1, DeliveredAndOpened =
 #ifndef SOAP_TYPE_ngwt__VersionEventType
 #define SOAP_TYPE_ngwt__VersionEventType (384)
 /* ngwt:VersionEventType */
-enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, resetStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
+enum ngwt__VersionEventType {archive_ = 0, checkIn = 1, checkOut = 2, copyIn = 3, copyOut = 4, copyVersion = 5, created = 6, deleteVersion = 7, endAccess = 8, reseStatus = 9, restore = 10, retrieve = 11, securityModified = 12, versionDownloaded = 13, viewed = 14, unknown = 15};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__VersionStatus
@@ -265,7 +265,7 @@ enum ngwe__EventType {AddressBookAdd = 0, AddressBookDelete = 1, AddressBookModi
 #ifndef SOAP_TYPE_ngwe__Field
 #define SOAP_TYPE_ngwe__Field (389)
 /* ngwe:Field */
-enum ngwe__Field {AcceptLevel_ = 0, Alarm_ = 1, AllDayEvent_ = 2, Attachment_ = 3, Category__ = 4, Classification_ = 5, Contact___ = 6, DueDate_ = 7, Duration_ = 8, EmailAddress_ = 9, ExpirationDate_ = 10, Hidden_ = 11, IMAddress_ = 12, MessageBody_ = 13, Name_ = 14, Organization___ = 15, Owner_ = 16, PersonalSubject_ = 17, PhoneNumber_ = 18, Place_ = 19, PostalAddress_ = 20, RecipientStatus_ = 21, Rights_ = 22, Security_ = 23, SendPriority_ = 24, StartDate_ = 25, Subject_ = 26, TaskCategory_ = 27, TaskPriority_ = 28};
+enum ngwe__Field {AcceptLevel_ = 0, Alarm_ = 1, AllDayEvent_ = 2, Attachment_ = 3, Category__ = 4, Classification_ = 5, Contact___ = 6, DueDate_ = 7, Duration_ = 8, EmailAddress_ = 9, ExpirationDate_ = 10, Hidden_ = 11, IMAddress_ = 12, MessageBody_ = 13, Name_ = 14, Organization___ = 15, Owner_ = 16, PersonalSubject_ = 17, PhoneNumber_ = 18, Place_ = 19, PostalAddress_ = 20, RecipienStatus_ = 21, Rights_ = 22, Security_ = 23, SendPriority_ = 24, StartDate_ = 25, Subject_ = 26, TaskCategory_ = 27, TaskPriority_ = 28};
 #endif
 
 #ifndef SOAP_TYPE_ngwe__ItemType
@@ -1764,10 +1764,10 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__RecipientStatus
-#define SOAP_TYPE_ngwt__RecipientStatus (123)
-/* ngwt:RecipientStatus */
-class SOAP_CMAC ngwt__RecipientStatus
+#ifndef SOAP_TYPE_ngwt__RecipienStatus
+#define SOAP_TYPE_ngwt__RecipienStatus (123)
+/* ngwt:RecipienStatus */
+class SOAP_CMAC ngwt__RecipienStatus
 {
 public:
 	char *delivered;	/* optional element of type xsd:string */
@@ -1783,8 +1783,8 @@ public:
 	char *deleted;	/* optional element of type xsd:string */
 	char *undeleted;	/* optional element of type xsd:string */
 	char *purged;	/* optional element of type xsd:string */
-	class ngwt__CommentStatus *accepted;	/* optional element of type ngwt:CommentStatus */
-	ngwt__CommentStatus *declined;	/* optional element of type ngwt:CommentStatus */
+	class ngwt__CommenStatus *accepted;	/* optional element of type ngwt:CommenStatus */
+	ngwt__CommenStatus *declined;	/* optional element of type ngwt:CommenStatus */
 	char *replied;	/* optional element of type xsd:string */
 	char *forwarded;	/* optional element of type xsd:string */
 	char *shared;	/* optional element of type xsd:string */
@@ -1795,15 +1795,15 @@ public:
 	std::vector<class ngwt__DelegateeStatus * >delegateeStatus;	/* optional element of type ngwt:DelegateeStatus */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipientStatus */
+	virtual int soap_type() const { return 123; } /* = unique id SOAP_TYPE_ngwt__RecipienStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__RecipientStatus() { }
-	virtual ~ngwt__RecipientStatus() { }
+	         ngwt__RecipienStatus() { }
+	virtual ~ngwt__RecipienStatus() { }
 };
 #endif
 
@@ -6386,25 +6386,25 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__CommentStatus
-#define SOAP_TYPE_ngwt__CommentStatus (40)
-/* Primitive ngwt:CommentStatus schema type: */
-class SOAP_CMAC ngwt__CommentStatus
+#ifndef SOAP_TYPE_ngwt__CommenStatus
+#define SOAP_TYPE_ngwt__CommenStatus (40)
+/* Primitive ngwt:CommenStatus schema type: */
+class SOAP_CMAC ngwt__CommenStatus
 {
 public:
 	char *__item;
 	std::string *comment;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommentStatus */
+	virtual int soap_type() const { return 40; } /* = unique id SOAP_TYPE_ngwt__CommenStatus */
 	virtual void soap_default(struct soap*);
 	virtual void soap_serialize(struct soap*) const;
 	virtual int soap_put(struct soap*, const char*, const char*) const;
 	virtual int soap_out(struct soap*, const char*, int, const char*) const;
 	virtual void *soap_get(struct soap*, const char*, const char*);
 	virtual void *soap_in(struct soap*, const char*, const char*);
-	         ngwt__CommentStatus() { }
-	virtual ~ngwt__CommentStatus() { }
+	         ngwt__CommenStatus() { }
+	virtual ~ngwt__CommenStatus() { }
 };
 #endif
 
@@ -6460,7 +6460,7 @@ public:
 class SOAP_CMAC ngwt__DelegatedStatus
 {
 public:
-	ngwt__CommentStatus *__item;
+	ngwt__CommenStatus *__item;
 	std::string *userid;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
@@ -6479,7 +6479,7 @@ public:
 #ifndef SOAP_TYPE_ngwt__DelegateeStatus
 #define SOAP_TYPE_ngwt__DelegateeStatus (53)
 /* ngwt:DelegateeStatus */
-class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipientStatus
+class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipienStatus
 {
 public:
 	std::string *userid;	/* optional attribute */
@@ -6774,7 +6774,7 @@ class SOAP_CMAC ngwt__Recipient : public ngwt__NameAndEmail
 public:
 	enum ngwt__DistributionType distType;	/* optional element of type ngwt:DistributionType */
 	enum ngwt__RecipientType recipType;	/* optional element of type ngwt:RecipientType */
-	ngwt__RecipientStatus *recipientStatus;	/* optional element of type ngwt:RecipientStatus */
+	ngwt__RecipienStatus *recipienStatus;	/* optional element of type ngwt:RecipienStatus */
 	enum ngwt__AcceptLevel *acceptLevel;	/* optional element of type ngwt:AcceptLevel */
 public:
 	virtual int soap_type() const { return 121; } /* = unique id SOAP_TYPE_ngwt__Recipient */
@@ -6792,7 +6792,7 @@ public:
 #ifndef SOAP_TYPE_ngwt__TransferFailedStatus
 #define SOAP_TYPE_ngwt__TransferFailedStatus (154)
 /* ngwt:TransferFailedStatus */
-class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipientStatus
+class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipienStatus
 {
 public:
 	std::string *FailureReason;	/* optional attribute */
diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index 0a0f3c58e..175387686 100644
--- a/kresources/groupwise/soap/stdsoap2.cpp
+++ b/kresources/groupwise/soap/stdsoap2.cpp
@@ -3316,7 +3316,7 @@ again:
     { short v;
       unsigned int k = soap->omode; /* make sure we only parse HTTP */
       size_t n = soap->count; /* save the content length */
-      soap->omode &= ~SOAP_ENC; /* mask IO and ENC */
+      soap->omode &= ~SOAP_ENC; /* tqmask IO and ENC */
       soap->omode |= SOAP_IO_BUFFER;
       soap_begin_send(soap);
       DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connecting to proxy server\n"));
@@ -3337,7 +3337,7 @@ again:
         return SOAP_INVALID_SOCKET;
       soap->omode = k;
       k = soap->imode;
-      soap->imode &= ~SOAP_ENC; /* mask IO and ENC */
+      soap->imode &= ~SOAP_ENC; /* tqmask IO and ENC */
       v = soap->version; /* preserve */
       if (soap_begin_recv(soap))
         return SOAP_INVALID_SOCKET;
@@ -6957,7 +6957,7 @@ SOAP_FMAC2
 soap_string_out(struct soap *soap, const char *s, int flag)
 { register const char *t;
   register soap_wchar c;
-  register soap_wchar mask = 0xFFFFFF80UL;
+  register soap_wchar tqmask = 0xFFFFFF80UL;
 #ifdef WITH_DOM
   if ((soap->mode & SOAP_XML_DOM) && soap->dom)
   { soap->dom->data = soap_strdup(soap, s); /* check EOM */
@@ -6965,7 +6965,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
   }
 #endif
   if (soap->mode & SOAP_C_UTFSTRING)
-    mask = 0;
+    tqmask = 0;
   t = s;
   while ((c = *t++))
   { switch (c)
@@ -7028,7 +7028,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
       }
 #endif
 #endif
-      if (c & mask)
+      if (c & tqmask)
       { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
           return soap->error;
         s = t;
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index af603d801..fb801fb8f 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -896,7 +896,7 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
 
 typedef soap_int32 soap_mode;
 
-#define SOAP_IO			0x00000003	/* IO mask */
+#define SOAP_IO			0x00000003	/* IO tqmask */
 #define SOAP_IO_FLUSH		0x00000000	/* flush output immediately, no buffering */
 #define SOAP_IO_BUFFER		0x00000001	/* buffer output in packets of size SOAP_BUFLEN */
 #define SOAP_IO_STORE		0x00000002	/* store entire output to determine length for transport */
@@ -914,7 +914,7 @@ typedef soap_int32 soap_mode;
 #define SOAP_ENC_ZLIB		0x00000400
 #define SOAP_ENC_SSL		0x00000800
 
-#define SOAP_ENC		0x00000FFF	/* IO and ENC mask */
+#define SOAP_ENC		0x00000FFF	/* IO and ENC tqmask */
 
 #define SOAP_XML_STRICT		0x00001000	/* strict validation */
 #define SOAP_XML_CANONICAL	0x00002000	/* C14N canonical XML */
@@ -1350,8 +1350,8 @@ struct soap
   std::ostream *os;
   std::istream *is;
 #else
-  void *os;	/* preserve alignment */
-  void *is;	/* preserve alignment */
+  void *os;	/* preserve tqalignment */
+  void *is;	/* preserve tqalignment */
 #endif
 #ifndef UNDER_CE
   int sendfd;
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index 26a91e679..e3032d118 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -57,7 +57,7 @@ Contact::Contact( const KABC::Addressee* addr )
 }
 
 // loading (xml->addressee)
-Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
   : mHasGeo( false )
 {
   load( xml );
@@ -487,7 +487,7 @@ void Contact::saveCustomAttributes( TQDomElement& element ) const
       writeString( element, (*it).name, (*it).value );
     } else {
       // skip writing the freebusyurl as it is a hack we need to remove eventually
-      if ( (*it).name == TQString::fromLatin1( "FreeBusyURL" ) ) {
+      if ( (*it).name == TQString::tqfromLatin1( "FreeBusyURL" ) ) {
         continue;
       }
 
@@ -1110,7 +1110,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
   //    (includes e.g. crypto settings, and extra im addresses)
   TQStringList knownCustoms;
   for ( const char** p = s_knownCustomFields; *p; ++p )
-    knownCustoms << TQString::fromLatin1( *p );
+    knownCustoms << TQString::tqfromLatin1( *p );
   TQStringList customs = addressee->customs();
   for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
     // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
@@ -1124,7 +1124,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
     if ( pos == -1 ) continue;
     TQString value = name.mid( pos + 1 );
     name = name.left( pos );
-    if ( !knownCustoms.contains( name ) ) {
+    if ( !knownCustoms.tqcontains( name ) ) {
       //kdDebug() << k_funcinfo << "app=" << app << " name=" << name << " value=" << value << endl;
       Custom c;
       if ( app != "KADDRESSBOOK" ) // that's the default
@@ -1162,8 +1162,8 @@ void Contact::saveTo( KABC::Addressee* addressee )
     for ( ; mit != mDistrListMembers.end(); ++mit ) {
       TQString displayName = (*mit).displayName;
       // fixup the display name DistributionList::assumes neither ',' nor ';' is present
-      displayName.replace( ',', ' ' );
-      displayName.replace( ';', ' ' );
+      displayName.tqreplace( ',', ' ' );
+      displayName.tqreplace( ';', ' ' );
       distrList.insertEntry( displayName, (*mit).email );
     }
     addressee->insertCustom( "KADDRESSBOOK", "DistributionList", distrList.custom( "KADDRESSBOOK", "DistributionList" ) );
@@ -1253,13 +1253,13 @@ void Contact::saveTo( KABC::Addressee* addressee )
   }
 
   for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
-    TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app;
+    TQString app = (*it).app.isEmpty() ? TQString::tqfromLatin1( "KADDRESSBOOK" ) : (*it).app;
     addressee->insertCustom( app, (*it).name, (*it).value );
   }
   //kdDebug(5006) << addressee->customs() << endl;
 }
 
-TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
 {
   TQImage img;
   KURL url;
@@ -1285,7 +1285,7 @@ TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
   return img;
 }
 
-TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum )
+TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
 {
   TQByteArray data;
   KURL url;
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index a9465642f..66a7c418a 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -69,7 +69,7 @@ public:
   };
 
   explicit Contact( const KABC::Addressee* address );
-  Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   ~Contact();
 
   void saveTo( KABC::Addressee* address );
@@ -221,10 +221,10 @@ private:
   void loadDistrListMember( const TQDomElement& element );
   void saveDistrListMembers( TQDomElement& element ) const;
 
-  TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   TQImage loadPictureFromAddressee( const KABC::Picture& picture );
 
-  TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, Q_UINT32 sernum );
+  TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
   TQByteArray loadSoundFromAddressee( const KABC::Sound& sound );
 
   TQString productID() const;
diff --git a/kresources/kolab/kabc/resourcekolab.cpp b/kresources/kolab/kabc/resourcekolab.cpp
index ae8e225fb..e9c481bfb 100644
--- a/kresources/kolab/kabc/resourcekolab.cpp
+++ b/kresources/kolab/kabc/resourcekolab.cpp
@@ -151,7 +151,7 @@ void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
 
 TQString KABC::ResourceKolab::loadContact( const TQString& contactData,
                                           const TQString& subResource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           KMailICalIface::StorageFormat format )
 {
   KABC::Addressee addr;
@@ -215,7 +215,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
     for ( int indexFormat = 0; indexFormat < 3; ++indexFormat ) {
       const char* mimetype = s_formats[indexFormat].mimetype;
       KMailICalIface::StorageFormat format = s_formats[indexFormat].format;
-      TQMap<Q_UINT32, TQString> lst;
+      TQMap<TQ_UINT32, TQString> lst;
       if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
         kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
         if ( progressId )
@@ -223,7 +223,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
         return false;
       }
 
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         loadContact( it.data(), subResource, it.key(), format );
       }
 
@@ -334,7 +334,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
   TQString subResource;
-  Q_UINT32 sernum;
+  TQ_UINT32 sernum;
   if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
@@ -416,7 +416,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.contains( uid ) ) {
+  if ( mUidMap.tqcontains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -453,7 +453,7 @@ void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
  */
 bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                                  const TQString& subResource,
-                                                 Q_UINT32 sernum,
+                                                 TQ_UINT32 sernum,
                                                  int format,
                                                  const TQString& contactXML )
 {
@@ -468,8 +468,8 @@ bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.contains( uid )
-       && !mUidsPendingUpdate.contains( uid ) ) {
+  if ( !mUidsPendingAdding.tqcontains( uid )
+       && !mUidsPendingUpdate.tqcontains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -490,11 +490,11 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.contains( uid ) ) {
+  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -523,7 +523,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -540,7 +540,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -575,13 +575,13 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
 
 
 
-void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                     const TQString& /* type */,
                                                     const TQString& folder )
 {
   // FIXME
   KMailICalIface::StorageFormat format = KMailICalIface::StorageXML;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     loadContact( it.data(), folder, it.key(), format );
   }
   if ( !addressBook() ){
@@ -597,7 +597,7 @@ TQStringList KABC::ResourceKolab::subresources() const
 
 bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -609,7 +609,7 @@ bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
 
 bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -617,7 +617,7 @@ bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) con
 
 int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -628,7 +628,7 @@ int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresourc
 
 TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -638,7 +638,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
 
 void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -657,7 +657,7 @@ TQMap<TQString, TQString> KABC::ResourceKolab::uidToResourceMap() const
 
 void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {
diff --git a/kresources/kolab/kabc/resourcekolab.h b/kresources/kolab/kabc/resourcekolab.h
index 9158375a1..2288bf258 100644
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@@ -112,12 +112,12 @@ public:
   void fromKMailDelSubresource( const TQString& type, const TQString& id );
 
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& contact );
+                              TQ_UINT32 sernum, int format, const TQString& contact );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& contact );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -158,7 +158,7 @@ protected:
                               const TQString& label, bool writable );
   bool loadSubResource( const TQString& subResource );
   TQString loadContact( const TQString& contactData, const TQString& subResource,
-                       Q_UINT32 sernum, const KMailICalIface::StorageFormat format );
+                       TQ_UINT32 sernum, const KMailICalIface::StorageFormat format );
 
   TQString configFile() const {
     return Kolab::ResourceKolabBase::configFile( "kabc" );
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index e1d58a13c..f8309053e 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -40,7 +40,7 @@ using namespace Kolab;
 
 
 KCal::Event* Event::xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res,
-                                const TQString& subResource, Q_UINT32 sernum )
+                                const TQString& subResource, TQ_UINT32 sernum )
 {
   Event event( res, subResource, sernum, tz );
   event.load( xml );
@@ -55,7 +55,7 @@ TQString Event::eventToXML( KCal::Event* kcalEvent, const TQString& tz  )
   return event.saveXML();
 }
 
-Event::Event( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Event::Event( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
               const TQString& tz, KCal::Event* event )
   : Incidence( res, subResource, sernum, tz ),
   mShowTimeAs( KCal::Event::Opaque ), mHasEndDate( false )
diff --git a/kresources/kolab/kcal/event.h b/kresources/kolab/kcal/event.h
index c45018adc..d9f1069a9 100644
--- a/kresources/kolab/kcal/event.h
+++ b/kresources/kolab/kcal/event.h
@@ -54,13 +54,13 @@ public:
   /// Use this to parse an xml string to a event entry
   /// The caller is responsible for deleting the returned event
   static KCal::Event* xmlToEvent( const TQString& xml, const TQString& tz, KCal::ResourceKolab* res = 0,
-                                  const TQString& subResource = TQString::null, Q_UINT32 sernum = 0 );
+                                  const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this event entry
   static TQString eventToXML( KCal::Event*, const TQString& tz );
 
   /// Create a event object and
-  explicit Event( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+  explicit Event( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                   const TQString& tz, KCal::Event* event = 0 );
   virtual ~Event();
 
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index de076eb98..060b9b93f 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -49,7 +49,7 @@
 using namespace Kolab;
 
 
-Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz )
   : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ),
     mResource( res ),
@@ -175,7 +175,7 @@ bool Incidence::loadAttendeeAttribute( TQDomElement& element,
       TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it contains commas or other quotable chars.
+        // Quote the text in case it tqcontains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
@@ -559,7 +559,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const
   saveAttachments( element );
   if ( mHasAlarm ) {
     // Alarms should be minutes before. Libkcal uses event time + alarm time
-    int alarmTime = qRound( -alarm() );
+    int alarmTime = tqRound( -alarm() );
     writeString( element, "alarm", TQString::number( alarmTime ) );
   }
   saveAlarms( element );
@@ -900,7 +900,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
 
   if ( mHasAlarm && mAlarms.isEmpty() ) {
     KCal::Alarm* alarm = incidence->newAlarm();
-    alarm->setStartOffset( qRound( mAlarm * 60.0 ) );
+    alarm->setStartOffset( tqRound( mAlarm * 60.0 ) );
     alarm->setEnabled( true );
     alarm->setType( KCal::Alarm::Display );
   } else if ( !mAlarms.isEmpty() ) {
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index 582d34c38..b3de2f914 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -77,7 +77,7 @@ public:
     TQString delegator;
   };
 
-  explicit Incidence( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+  explicit Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz );
   virtual ~Incidence();
 
@@ -167,7 +167,7 @@ protected:
 
   KCal::ResourceKolab *mResource;
   TQString mSubResource;
-  Q_UINT32 mSernum;
+  TQ_UINT32 mSernum;
 };
 
 }
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 1f5f486ff..5bbae761b 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -70,7 +70,7 @@ static const char* incidenceInlineMimeType = "text/calendar";
 
 ResourceKolab::ResourceKolab( const KConfig *config )
   : ResourceCalendar( config ), ResourceKolabBase( "ResourceKolab-libkcal" ),
-    mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
+    mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
         "mResourceChangedTimer" ), mBatchAddingInProgress( false )
 {
   if ( !config ) {
@@ -170,7 +170,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
                            : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
                            : i18n( "Loading events..." );
-  const bool useProgress = qApp && qApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
+  const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
   if ( useProgress )
     (void)::Observer::self(); // ensure kio_uiserver is running
   UIServer_stub uiserver( "kio_uiserver", "UIServer" );
@@ -183,7 +183,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   }
 
   for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
-    TQMap<Q_UINT32, TQString> lst;
+    TQMap<TQ_UINT32, TQString> lst;
     if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
       kdError(5650) << "Communication problem in ResourceKolab::load()\n";
       if ( progressId )
@@ -193,7 +193,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
 
     { // for RAII scoping below
       TemporarySilencer t( this );
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         addIncidence( mimetype, it.data(), subResource, it.key() );
       }
     }
@@ -310,7 +310,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
   const TQString uid = incidencebase->uid();
   //kdDebug() << k_funcinfo << uid << endl;
 
-  if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
+  if ( mUidsPendingUpdate.tqcontains( uid ) || mUidsPendingAdding.tqcontains( uid ) ) {
     /* We are currently processing this event ( removing and readding or
      * adding it ). If so, ignore this update. Keep the last of these around
      * and process once we hear back from KMail on this event. */
@@ -336,7 +336,7 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
     if ( i ) {
       bool ignoreThisUpdate = false;
 
-      if ( !mLastKnownRevisions.contains( uid ) ) {
+      if ( !mLastKnownRevisions.tqcontains( uid ) ) {
         mLastKnownRevisions[uid] = i->revision();
       }
 
@@ -354,8 +354,8 @@ void ResourceKolab::incidenceUpdatedSilent( KCal::IncidenceBase* incidencebase )
   } // end optimization
 
   TQString subResource;
-  Q_UINT32 sernum = 0;
-  if ( mUidMap.contains( uid ) ) {
+  TQ_UINT32 sernum = 0;
+  if ( mUidMap.tqcontains( uid ) ) {
     subResource = mUidMap[ uid ].resource();
     sernum = mUidMap[ uid ].serialNumber();
     mUidsPendingUpdate.append( uid );
@@ -370,7 +370,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   }
 
   incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD );
-  incidencebase->setLastModified( TQDateTime::currentDateTime() );
+  incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
 
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
@@ -378,7 +378,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   incidenceUpdatedSilent( incidencebase );
 }
 
-void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subresource, Q_UINT32 sernum )
+void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subresource, TQ_UINT32 sernum )
 {
   if ( !inc ) {
     return;
@@ -441,7 +441,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
    mSilent = silent;
 }
 void ResourceKolab::addIncidence( const char* mimetype, const TQString& data,
-                                  const TQString& subResource, Q_UINT32 sernum )
+                                  const TQString& subResource, TQ_UINT32 sernum )
 {
   // This uses pointer comparison, so it only works if we use the static
   // objects defined in the top of the file
@@ -459,7 +459,7 @@ void ResourceKolab::addIncidence( const char* mimetype, const TQString& data,
 
 
 bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const TQString& subresource,
-                                     Q_UINT32 sernum )
+                                     TQ_UINT32 sernum )
 {
   const TQString& type = incidencebase->type();
   const char* mimetype = 0;
@@ -543,7 +543,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T
   // behold, sernum is an in-parameter
   const bool rc = kmailUpdate( subresource, sernum, data, mimetype, subject, customHeaders, attURLs, attMimeTypes, attNames, deletedAtts );
   // update the serial number
-  if ( mUidMap.contains( incidencebase->uid() ) ) {
+  if ( mUidMap.tqcontains( incidencebase->uid() ) ) {
     mUidMap[ incidencebase->uid() ].setSerialNumber( sernum );
   }
 
@@ -556,7 +556,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T
 }
 
 bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _subresource,
-                                  Q_UINT32 sernum )
+                                  TQ_UINT32 sernum )
 {
   Q_ASSERT( incidence );
   if ( !incidence ) {
@@ -629,7 +629,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
 
       // Lets not warn the user 100 times that there's no writable resource
       // and not ask 100 times which resource to use
-      if ( !mBatchAddingInProgress || !mLastUsedResources.contains( type ) ) {
+      if ( !mBatchAddingInProgress || !mLastUsedResources.tqcontains( type ) ) {
         subResource = findWritableResource( type, *map, text );
         mLastUsedResources[type] = subResource;
       } else {
@@ -676,7 +676,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
     }
   } else { /* KMail told us */
-    const bool ourOwnUpdate = mUidsPendingUpdate.contains(  uid );
+    const bool ourOwnUpdate = mUidsPendingUpdate.tqcontains(  uid );
     kdDebug( 5650 ) << "addIncidence: ourOwnUpdate " << ourOwnUpdate << endl;
     /* Check if we updated this one, which means kmail deleted and added it.
      * We know the new state, so lets just not do much at all. The old incidence
@@ -692,7 +692,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
        * unless the folder is read-only, in which case the user should not be
        * offered a means of putting mails in a folder she'll later be unable to
        * upload. Skip the incidence, in this case. */
-      if ( mUidMap.contains( uid ) ) {
+      if ( mUidMap.tqcontains( uid ) ) {
         if ( mUidMap[ uid ].resource() == subResource ) {
           if ( (*map)[ subResource ].writable() ) {
             kdDebug( 5650 ) << "lets resolve the conflict " << endl;
@@ -716,7 +716,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
        * we've already added it, and listen to updates from KOrganizer for it. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         mCalendar.addIncidence( incidence );
         incidence->registerObserver( this );
       }
@@ -733,7 +733,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
     } else {
       /* If the uid was added by KMail, KOrganizer needs to be told, so
        * schedule emitting of the resourceChanged signal. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         if ( !ourOwnUpdate ) mResourceChangedTimer.changeInterval( 100 );
       } else {
         mUidsPendingAdding.remove( uid );
@@ -752,7 +752,7 @@ bool ResourceKolab::addEvent( KCal::Event *event )
 
 bool ResourceKolab::addEvent( KCal::Event *event, const TQString &subResource )
 {
-  if ( mUidMap.contains( event->uid() ) ) {
+  if ( mUidMap.tqcontains( event->uid() ) ) {
     return true; //noop
   } else {
     return addIncidence( event, subResource, 0 );
@@ -760,7 +760,7 @@ bool ResourceKolab::addEvent( KCal::Event *event, const TQString &subResource )
 }
 
 void ResourceKolab::addEvent( const TQString& xml, const TQString& subresource,
-                              Q_UINT32 sernum )
+                              TQ_UINT32 sernum )
 {
   KCal::Event* event = Kolab::Event::xmlToEvent( xml, mCalendar.timeZoneId(), this, subresource, sernum );
   Q_ASSERT( event );
@@ -776,7 +776,7 @@ bool ResourceKolab::deleteIncidence( KCal::Incidence* incidence )
   }
 
   const TQString uid = incidence->uid();
-  if( !mUidMap.contains( uid ) ) return false; // Odd
+  if( !mUidMap.tqcontains( uid ) ) return false; // Odd
   /* The user told us to delete, tell KMail */
   if ( !mSilent ) {
     kmailDeleteIncidence( mUidMap[ uid ].resource(),
@@ -832,7 +832,7 @@ bool ResourceKolab::addTodo( KCal::Todo *todo )
 
 bool ResourceKolab::addTodo( KCal::Todo *todo, const TQString &subResource )
 {
-  if ( mUidMap.contains( todo->uid() ) ) {
+  if ( mUidMap.tqcontains( todo->uid() ) ) {
     return true; //noop
   } else {
     return addIncidence( todo, subResource, 0 );
@@ -840,7 +840,7 @@ bool ResourceKolab::addTodo( KCal::Todo *todo, const TQString &subResource )
 }
 
 void ResourceKolab::addTodo( const TQString& xml, const TQString& subresource,
-                             Q_UINT32 sernum )
+                             TQ_UINT32 sernum )
 {
   KCal::Todo* todo = Kolab::Task::xmlToTask( xml, mCalendar.timeZoneId(), this, subresource, sernum );
   Q_ASSERT( todo );
@@ -876,14 +876,14 @@ bool ResourceKolab::addJournal( KCal::Journal *journal )
 
 bool ResourceKolab::addJournal( KCal::Journal *journal, const TQString &subResource )
 {
-  if ( mUidMap.contains( journal->uid() ) )
+  if ( mUidMap.tqcontains( journal->uid() ) )
     return true; //noop
   else
     return addIncidence( journal, subResource, 0 );
 }
 
 void ResourceKolab::addJournal( const TQString& xml, const TQString& subresource,
-                                Q_UINT32 sernum )
+                                TQ_UINT32 sernum )
 {
   KCal::Journal* journal =
     Kolab::Journal::xmlToJournal( xml, mCalendar.timeZoneId() );
@@ -921,12 +921,12 @@ KCal::Alarm::List ResourceKolab::relevantAlarms( const KCal::Alarm::List &alarms
     KCal::Alarm *a = (*it);
     ++it;
     const TQString &uid = a->parent()->uid();
-     if ( mUidMap.contains( uid ) ) {
+     if ( mUidMap.tqcontains( uid ) ) {
        const TQString &sr = mUidMap[ uid ].resource();
        Kolab::SubResource *subResource = 0;
-       if ( mEventSubResources.contains( sr ) )
+       if ( mEventSubResources.tqcontains( sr ) )
           subResource = &( mEventSubResources[ sr ] );
-       else if ( mTodoSubResources.contains( sr ) )
+       else if ( mTodoSubResources.tqcontains( sr ) )
           subResource = &( mTodoSubResources[ sr ] );
        assert( subResource );
        if ( subResource->alarmRelevant() )
@@ -960,7 +960,7 @@ void ResourceKolab::setTimeZoneId( const TQString& tzid )
 
 bool ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int format,
                                            const TQString& data )
 {
@@ -1011,14 +1011,14 @@ void ResourceKolab::fromKMailDelIncidence( const TQString& type,
   // Can't be in both, by contract
   if ( mUidsPendingDeletion.find( uid ) != mUidsPendingDeletion.end() ) {
     mUidsPendingDeletion.remove( mUidsPendingDeletion.find( uid ) );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     TQString uidToUse;
 
     QPair<TQString, TQString> p( uid, subResource );
-    if ( mOriginalUID2fakeUID.contains( p ) ) {
+    if ( mOriginalUID2fakeUID.tqcontains( p ) ) {
       // Incidence with the same uid in a different folder...
       // use the UID that addIncidence(...) generated
       uidToUse = mOriginalUID2fakeUID[p];
@@ -1073,7 +1073,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -1093,7 +1093,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   ResourceMap* map = subResourceMap( type );
   if ( !map ) // not ours
     return;
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     map->erase( subResource );
   else
     // Not registered
@@ -1122,21 +1122,21 @@ TQStringList ResourceKolab::subresources() const
 const QString
 ResourceKolab::labelForSubresource( const TQString& subresource ) const
 {
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].label();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].label();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].label();
   return subresource;
 }
 
-void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
   TemporarySilencer t( this );
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
     addIncidence( type.latin1(), it.data(), folder, it.key() );
 }
 
@@ -1146,11 +1146,11 @@ bool ResourceKolab::subresourceActive( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceKolab*>( this )->doOpen();
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].active();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].active();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].active();
 
   // Safe default bet:
@@ -1163,15 +1163,15 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v )
 {
   ResourceMap *map = 0;
   const char* mimeType = 0;
-  if ( mEventSubResources.contains( subresource ) ) {
+  if ( mEventSubResources.tqcontains( subresource ) ) {
      map = &mEventSubResources;
      mimeType = eventAttachmentMimeType;
   }
-  if ( mTodoSubResources.contains( subresource ) ) {
+  if ( mTodoSubResources.tqcontains( subresource ) ) {
      map = &mTodoSubResources;
      mimeType = todoAttachmentMimeType;
   }
-  if ( mJournalSubResources.contains( subresource ) ) {
+  if ( mJournalSubResources.tqcontains( subresource ) ) {
      map = &mJournalSubResources;
      mimeType = journalAttachmentMimeType;
   }
@@ -1194,11 +1194,11 @@ bool ResourceKolab::subresourceWritable( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceKolab*>( this )->doOpen();
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].writable();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].writable();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].writable();
 
   return false; //better a safe default
@@ -1236,11 +1236,11 @@ bool ResourceKolab::addSubresource( const TQString& resource, const TQString& pa
    kdDebug(5650) << "KCal Kolab resource - adding subresource: " << resource << endl;
    TQString contentsType = kmailCalendarContentsType;
    if ( !parent.isEmpty() ) {
-     if ( mEventSubResources.contains( parent ) )
+     if ( mEventSubResources.tqcontains( parent ) )
        contentsType = kmailCalendarContentsType;
-     else if ( mTodoSubResources.contains( parent ) )
+     else if ( mTodoSubResources.tqcontains( parent ) )
        contentsType = kmailTodoContentsType;
-     else if ( mJournalSubResources.contains( parent ) )
+     else if ( mJournalSubResources.tqcontains( parent ) )
        contentsType = kmailJournalContentsType;
    } else {
      TQStringList contentTypeChoices;
@@ -1269,10 +1269,10 @@ bool ResourceKolab::removeSubresource( const TQString& resource )
 TQString ResourceKolab::subresourceIdentifier( Incidence *incidence )
 {
   TQString uid = incidence->uid();
-  if ( mUidMap.contains( uid ) )
+  if ( mUidMap.tqcontains( uid ) )
     return mUidMap[ uid ].resource();
   else
-    if ( mNewIncidencesMap.contains( uid ) )
+    if ( mNewIncidencesMap.tqcontains( uid ) )
       return mNewIncidencesMap[ uid ];
     else
       return TQString();
@@ -1311,11 +1311,11 @@ bool ResourceKolab::unloadSubResource( const TQString& subResource )
 
 TQString ResourceKolab::subresourceType( const TQString &resource )
 {
-  if ( mEventSubResources.contains( resource ) )
+  if ( mEventSubResources.tqcontains( resource ) )
     return "event";
-  if ( mTodoSubResources.contains( resource ) )
+  if ( mTodoSubResources.tqcontains( resource ) )
     return "todo";
-  if ( mJournalSubResources.contains( resource ) )
+  if ( mJournalSubResources.tqcontains( resource ) )
     return "journal";
   return TQString();
 }
diff --git a/kresources/kolab/kcal/resourcekolab.h b/kresources/kolab/kcal/resourcekolab.h
index dda5ba32a..fd4c3b57e 100644
--- a/kresources/kolab/kcal/resourcekolab.h
+++ b/kresources/kolab/kcal/resourcekolab.h
@@ -106,7 +106,7 @@ public:
 
   /// The ResourceKolabBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& subResource,
-                              Q_UINT32 sernum, int format, const TQString& data );
+                              TQ_UINT32 sernum, int format, const TQString& data );
   void fromKMailDelIncidence( const TQString& type, const TQString& subResource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& subResource );
@@ -117,7 +117,7 @@ public:
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -165,23 +165,23 @@ protected:
 
 private:
   void removeIncidences( const TQCString& incidenceType );
-  void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum );
+  void resolveConflict( KCal::Incidence*, const TQString& subresource, TQ_UINT32 sernum );
   void addIncidence( const char* mimetype, const TQString& xml,
-                     const TQString& subResource, Q_UINT32 sernum );
+                     const TQString& subResource, TQ_UINT32 sernum );
 
 
   /**
      Caller guarantees i is not null.
    */
   bool addIncidence( KCal::Incidence *i, const TQString& subresource,
-                     Q_UINT32 sernum );
+                     TQ_UINT32 sernum );
 
   void addEvent( const TQString& xml, const TQString& subresource,
-                 Q_UINT32 sernum );
+                 TQ_UINT32 sernum );
   void addTodo( const TQString& xml, const TQString& subresource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   void addJournal( const TQString& xml, const TQString& subresource,
-                   Q_UINT32 sernum );
+                   TQ_UINT32 sernum );
 
 
   bool loadAllEvents();
@@ -209,7 +209,7 @@ private:
   Kolab::ResourceMap* subResourceMap( const TQString& contentsType );
 
   bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
-                        Q_UINT32 sernum );
+                        TQ_UINT32 sernum );
 
 
   KCal::CalendarLocal mCalendar;
@@ -223,11 +223,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map contains the association between a new added incidence
+    This map tqcontains the association between a new added incidence
     and the subresource it belongs to.
     That's needed to return the correct mapping in subresourceIdentifier().
 
-    We can't trust on mUidMap here, because it contains only non-pending uids.
+    We can't trust on mUidMap here, because it tqcontains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 36876b7d5..33cc50eef 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -75,7 +75,7 @@ static int kolabPrioritytoKCal( const int kolabPriority )
 }
 
 KCal::Todo* Task::xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res,
-                             const TQString& subResource, Q_UINT32 sernum )
+                             const TQString& subResource, TQ_UINT32 sernum )
 {
   Task task( res, subResource, sernum, tz );
   task.load( xml );
@@ -90,7 +90,7 @@ TQString Task::taskToXML( KCal::Todo* todo, const TQString& tz )
   return task.saveXML();
 }
 
-Task::Task( KCal::ResourceKolab *res, const TQString &subResource, Q_UINT32 sernum,
+Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
             const TQString& tz, KCal::Todo* task )
   : Incidence( res, subResource, sernum, tz ),
     mPriority( 5 ), mPercentCompleted( 0 ),
@@ -126,7 +126,7 @@ int Task::percentCompleted() const
   return mPercentCompleted;
 }
 
-void Task::setStatus( KCal::Incidence::Status status )
+void Task::seStatus( KCal::Incidence::Status status )
 {
   mStatus = status;
 }
@@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element )
     setPercentCompleted( percent );
   } else if ( tagName == "status" ) {
     if ( element.text() == "in-progress" )
-      setStatus( KCal::Incidence::StatusInProcess );
+      seStatus( KCal::Incidence::StatusInProcess );
     else if ( element.text() == "completed" )
-      setStatus( KCal::Incidence::StatusCompleted );
+      seStatus( KCal::Incidence::StatusCompleted );
     else if ( element.text() == "waiting-on-someone-else" )
-      setStatus( KCal::Incidence::StatusNeedsAction );
+      seStatus( KCal::Incidence::StatusNeedsAction );
     else if ( element.text() == "deferred" )
       // Guessing a status here
-      setStatus( KCal::Incidence::StatusCanceled );
+      seStatus( KCal::Incidence::StatusCanceled );
     else
       // Default
-      setStatus( KCal::Incidence::StatusNone );
+      seStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
   } else if ( tagName == "parent" ) {
@@ -374,7 +374,7 @@ void Task::setFields( const KCal::Todo* task )
 
   setPriority( task->priority() );
   setPercentCompleted( task->percentComplete() );
-  setStatus( task->status() );
+  seStatus( task->status() );
   setHasStartDate( task->hasStartDate() );
 
   if ( task->hasDueDate() ) {
@@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task )
 
   task->setPriority( priority() );
   task->setPercentComplete( percentCompleted() );
-  task->setStatus( status() );
+  task->seStatus( status() );
   task->setHasStartDate( hasStartDate() );
   task->setHasDueDate( hasDueDate() );
   if ( hasDueDate() )
diff --git a/kresources/kolab/kcal/task.h b/kresources/kolab/kcal/task.h
index f7e7c6d51..6fe318e2c 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -58,12 +58,12 @@ public:
   /// Use this to parse an xml string to a task entry
   /// The caller is responsible for deleting the returned task
   static KCal::Todo* xmlToTask( const TQString& xml, const TQString& tz, KCal::ResourceKolab *res = 0,
-                                const TQString& subResource = TQString::null, Q_UINT32 sernum = 0 );
+                                const TQString& subResource = TQString::null, TQ_UINT32 sernum = 0 );
 
   /// Use this to get an xml string describing this task entry
   static TQString taskToXML( KCal::Todo*, const TQString& tz );
 
-  explicit Task( KCal::ResourceKolab *res, const TQString& subResource, Q_UINT32 sernum,
+  explicit Task( KCal::ResourceKolab *res, const TQString& subResource, TQ_UINT32 sernum,
                  const TQString& tz, KCal::Todo* todo = 0 );
   virtual ~Task();
 
@@ -77,7 +77,7 @@ public:
   virtual void setPercentCompleted( int percent );
   virtual int percentCompleted() const;
 
-  virtual void setStatus( KCal::Incidence::Status status );
+  virtual void seStatus( KCal::Incidence::Status status );
   virtual KCal::Incidence::Status status() const;
 
   virtual void setParent( const TQString& parentUid );
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index d917d0ac2..38f670871 100644
--- a/kresources/kolab/knotes/resourcekolab.cpp
+++ b/kresources/kolab/knotes/resourcekolab.cpp
@@ -52,7 +52,7 @@ static const char* inlineMimeType = "text/calendar";
 
 ResourceKolab::ResourceKolab( const KConfig *config )
   : ResourceNotes( config ), ResourceKolabBase( "ResourceKolab-KNotes" ),
-    mCalendar( TQString::fromLatin1("UTC") )
+    mCalendar( TQString::tqfromLatin1("UTC") )
 {
   if ( !config ) {
     setResourceName( i18n( "Kolab Server" ) );
@@ -105,7 +105,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
     return false;
   }
 
-  TQMap<Q_UINT32, TQString> lst;
+  TQMap<TQ_UINT32, TQString> lst;
   if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) {
     kdError(5500) << "Communication problem in "
                   << "ResourceKolab::getIncidenceList()\n";
@@ -117,7 +117,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   // Populate with the new entries
   const bool silent = mSilent;
   mSilent = true;
-  TQMap<Q_UINT32, TQString>::ConstIterator it;
+  TQMap<TQ_UINT32, TQString>::ConstIterator it;
   for ( it = lst.constBegin(); it != lst.constEnd(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype );
     if ( !journal )
@@ -164,7 +164,7 @@ bool ResourceKolab::addNote( KCal::Journal* journal )
 }
 
 KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource,
-                             Q_UINT32 sernum, const TQString &mimetype )
+                             TQ_UINT32 sernum, const TQString &mimetype )
 {
   KCal::Journal *journal = 0;
 
@@ -178,12 +178,12 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub
   Q_ASSERT( journal );
 
   bool addedOk = journal &&
-                 !mUidMap.contains( journal->uid() ) &&
+                 !mUidMap.tqcontains( journal->uid() ) &&
                  addNote( journal, subresource, sernum );
 
   // for debugging
-  if ( journal && mUidMap.contains( journal->uid() ) ) {
-    kdDebug(5500) << "mUidMap already contains " << journal->uid() << endl;
+  if ( journal && mUidMap.tqcontains( journal->uid() ) ) {
+    kdDebug(5500) << "mUidMap already tqcontains " << journal->uid() << endl;
   }
 
   if ( !addedOk ) {
@@ -194,7 +194,7 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub
   return journal;
 }
 
-bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, Q_UINT32 sernum )
+bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, TQ_UINT32 sernum )
 {
   kdDebug(5500) << "ResourceKolab::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n";
 
@@ -232,7 +232,7 @@ bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource
 bool ResourceKolab::deleteNote( KCal::Journal* journal )
 {
   const TQString uid = journal->uid();
-  if ( !mUidMap.contains( uid ) )
+  if ( !mUidMap.tqcontains( uid ) )
     // Odd
     return false;
 
@@ -270,8 +270,8 @@ KCal::Alarm::List ResourceKolab::alarms( const TQDateTime& from, const TQDateTim
 void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
 {
   TQString subResource;
-  Q_UINT32 sernum;
-  if ( mUidMap.contains( i->uid() ) ) {
+  TQ_UINT32 sernum;
+  if ( mUidMap.tqcontains( i->uid() ) ) {
     subResource = mUidMap[ i->uid() ].resource();
     sernum = mUidMap[ i->uid() ].serialNumber();
   } else { // can this happen?
@@ -293,7 +293,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* i )
  */
 bool ResourceKolab::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int format,
                                            const TQString& note )
 {
@@ -352,7 +352,7 @@ void ResourceKolab::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -372,7 +372,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -408,7 +408,7 @@ void ResourceKolab::fromKMailDelSubresource( const TQString& type,
   emit signalSubresourceRemoved( this, type, subResource );
 }
 
-void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
@@ -422,7 +422,7 @@ void ResourceKolab::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& m
     mimetype = attachmentMimeType;
   else
     mimetype = inlineMimeType;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.constBegin(); it != map.constEnd(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype );
     if ( !journal )
       kdDebug(5500) << "loading note " << it.key() << " failed" << endl;
@@ -440,7 +440,7 @@ TQStringList ResourceKolab::subresources() const
 
 bool ResourceKolab::subresourceActive( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].active();
   }
 
@@ -452,7 +452,7 @@ bool ResourceKolab::subresourceActive( const TQString& res ) const
 
 bool ResourceKolab::subresourceWritable( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].writable();
   }
 
diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h
index 6ff994ccf..cfeeb0eb6 100644
--- a/kresources/kolab/knotes/resourcekolab.h
+++ b/kresources/kolab/knotes/resourcekolab.h
@@ -81,7 +81,7 @@ public:
 
   /// The ResourceKolabBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& note );
+                              TQ_UINT32 sernum, int format, const TQString& note );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -92,7 +92,7 @@ public:
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -111,9 +111,9 @@ signals:
 
 private:
   bool addNote( KCal::Journal* journal, const TQString& resource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   KCal::Journal* addNote( const TQString& data, const TQString& subresource,
-                          Q_UINT32 sernum, const TQString &mimetype );
+                          TQ_UINT32 sernum, const TQString &mimetype );
 
   bool loadSubResource( const TQString& resource, const TQString& mimetype );
 
diff --git a/kresources/kolab/shared/kmailconnection.cpp b/kresources/kolab/shared/kmailconnection.cpp
index 66674abfa..5b2921b94 100644
--- a/kresources/kolab/shared/kmailconnection.cpp
+++ b/kresources/kolab/shared/kmailconnection.cpp
@@ -85,7 +85,7 @@ bool KMailConnection::connectToKMail()
         if ( services[i].find( "anonymous" ) == 0 ) // querying anonymous-XXXXX deadlocks as well, what are those anyway?
           continue; 
         const QCStringList objs = kapp->dcopClient()->remoteObjects( services[i] );
-        if ( objs.contains( dcopObjectId ) ) {
+        if ( objs.tqcontains( dcopObjectId ) ) {
           dcopService = services[i];
           break;
         }
@@ -111,8 +111,8 @@ bool KMailConnection::connectToKMail()
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
-    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
-                              "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
+    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,TQ_UINT32,int,TQString)",
+                              "fromKMailAddIncidence(TQString,TQString,TQ_UINT32,int,TQString)" ) )
       kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
     if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
                               "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
@@ -126,8 +126,8 @@ bool KMailConnection::connectToKMail()
     if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
                               "fromKMailDelSubresource(TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
-    if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
-                              "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
+    if ( !connectKMailSignal( "asyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)",
+                              "fromKMailAsyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)" ) )
       kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
   }
 
@@ -136,7 +136,7 @@ bool KMailConnection::connectToKMail()
 
 bool KMailConnection::fromKMailAddIncidence( const TQString& type,
                                              const TQString& folder,
-                                             Q_UINT32 sernum,
+                                             TQ_UINT32 sernum,
                                              int format,
                                              const TQString& data )
 {
@@ -184,7 +184,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type,
   mResource->fromKMailDelSubresource( type, resource );
 }
 
-void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                 const TQString& type,
                                                 const TQString& folder )
 {
@@ -219,7 +219,7 @@ bool KMailConnection::kmailIncidencesCount( int& count,
   return mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool KMailConnection::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                        const TQString& mimetype,
                                        const TQString& resource,
                                        int startIndex,
@@ -235,7 +235,7 @@ bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 
 bool KMailConnection::kmailGetAttachment( KURL& url,
                                           const TQString& resource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           const TQString& filename )
 {
   if ( !connectToKMail() )
@@ -247,7 +247,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
 
 bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
                                                const TQString & resource,
-                                               Q_UINT32 sernum,
+                                               TQ_UINT32 sernum,
                                                const TQString & filename )
 {
   if ( !connectToKMail() )
@@ -257,7 +257,7 @@ bool KMailConnection::kmailAttachmentMimetype( TQString & mimeType,
 }
 
 bool KMailConnection::kmailListAttachments(TQStringList &list,
-                                            const TQString & resource, Q_UINT32 sernum)
+                                            const TQString & resource, TQ_UINT32 sernum)
 {
   if ( !connectToKMail() )
     return false;
@@ -267,7 +267,7 @@ bool KMailConnection::kmailListAttachments(TQStringList &list,
 }
 
 bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
-                                            Q_UINT32 sernum )
+                                            TQ_UINT32 sernum )
 {
   return connectToKMail()
     && mKMailIcalIfaceStub->deleteIncidenceKolab( resource, sernum )
@@ -275,7 +275,7 @@ bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
 }
 
 bool KMailConnection::kmailUpdate( const TQString& resource,
-                                   Q_UINT32& sernum,
+                                   TQ_UINT32& sernum,
                                    const TQString& subject,
                                    const TQString& plainTextBody,
                                    const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/kolab/shared/kmailconnection.h b/kresources/kolab/shared/kmailconnection.h
index 16b80bfb0..3cf5b826f 100644
--- a/kresources/kolab/shared/kmailconnection.h
+++ b/kresources/kolab/shared/kmailconnection.h
@@ -55,7 +55,7 @@ class KMailConnection : public TQObject, public DCOPObject {
   // These are the methods called by KMail when the resource changes
 k_dcop:
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& xml );
+                              TQ_UINT32 sernum, int format, const TQString& xml );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& xml );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -63,7 +63,7 @@ k_dcop:
                                 const TQString& label, bool writable,
                                 bool alarmRelevant );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map, const TQString& type,
                                  const TQString& folder );
 
 public:
@@ -81,20 +81,20 @@ public:
   bool kmailIncidencesCount( int& count,
                              const TQString& mimetype,
                              const TQString& resource );
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages );
 
-  bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+  bool kmailGetAttachment( KURL& url, const TQString& resource, TQ_UINT32 sernum,
                            const TQString& filename );
   bool kmailAttachmentMimetype( TQString &mimeType, const TQString &resource,
-                                Q_UINT32 sernum, const TQString &filename );
+                                TQ_UINT32 sernum, const TQString &filename );
   bool kmailListAttachments( TQStringList &list, const TQString &resource,
-                             Q_UINT32 sernum );
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+                             TQ_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
   bool kmailUpdate( const TQString& resource,
-                    Q_UINT32& sernum,
+                    TQ_UINT32& sernum,
                     const TQString& subject,
                     const TQString& plainTextBody,
                     const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index b7f502576..978481072 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -44,8 +44,8 @@ using namespace Kolab;
 
 
 KolabBase::KolabBase( const TQString& tz )
-  : mCreationDate( TQDateTime::currentDateTime() ),
-    mLastModified( TQDateTime::currentDateTime() ),
+  : mCreationDate( TQDateTime::tqcurrentDateTime() ),
+    mLastModified( TQDateTime::tqcurrentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
     mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
 {
@@ -94,7 +94,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
   kdDebug(5006) << "Creation time string: " << creationString << endl;
   TQDateTime creationDate;
   if ( creationString.isEmpty() ) {
-    creationDate = TQDateTime::currentDateTime();
+    creationDate = TQDateTime::tqcurrentDateTime();
     kdDebug(5006) << "Creation date set to current time\n";
   }
   else {
@@ -103,7 +103,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
   }
   TQDateTime modified = addressee->revision();
   if ( !modified.isValid() )
-    modified = TQDateTime::currentDateTime();
+    modified = TQDateTime::tqcurrentDateTime();
   setLastModified( modified );
   if ( modified < creationDate ) {
     // It's not possible that the modification date is earlier than creation
@@ -259,7 +259,7 @@ bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
       const TQString tagName = e.tagName();
 
       if ( tagName == "display-name" ) {
-        // Quote the text in case it contains commas or other quotable chars.
+        // Quote the text in case it tqcontains commas or other quotable chars.
         TQString tusername = KPIM::quoteNameIfNecessary( e.text() );
 
         TQString tname, temail;
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index 2db2117db..26ef00db6 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -83,7 +83,7 @@ bool ResourceKolabBase::kmailIncidencesCount( int &count,
   return mConnection->kmailIncidencesCount( count, mimetype, resource );
 }
 
-bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool ResourceKolabBase::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                          const TQString& mimetype,
                                          const TQString& resource,
                                          int startIndex,
@@ -93,27 +93,27 @@ bool ResourceKolabBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 }
 
 bool ResourceKolabBase::kmailGetAttachment( KURL& url, const TQString& resource,
-                                            Q_UINT32 sernum,
+                                            TQ_UINT32 sernum,
                                             const TQString& filename ) const
 {
   return mConnection->kmailGetAttachment( url, resource, sernum, filename );
 }
 
 bool ResourceKolabBase::kmailAttachmentMimetype( TQString & mimeType, TQString & resource,
-                                                 Q_UINT32 sernum, const TQString & filename ) const
+                                                 TQ_UINT32 sernum, const TQString & filename ) const
 {
   return mConnection->kmailAttachmentMimetype( mimeType, resource, sernum, filename );
 }
 
 bool ResourceKolabBase::kmailListAttachments( TQStringList &list,
                                               const TQString & resource,
-                                              Q_UINT32 sernum ) const
+                                              TQ_UINT32 sernum ) const
 {
   return mConnection->kmailListAttachments( list, resource, sernum );
 }
 
 bool ResourceKolabBase::kmailDeleteIncidence( const TQString& resource,
-                                              Q_UINT32 sernum )
+                                              TQ_UINT32 sernum )
 {
   return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
 }
@@ -126,7 +126,7 @@ static TQString plainTextBody()
     " Groupware format.\nFor a list of such email clients please"
     " visit\n%1" );
   const char * url = "http://www.kolab.org/kolab2-clients.html";
-  TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+  TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).arg( url );
   TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
   if ( firstPartText != firstPartTextUntranslated ) {
     firstPartText.append("\n\n-----------------------------------------------------\n\n");
@@ -136,7 +136,7 @@ static TQString plainTextBody()
 }
 
 bool ResourceKolabBase::kmailUpdate( const TQString& resource,
-                                     Q_UINT32& sernum,
+                                     TQ_UINT32& sernum,
                                      const TQString& xml,
                                      const TQString& mimetype,
                                      const TQString& subject,
diff --git a/kresources/kolab/shared/resourcekolabbase.h b/kresources/kolab/shared/resourcekolabbase.h
index 1bd8b9515..565be2675 100644
--- a/kresources/kolab/shared/resourcekolabbase.h
+++ b/kresources/kolab/shared/resourcekolabbase.h
@@ -81,7 +81,7 @@ public:
   // These are the methods called by KMail when the resource changes
   virtual bool fromKMailAddIncidence( const TQString& type,
                                       const TQString& resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       int format,
                                       const TQString& data ) = 0;
   virtual void fromKMailDelIncidence( const TQString& type,
@@ -97,7 +97,7 @@ public:
   virtual void fromKMailDelSubresource( const TQString& type,
                                         const TQString& resource ) = 0;
 
-  virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  virtual void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                          const TQString& type,
                                          const TQString& folder ) = 0;
 protected:
@@ -119,7 +119,7 @@ protected:
 
   /// Get the mimetype attachments from a chunk of messages from this folder.
   /// Returns a TQMap with serialNumber/attachment pairs.
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages ) const;
@@ -131,20 +131,20 @@ public: // for Contact
   /// be called by the resource after obtaining the incidence.
   /// The resource must delete the temp file.
   bool kmailGetAttachment( KURL& url, const TQString& resource,
-                           Q_UINT32 sernum,
+                           TQ_UINT32 sernum,
                            const TQString& filename ) const;
 
   /** Get the mimetype of the specified attachment. */
   bool kmailAttachmentMimetype( TQString &mimeType, TQString &resource,
-                                Q_UINT32 sernum, const TQString &filename ) const;
+                                TQ_UINT32 sernum, const TQString &filename ) const;
 
   /// List all attachments of a mail.
   bool kmailListAttachments( TQStringList &list, const TQString &resource,
-                             Q_UINT32 sernum ) const;
+                             TQ_UINT32 sernum ) const;
 
 protected:
   /// Delete an incidence.
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
 
   KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
 
@@ -152,7 +152,7 @@ protected:
 
   /// Update an incidence. The list of attachments are URLs.
   /// The parameter sernum is updated with the right KMail serial number
-  bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+  bool kmailUpdate( const TQString& resource, TQ_UINT32& sernum,
                     const TQString& xml,
                     const TQString& mimetype,
                     const TQString& subject,
diff --git a/kresources/kolab/shared/subresource.cpp b/kresources/kolab/shared/subresource.cpp
index de4048fc7..a7ffb8f90 100644
--- a/kresources/kolab/shared/subresource.cpp
+++ b/kresources/kolab/shared/subresource.cpp
@@ -103,7 +103,7 @@ int SubResource::completionWeight() const
   return mCompletionWeight;
 }
 
-StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, TQ_UINT32 sernum )
   : mResource( resource ), mSerialNumber( sernum )
 {
 }
@@ -122,12 +122,12 @@ TQString StorageReference::resource() const
   return mResource;
 }
 
-void StorageReference::setSerialNumber( Q_UINT32 serialNumber )
+void StorageReference::setSerialNumber( TQ_UINT32 serialNumber )
 {
   mSerialNumber = serialNumber;
 }
 
-Q_UINT32 StorageReference::serialNumber() const
+TQ_UINT32 StorageReference::serialNumber() const
 {
   return mSerialNumber;
 }
diff --git a/kresources/kolab/shared/subresource.h b/kresources/kolab/shared/subresource.h
index 87f98e6dd..de7a92e93 100644
--- a/kresources/kolab/shared/subresource.h
+++ b/kresources/kolab/shared/subresource.h
@@ -96,18 +96,18 @@ public:
   // Just for QMap
   StorageReference() {}
 
-  StorageReference( const TQString& resource, Q_UINT32 sernum );
+  StorageReference( const TQString& resource, TQ_UINT32 sernum );
   virtual ~StorageReference();
 
   virtual void setResource( const TQString& resource );
   virtual TQString resource() const;
 
-  virtual void setSerialNumber( Q_UINT32 serialNumber );
-  virtual Q_UINT32 serialNumber() const;
+  virtual void setSerialNumber( TQ_UINT32 serialNumber );
+  virtual TQ_UINT32 serialNumber() const;
 
 private:
   TQString mResource;
-  Q_UINT32 mSerialNumber;
+  TQ_UINT32 mSerialNumber;
 };
 
 typedef TQMap<TQString, StorageReference> UidMap;
diff --git a/kresources/lib/addressbookadaptor.cpp b/kresources/lib/addressbookadaptor.cpp
index 80da39421..65ca96290 100644
--- a/kresources/lib/addressbookadaptor.cpp
+++ b/kresources/lib/addressbookadaptor.cpp
@@ -62,7 +62,7 @@ TQString AddressBookAdaptor::mimeType() const
 
 bool AddressBookAdaptor::localItemExists( const TQString &localId )
 {
-  KABC::Addressee a = mResource->findByUid( localId );
+  KABC::Addressee a = mResource->tqfindByUid( localId );
   return !a.isEmpty();
 }
 
@@ -85,7 +85,7 @@ bool AddressBookAdaptor::localItemHasChanged( const TQString &localId )
 
 void AddressBookAdaptor::deleteItem( const TQString &localId )
 {
-  KABC::Addressee a = mResource->findByUid( localId );
+  KABC::Addressee a = mResource->tqfindByUid( localId );
   if ( !a.isEmpty() ) {
     mResource->removeAddressee( a );
     mResource->clearChange( a.uid() );
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index 25fd7d826..0a530361f 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -73,12 +73,12 @@ void FolderConfig::setFolderLister( FolderLister *f )
   
   TQValueList<FolderListView::Property> types;
   TQValueList<FolderLister::ContentType> suptypes( mFolderLister->supportedTypes() );
-  if ( suptypes.contains( FolderLister::Event ) ) types << FolderListView::Event;
-  if ( suptypes.contains( FolderLister::Todo ) ) types << FolderListView::Todo;
-  if ( suptypes.contains( FolderLister::Journal ) ) types << FolderListView::Journal;
-  if ( suptypes.contains( FolderLister::Contact ) ) types << FolderListView::Contact;
-  if ( suptypes.contains( FolderLister::All ) ) types << FolderListView::All;
-  if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
+  if ( suptypes.tqcontains( FolderLister::Event ) ) types << FolderListView::Event;
+  if ( suptypes.tqcontains( FolderLister::Todo ) ) types << FolderListView::Todo;
+  if ( suptypes.tqcontains( FolderLister::Journal ) ) types << FolderListView::Journal;
+  if ( suptypes.tqcontains( FolderLister::Contact ) ) types << FolderListView::Contact;
+  if ( suptypes.tqcontains( FolderLister::All ) ) types << FolderListView::All;
+  if ( suptypes.tqcontains( FolderLister::Unknown ) ) types << FolderListView::Unknown;
 
   mFolderList->setEnabledTypes( types );
   connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) );
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index cd203463c..a39b316a9 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -50,11 +50,11 @@ void FolderLister::setWriteDestinationId( KPIM::FolderLister::ContentType type,
 
 TQString FolderLister::writeDestinationId( KPIM::FolderLister::ContentType type ) const
 {
-  if ( mWriteDestinationId.contains( type ) ) {
+  if ( mWriteDestinationId.tqcontains( type ) ) {
     return mWriteDestinationId[type];
-  } else if ( mWriteDestinationId.contains( KPIM::FolderLister::All ) ) {
+  } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::All ) ) {
     return mWriteDestinationId[ KPIM::FolderLister::All ];
-  } else if ( mWriteDestinationId.contains( KPIM::FolderLister::Unknown ) ) {
+  } else if ( mWriteDestinationId.tqcontains( KPIM::FolderLister::Unknown ) ) {
     return mWriteDestinationId[ KPIM::FolderLister::Unknown ];
   } else return TQString::null;
 }
@@ -196,7 +196,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
 
   TQStringList defaultFolders;
   #define writeDestination(type) \
-    if ( mWriteDestinationId.contains( type ) ) \
+    if ( mWriteDestinationId.tqcontains( type ) ) \
       defaultFolders << mWriteDestinationId[type]; \
     else defaultFolders << TQString::null;
   writeDestination( KPIM::FolderLister::Event );
@@ -262,7 +262,7 @@ void FolderLister::doRetrieveFolder( const KURL &u )
 
   KURL url( u );
   if ( adaptor() ) adaptor()->adaptDownloadUrl( url );
-  if ( mUrls.contains( url ) || mProcessedPathes.contains( url.path(-1) ) ) {
+  if ( mUrls.tqcontains( url ) || mProcessedPathes.tqcontains( url.path(-1) ) ) {
     kdDebug()<<"Item "<<u.path(-1)<<" is already being downloaded "<<endl;
   } else {
 
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index b29e61c9d..d0a11f434 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -54,37 +54,37 @@ void FolderListView::setEnabledTypes( const TQValueList<Property> &types )
 kdDebug() << "FolderListView::setEnabledTypes" << endl;
   for ( int i = 0; i< columns(); ++i ) removeColumn( i );
   mTypes = types;
-  if ( !mTypes.contains( FolderName ) ) mTypes.prepend( FolderName );
+  if ( !mTypes.tqcontains( FolderName ) ) mTypes.prepend( FolderName );
   mColumnMap[FolderName] = addColumn( i18n("Folder") );
   mTypeMap[mColumnMap[FolderName]] = FolderName;
 
 
-  if ( mTypes.contains( Event ) ) {
+  if ( mTypes.tqcontains( Event ) ) {
     mColumnMap[Event] = addColumn( i18n("Short column header meaning default for new events", "Events") );
     mTypeMap[mColumnMap[Event]] = Event;
   } else mColumnMap[Event] = -1;
 
-  if ( mTypes.contains( Todo ) ) {
+  if ( mTypes.tqcontains( Todo ) ) {
     mColumnMap[Todo] = addColumn( i18n("Short column header meaning default for new to-dos", "Todos") );
     mTypeMap[mColumnMap[Todo]] = Todo;
   } else mColumnMap[Todo] = -1;
 
-  if ( mTypes.contains( Journal ) ) {
+  if ( mTypes.tqcontains( Journal ) ) {
     mColumnMap[Journal] = addColumn( i18n("Short column header meaning default for new journals", "Journals") );
     mTypeMap[mColumnMap[Journal]] = Journal;
   } else mColumnMap[Journal] = -1;
 
-  if ( mTypes.contains( Contact ) ) {
+  if ( mTypes.tqcontains( Contact ) ) {
     mColumnMap[Contact] = addColumn( i18n("Short column header meaning default for new contacts", "Contacts") );
     mTypeMap[mColumnMap[Contact]] = Contact;
   } else mColumnMap[Contact] = -1;
 
-  if ( mTypes.contains( All ) ) {
+  if ( mTypes.tqcontains( All ) ) {
     mColumnMap[All] = addColumn( i18n("Short column header meaning default for all items", "All") );
     mTypeMap[mColumnMap[All]] = All;
   } else mColumnMap[All] = -1;
 
-  if ( mTypes.contains( Unknown ) ) {
+  if ( mTypes.tqcontains( Unknown ) ) {
     mColumnMap[Unknown] = addColumn( i18n("Short column header meaning default for unknown new items", "Unknown") );
     mTypeMap[mColumnMap[Unknown]] = Unknown;
   } else mColumnMap[Unknown] = -1;
@@ -103,27 +103,27 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
   m.setItemChecked( id, i->isOn() );
   m.insertSeparator();
 
-  if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.tqcontains( Event ) ) ) {
     id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event );
     m.setItemChecked( id, i->isDefault( Event ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.tqcontains( Todo ) ) ) {
     id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo );
     m.setItemChecked( id, i->isDefault( Todo ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.tqcontains( Journal ) ) ) {
     id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal );
     m.setItemChecked( id, i->isDefault( Journal ) );
   }
-  if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) {
+  if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.tqcontains( Contact ) ) ) {
     id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact );
     m.setItemChecked( id, i->isDefault( Contact ) );
   }
-  if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) {
+  if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.tqcontains( All ) ) ) {
     id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All );
     m.setItemChecked( id, i->isDefault( All ) );
   }
-  if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) {
+  if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.tqcontains( Unknown ) ) ) {
     id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown );
     m.setItemChecked( id, i->isDefault( Unknown ) );
   }
@@ -134,7 +134,7 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos
 void FolderListView::showPopupMenu( TQListViewItem *i )
 {
   if ( dynamic_cast<FolderListItem*>(i) )
-    showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(itemRect(i).topLeft()) );
+    showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(tqitemRect(i).topLeft()) );
 }
 
 void FolderListView::slotPopupHandler( int z )
@@ -152,7 +152,7 @@ void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint&
     }
     else if ( btn == Qt::LeftButton && c > 0 ) {
       // map pos to item/column and call FolderListItem::activate(col, pos)
-      ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
+      ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
 //     } else {
 //       KListView::slotMousePressed( btn, i, pos, c );
     }
@@ -184,7 +184,7 @@ void FolderListItem::activate( int column, const TQPoint &localPos )
     default:
       return;
   }
-  if ( !TQRect( x, 0, w, BoxSize ).contains( localPos ) )
+  if ( !TQRect( x, 0, w, BoxSize ).tqcontains( localPos ) )
     changeProperty( prop );
 }
 
@@ -242,7 +242,7 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i
   if ( !lv ) return;
 
   // use a private color group and set the text/highlighted text colors
-//   TQColorGroup mcg = lv->viewport()->colorGroup();
+//   TQColorGroup mcg = lv->viewport()->tqcolorGroup();
   FolderListView::Property prop( mFolderListView->typeForColumn(col) );
 
   if ( prop == FolderListView::FolderName ) {
@@ -293,4 +293,4 @@ void FolderListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col, i
 //END
 
 #include "folderlistview.moc"
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/kresources/lib/folderlistview.h b/kresources/lib/folderlistview.h
index e7b634ef6..627668305 100644
--- a/kresources/lib/folderlistview.h
+++ b/kresources/lib/folderlistview.h
@@ -54,8 +54,8 @@ class FolderListView : public KListView
     void emitChanged() { emit changed(); };
     void setEnabledTypes( const TQValueList<Property> &types );
 
-    int columnForType( Property prop ) const { if ( mColumnMap.contains(prop) ) return mColumnMap[prop]; else return -1;}
-    Property typeForColumn( int col ) const { if ( mTypeMap.contains( col ) ) return mTypeMap[col]; else return Unknown; }
+    int columnForType( Property prop ) const { if ( mColumnMap.tqcontains(prop) ) return mColumnMap[prop]; else return -1;}
+    Property typeForColumn( int col ) const { if ( mTypeMap.tqcontains( col ) ) return mTypeMap[col]; else return Unknown; }
 
   private slots:
     /* Display a popupmenu for item i at item position */
@@ -126,4 +126,4 @@ class FolderListItem : public QCheckListItem
 
 #endif
 
-// kate: space-indent on; indent-width 2; replace-tabs on;
+// kate: space-indent on; indent-width 2; tqreplace-tabs on;
diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp
index c4d343598..8703c4415 100644
--- a/kresources/lib/folderselectdialog.cpp
+++ b/kresources/lib/folderselectdialog.cpp
@@ -42,16 +42,16 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
   : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true)
 {
   TQFrame* frame = makeMainWidget();
-  TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   TQLabel* labelWidget = new TQLabel( label, frame );
-  layout->addWidget( labelWidget );
+  tqlayout->addWidget( labelWidget );
 
   mListBox = new KListBox( frame );
   mListBox->insertStringList( list );
   mListBox->setSelected( 0, true );
   mListBox->ensureCurrentVisible();
-  layout->addWidget( mListBox, 10 );
+  tqlayout->addWidget( mListBox, 10 );
 
   connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
            TQT_SLOT( slotOk() ) );
@@ -60,7 +60,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
 
   mListBox->setFocus();
 
-  layout->addStretch();
+  tqlayout->addStretch();
 
   setMinimumWidth( 320 );
 }
diff --git a/kresources/lib/groupwaredataadaptor.cpp b/kresources/lib/groupwaredataadaptor.cpp
index 033ea81de..53b2ecdb4 100644
--- a/kresources/lib/groupwaredataadaptor.cpp
+++ b/kresources/lib/groupwaredataadaptor.cpp
@@ -78,7 +78,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadNewJob, baseurl=" << baseurl.url()
   if ( job ) {
     kdDebug() << "Adding If-None-Match " << endl;
     TQString header;
-    if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
+    if ( job->outgoingMetaData().tqcontains("customHTTPHeader") ) {
       header = job->outgoingMetaData()["customHTTPHeader"];
       header += "\r\n";
     }
@@ -96,7 +96,7 @@ kdDebug()<<"GroupwareUploadItem::createUploadJob" << endl;
   if ( job && adaptor ) {
   kdDebug()<<"Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl;
     TQString header;
-    if ( job->outgoingMetaData().contains("customHTTPHeader") ) {
+    if ( job->outgoingMetaData().tqcontains("customHTTPHeader") ) {
       header = job->outgoingMetaData()["customHTTPHeader"];
       header += "\r\n";
     }
@@ -262,7 +262,7 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( KIO::Job *job, const TQString
 TQString GroupwareDataAdaptor::uidFromJob( KIO::Job *job ) const
 {
 kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<<job<<")"<<endl;
-  if ( mJobUIDMap.contains( job ) ) {
+  if ( mJobUIDMap.tqcontains( job ) ) {
     kdDebug()<<"  Contained: "<< mJobUIDMap[job] << endl;
     return mJobUIDMap[ job ];
   } else {
diff --git a/kresources/lib/groupwaredataadaptor.h b/kresources/lib/groupwaredataadaptor.h
index 52021a07b..95119354c 100644
--- a/kresources/lib/groupwaredataadaptor.h
+++ b/kresources/lib/groupwaredataadaptor.h
@@ -240,7 +240,7 @@ Q_OBJECT
     virtual FolderLister::Entry::List defaultFolders();
     virtual TQValueList<FolderLister::ContentType> supportedTypes() = 0;
     virtual bool supports( FolderLister::ContentType type ) {
-      return supportedTypes().contains( type );
+      return supportedTypes().tqcontains( type );
     }
 
 
diff --git a/kresources/lib/groupwaredownloadjob.cpp b/kresources/lib/groupwaredownloadjob.cpp
index 7bfa804a7..85f9c9f34 100644
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@@ -229,9 +229,9 @@ void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL,
 {
   KURL url( remoteURL );
   adaptor()->adaptDownloadUrl( url );
-  if ( !mItemsForDownload.contains( url ) &&
-       !mItemsDownloading.contains( url ) &&
-       !mItemsDownloaded.contains( url ) ) {
+  if ( !mItemsForDownload.tqcontains( url ) &&
+       !mItemsDownloading.tqcontains( url ) &&
+       !mItemsDownloaded.tqcontains( url ) ) {
     mItemsForDownload.insert( url, type );
   }
 }
@@ -240,7 +240,7 @@ void GroupwareDownloadJob::slotItemToDownload( const KURL &remoteURL,
 void GroupwareDownloadJob::slotItemOnServer( const KURL &remoteURL )
 {
 kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")" << endl;
-  if ( !mCurrentlyOnServer.contains( remoteURL ) ) {
+  if ( !mCurrentlyOnServer.tqcontains( remoteURL ) ) {
     mCurrentlyOnServer.append( remoteURL );
   }
 }
@@ -249,9 +249,9 @@ kdDebug()<<"GroupwareDownloadJob::slotItemOnServer( " << remoteURL.url() << ")"
 void GroupwareDownloadJob::slotItemDownloadError( const KURL &remoteURL, const TQString &/*error*/ )
 {
   // TODO: Error handling!
-  if ( mItemsDownloading.contains( remoteURL ) ) {
+  if ( mItemsDownloading.tqcontains( remoteURL ) ) {
     mItemsDownloadError[ remoteURL ] = mItemsDownloading[ remoteURL ];
-  } else if ( mItemsForDownload.contains( remoteURL ) ) {
+  } else if ( mItemsForDownload.tqcontains( remoteURL ) ) {
     mItemsDownloadError[ remoteURL ] = mItemsForDownload[ remoteURL ];
   }
 }
@@ -261,15 +261,15 @@ void GroupwareDownloadJob::slotItemDownloaded( const TQString &localID,
          const KURL &remoteURL, const TQString &fingerprint )
 {
 kdDebug()<<"GroupwareDownloadJob::slotItemDownloaded( " << localID << ", " << remoteURL.url() << ", " << fingerprint << ")" << endl;
-  if ( mItemsForDownload.contains( remoteURL ) ) {
+  if ( mItemsForDownload.tqcontains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = mItemsForDownload[ remoteURL ];
     mItemsForDownload.remove( remoteURL );
   }
-  if ( mItemsDownloading.contains( remoteURL ) ) {
+  if ( mItemsDownloading.tqcontains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = mItemsDownloading[ remoteURL ];
     mItemsDownloading.remove( remoteURL );
   }
-  if ( !mItemsDownloaded.contains( remoteURL ) ) {
+  if ( !mItemsDownloaded.tqcontains( remoteURL ) ) {
     mItemsDownloaded[ remoteURL ] = KPIM::FolderLister::Unknown;
   }
   adaptor()->idMapper()->setRemoteId( localID, remoteURL.path() );
diff --git a/kresources/lib/kcal_resourcegroupwarebase.cpp b/kresources/lib/kcal_resourcegroupwarebase.cpp
index 823943c2b..11db0e81e 100644
--- a/kresources/lib/kcal_resourcegroupwarebase.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebase.cpp
@@ -219,7 +219,7 @@ void ResourceGroupwareBase::enter_loop()
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
   dummy.setFocusPolicy( TQWidget::NoFocus );
   qt_enter_modal(&dummy);
-  qApp->enter_loop();
+  tqApp->enter_loop();
   qt_leave_modal(&dummy);
 }
 // END:COPIED
@@ -228,7 +228,7 @@ void ResourceGroupwareBase::slotLoginJobResult( KIO::Job *job )
 {
   if ( !adaptor() ) return;
   mLoginFinished = adaptor()->interpretLoginJobResult( job );
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 
 void ResourceGroupwareBase::doClose()
@@ -251,7 +251,7 @@ void ResourceGroupwareBase::slotLogoffJobResult( KIO::Job *job )
   if ( !adaptor() ) return;
   adaptor()->interpretLogoffJobResult( job );
   // TODO: Do we really need to block while waiting for the job to return?
-  qApp->exit_loop();
+  tqApp->exit_loop();
 }
 
 bool ResourceGroupwareBase::doLoad()
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index be32291be..d2a8d55cd 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -432,7 +432,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
           continue;
         }
         TQString uid = uidElement.text();
-        if ( ! m_uids.contains( uid ) ) {
+        if ( ! m_uids.tqcontains( uid ) ) {
           m_uids[uid] = 1;
           handleRecurrence(uid);
           successCount++;
diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/kresources/newexchange/exchangeconvertercontact.cpp
index 732c9db15..88ad3a158 100644
--- a/kresources/newexchange/exchangeconvertercontact.cpp
+++ b/kresources/newexchange/exchangeconvertercontact.cpp
@@ -461,7 +461,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
 
   TQStringList emails = addr.emails();
   TQString prefemail = addr.preferredEmail();
-  if ( emails.contains( prefemail ) )
+  if ( emails.tqcontains( prefemail ) )
     emails.remove( prefemail );
   emails.prepend( prefemail );
   if ( emails.count() > 0 ) {
diff --git a/kresources/scalix/kabc/resourcescalix.cpp b/kresources/scalix/kabc/resourcescalix.cpp
index 31ccdf2c9..55b2ed2ec 100644
--- a/kresources/scalix/kabc/resourcescalix.cpp
+++ b/kresources/scalix/kabc/resourcescalix.cpp
@@ -155,7 +155,7 @@ void KABC::ResourceScalix::releaseSaveTicket( Ticket* ticket )
 
 TQString KABC::ResourceScalix::loadContact( const TQString& contactData,
                                           const TQString& subResource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           KMailICalIface::StorageFormat )
 {
   KABC::Addressee addr = Contact::fromXml( contactData );
@@ -204,7 +204,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
   }
 
   for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
-    TQMap<Q_UINT32, TQString> lst;
+    TQMap<TQ_UINT32, TQString> lst;
 
     if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
       kdError() << "Communication problem in ResourceScalix::load()\n";
@@ -213,7 +213,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
       return false;
     }
 
-    for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+    for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
       loadContact( it.data(), subResource, it.key(), format );
     }
     if ( progressId ) {
@@ -316,7 +316,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
 {
   const TQString uid = addr.uid();
   TQString subResource;
-  Q_UINT32 sernum;
+  TQ_UINT32 sernum;
   if ( mUidMap.find( uid ) != mUidMap.end() ) {
     subResource = mUidMap[ uid ].resource();
     if ( !subresourceWritable( subResource ) ) {
@@ -377,7 +377,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
   const TQString uid = addr.uid();
   //kdDebug(5650) << k_funcinfo << uid << endl;
   bool ok = false;
-  if ( mUidMap.contains( uid ) ) {
+  if ( mUidMap.tqcontains( uid ) ) {
     mUidsPendingUpdate.append( uid );
   } else {
     mUidsPendingAdding.append( uid );
@@ -414,7 +414,7 @@ void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
  */
 bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
                                                  const TQString& subResource,
-                                                 Q_UINT32 sernum,
+                                                 TQ_UINT32 sernum,
                                                  int format,
                                                  const TQString& contactXML )
 {
@@ -429,8 +429,8 @@ bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Emit "addressbook changed" if this comes from kmail and not from the GUI
-  if ( !mUidsPendingAdding.contains( uid )
-       && !mUidsPendingUpdate.contains( uid ) ) {
+  if ( !mUidsPendingAdding.tqcontains( uid )
+       && !mUidsPendingUpdate.tqcontains( uid ) ) {
     addressBook()->emitAddressBookChanged();
   } else {
     mUidsPendingAdding.remove( uid );
@@ -451,11 +451,11 @@ void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
   //kdDebug(5650) << k_funcinfo << uid << endl;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.contains( uid ) ) {
+  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     mAddrMap.remove( uid );
@@ -483,7 +483,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -500,7 +500,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
 {
   if( type != s_kmailContentsType ) return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -535,13 +535,13 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
 
 
 
-void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                     const TQString& /* type */,
                                                     const TQString& folder )
 {
   // FIXME
   KMailICalIface::StorageFormat format = KMailICalIface::StorageXML;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     loadContact( it.data(), folder, it.key(), format );
   }
   if ( !addressBook() ){
@@ -557,7 +557,7 @@ TQStringList KABC::ResourceScalix::subresources() const
 
 bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].active();
   }
 
@@ -569,7 +569,7 @@ bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) cons
 
 bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].writable();
   }
   return false; //better a safe default
@@ -577,7 +577,7 @@ bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) co
 
 int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].completionWeight();
   }
 
@@ -588,7 +588,7 @@ int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresour
 
 TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) const
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     return mSubResources[ subresource ].label();
   }
 
@@ -598,7 +598,7 @@ TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) c
 
 void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setCompletionWeight( completionWeight );
   } else {
     kdDebug(5650) << "setSubresourceCompletionWeight: subresource " << subresource << " not found" << endl;
@@ -617,7 +617,7 @@ TQMap<TQString, TQString> KABC::ResourceScalix::uidToResourceMap() const
 
 void KABC::ResourceScalix::setSubresourceActive( const TQString &subresource, bool active )
 {
-  if ( mSubResources.contains( subresource ) ) {
+  if ( mSubResources.tqcontains( subresource ) ) {
     mSubResources[ subresource ].setActive( active );
     load();
   } else {
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index 25eca7e49..70eb7c92b 100644
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@@ -112,12 +112,12 @@ public:
   void fromKMailDelSubresource( const TQString& type, const TQString& id );
 
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& contact );
+                              TQ_UINT32 sernum, int format, const TQString& contact );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& contact );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -153,7 +153,7 @@ protected:
   bool loadSubResource( const TQString& subResource );
   bool loadSubResourceHelper( const TQString& subResource, const char* mimetype, KMailICalIface::StorageFormat format );
   TQString loadContact( const TQString& contactData, const TQString& subResource,
-                       Q_UINT32 sernum, const KMailICalIface::StorageFormat format );
+                       TQ_UINT32 sernum, const KMailICalIface::StorageFormat format );
 
   TQString configFile() const {
     return Scalix::ResourceScalixBase::configFile( "kabc" );
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 63e964eb9..1d74c5709 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -63,7 +63,7 @@ static const char* incidenceInlineMimeType = "text/calendar";
 
 ResourceScalix::ResourceScalix( const KConfig *config )
   : ResourceCalendar( config ), ResourceScalixBase( "ResourceScalix-libkcal" ),
-    mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
+    mCalendar( TQString::tqfromLatin1("UTC") ), mOpen( false )
 {
   setType( "scalix" );
   connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
@@ -159,7 +159,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
                            : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
                            : i18n( "Loading events..." );
-  const bool useProgress = qApp && qApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
+  const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
   if ( useProgress )
     (void)::Observer::self(); // ensure kio_uiserver is running
   UIServer_stub uiserver( "kio_uiserver", "UIServer" );
@@ -172,7 +172,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   }
 
   for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) {
-    TQMap<Q_UINT32, TQString> lst;
+    TQMap<TQ_UINT32, TQString> lst;
     if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
       kdError(5650) << "Communication problem in ResourceScalix::load()\n";
       if ( progressId )
@@ -182,7 +182,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
 
     { // for RAII scoping below
       TemporarySilencer t( this );
-      for( TQMap<Q_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
+      for( TQMap<TQ_UINT32, TQString>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
         addIncidence( mimetype, it.data(), subResource, it.key() );
       }
     }
@@ -269,24 +269,24 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
 {
   if ( incidencebase->isReadOnly() ) return; // Should not happen (TM)
   incidencebase->setSyncStatus( KCal::Event::SYNCMOD );
-  incidencebase->setLastModified( TQDateTime::currentDateTime() );
+  incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
 
   const TQString uid = incidencebase->uid();
 
-  if ( mUidsPendingUpdate.contains( uid ) || mUidsPendingAdding.contains( uid ) ) {
+  if ( mUidsPendingUpdate.tqcontains( uid ) || mUidsPendingAdding.tqcontains( uid ) ) {
     /* We are currently processing this event ( removing and readding or
      * adding it ). If so, ignore this update. Keep the last of these around
      * and process once we hear back from KMail on this event. */
-    mPendingUpdates.replace( uid, incidencebase );
+    mPendingUpdates.tqreplace( uid, incidencebase );
     return;
   }
 
   TQString subResource;
-  Q_UINT32 sernum = 0;
-  if ( mUidMap.contains( uid ) ) {
+  TQ_UINT32 sernum = 0;
+  if ( mUidMap.tqcontains( uid ) ) {
     subResource = mUidMap[ uid ].resource();
     sernum = mUidMap[ uid ].serialNumber();
     mUidsPendingUpdate.append( uid );
@@ -294,7 +294,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   sendKMailUpdate( incidencebase, subResource, sernum );
 }
 
-void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subresource, Q_UINT32 sernum )
+void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subresource, TQ_UINT32 sernum )
 {
     if ( ! inc )
         return;
@@ -344,7 +344,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
   }
 }
 void ResourceScalix::addIncidence( const char* mimetype, const TQString& data,
-                                  const TQString& subResource, Q_UINT32 sernum )
+                                  const TQString& subResource, TQ_UINT32 sernum )
 {
   // This uses pointer comparison, so it only works if we use the static
   // objects defined in the top of the file
@@ -354,7 +354,7 @@ void ResourceScalix::addIncidence( const char* mimetype, const TQString& data,
 
 
 bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const TQString& subresource,
-                                     Q_UINT32 sernum )
+                                     TQ_UINT32 sernum )
 {
   const TQString& type = incidencebase->type();
   const char* mimetype = 0;
@@ -390,14 +390,14 @@ bool ResourceScalix::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const
   // behold, sernum is an in-parameter
   const bool rc = kmailUpdate( subresource, sernum, data, mimetype, subject, customHeaders );
   // update the serial number
-  if ( mUidMap.contains( incidencebase->uid() ) ) {
+  if ( mUidMap.tqcontains( incidencebase->uid() ) ) {
     mUidMap[ incidencebase->uid() ].setSerialNumber( sernum );
   }
   return rc;
 }
 
 bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _subresource,
-                                  Q_UINT32 sernum )
+                                  TQ_UINT32 sernum )
 {
   Q_ASSERT( incidence );
   if ( !incidence ) return false;
@@ -450,7 +450,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
      * We know the new state, so lets just not do much at all. The old incidence
      * in the calendar remains valid, but the serial number changed, so we need to
      * update that */
-    if ( ourOwnUpdate = mUidsPendingUpdate.contains( uid ) ) {
+    if ( ourOwnUpdate = mUidsPendingUpdate.tqcontains( uid ) ) {
       mUidsPendingUpdate.remove( uid );
       mUidMap.remove( uid );
       mUidMap[ uid ] = StorageReference( subResource, sernum );
@@ -460,7 +460,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
        * unless the folder is read-only, in which case the user should not be
        * offered a means of putting mails in a folder she'll later be unable to
        * upload. Skip the incidence, in this case. */
-      if ( mUidMap.contains( uid )
+      if ( mUidMap.tqcontains( uid )
           && ( mUidMap[ uid ].resource() == subResource ) ) {
         if ( (*map)[ subResource ].writable() ) {
           resolveConflict( incidence, subResource, sernum );
@@ -472,7 +472,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
        * we've already added it, and listen to updates from KOrganizer for it. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         mCalendar.addIncidence( incidence );
         incidence->registerObserver( this );
       }
@@ -489,7 +489,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
     } else {
       /* If the uid was added by KMail, KOrganizer needs to be told, so
        * schedule emitting of the resourceChanged signal. */
-      if ( !mUidsPendingAdding.contains( uid ) ) {
+      if ( !mUidsPendingAdding.tqcontains( uid ) ) {
         if ( !ourOwnUpdate ) mResourceChangedTimer.changeInterval( 100 );
       } else {
         mUidsPendingAdding.remove( uid );
@@ -504,7 +504,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _
 
 bool ResourceScalix::addEvent( KCal::Event* event )
 {
-  if ( mUidMap.contains( event->uid() ) )
+  if ( mUidMap.tqcontains( event->uid() ) )
     return true; //noop
   else
     return addIncidence( event, TQString::null, 0 );
@@ -521,7 +521,7 @@ bool ResourceScalix::deleteIncidence( KCal::Incidence* incidence )
   if ( incidence->isReadOnly() ) return false;
 
   const TQString uid = incidence->uid();
-  if( !mUidMap.contains( uid ) ) return false; // Odd
+  if( !mUidMap.tqcontains( uid ) ) return false; // Odd
   /* The user told us to delete, tell KMail */
   if ( !mSilent ) {
     kmailDeleteIncidence( mUidMap[ uid ].resource(),
@@ -572,7 +572,7 @@ KCal::Event::List ResourceScalix::rawEvents( const TQDate& start,
 
 bool ResourceScalix::addTodo( KCal::Todo* todo )
 {
-  if ( mUidMap.contains( todo->uid() ) )
+  if ( mUidMap.tqcontains( todo->uid() ) )
     return true; //noop
   else
     return addIncidence( todo, TQString::null, 0 );
@@ -606,7 +606,7 @@ KCal::Todo::List ResourceScalix::rawTodosForDate( const TQDate& date )
 
 bool ResourceScalix::addJournal( KCal::Journal* journal )
 {
-  if ( mUidMap.contains( journal->uid() ) )
+  if ( mUidMap.tqcontains( journal->uid() ) )
     return true; //noop
   else
     return addIncidence( journal, TQString::null, 0 );
@@ -657,7 +657,7 @@ void ResourceScalix::setTimeZoneId( const TQString& tzid )
 
 bool ResourceScalix::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int /*format*/,
                                            const TQString& data )
 {
@@ -689,11 +689,11 @@ void ResourceScalix::fromKMailDelIncidence( const TQString& type,
   if ( !subresourceActive( subResource ) ) return;
 
   // Can't be in both, by contract
-  if ( mUidsPendingDeletion.contains( uid ) ) {
+  if ( mUidsPendingDeletion.tqcontains( uid ) ) {
     mUidsPendingDeletion.remove( uid );
-  } else if ( mUidsPendingUpdate.contains( uid ) ) {
+  } else if ( mUidsPendingUpdate.tqcontains( uid ) ) {
     // It's good to know if was deleted, but we are waiting on a new one to
-    // replace it, so let's just sit tight.
+    // tqreplace it, so let's just sit tight.
   } else {
     // We didn't trigger this, so KMail did, remove the reference to the uid
     KCal::Incidence* incidence = mCalendar.incidence( uid );
@@ -741,7 +741,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -760,7 +760,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
   ResourceMap* map = subResourceMap( type );
   if ( !map ) // not ours
     return;
-  if ( map->contains( subResource ) )
+  if ( map->tqcontains( subResource ) )
     map->erase( subResource );
   else
     // Not registered
@@ -807,11 +807,11 @@ TQStringList ResourceScalix::subresources() const
 const QString
 ResourceScalix::labelForSubresource( const TQString& subresource ) const
 {
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].label();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].label();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].label();
   return subresource;
 }
@@ -819,21 +819,21 @@ ResourceScalix::labelForSubresource( const TQString& subresource ) const
 TQString ResourceScalix::subresourceIdentifier( Incidence *incidence )
 {
   TQString uid = incidence->uid();
-  if ( mUidMap.contains( uid ) )
+  if ( mUidMap.tqcontains( uid ) )
     return mUidMap[ uid ].resource();
   else
-    if ( mNewIncidencesMap.contains( uid ) )
+    if ( mNewIncidencesMap.tqcontains( uid ) )
       return mNewIncidencesMap[ uid ];
     else
       return TQString();
 }
 
-void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
   TemporarySilencer t( this );
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it )
     addIncidence( type.latin1(), it.data(), folder, it.key() );
 }
 
@@ -843,11 +843,11 @@ bool ResourceScalix::subresourceActive( const TQString& subresource ) const
   // before it opens the resource :-( Make sure we are open
   const_cast<ResourceScalix*>( this )->doOpen();
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
     return mEventSubResources[ subresource ].active();
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
     return mTodoSubResources[ subresource ].active();
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
     return mJournalSubResources[ subresource ].active();
 
   // Safe default bet:
@@ -860,11 +860,11 @@ void ResourceScalix::setSubresourceActive( const TQString &subresource, bool v )
 {
   ResourceMap *map = 0;
 
-  if ( mEventSubResources.contains( subresource ) )
+  if ( mEventSubResources.tqcontains( subresource ) )
      map = &mEventSubResources;
-  if ( mTodoSubResources.contains( subresource ) )
+  if ( mTodoSubResources.tqcontains( subresource ) )
      map = &mTodoSubResources;
-  if ( mJournalSubResources.contains( subresource ) )
+  if ( mJournalSubResources.tqcontains( subresource ) )
      map = &mJournalSubResources;
 
   if ( map && ( ( *map )[ subresource ].active() != v ) ) {
diff --git a/kresources/scalix/kcal/resourcescalix.h b/kresources/scalix/kcal/resourcescalix.h
index 11baa5ec0..e00909c7e 100644
--- a/kresources/scalix/kcal/resourcescalix.h
+++ b/kresources/scalix/kcal/resourcescalix.h
@@ -105,7 +105,7 @@ public:
 
   /// The ResourceScalixBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& subResource,
-                              Q_UINT32 sernum, int format, const TQString& data );
+                              TQ_UINT32 sernum, int format, const TQString& data );
   void fromKMailDelIncidence( const TQString& type, const TQString& subResource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& subResource );
@@ -115,7 +115,7 @@ public:
                                 const TQString& label, bool writable );
   void fromKMailDelSubresource( const TQString& type, const TQString& subResource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -141,20 +141,20 @@ protected slots:
 
 private:
   void removeIncidences( const TQCString& incidenceType );
-  void resolveConflict( KCal::Incidence*, const TQString& subresource, Q_UINT32 sernum );
+  void resolveConflict( KCal::Incidence*, const TQString& subresource, TQ_UINT32 sernum );
 
   void addIncidence( const char* mimetype, const TQString& xml,
-                     const TQString& subResource, Q_UINT32 sernum );
+                     const TQString& subResource, TQ_UINT32 sernum );
 
   bool addIncidence( KCal::Incidence* i, const TQString& subresource,
-                     Q_UINT32 sernum );
+                     TQ_UINT32 sernum );
 /*
   void addEvent( const TQString& xml, const TQString& subresource,
-                 Q_UINT32 sernum );
+                 TQ_UINT32 sernum );
   void addTodo( const TQString& xml, const TQString& subresource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   void addJournal( const TQString& xml, const TQString& subresource,
-                   Q_UINT32 sernum );
+                   TQ_UINT32 sernum );
 */
 
   bool loadAllEvents();
@@ -180,7 +180,7 @@ private:
   Scalix::ResourceMap* subResourceMap( const TQString& contentsType );
 
   bool sendKMailUpdate( KCal::IncidenceBase* incidence, const TQString& _subresource,
-                        Q_UINT32 sernum );
+                        TQ_UINT32 sernum );
 
 
   KCal::CalendarLocal mCalendar;
@@ -194,11 +194,11 @@ private:
   ICalFormat mFormat;
 
   /**
-    This map contains the association between a new added incidence
+    This map tqcontains the association between a new added incidence
     and the subresource it belongs to.
     That's needed to return the correct mapping in subresourceIdentifier().
 
-    We can't trust on mUidMap here, because it contains only non-pending uids.
+    We can't trust on mUidMap here, because it tqcontains only non-pending uids.
    */
   TQMap<TQString, TQString> mNewIncidencesMap;
   int mProgressDialogIncidenceLimit;
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index 043b0f4a1..2a0c06cdd 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -73,7 +73,7 @@ void Scalix::get( const KURL &url )
 
   TQString path = url.path();
 
-  if ( path.contains( "/freebusy/" ) ) {
+  if ( path.tqcontains( "/freebusy/" ) ) {
     retrieveFreeBusy( url );
   } else {
     error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
@@ -84,7 +84,7 @@ void Scalix::put( const KURL& url, int, bool, bool )
 {
   TQString path = url.path();
 
-  if ( path.contains( "/freebusy/" ) ) {
+  if ( path.tqcontains( "/freebusy/" ) ) {
     publishFreeBusy( url );
   } else {
     error( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown path. Known path is '/freebusy/'" ) );
@@ -121,7 +121,7 @@ void Scalix::retrieveFreeBusy( const KURL &url )
   connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
            this, TQT_SLOT( slotRetrieveResult( KIO::Job* ) ) );
 
-  qApp->eventLoop()->enterLoop();
+  tqApp->eventLoop()->enterLoop();
 }
 
 void Scalix::publishFreeBusy( const KURL &url )
@@ -185,7 +185,7 @@ void Scalix::publishFreeBusy( const KURL &url )
   connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
            this, TQT_SLOT( slotPublishResult( KIO::Job* ) ) );
 
-  qApp->eventLoop()->enterLoop();
+  tqApp->eventLoop()->enterLoop();
 }
 
 void Scalix::slotInfoMessage( KIO::Job *job, const TQString &data )
@@ -208,7 +208,7 @@ void Scalix::slotRetrieveResult( KIO::Job *job )
     finished();
   }
 
-  qApp->eventLoop()->exitLoop();
+  tqApp->eventLoop()->exitLoop();
 }
 
 void Scalix::slotPublishResult( KIO::Job *job )
@@ -219,7 +219,7 @@ void Scalix::slotPublishResult( KIO::Job *job )
     finished();
   }
 
-  qApp->eventLoop()->exitLoop();
+  tqApp->eventLoop()->exitLoop();
 }
 
 #include "scalix.moc"
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index 2b7895282..5afd6402d 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.cpp
@@ -49,7 +49,7 @@ static const char* inlineMimeType = "text/calendar";
 
 ResourceScalix::ResourceScalix( const KConfig *config )
   : ResourceNotes( config ), ResourceScalixBase( "ResourceScalix-KNotes" ),
-    mCalendar( TQString::fromLatin1("UTC") )
+    mCalendar( TQString::tqfromLatin1("UTC") )
 {
   setType( "scalix" );
 }
@@ -99,7 +99,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
     return false;
   }
 
-  TQMap<Q_UINT32, TQString> lst;
+  TQMap<TQ_UINT32, TQString> lst;
   if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) {
     kdError(5500) << "Communication problem in "
                   << "ResourceScalix::getIncidenceList()\n";
@@ -111,7 +111,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   // Populate with the new entries
   const bool silent = mSilent;
   mSilent = true;
-  TQMap<Q_UINT32, TQString>::Iterator it;
+  TQMap<TQ_UINT32, TQString>::Iterator it;
   for ( it = lst.begin(); it != lst.end(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), subResource, it.key(), mimetype );
     if ( !journal )
@@ -158,7 +158,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal )
 }
 
 KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& subresource,
-                             Q_UINT32 sernum, const TQString& )
+                             TQ_UINT32 sernum, const TQString& )
 {
   KCal::Journal* journal = 0;
     // FIXME: This does not take into account the time zone!
@@ -166,7 +166,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su
   journal = static_cast<KCal::Journal*>( formatter.fromString( data ) );
 
   Q_ASSERT( journal );
-  if( journal && !mUidMap.contains( journal->uid() ) )
+  if( journal && !mUidMap.tqcontains( journal->uid() ) )
     if ( addNote( journal, subresource, sernum ) )
       return journal;
     else
@@ -175,7 +175,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su
 }
 
 bool ResourceScalix::addNote( KCal::Journal* journal,
-                             const TQString& subresource, Q_UINT32 sernum )
+                             const TQString& subresource, TQ_UINT32 sernum )
 {
   kdDebug(5500) << "ResourceScalix::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n";
 
@@ -212,7 +212,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal,
 bool ResourceScalix::deleteNote( KCal::Journal* journal )
 {
   const TQString uid = journal->uid();
-  if ( !mUidMap.contains( uid ) )
+  if ( !mUidMap.tqcontains( uid ) )
     // Odd
     return false;
 
@@ -252,8 +252,8 @@ KCal::Alarm::List ResourceScalix::alarms( const TQDateTime& from, const TQDateTi
 void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
 {
   TQString subResource;
-  Q_UINT32 sernum;
-  if ( mUidMap.contains( i->uid() ) ) {
+  TQ_UINT32 sernum;
+  if ( mUidMap.tqcontains( i->uid() ) ) {
     subResource = mUidMap[ i->uid() ].resource();
     sernum = mUidMap[ i->uid() ].serialNumber();
   } else { // can this happen?
@@ -276,7 +276,7 @@ void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* i )
  */
 bool ResourceScalix::fromKMailAddIncidence( const TQString& type,
                                            const TQString& subResource,
-                                           Q_UINT32 sernum,
+                                           TQ_UINT32 sernum,
                                            int,
                                            const TQString& note )
 {
@@ -327,7 +327,7 @@ void ResourceScalix::fromKMailAddSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( mSubResources.contains( subResource ) )
+  if ( mSubResources.tqcontains( subResource ) )
     // Already registered
     return;
 
@@ -347,7 +347,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
     // Not ours
     return;
 
-  if ( !mSubResources.contains( subResource ) )
+  if ( !mSubResources.tqcontains( subResource ) )
     // Not registered
     return;
 
@@ -383,7 +383,7 @@ void ResourceScalix::fromKMailDelSubresource( const TQString& type,
   emit signalSubresourceRemoved( this, type, subResource );
 }
 
-void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                               const TQString& type,
                                               const TQString& folder )
 {
@@ -393,7 +393,7 @@ void ResourceScalix::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>&
   const bool silent = mSilent;
   mSilent = true;
   TQString mimetype = inlineMimeType;
-  for( TQMap<Q_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
+  for( TQMap<TQ_UINT32, TQString>::ConstIterator it = map.begin(); it != map.end(); ++it ) {
     KCal::Journal* journal = addNote( it.data(), folder, it.key(), mimetype );
     if ( !journal )
       kdDebug(5500) << "loading note " << it.key() << " failed" << endl;
@@ -411,7 +411,7 @@ TQStringList ResourceScalix::subresources() const
 
 bool ResourceScalix::subresourceActive( const TQString& res ) const
 {
-  if ( mSubResources.contains( res ) ) {
+  if ( mSubResources.tqcontains( res ) ) {
     return mSubResources[ res ].active();
   }
 
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index cb0c50fbf..dc8517b68 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -80,7 +80,7 @@ public:
 
   /// The ResourceScalixBase methods called by KMail
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& note );
+                              TQ_UINT32 sernum, int format, const TQString& note );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& uid );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
@@ -90,7 +90,7 @@ public:
                                 const TQString& label, bool writable );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
 
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                  const TQString& type,
                                  const TQString& folder );
 
@@ -106,9 +106,9 @@ signals:
 
 private:
   bool addNote( KCal::Journal* journal, const TQString& resource,
-                Q_UINT32 sernum );
+                TQ_UINT32 sernum );
   KCal::Journal* addNote( const TQString& data, const TQString& subresource,
-                          Q_UINT32 sernum, const TQString &mimetype );
+                          TQ_UINT32 sernum, const TQString &mimetype );
 
   bool loadSubResource( const TQString& resource, const TQString& mimetype );
 
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index 661f57430..d0a9644e8 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -35,18 +35,18 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
   : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
 {
   TQWidget *page = new TQWidget( this );
-  TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 );
 
   TQLabel *label = new TQLabel( i18n( "User:" ), page );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mEmail = new TQLineEdit( page );
-  layout->addWidget( mEmail, 0, 1 );
+  tqlayout->addWidget( mEmail, 0, 1 );
 
   TQToolButton *emailSelector = new TQToolButton( page );
   emailSelector->setUsesTextLabel( true );
   emailSelector->setTextLabel( i18n( "..." ) );
-  layout->addWidget( emailSelector, 0, 2 );
+  tqlayout->addWidget( emailSelector, 0, 2 );
 
   TQValueList<Scalix::DelegateTypes> types;
   types << Scalix::SendOnBehalfOf;
@@ -57,7 +57,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
   int row = 1;
   for ( uint i = 0; i < types.count(); ++i ) {
     TQCheckBox *box = new TQCheckBox( Scalix::Delegate::rightsAsString( types[ i ] ), page );
-    layout->addMultiCellWidget( box, row, row, 1, 2 );
+    tqlayout->addMultiCellWidget( box, row, row, 1, 2 );
 
     mRights.insert( types[ i ], box );
     row++;
diff --git a/kresources/scalix/scalixadmin/delegatepage.cpp b/kresources/scalix/scalixadmin/delegatepage.cpp
index 033472901..32b29d465 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -37,21 +37,21 @@
 DelegatePage::DelegatePage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
   mView = new DelegateView( &mManager, this );
-  layout->addMultiCellWidget( mView, 0, 0, 0, 2 );
+  tqlayout->addMultiCellWidget( mView, 0, 0, 0, 2 );
 
   mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this );
-  layout->addWidget( mAddButton, 1, 0 );
+  tqlayout->addWidget( mAddButton, 1, 0 );
 
   mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this );
   mEditButton->setEnabled( false );
-  layout->addWidget( mEditButton, 1, 1 );
+  tqlayout->addWidget( mEditButton, 1, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this );
   mRemoveButton->setEnabled( false );
-  layout->addWidget( mRemoveButton, 1, 2 );
+  tqlayout->addWidget( mRemoveButton, 1, 2 );
 
   connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) );
diff --git a/kresources/scalix/scalixadmin/otherusermanager.cpp b/kresources/scalix/scalixadmin/otherusermanager.cpp
index a3c19de12..cacb94742 100644
--- a/kresources/scalix/scalixadmin/otherusermanager.cpp
+++ b/kresources/scalix/scalixadmin/otherusermanager.cpp
@@ -30,7 +30,7 @@ OtherUserManager::~OtherUserManager()
 
 void OtherUserManager::addOtherUser( const TQString &email )
 {
-  if ( !mOtherUsers.contains( email ) ) {
+  if ( !mOtherUsers.tqcontains( email ) ) {
     mOtherUsers.append( email );
     emit changed();
   }
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index 8570cab06..f7a9ee63f 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -40,17 +40,17 @@
 OtherUserPage::OtherUserPage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 );
 
   mView = new OtherUserView( &mManager, this );
-  layout->addMultiCellWidget( mView, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mView, 0, 0, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add Account..." ), this );
-  layout->addWidget( mAddButton, 1, 0 );
+  tqlayout->addWidget( mAddButton, 1, 0 );
 
   mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this );
   mDeleteButton->setEnabled( false );
-  layout->addWidget( mDeleteButton, 1, 1 );
+  tqlayout->addWidget( mDeleteButton, 1, 1 );
 
   connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) );
@@ -139,12 +139,12 @@ void OtherUserPage::selectionChanged()
 
 void OtherUserPage::updateKmail()
 {
-  TQMessageBox *msg = new TQMessageBox( qApp->mainWidget() );
+  TQMessageBox *msg = new TQMessageBox( tqApp->mainWidget() );
   msg->setText( i18n( "Updating account..." ) );
   msg->show();
-  qApp->processEvents();
+  tqApp->processEvents();
   sleep( 1 );
-  qApp->processEvents();
+  tqApp->processEvents();
 
   TQString error;
   TQCString dcopService;
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index e1e331fc4..401d4de18 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -36,7 +36,7 @@
 OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
   TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
 
@@ -48,10 +48,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
   mMessage = new TQTextEdit( this );
   mSaveButton = new TQPushButton( i18n( "Save" ), this );
 
-  layout->addMultiCellWidget( group, 0, 0, 0, 1 );
-  layout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
-  layout->addMultiCellWidget( mMessage, 2, 2, 0, 1 );
-  layout->addWidget( mSaveButton, 3, 1 );
+  tqlayout->addMultiCellWidget( group, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( mLabel, 1, 1, 0, 1 );
+  tqlayout->addMultiCellWidget( mMessage, 2, 2, 0, 1 );
+  tqlayout->addWidget( mSaveButton, 3, 1 );
 
   statusChanged();
 
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index facc29170..e75d3fdd2 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -38,29 +38,29 @@
 PasswordPage::PasswordPage( TQWidget *parent )
   : TQWidget( parent ), mJob( 0 )
 {
-  TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
 
   TQLabel *label = new TQLabel( i18n( "New password:" ), this );
-  layout->addWidget( label, 0, 0 );
+  tqlayout->addWidget( label, 0, 0 );
 
   mPassword = new TQLineEdit( this );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
-  layout->addWidget( mPassword, 0, 1 );
+  tqlayout->addWidget( mPassword, 0, 1 );
 
   label = new TQLabel( i18n( "Retype new password:" ), this );
-  layout->addWidget( label, 1, 0 );
+  tqlayout->addWidget( label, 1, 0 );
 
   mPasswordRetype = new TQLineEdit( this );
   mPasswordRetype->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPasswordRetype );
-  layout->addWidget( mPasswordRetype, 1, 1 );
+  tqlayout->addWidget( mPasswordRetype, 1, 1 );
 
   mButton = new TQPushButton( i18n( "Change" ), this );
   mButton->setEnabled( false );
-  layout->addWidget( mButton, 2, 1 );
+  tqlayout->addWidget( mButton, 2, 1 );
 
-  layout->setRowSpacing( 3, 1 );
+  tqlayout->setRowSpacing( 3, 1 );
 
   connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
   connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) );
@@ -165,8 +165,8 @@ void PasswordPage::finished( KIO::Job* job )
       // First try to store in KWallet
       if ( KWallet::Wallet::isEnabled() ) {
         WId window = 0;
-        if ( qApp->activeWindow() )
-          window = qApp->activeWindow()->winId();
+        if ( tqApp->activeWindow() )
+          window = tqApp->activeWindow()->winId();
 
         KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), window );
         if ( wallet ) {
diff --git a/kresources/scalix/shared/kmailconnection.cpp b/kresources/scalix/shared/kmailconnection.cpp
index b4b4b9ebf..60ea25ee0 100644
--- a/kresources/scalix/shared/kmailconnection.cpp
+++ b/kresources/scalix/shared/kmailconnection.cpp
@@ -88,8 +88,8 @@ bool KMailConnection::connectToKMail()
                                                    dcopService, dcopObjectId );
 
     // Attach to the KMail signals
-    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,Q_UINT32,int,TQString)",
-                              "fromKMailAddIncidence(TQString,TQString,Q_UINT32,int,TQString)" ) )
+    if ( !connectKMailSignal( "incidenceAdded(TQString,TQString,TQ_UINT32,int,TQString)",
+                              "fromKMailAddIncidence(TQString,TQString,TQ_UINT32,int,TQString)" ) )
       kdError(5650) << "DCOP connection to incidenceAdded failed" << endl;
     if ( !connectKMailSignal( "incidenceDeleted(TQString,TQString,TQString)",
                               "fromKMailDelIncidence(TQString,TQString,TQString)" ) )
@@ -103,8 +103,8 @@ bool KMailConnection::connectToKMail()
     if ( !connectKMailSignal( "subresourceDeleted(TQString,TQString)",
                               "fromKMailDelSubresource(TQString,TQString)" ) )
       kdError(5650) << "DCOP connection to subresourceDeleted failed" << endl;
-    if ( !connectKMailSignal( "asyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)",
-                              "fromKMailAsyncLoadResult(TQMap<Q_UINT32, TQString>, TQString, TQString)" ) )
+    if ( !connectKMailSignal( "asyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)",
+                              "fromKMailAsyncLoadResult(TQMap<TQ_UINT32, TQString>, TQString, TQString)" ) )
       kdError(5650) << "DCOP connection to asyncLoadResult failed" << endl;
   }
 
@@ -113,7 +113,7 @@ bool KMailConnection::connectToKMail()
 
 bool KMailConnection::fromKMailAddIncidence( const TQString& type,
                                              const TQString& folder,
-                                             Q_UINT32 sernum,
+                                             TQ_UINT32 sernum,
                                              int format,
                                              const TQString& data )
 {
@@ -164,7 +164,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type,
   mResource->fromKMailDelSubresource( type, resource );
 }
 
-void KMailConnection::fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+void KMailConnection::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                                 const TQString& type,
                                                 const TQString& folder )
 {
@@ -199,7 +199,7 @@ bool KMailConnection::kmailIncidencesCount( int& count,
   return mKMailIcalIfaceStub->ok();
 }
 
-bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool KMailConnection::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                        const TQString& mimetype,
                                        const TQString& resource,
                                        int startIndex,
@@ -215,7 +215,7 @@ bool KMailConnection::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 
 bool KMailConnection::kmailGetAttachment( KURL& url,
                                           const TQString& resource,
-                                          Q_UINT32 sernum,
+                                          TQ_UINT32 sernum,
                                           const TQString& filename )
 {
   if ( !connectToKMail() )
@@ -226,7 +226,7 @@ bool KMailConnection::kmailGetAttachment( KURL& url,
 }
 
 bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
-                                            Q_UINT32 sernum )
+                                            TQ_UINT32 sernum )
 {
   return connectToKMail()
     && mKMailIcalIfaceStub->deleteIncidenceKolab( resource, sernum )
@@ -234,7 +234,7 @@ bool KMailConnection::kmailDeleteIncidence( const TQString& resource,
 }
 
 bool KMailConnection::kmailUpdate( const TQString& resource,
-                                   Q_UINT32& sernum,
+                                   TQ_UINT32& sernum,
                                    const TQString& subject,
                                    const TQString& plainTextBody,
                                    const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/scalix/shared/kmailconnection.h b/kresources/scalix/shared/kmailconnection.h
index bd02d7bb0..3d34d5c67 100644
--- a/kresources/scalix/shared/kmailconnection.h
+++ b/kresources/scalix/shared/kmailconnection.h
@@ -54,13 +54,13 @@ class KMailConnection : public TQObject, public DCOPObject {
   // These are the methods called by KMail when the resource changes
 k_dcop:
   bool fromKMailAddIncidence( const TQString& type, const TQString& resource,
-                              Q_UINT32 sernum, int format, const TQString& xml );
+                              TQ_UINT32 sernum, int format, const TQString& xml );
   void fromKMailDelIncidence( const TQString& type, const TQString& resource,
                               const TQString& xml );
   void fromKMailRefresh( const TQString& type, const TQString& resource );
   void fromKMailAddSubresource( const TQString& type, const TQString& resource, const TQString& label );
   void fromKMailDelSubresource( const TQString& type, const TQString& resource );
-  void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map, const TQString& type,
+  void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map, const TQString& type,
                                  const TQString& folder );
 
 public:
@@ -78,16 +78,16 @@ public:
   bool kmailIncidencesCount( int& count,
                              const TQString& mimetype,
                              const TQString& resource );
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages );
 
-  bool kmailGetAttachment( KURL& url, const TQString& resource, Q_UINT32 sernum,
+  bool kmailGetAttachment( KURL& url, const TQString& resource, TQ_UINT32 sernum,
                            const TQString& filename );
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
   bool kmailUpdate( const TQString& resource,
-                    Q_UINT32& sernum,
+                    TQ_UINT32& sernum,
                     const TQString& subject,
                     const TQString& plainTextBody,
                     const TQMap<TQCString, TQString>& customHeaders,
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index e239bfb3e..9bd0afb83 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -82,7 +82,7 @@ bool ResourceScalixBase::kmailIncidencesCount( int &count,
   return mConnection->kmailIncidencesCount( count, mimetype, resource );
 }
 
-bool ResourceScalixBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
+bool ResourceScalixBase::kmailIncidences( TQMap<TQ_UINT32, TQString>& lst,
                                          const TQString& mimetype,
                                          const TQString& resource,
                                          int startIndex,
@@ -92,20 +92,20 @@ bool ResourceScalixBase::kmailIncidences( TQMap<Q_UINT32, TQString>& lst,
 }
 
 bool ResourceScalixBase::kmailGetAttachment( KURL& url, const TQString& resource,
-                                            Q_UINT32 sernum,
+                                            TQ_UINT32 sernum,
                                             const TQString& filename ) const
 {
   return mConnection->kmailGetAttachment( url, resource, sernum, filename );
 }
 
 bool ResourceScalixBase::kmailDeleteIncidence( const TQString& resource,
-                                              Q_UINT32 sernum )
+                                              TQ_UINT32 sernum )
 {
   return mSilent || mConnection->kmailDeleteIncidence( resource, sernum );
 }
 
 bool ResourceScalixBase::kmailUpdate( const TQString& resource,
-                                     Q_UINT32& sernum,
+                                     TQ_UINT32& sernum,
                                      const TQString& xml,
                                      const TQString& mimetype,
                                      const TQString& subject,
diff --git a/kresources/scalix/shared/resourcescalixbase.h b/kresources/scalix/shared/resourcescalixbase.h
index 803ac47b3..e402e4278 100644
--- a/kresources/scalix/shared/resourcescalixbase.h
+++ b/kresources/scalix/shared/resourcescalixbase.h
@@ -78,7 +78,7 @@ public:
   // These are the methods called by KMail when the resource changes
   virtual bool fromKMailAddIncidence( const TQString& type,
                                       const TQString& resource,
-                                      Q_UINT32 sernum,
+                                      TQ_UINT32 sernum,
                                       int format,
                                       const TQString& data ) = 0;
   virtual void fromKMailDelIncidence( const TQString& type,
@@ -93,7 +93,7 @@ public:
   virtual void fromKMailDelSubresource( const TQString& type,
                                         const TQString& resource ) = 0;
 
-  virtual void fromKMailAsyncLoadResult( const TQMap<Q_UINT32, TQString>& map,
+  virtual void fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
                                          const TQString& type,
                                          const TQString& folder ) = 0;
 protected:
@@ -115,7 +115,7 @@ protected:
 
   /// Get the mimetype attachments from a chunk of messages from this folder.
   /// Returns a TQMap with serialNumber/attachment pairs.
-  bool kmailIncidences( TQMap<Q_UINT32, TQString>& lst, const TQString& mimetype,
+  bool kmailIncidences( TQMap<TQ_UINT32, TQString>& lst, const TQString& mimetype,
                         const TQString& resource,
                         int startIndex,
                         int nbMessages ) const;
@@ -127,12 +127,12 @@ public: // for Contact
   /// be called by the resource after obtaining the incidence.
   /// The resource must delete the temp file.
   bool kmailGetAttachment( KURL& url, const TQString& resource,
-                           Q_UINT32 sernum,
+                           TQ_UINT32 sernum,
                            const TQString& filename ) const;
 
 protected:
   /// Delete an incidence.
-  bool kmailDeleteIncidence( const TQString& resource, Q_UINT32 sernum );
+  bool kmailDeleteIncidence( const TQString& resource, TQ_UINT32 sernum );
 
   KMailICalIface::StorageFormat kmailStorageFormat( const TQString& folder ) const;
 
@@ -140,7 +140,7 @@ protected:
 
   /// Update an incidence. The list of attachments are URLs.
   /// The parameter sernum is updated with the right KMail serial number
-  bool kmailUpdate( const TQString& resource, Q_UINT32& sernum,
+  bool kmailUpdate( const TQString& resource, TQ_UINT32& sernum,
                     const TQString& xml,
                     const TQString& mimetype,
                     const TQString& subject,
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 8fb5177b7..e9a5ab8c8 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -42,8 +42,8 @@ using namespace Scalix;
 
 
 ScalixBase::ScalixBase( const TQString& tz )
-  : mCreationDate( TQDateTime::currentDateTime() ),
-    mLastModified( TQDateTime::currentDateTime() ),
+  : mCreationDate( TQDateTime::tqcurrentDateTime() ),
+    mLastModified( TQDateTime::tqcurrentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
     mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
 {
@@ -92,7 +92,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
   kdDebug(5006) << "Creation time string: " << creationString << endl;
   TQDateTime creationDate;
   if ( creationString.isEmpty() ) {
-    creationDate = TQDateTime::currentDateTime();
+    creationDate = TQDateTime::tqcurrentDateTime();
     kdDebug(5006) << "Creation date set to current time\n";
   }
   else {
@@ -101,7 +101,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
   }
   TQDateTime modified = addressee->revision();
   if ( !modified.isValid() )
-    modified = TQDateTime::currentDateTime();
+    modified = TQDateTime::tqcurrentDateTime();
   setLastModified( modified );
   if ( modified < creationDate ) {
     // It's not possible that the modification date is earlier than creation
diff --git a/kresources/scalix/shared/subresource.cpp b/kresources/scalix/shared/subresource.cpp
index 0acfb0816..02c9e40f6 100644
--- a/kresources/scalix/shared/subresource.cpp
+++ b/kresources/scalix/shared/subresource.cpp
@@ -86,7 +86,7 @@ int SubResource::completionWeight() const
   return mCompletionWeight;
 }
 
-StorageReference::StorageReference( const TQString& resource, Q_UINT32 sernum )
+StorageReference::StorageReference( const TQString& resource, TQ_UINT32 sernum )
   : mResource( resource ), mSerialNumber( sernum )
 {
 }
@@ -105,12 +105,12 @@ TQString StorageReference::resource() const
   return mResource;
 }
 
-void StorageReference::setSerialNumber( Q_UINT32 serialNumber )
+void StorageReference::setSerialNumber( TQ_UINT32 serialNumber )
 {
   mSerialNumber = serialNumber;
 }
 
-Q_UINT32 StorageReference::serialNumber() const
+TQ_UINT32 StorageReference::serialNumber() const
 {
   return mSerialNumber;
 }
diff --git a/kresources/scalix/shared/subresource.h b/kresources/scalix/shared/subresource.h
index f7898c14f..d7c575daf 100644
--- a/kresources/scalix/shared/subresource.h
+++ b/kresources/scalix/shared/subresource.h
@@ -89,18 +89,18 @@ public:
   // Just for QMap
   StorageReference() {}
 
-  StorageReference( const TQString& resource, Q_UINT32 sernum );
+  StorageReference( const TQString& resource, TQ_UINT32 sernum );
   virtual ~StorageReference();
 
   virtual void setResource( const TQString& resource );
   virtual TQString resource() const;
 
-  virtual void setSerialNumber( Q_UINT32 serialNumber );
-  virtual Q_UINT32 serialNumber() const;
+  virtual void setSerialNumber( TQ_UINT32 serialNumber );
+  virtual TQ_UINT32 serialNumber() const;
 
 private:
   TQString mResource;
-  Q_UINT32 mSerialNumber;
+  TQ_UINT32 mSerialNumber;
 };
 
 typedef TQMap<TQString, StorageReference> UidMap;
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index 16d5aced5..433a6adb0 100644
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@@ -218,7 +218,7 @@ bool ResourceSlox::asyncLoad()
            TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
            TQT_SLOT( cancelDownload() ) );
 
-  mPrefs->setLastSync( TQDateTime::currentDateTime() );
+  mPrefs->setLastSync( TQDateTime::tqcurrentDateTime() );
 
   return true;
 }
@@ -269,7 +269,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
         a.setResource( this );
         a.setChanged( false );
 
-        mAddrMap.replace( a.uid(), a );
+        mAddrMap.tqreplace( a.uid(), a );
 
         // TODO: Do we need to try to associate addressees with slox accounts?
 
@@ -306,7 +306,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
     TQValueList<SloxItem>::ConstIterator it;
     for( it = items.begin(); it != items.end(); ++it ) {
       SloxItem item = *it;
-      if ( !item.response.contains( "200" ) ) {
+      if ( !item.response.tqcontains( "200" ) ) {
         savingError( this, item.response + "\n" + item.responseDescription );
         continue;
       }
@@ -320,7 +320,7 @@ void ResourceSlox::slotUploadResult( KIO::Job *job )
           a.setUid( "kresources_slox_kabc_" + item.sloxId );
           a.setResource( this );
           a.setChanged( false );
-          mAddrMap.replace( a.uid(), a );
+          mAddrMap.tqreplace( a.uid(), a );
           saveCache();
         }
       }
@@ -603,7 +603,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
   else
     pnSaveMap = mPhoneNumberSloxMap;
   for ( PhoneNumber::List::ConstIterator it = pnlist.begin() ; it != pnlist.end(); ++it ) {
-    if ( pnSaveMap.contains( (*it).type() ) ) {
+    if ( pnSaveMap.tqcontains( (*it).type() ) ) {
       TQStringList l = pnSaveMap[(*it).type()];
       TQString fn = l.first();
       l.remove( l.begin() );
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index edd13e6f9..668631d37 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -237,7 +237,7 @@ void KCalResourceSlox::requestEvents()
            TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
            TQT_SLOT( cancelLoadEvents() ) );
 
-  mPrefs->setLastEventSync( TQDateTime::currentDateTime() );
+  mPrefs->setLastEventSync( TQDateTime::tqcurrentDateTime() );
 }
 
 void KCalResourceSlox::requestTodos()
@@ -282,7 +282,7 @@ void KCalResourceSlox::requestTodos()
            TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
            TQT_SLOT( cancelLoadTodos() ) );
 
-  mPrefs->setLastTodoSync( TQDateTime::currentDateTime() );
+  mPrefs->setLastTodoSync( TQDateTime::tqcurrentDateTime() );
 }
 
 void KCalResourceSlox::uploadIncidences()
@@ -629,11 +629,11 @@ void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
       TQString status = memberElement.attribute( "confirm" );
       if ( !status.isEmpty() ) {
         if ( status == "accept" ) {
-          a->setStatus( Attendee::Accepted );
+          a->seStatus( Attendee::Accepted );
         } else if ( status == "decline" ) {
-          a->setStatus( Attendee::Declined );
+          a->seStatus( Attendee::Declined );
         } else {
-          a->setStatus( Attendee::NeedsAction );
+          a->seStatus( Attendee::NeedsAction );
         }
       }
     } else {
@@ -1113,7 +1113,7 @@ void KCalResourceSlox::slotUploadResult( KIO::Job *job )
         if ( !status.isNull() ) {
           TQDomElement statusElement = status.toElement();
           TQString response = statusElement.text();
-        if ( !response.contains( "200" ) ) {
+        if ( !response.tqcontains( "200" ) ) {
             TQString error = "'" + mUploadedIncidence->summary() + "'\n";
             error += response;
             TQDomNode dn = propstat.namedItem( "responsedescription" );
diff --git a/kresources/slox/sloxaccounts.cpp b/kresources/slox/sloxaccounts.cpp
index a32df5fa2..a49594ea7 100644
--- a/kresources/slox/sloxaccounts.cpp
+++ b/kresources/slox/sloxaccounts.cpp
@@ -65,7 +65,7 @@ void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a )
 {
   kdDebug() << "SloxAccount::insertUser() " << id << endl;
 
-  mUsers.replace( id, a );
+  mUsers.tqreplace( id, a );
 
   TQString email = a.preferredEmail();
 
diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h
index 7047ed28d..dd96cc496 100644
--- a/kresources/slox/sloxbase.h
+++ b/kresources/slox/sloxbase.h
@@ -35,7 +35,7 @@ class KDE_EXPORT SloxBase {
       FolderId,
       LastSync,
       ObjectType,
-      ObjectStatus,
+      ObjecStatus,
       CreatedBy,
       Categories,
       IncidenceTitle, // incidence fields
diff --git a/kresources/slox/sloxfolderdialog.cpp b/kresources/slox/sloxfolderdialog.cpp
index 4f17ea893..dc3c59dc2 100644
--- a/kresources/slox/sloxfolderdialog.cpp
+++ b/kresources/slox/sloxfolderdialog.cpp
@@ -70,7 +70,7 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder )
     return;
   if ( folder->type() != mFolderType && folder->type() != Unbound )
     return;
-  if( mManager->folders().contains( folder->parentId() ) ) {
+  if( mManager->folders().tqcontains( folder->parentId() ) ) {
     SloxFolder *parent = mManager->folders()[folder->parentId()];
     createFolderViewItem( parent );
     if ( parent->item )
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index 3f1b6be86..576def371 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -129,7 +129,7 @@ TQValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const TQDomDoc
           item.status = SloxItem::New;
       }
 
-      TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjectStatus ) );
+      TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjecStatus ) );
       if ( !sloxStatus.isNull() ) {
         TQDomElement sloxStatusElement = sloxStatus.toElement();
         if ( sloxStatusElement.text() == "DELETE" ) {
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index 83ae49bb9..a7cfebecd 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -288,8 +288,8 @@ bool ResourceTVAnytime::readServiceInformation( const TQDomDocument & serviceInf
           Service s;
           TQDomElement e3 = n3.toElement();
           if (s.loadXML( e3 ) ) {
-            s.setActive( mActiveServices.contains( s.id() ) );
-            bool newService = !mServiceMap.contains( s.id() );   
+            s.setActive( mActiveServices.tqcontains( s.id() ) );
+            bool newService = !mServiceMap.tqcontains( s.id() );   
             if ( newService )
             {
               mServiceMap.insert( s.id(), s );
@@ -320,7 +320,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
   TQStringList entries = mScheduleArchive->directory()->entries();
   TQRegExp re( "^(\\d{8})" + serviceId );
   TQStringList dates;
-  TQString todaysDate = TQDate::currentDate().toString( "yyyyMMdd" );
+  TQString todaysDate = TQDate::tqcurrentDate().toString( "yyyyMMdd" );
   for( TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
   {
     if ( re.search( *it ) != -1 ) // this entry belongs to the requested service
@@ -328,10 +328,10 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
       TQString entry = re.cap( 1 );
       // handle this date according to user preferences
       TQDate entryDate( entry.left( 4 ).toInt(), entry.mid( 4, 2 ).toInt(), entry.right( 2 ).toInt() );
-      if ( entryDate < TQDate::currentDate() || ( entryDate > TQDate::currentDate().addDays( prefs()->days() - 1 ) ) )
+      if ( entryDate < TQDate::tqcurrentDate() || ( entryDate > TQDate::tqcurrentDate().addDays( prefs()->days() - 1 ) ) )
         continue;
 
-      if ( !dates.contains( re.cap( 1 ) ) )
+      if ( !dates.tqcontains( re.cap( 1 ) ) )
         dates.append( re.cap( 1 ) );
     }
   }
@@ -415,7 +415,7 @@ bool ResourceTVAnytime::readService( const TQString & serviceId )
                 }
               }
               else
-                kdDebug() << " file contains schedule for another service!" << endl;
+                kdDebug() << " file tqcontains schedule for another service!" << endl;
             }
           }
         }
@@ -454,7 +454,7 @@ bool ResourceTVAnytime::subresourceActive( const TQString & subresource ) const
 
 void ResourceTVAnytime::setSubresourceActive( const TQString & subresource, bool active )
 {
-  if ( mServiceMap.contains( subresource ) )
+  if ( mServiceMap.tqcontains( subresource ) )
   {
     Service s = mServiceMap[ subresource ];
     if ( s.active() != active )