Rename a number of old tq methods that are no longer tq specific

93 files changed, 2121 insertions, 2121 deletions

diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index db0a7b77d..7102c8be4 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::tqfromLatin1( "UTC" ) ),
+  : ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
     mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
 {
   if ( config ) {
@@ -80,7 +80,7 @@ ResourceKABC::ResourceKABC( const KConfig* config )
 }
 
 ResourceKABC::ResourceKABC()
-  : ResourceCalendar( 0 ), mCalendar( TQString::tqfromLatin1( "UTC" ) ),
+  : ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ),
     mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
 {
   init();
@@ -169,7 +169,7 @@ bool ResourceKABC::doLoad()
       email_1 = (*it).fullEmail();
       uid_1 = (*it).uid();
       if (name_1.isEmpty()) name_1 = (*it).realName();
-      summary = i18n("%1's birthday").tqarg( name_1 );
+      summary = i18n("%1's birthday").arg( name_1 );
 
 
       Event *ev = new Event();
@@ -276,10 +276,10 @@ bool ResourceKABC::doLoad()
         name_2 = spouse.realName();
       }
       summary = i18n("insert names of both spouses",
-                     "%1's & %2's anniversary").tqarg( name_1 ).tqarg( name_2 );
+                     "%1's & %2's anniversary").arg( name_1 ).arg( name_2 );
     } else {
       summary = i18n("only one spouse in addressbook, insert the name",
-                     "%1's anniversary").tqarg( name_1 );
+                     "%1's anniversary").arg( name_1 );
     }
 
     Event *ev = new Event();
diff --git a/kresources/birthdays/resourcekabcconfig.cpp b/kresources/birthdays/resourcekabcconfig.cpp
index 2f7671dc7..f7aa2a140 100644
--- a/kresources/birthdays/resourcekabcconfig.cpp
+++ b/kresources/birthdays/resourcekabcconfig.cpp
@@ -22,7 +22,7 @@
 #include <typeinfo>
 
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kabprefs.h>
 #include <kdebug.h>
diff --git a/kresources/blogging/resourcebloggingsettings.ui b/kresources/blogging/resourcebloggingsettings.ui
index 917933cee..7d7e02279 100644
--- a/kresources/blogging/resourcebloggingsettings.ui
+++ b/kresources/blogging/resourcebloggingsettings.ui
@@ -19,7 +19,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout12</cstring>
+                <cstring>layout12</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -291,7 +291,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>84</height>
diff --git a/kresources/blogging/xmlrpcjob.cpp b/kresources/blogging/xmlrpcjob.cpp
index ae2b1b802..19582ec35 100644
--- a/kresources/blogging/xmlrpcjob.cpp
+++ b/kresources/blogging/xmlrpcjob.cpp
@@ -171,14 +171,14 @@ kdDebug() << m_str_response << endl;
       // TODO: Set the error of the job
       m_response.clear();
       m_response << TQVariant( i18n( "Unknown type of XML markup received. "
-                    "Markup: \n %1" ).tqarg( m_str_response ) );
+                    "Markup: \n %1" ).arg( m_str_response ) );
       m_responseType = XMLRPCUnknownResponse;
     }
 
   } else {
     // TODO: if we can't parse the XML response, set the correct error message!
 //     emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" )
-//                         .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id );
+//                         .arg( errMsg ).arg( errLine ).arg( errCol ), m_id );
   }
 
   TransferJob::slotFinished();
diff --git a/kresources/caldav/config.cpp b/kresources/caldav/config.cpp
index f3cf57fdc..9f2190520 100644
--- a/kresources/caldav/config.cpp
+++ b/kresources/caldav/config.cpp
@@ -27,7 +27,7 @@
 #include <kurlrequester.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 /*=========================================================================
diff --git a/kresources/caldav/configwidgets.cpp b/kresources/caldav/configwidgets.cpp
index 4a7072b5f..34fb5fe6c 100644
--- a/kresources/caldav/configwidgets.cpp
+++ b/kresources/caldav/configwidgets.cpp
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
@@ -114,7 +114,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent )
   d->mIntervalSpin->setEnabled( false );
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
   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->tqlayout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
   vbox->addWidget(delay);
   vbox->addWidget(every);
   vbox->addWidget(intervalRadio);
diff --git a/kresources/caldav/job.cpp b/kresources/caldav/job.cpp
index c79ef06ac..8e49041f6 100644
--- a/kresources/caldav/job.cpp
+++ b/kresources/caldav/job.cpp
@@ -82,7 +82,7 @@ void CalDavJob::processError(const caldav_error* err) {
     if (-401 == code) { // unauthorized
         error_string = i18n("Unauthorized. Username or password incorrect.");
     } else if (-599 <= code && code <= -300) {
-        error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+        error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
     } else {
         error_string = err->str;
     }
@@ -98,7 +98,7 @@ void CalDavJob::processTasksError(const caldav_error* err) {
     if (-401 == code) { // unauthorized
         error_string = i18n("Unauthorized. Username or password incorrect.");
     } else if (-599 <= code && code <= -300) {
-        error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+        error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
     } else {
         error_string = err->str;
     }
@@ -114,7 +114,7 @@ void CalDavJob::processJournalsError(const caldav_error* err) {
     if (-401 == code) { // unauthorized
         error_string = i18n("Unauthorized. Username or password incorrect.");
     } else if (-599 <= code && code <= -300) {
-        error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").tqarg(-code);
+        error_string = i18n("HTTP error %1. Please ensure that the URL is a valid CalDAV resource.").arg(-code);
     } else {
         error_string = err->str;
     }
diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp
index db4546d82..daf7ebdeb 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);
-        tqApp->tqprocessEvents(TQEventLoop::ExcludeUserInput);
+        tqApp->processEvents(TQEventLoop::ExcludeUserInput);
     }
 
     if (mWriter) {
@@ -147,7 +147,7 @@ bool ResourceCalDav::doLoad() {
         return true;	// Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them!
     }
 
-    log(TQString("doLoad(%1)").tqarg(syncCache));
+    log(TQString("doLoad(%1)").arg(syncCache));
 
     clearCache();
 
@@ -168,7 +168,7 @@ bool ResourceCalDav::doLoad() {
 bool ResourceCalDav::doSave() {
     bool syncCache = true;
 
-    log(TQString("doSave(%1)").tqarg(syncCache));
+    log(TQString("doSave(%1)").arg(syncCache));
 
     if (!hasChanges()) {
         log("no changes");
@@ -338,7 +338,7 @@ void ResourceCalDav::loadingQueuePop() {
     mLoader->setParent(this);
     mLoader->setType(0);
 
-    TQDateTime dt(TQDate::tqcurrentDate());
+    TQDateTime dt(TQDate::currentDate());
     mLoader->setRange(dt.addDays(-CACHE_DAYS), dt.addDays(CACHE_DAYS));
     //mLoader->setGetAll();
 
@@ -378,7 +378,7 @@ void ResourceCalDav::loadFinished() {
                 TQCString newpass;
                 if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
                     log("load error: " + loader->errorString() );
-                    loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+                    loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
                 }
                 else {
                     // Set new password and try again
@@ -388,12 +388,12 @@ void ResourceCalDav::loadFinished() {
             }
             else {
                 log("load error: " + loader->errorString() );
-                loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+                loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
             }
         }
         else {
             log("load error: " + loader->errorString() );
-            loadError(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+            loadError(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
         }
     } else {
         log("successful event load");
@@ -426,7 +426,7 @@ void ResourceCalDav::loadFinished() {
 //                 TQCString newpass;
 //                 if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
 //                     log("load error: " + loader->tasksErrorString() );
-//                     loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+//                     loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
 //                 }
 //                 else {
 //                     // Set new password and try again
@@ -436,12 +436,12 @@ void ResourceCalDav::loadFinished() {
             }
             else {
                 log("load error: " + loader->tasksErrorString() );
-                loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+                loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
             }
         }
         else {
             log("load error: " + loader->tasksErrorString() );
-            loadError(TQString("[%1] ").tqarg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
+            loadError(TQString("[%1] ").arg(abs(loader->tasksErrorNumber())) + loader->tasksErrorString());
         }
     } else {
         log("successful tasks load");
@@ -474,7 +474,7 @@ void ResourceCalDav::loadFinished() {
 //                 TQCString newpass;
 //                 if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
 //                     log("load error: " + loader->journalsErrorString() );
-//                     loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+//                     loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
 //                 }
 //                 else {
 //                     // Set new password and try again
@@ -484,12 +484,12 @@ void ResourceCalDav::loadFinished() {
             }
             else {
                 log("load error: " + loader->journalsErrorString() );
-                loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+                loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
             }
         }
         else {
             log("load error: " + loader->journalsErrorString() );
-            loadError(TQString("[%1] ").tqarg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
+            loadError(TQString("[%1] ").arg(abs(loader->journalsErrorNumber())) + loader->journalsErrorString());
         }
     } else {
         log("successful journals load");
@@ -971,7 +971,7 @@ void ResourceCalDav::writingFinished() {
                 TQCString newpass;
                 if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
                     log("write error: " + mWriter->errorString());
-                    saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+                    saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
                 }
                 else {
                     // Set new password and try again
@@ -981,12 +981,12 @@ void ResourceCalDav::writingFinished() {
             }
             else {
                 log("write error: " + mWriter->errorString());
-                saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+                saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
             }
         }
         else {
             log("write error: " + mWriter->errorString());
-            saveError(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+            saveError(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
         }
     } else {
         log("success");
diff --git a/kresources/carddav/config.cpp b/kresources/carddav/config.cpp
index 390e3adc7..a836de3a4 100644
--- a/kresources/carddav/config.cpp
+++ b/kresources/carddav/config.cpp
@@ -26,7 +26,7 @@
 #include <kurlrequester.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 /*=========================================================================
diff --git a/kresources/carddav/configwidgets.cpp b/kresources/carddav/configwidgets.cpp
index b159a0211..e21f75b0e 100644
--- a/kresources/carddav/configwidgets.cpp
+++ b/kresources/carddav/configwidgets.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
@@ -113,7 +113,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
   d->mIntervalSpin->setEnabled( false );
 
   groupBox->setColumnLayout(1, Qt::Vertical);
-  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->tqlayout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
   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->tqlayout());
+  TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout());
   vbox->addWidget(delay);
   vbox->addWidget(every);
   vbox->addWidget(intervalRadio);
diff --git a/kresources/carddav/job.cpp b/kresources/carddav/job.cpp
index a842b00a4..994964afb 100644
--- a/kresources/carddav/job.cpp
+++ b/kresources/carddav/job.cpp
@@ -69,7 +69,7 @@ void CardDavJob::processError(const carddav_error* err) {
     if (-401 == code) { // unauthorized
         error_string = i18n("Unauthorized. Username or password incorrect.");
     } else if (-599 <= code && code <= -300) {
-        error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").tqarg(-code);
+        error_string = i18n("HTTP error %1. Maybe, URL is not a CardDAV resource.").arg(-code);
     } else {
         error_string = err->str;
     }
diff --git a/kresources/carddav/resource.cpp b/kresources/carddav/resource.cpp
index 4fb33af55..a708eef02 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);
-        tqApp->tqprocessEvents(TQEventLoop::ExcludeUserInput);
+        tqApp->processEvents(TQEventLoop::ExcludeUserInput);
     }
 
     if (mWriter) {
@@ -144,7 +144,7 @@ bool ResourceCardDav::load() {
         return true;	// Silently fail; the user has obviously not responded to a dialog and we don't need to pop up more of them!
     }
 
-    log(TQString("doLoad(%1)").tqarg(syncCache));
+    log(TQString("doLoad(%1)").arg(syncCache));
 
     // FIXME KABC
     //clearCache();
@@ -166,7 +166,7 @@ bool ResourceCardDav::load() {
 bool ResourceCardDav::doSave() {
     bool syncCache = true;
 
-    log(TQString("doSave(%1)").tqarg(syncCache));
+    log(TQString("doSave(%1)").arg(syncCache));
 
     if (!hasChanges()) {
         log("no changes");
@@ -372,7 +372,7 @@ void ResourceCardDav::loadFinished() {
                 TQCString newpass;
                 if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
                     log("load error: " + loader->errorString() );
-                    addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+                    addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
                 }
                 else {
                     // Set new password and try again
@@ -382,12 +382,12 @@ void ResourceCardDav::loadFinished() {
             }
             else {
                 log("load error: " + loader->errorString() );
-                addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+                addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
             }
         }
         else {
             log("load error: " + loader->errorString() );
-            addressBook()->error(TQString("[%1] ").tqarg(abs(loader->errorNumber())) + loader->errorString());
+            addressBook()->error(TQString("[%1] ").arg(abs(loader->errorNumber())) + loader->errorString());
         }
     } else {
         log("successful load");
@@ -641,7 +641,7 @@ void ResourceCardDav::writingFinished() {
                 TQCString newpass;
                 if (KPasswordDialog::getPassword (newpass, TQString("<b>") + i18n("Remote authorization required") + TQString("</b><p>") + i18n("Please input the password for") + TQString(" ") + mPrefs->getusername(), NULL) != 1) {
                     log("write error: " + mWriter->errorString());
-                    addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+                    addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
                 }
                 else {
                     // Set new password and try again
@@ -651,12 +651,12 @@ void ResourceCardDav::writingFinished() {
             }
             else {
                 log("write error: " + mWriter->errorString());
-                addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+                addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
             }
         }
         else {
             log("write error: " + mWriter->errorString());
-            addressBook()->error(TQString("[%1] ").tqarg(abs(mWriter->errorNumber())) + mWriter->errorString());
+            addressBook()->error(TQString("[%1] ").arg(abs(mWriter->errorNumber())) + mWriter->errorString());
         }
     } else {
         log("success");
diff --git a/kresources/egroupware/debugdialog.cpp b/kresources/egroupware/debugdialog.cpp
index 0b2764c64..975cae8c7 100644
--- a/kresources/egroupware/debugdialog.cpp
+++ b/kresources/egroupware/debugdialog.cpp
@@ -20,7 +20,7 @@
 
 #include <tqfile.h>
 #include <tqfiledialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <ktextbrowser.h>
 #include <kstaticdeleter.h>
@@ -38,10 +38,10 @@ DebugDialog::DebugDialog()
                 User1 | User2 | Ok, Ok, true )
 {
   TQWidget *page = plainPage();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, marginHint(), spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( page, marginHint(), spacingHint() );
 
   mView = new KTextBrowser( page );
-  tqlayout->addWidget( mView );
+  layout->addWidget( mView );
 
   setButtonText( User1, "Save As..." );
   setButtonText( User2, "Clear" );
diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index 1247975f7..222c4f4f2 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -393,7 +393,7 @@ void ResourceXMLRPC::deleteContactFinished( const TQValueList<TQVariant>&,
 void ResourceXMLRPC::fault( int error, const TQString &errorMsg,
                             const TQVariant& )
 {
-  TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).tqarg( error ).tqarg( errorMsg );
+  TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).arg( error ).arg( errorMsg );
   if ( addressBook() )
     addressBook()->error( msg );
 
@@ -408,7 +408,7 @@ void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg,
   mAddrMap.remove( addr.uid() );
 
   TQString msg = i18n( "Unable to add contact %1 to server. (%2)" );
-  addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
+  addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
 }
 
 void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
@@ -417,7 +417,7 @@ void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
   KABC::Addressee addr = mAddrMap[ id.toString() ];
 
   TQString msg = i18n( "Unable to update contact %1 on server. (%2)" );
-  addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
+  addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
 }
 
 void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg,
@@ -437,7 +437,7 @@ void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg,
   mAddrMap.insert( addr.uid(), addr );
 
   TQString msg = i18n( "Unable to delete contact %1 from server. (%2)" );
-  addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
+  addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
 }
 
 TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask )
diff --git a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
index ddafbd1f2..56caa2ea1 100644
--- a/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpcconfig.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index f47df2718..8841da75e 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::tqcurrentDate().addDays( -12 ) ) );
-  args.insert( "end", TQDateTime( TQDate::tqcurrentDate().addDays( 2000 ) ) );
+  args.insert( "start", TQDateTime( TQDate::currentDate().addDays( -12 ) ) );
+  args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) );
 
   mServer->call( SearchEventsCommand, args,
                  this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ),
diff --git a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
index 213da26e3..846c648fe 100644
--- a/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpcconfig.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kresources/egroupware/knotes_resourcexmlrpc.cpp b/kresources/egroupware/knotes_resourcexmlrpc.cpp
index 8b50c3b8e..c9a9a1bfd 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::tqfromLatin1("UTC") ),
+  : ResourceNotes( config ),  mCalendar( TQString::fromLatin1("UTC") ),
     mServer( 0 )
 {
   init();
@@ -65,7 +65,7 @@ ResourceXMLRPC::ResourceXMLRPC( const KConfig* config )
 }
 
 ResourceXMLRPC::ResourceXMLRPC( )
-  : ResourceNotes( 0 ), mCalendar( TQString::tqfromLatin1("UTC") ),
+  : ResourceNotes( 0 ), mCalendar( TQString::fromLatin1("UTC") ),
     mServer( 0 )
 {
   init();
diff --git a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
index 8cf2a35c8..e240bab8a 100644
--- a/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
+++ b/kresources/egroupware/knotes_resourcexmlrpcconfig.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index 81c517d0c..531b298f5 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -153,7 +153,7 @@ TQString TodoStateMapper::toRemote( int localState )
   else if ( localState == 100 )
     return "done";
   else
-    return TQString( "%1%" ).tqarg( localState );
+    return TQString( "%1%" ).arg( localState );
 }
 
 TQString TodoStateMapper::filename()
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index 09176ae6b..fd12d174d 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -113,7 +113,7 @@ void Query::slotResult( KIO::Job *job )
   if ( !doc.setContent( data, false, &errMsg, &errLine, &errCol  ) )
   {
     emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" )
-                        .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id );
+                        .arg( errMsg ).arg( errLine ).arg( errCol ), m_id );
     emit finished( this );
     return ;
   }
diff --git a/kresources/exchange/resourceexchange.cpp b/kresources/exchange/resourceexchange.cpp
index b58a750f2..9aace4162 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::tqfromLatin1( "UTC" );
+  mTimeZoneId = TQString::fromLatin1( "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::tqtopLevelWidgets();
+  TQWidgetList* widgets = TQApplication::topLevelWidgets();
   if ( !widgets->isEmpty() )
     mClient->setWindow( widgets->first() );
   delete widgets;
@@ -477,7 +477,7 @@ 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::tqcurrentDateTime();
+  TQDateTime now = TQDateTime::currentDateTime();
   // kdDebug() << "Now is " << now.toString() << endl;
   // kdDebug() << "mDates: " << mDates << endl;
   TQDate start = TQDate( qd.year(), qd.month(), 1 ); // First day of month
diff --git a/kresources/exchange/resourceexchangeconfig.cpp b/kresources/exchange/resourceexchangeconfig.cpp
index 36774901b..c5b59740d 100644
--- a/kresources/exchange/resourceexchangeconfig.cpp
+++ b/kresources/exchange/resourceexchangeconfig.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp
index f30ec2700..856b2526d 100644
--- a/kresources/featureplan/benchmarkfeaturelist.cpp
+++ b/kresources/featureplan/benchmarkfeaturelist.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <iostream>
 
diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp
index 08f6fdf0a..8d77cfa93 100644
--- a/kresources/featureplan/dumpfeaturelist.cpp
+++ b/kresources/featureplan/dumpfeaturelist.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <iostream>
 
diff --git a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
index 55d12cbd9..8b7714ea1 100644
--- a/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplanconfig.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
diff --git a/kresources/groupdav/groupdavglobals.cpp b/kresources/groupdav/groupdavglobals.cpp
index 5fb9d6d3a..896680e9e 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::tqfromLatin1("UTC") );
+  KCal::CalendarLocal calendar( TQString::fromLatin1("UTC") );
   KCal::ICalFormat ical;
   calendar.setTimeZoneId( adaptor->resource()->timeZoneId() );
   KCal::Incidence::List incidences;
diff --git a/kresources/groupware/kabc_resourcegroupwareconfig.cpp b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
index 956ee4321..b9c351633 100644
--- a/kresources/groupware/kabc_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kabc_resourcegroupwareconfig.cpp
@@ -32,7 +32,7 @@
 #include <kurlrequester.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KABC;
 
diff --git a/kresources/groupware/kcal_resourcegroupwareconfig.cpp b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
index 9a191bc30..45a5c7962 100644
--- a/kresources/groupware/kcal_resourcegroupwareconfig.cpp
+++ b/kresources/groupware/kcal_resourcegroupwareconfig.cpp
@@ -21,7 +21,7 @@
 #include <typeinfo>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index 8291b2bfc..d14d1a419 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -287,7 +287,7 @@ bool ResourceGroupwise::asyncLoad()
   if ( !mProgress )
   {
     mProgress = KPIM::ProgressManager::instance()->createProgressItem(
-      KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).tqarg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
+      KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
     connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
                TQT_SLOT( cancelLoad() ) );
   }
@@ -708,7 +708,7 @@ KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, uns
 
   if ( mode == Update && lastSequenceNumber > 0 && lastPORebuildTime > 0 )
   {
-    query += TQString::tqfromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).tqarg( lastSequenceNumber ).tqarg( lastPORebuildTime );;
+    query += TQString::fromLatin1( "&update=true&lastSeqNo=%1&PORebuildTime=%2" ).arg( lastSequenceNumber ).arg( lastPORebuildTime );;
   }
   url.setQuery( query );
   return url;
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
index 483268cc2..65e8a8bfe 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -32,7 +32,7 @@
 #include <kurlrequester.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KABC;
 
diff --git a/kresources/groupwise/kcal_resourcegroupwise.cpp b/kresources/groupwise/kcal_resourcegroupwise.cpp
index 026cf9b6c..060fe5f20 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::tqfromLatin1("UTC") );
+    CalendarLocal calendar( TQString::fromLatin1("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 26689315e..a891e3d45 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -21,7 +21,7 @@
 #include <typeinfo>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
@@ -124,7 +124,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
     if ( s )
     {
       KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
-//       TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog );
+//       TQVBoxLayout * layout = 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 4ebb2e387..e257ba71e 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -117,7 +117,7 @@ void Groupwise::get( const KURL &url )
       getAddressbook( url );
   } else {
     TQString error = i18n("Unknown path. Known paths are '/freebusy/', "
-        "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).tqarg( url.url() );
+        "'/calendar/' and '/addressbook/'.") + TQString(" path was %1" ).arg( url.url() );
     errorMessage( error );
   }
   
@@ -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::tqcurrentDate().addDays( -3 );
-      TQDate end = TQDate::tqcurrentDate().addDays( 60 );
+      TQDate start = TQDate::currentDate().addDays( -3 );
+      TQDate end = TQDate::currentDate().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::tqfromLatin1("UTC"));
+  KCal::CalendarLocal calendar( TQString::fromLatin1("UTC"));
 
   kdDebug() << "Login" << endl;
   if ( !server.login() ) {
@@ -419,7 +419,7 @@ void Groupwise::slotReadAddressBookProcessedSize( int size )
 void Groupwise::slotServerErrorMessage( const TQString & serverErrorMessage, bool fatal )
 {
   kdDebug() << "Groupwise::slotJobErrorMessage()" << serverErrorMessage << ( fatal ? ", FATAL!" : ", proceeding" ) << endl;
-  errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).tqarg( serverErrorMessage ) );
+  errorMessage( i18n( "An error occurred while communicating with the GroupWise server:\n%1" ).arg( serverErrorMessage ) );
 }
 
 #include "groupwise.moc"
diff --git a/kresources/groupwise/soap/contactconverter.cpp b/kresources/groupwise/soap/contactconverter.cpp
index 4f4454399..69c4b90f2 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::tqfromLatin1("messaging/%1").tqarg( protocol ),
-                          TQString::tqfromLatin1( "All" ),
+      addr.insertCustom( TQString::fromLatin1("messaging/%1").arg( protocol ),
+                          TQString::fromLatin1( "All" ),
                           addresses.join( TQChar( 0xE000 ) ) );
     }
   }
@@ -583,7 +583,7 @@ ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee
     TQString app, name, value;
     splitField( *it, app, name, value );
 
-    if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) && name == TQString::tqfromLatin1( "All" ) ) {
+    if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) && name == TQString::fromLatin1( "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 67c0da6e7..130895cdc 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -129,10 +129,10 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
   if (rc != 0 ) {
     kdError() << "gSoapOpen: lookup of " << host << " failed " << rc << endl;
     TQString errorMessage;
-    errorMessage = TQString::tqfromLatin1( strerror( errno ) );
+    errorMessage = TQString::fromLatin1( strerror( errno ) );
     perror( 0 );
     soap->error = SOAP_TCP_ERROR;
-    mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage );
+    mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
     return SOAP_INVALID_SOCKET;
   }
 
@@ -141,15 +141,15 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
     kdError() << "gSoapOpen: connect failed " << rc << endl;
     TQString errorMessage;
     if ( rc == -1 ) {
-      errorMessage = TQString::tqfromLatin1( strerror( errno ) );
+      errorMessage = TQString::fromLatin1( strerror( errno ) );
       perror( 0 );
     }
 	//set the soap struct's error here!
     else {
       if ( rc == -3 )
-        errorMessage = TQString::tqfromLatin1( "Connection timed out.  Check host and port number" );
+        errorMessage = TQString::fromLatin1( "Connection timed out.  Check host and port number" );
     }
-    mErrorText = i18n("Connect failed: %1.").tqarg( errorMessage );
+    mErrorText = i18n("Connect failed: %1.").arg( errorMessage );
     soap->error =SOAP_TCP_ERROR;
    return SOAP_INVALID_SOCKET;
   }
@@ -1097,7 +1097,7 @@ bool GroupwiseServer::changeIncidence( KCal::Incidence *incidence )
   return success;
 }
 
-bool GroupwiseServer::checkResponse( int result, ngwt__tqStatus *status )
+bool GroupwiseServer::checkResponse( int result, ngwt__Status *status )
 {
   if ( result != 0 ) {
     soap_print_fault( mSoap, stderr );
diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h
index 2c537661a..c37cc1486 100644
--- a/kresources/groupwise/soap/groupwiseserver.h
+++ b/kresources/groupwise/soap/groupwiseserver.h
@@ -59,7 +59,7 @@ class ngwt__Item;
 class ngwt__Appointment;
 class ngwt__Mail;
 class ngwt__Task;
-class ngwt__tqStatus;
+class ngwt__Status;
 class GroupWiseBinding;
 
 namespace GroupWise {
@@ -97,7 +97,7 @@ class GroupwiseServer : public TQObject
   TQ_OBJECT
 
   public:
-    bool checkResponse( int result, ngwt__tqStatus *status );
+    bool checkResponse( int result, ngwt__Status *status );
     enum RetractCause { DueToResend, Other };
     GroupwiseServer( const TQString &url, const TQString &user,
                      const TQString &password, TQObject *parent );
diff --git a/kresources/groupwise/soap/gwconverter.cpp b/kresources/groupwise/soap/gwconverter.cpp
index 2f7d5e03b..bda455f78 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::stringToTQDate( std::string* str )
 {
   //NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again
-  return TQDate::fromString( TQString::tqfromLatin1( str->c_str() ), Qt::ISODate );
+  return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate );
 }
 
 TQDateTime GWConverter::charToTQDateTime( const char *str )
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index 2a51adf06..47aa67745 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -121,7 +121,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
                                     &itemsRequest, &itemsResponse );
   if ( result != 0 ) {
     soap_print_fault( mSoap, stderr );
-    mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).tqarg( id.c_str() ), false );
+    mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: %1" ).arg( id.c_str() ), false );
     return;
   }
 
@@ -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::tqfromLatin1( "startDate" ).utf8();
-  filterEntry->value = TQDateTime::tqcurrentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
+  filterEntry->field = TQString::fromLatin1( "startDate" ).utf8();
+  filterEntry->value = TQDateTime::currentDateTime().toString( "yyyyMMddThhmmZ" ).utf8();
 
   filter->element = filterEntry;
 
@@ -613,7 +613,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
     else
     {
       kdDebug() << " readCursor got no Items in Response!" << endl;
-      mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).tqarg( id.c_str() ), false );
+      mServer->emitErrorMessage( i18n("Unable to read GroupWise address book: reading %1 returned no items." ).arg( id.c_str() ), false );
       break;
     }
   }
diff --git a/kresources/groupwise/soap/incidenceconverter.cpp b/kresources/groupwise/soap/incidenceconverter.cpp
index 7360d8a42..f0fe73892 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::tqfromLatin1( ";  %1" ).tqarg( (*it)->name() );
+      to += TQString::fromLatin1( ";  %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->recipientqStatus = 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( stringToTQString(recipient->email), mFromEmail ) )
         if ( item->status->accepted )
-          attendee->setqStatus( ( *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 c6fe2a4f6..e38f00d04 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -109,7 +109,7 @@ void KSSLSocket::slotConnected()
 			d->kssl->reInitialize();
 		}
 		d->kssl->setPeerHost(host());
-//        kdDebug() << "SOCKET STATUS: " << socketqStatus() << endl;
+//        kdDebug() << "SOCKET STATUS: " << sockeStatus() << endl;
 		int rc = d->kssl->connect( sockfd );
                 if ( rc <= 0 ) {
                   kdError() << "Error connecting KSSL: " << rc << endl;
@@ -325,7 +325,7 @@ int KSSLSocket::verifyCertificate()
 								"does not match the one the "
 								"certificate was issued to.");
 						result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
-						msg.tqarg(ourHost),
+						msg.arg(ourHost),
 						i18n("Server Authentication"),
 						i18n("&Details"),
 						KStdGuiItem::cont().text() );
@@ -335,7 +335,7 @@ int KSSLSocket::verifyCertificate()
 						TQString msg = i18n("The server certificate failed the "
 							"authenticity test (%1).");
 						result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
-						msg.tqarg(ourHost),
+						msg.arg(ourHost),
 						i18n("Server Authentication"),
 						i18n("&Details"),
 						KStdGuiItem::cont().text() );
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index a64b82b66..658040e41 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -164,8 +164,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwe__EventType(soap, NULL, NULL, "ngwe:EventType");
 	case SOAP_TYPE_ngwt__WeekDay:
 		return soap_in_ngwt__WeekDay(soap, NULL, NULL, "ngwt:WeekDay");
-	case SOAP_TYPE_ngwt__VersiontqStatus:
-		return soap_in_ngwt__VersiontqStatus(soap, NULL, NULL, "ngwt:VersionStatus");
+	case SOAP_TYPE_ngwt__VersionStatus:
+		return soap_in_ngwt__VersionStatus(soap, NULL, NULL, "ngwt:VersionStatus");
 	case SOAP_TYPE_ngwt__VersionEventType:
 		return soap_in_ngwt__VersionEventType(soap, NULL, NULL, "ngwt:VersionEventType");
 	case SOAP_TYPE_ngwt__StatusTrackingOptions:
@@ -206,8 +206,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__Frequency(soap, NULL, NULL, "ngwt:Frequency");
 	case SOAP_TYPE_ngwt__FolderType:
 		return soap_in_ngwt__FolderType(soap, NULL, NULL, "ngwt:FolderType");
-	case SOAP_TYPE_ngwt__FolderACLtqStatus:
-		return soap_in_ngwt__FolderACLtqStatus(soap, NULL, NULL, "ngwt:FolderACLStatus");
+	case SOAP_TYPE_ngwt__FolderACLStatus:
+		return soap_in_ngwt__FolderACLStatus(soap, NULL, NULL, "ngwt:FolderACLStatus");
 	case SOAP_TYPE_ngwt__FilterOp:
 		return soap_in_ngwt__FilterOp(soap, NULL, NULL, "ngwt:FilterOp");
 	case SOAP_TYPE_ngwt__FilterDate:
@@ -610,8 +610,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__UserInfo(soap, NULL, NULL, "ngwt:UserInfo");
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		return soap_in_ngwt__TrustedApplication(soap, NULL, NULL, "ngwt:TrustedApplication");
-	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
-		return soap_in_ngwt__TransferFailedtqStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus");
+	case SOAP_TYPE_ngwt__TransferFailedStatus:
+		return soap_in_ngwt__TransferFailedStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus");
 	case SOAP_TYPE_ngwt__TimezoneList:
 		return soap_in_ngwt__TimezoneList(soap, NULL, NULL, "ngwt:TimezoneList");
 	case SOAP_TYPE_ngwt__TimezoneComponent:
@@ -624,8 +624,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__SystemFolder(soap, NULL, NULL, "ngwt:SystemFolder");
 	case SOAP_TYPE_ngwt__StatusTracking:
 		return soap_in_ngwt__StatusTracking(soap, NULL, NULL, "ngwt:StatusTracking");
-	case SOAP_TYPE_ngwt__tqStatus:
-		return soap_in_ngwt__tqStatus(soap, NULL, NULL, "ngwt:Status");
+	case SOAP_TYPE_ngwt__Status:
+		return soap_in_ngwt__Status(soap, NULL, NULL, "ngwt:Status");
 	case SOAP_TYPE_ngwt__SMimeOperation:
 		return soap_in_ngwt__SMimeOperation(soap, NULL, NULL, "ngwt:SMimeOperation");
 	case SOAP_TYPE_ngwt__SignatureData:
@@ -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__RecipientqStatus:
-		return soap_in_ngwt__RecipientqStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
+	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:
@@ -738,8 +738,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__JunkHandlingList(soap, NULL, NULL, "ngwt:JunkHandlingList");
 	case SOAP_TYPE_ngwt__JunkEntry:
 		return soap_in_ngwt__JunkEntry(soap, NULL, NULL, "ngwt:JunkEntry");
-	case SOAP_TYPE_ngwt__ItemtqStatus:
-		return soap_in_ngwt__ItemtqStatus(soap, NULL, NULL, "ngwt:ItemStatus");
+	case SOAP_TYPE_ngwt__ItemStatus:
+		return soap_in_ngwt__ItemStatus(soap, NULL, NULL, "ngwt:ItemStatus");
 	case SOAP_TYPE_ngwt__Items:
 		return soap_in_ngwt__Items(soap, NULL, NULL, "ngwt:Items");
 	case SOAP_TYPE_ngwt__ItemRefList:
@@ -812,10 +812,10 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_ngwt__Distribution(soap, NULL, NULL, "ngwt:Distribution");
 	case SOAP_TYPE_ngwt__DeltaInfo:
 		return soap_in_ngwt__DeltaInfo(soap, NULL, NULL, "ngwt:DeltaInfo");
-	case SOAP_TYPE_ngwt__DelegateetqStatus:
-		return soap_in_ngwt__DelegateetqStatus(soap, NULL, NULL, "ngwt:DelegateeStatus");
-	case SOAP_TYPE_ngwt__DelegatedtqStatus:
-		return soap_in_ngwt__DelegatedtqStatus(soap, NULL, NULL, "ngwt:DelegatedStatus");
+	case SOAP_TYPE_ngwt__DelegateeStatus:
+		return soap_in_ngwt__DelegateeStatus(soap, NULL, NULL, "ngwt:DelegateeStatus");
+	case SOAP_TYPE_ngwt__DelegatedStatus:
+		return soap_in_ngwt__DelegatedStatus(soap, NULL, NULL, "ngwt:DelegatedStatus");
 	case SOAP_TYPE_ngwt__DayOfYearWeekList:
 		return soap_in_ngwt__DayOfYearWeekList(soap, NULL, NULL, "ngwt:DayOfYearWeekList");
 	case SOAP_TYPE_ngwt__DayOfYearWeek:
@@ -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__CommentqStatus:
-		return soap_in_ngwt__CommentqStatus(soap, NULL, NULL, "ngwt:CommenStatus");
+	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:
@@ -1262,8 +1262,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__EmailAddressList(soap, NULL, NULL, "ngwt:EmailAddressList");
 	case SOAP_TYPE_PointerTongwt__FullName:
 		return soap_in_PointerTongwt__FullName(soap, NULL, NULL, "ngwt:FullName");
-	case SOAP_TYPE_PointerTongwt__VersiontqStatus:
-		return soap_in_PointerTongwt__VersiontqStatus(soap, NULL, NULL, "ngwt:VersionStatus");
+	case SOAP_TYPE_PointerTongwt__VersionStatus:
+		return soap_in_PointerTongwt__VersionStatus(soap, NULL, NULL, "ngwt:VersionStatus");
 	case SOAP_TYPE_PointerTongwt__FolderACL:
 		return soap_in_PointerTongwt__FolderACL(soap, NULL, NULL, "ngwt:FolderACL");
 	case SOAP_TYPE_PointerTongwt__RuleActionList:
@@ -1272,8 +1272,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__Execution(soap, NULL, NULL, "ngwt:Execution");
 	case SOAP_TYPE_PointerTongwt__Query:
 		return soap_in_PointerTongwt__Query(soap, NULL, NULL, "ngwt:Query");
-	case SOAP_TYPE_PointerTongwt__FolderACLtqStatus:
-		return soap_in_PointerTongwt__FolderACLtqStatus(soap, NULL, NULL, "ngwt:FolderACLStatus");
+	case SOAP_TYPE_PointerTongwt__FolderACLStatus:
+		return soap_in_PointerTongwt__FolderACLStatus(soap, NULL, NULL, "ngwt:FolderACLStatus");
 	case SOAP_TYPE_PointerTongwt__AccessControlList:
 		return soap_in_PointerTongwt__AccessControlList(soap, NULL, NULL, "ngwt:AccessControlList");
 	case SOAP_TYPE_PointerTongwt__WeekOfYear:
@@ -1286,12 +1286,12 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__ItemClass(soap, NULL, NULL, "ngwt:ItemClass");
 	case SOAP_TYPE_PointerTongwt__ItemSource:
 		return soap_in_PointerTongwt__ItemSource(soap, NULL, NULL, "ngwt:ItemSource");
-	case SOAP_TYPE_PointerTongwt__ItemtqStatus:
-		return soap_in_PointerTongwt__ItemtqStatus(soap, NULL, NULL, "ngwt:ItemStatus");
+	case SOAP_TYPE_PointerTongwt__ItemStatus:
+		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__RecipientqStatus:
-		return soap_in_PointerTongwt__RecipientqStatus(soap, NULL, NULL, "ngwt:RecipienStatus");
+	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:
@@ -1394,8 +1394,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__Distribution(soap, NULL, NULL, "ngwt:Distribution");
 	case SOAP_TYPE_PointerTongwt__View:
 		return soap_in_PointerTongwt__View(soap, NULL, NULL, "ngwt:View");
-	case SOAP_TYPE_PointerTongwt__tqStatus:
-		return soap_in_PointerTongwt__tqStatus(soap, NULL, NULL, "ngwt:Status");
+	case SOAP_TYPE_PointerTongwt__Status:
+		return soap_in_PointerTongwt__Status(soap, NULL, NULL, "ngwt:Status");
 	case SOAP_TYPE_PointerTongwt__ItemRefList:
 		return soap_in_PointerTongwt__ItemRefList(soap, NULL, NULL, "ngwt:ItemRefList");
 	case SOAP_TYPE_PointerTongwt__UserInfo:
@@ -1450,14 +1450,14 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 		return soap_in_PointerTongwt__DayOfYearWeekList(soap, NULL, NULL, "ngwt:DayOfYearWeekList");
 	case SOAP_TYPE_PointerTongwt__Frequency:
 		return soap_in_PointerTongwt__Frequency(soap, NULL, NULL, "ngwt:Frequency");
-	case SOAP_TYPE_PointerTongwt__DelegateetqStatus:
-		return soap_in_PointerTongwt__DelegateetqStatus(soap, NULL, NULL, "ngwt:DelegateeStatus");
-	case SOAP_TYPE_PointerTongwt__DelegatedtqStatus:
-		return soap_in_PointerTongwt__DelegatedtqStatus(soap, NULL, NULL, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommentqStatus:
-		return soap_in_PointerTongwt__CommentqStatus(soap, NULL, NULL, "ngwt:CommenStatus");
-	case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus:
-		return soap_in_PointerTongwt__TransferFailedtqStatus(soap, NULL, NULL, "ngwt:TransferFailedStatus");
+	case SOAP_TYPE_PointerTongwt__DelegateeStatus:
+		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__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:
 		return soap_in_PointerTongwt__Recipient(soap, NULL, NULL, "ngwt:Recipient");
 	case SOAP_TYPE_PointerTongwt__Filter:
@@ -1649,8 +1649,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 			return soap_in_ngwt__WeekDay(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:VersionStatus"))
-		{	*type = SOAP_TYPE_ngwt__VersiontqStatus;
-			return soap_in_ngwt__VersiontqStatus(soap, NULL, NULL, NULL);
+		{	*type = SOAP_TYPE_ngwt__VersionStatus;
+			return soap_in_ngwt__VersionStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:VersionEventType"))
 		{	*type = SOAP_TYPE_ngwt__VersionEventType;
@@ -1733,8 +1733,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 			return soap_in_ngwt__FolderType(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:FolderACLStatus"))
-		{	*type = SOAP_TYPE_ngwt__FolderACLtqStatus;
-			return soap_in_ngwt__FolderACLtqStatus(soap, NULL, NULL, NULL);
+		{	*type = SOAP_TYPE_ngwt__FolderACLStatus;
+			return soap_in_ngwt__FolderACLStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:FilterOp"))
 		{	*type = SOAP_TYPE_ngwt__FilterOp;
@@ -2541,8 +2541,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 			return soap_in_ngwt__TrustedApplication(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:TransferFailedStatus"))
-		{	*type = SOAP_TYPE_ngwt__TransferFailedtqStatus;
-			return soap_in_ngwt__TransferFailedtqStatus(soap, NULL, NULL, NULL);
+		{	*type = SOAP_TYPE_ngwt__TransferFailedStatus;
+			return soap_in_ngwt__TransferFailedStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:TimezoneList"))
 		{	*type = SOAP_TYPE_ngwt__TimezoneList;
@@ -2569,8 +2569,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 			return soap_in_ngwt__StatusTracking(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:Status"))
-		{	*type = SOAP_TYPE_ngwt__tqStatus;
-			return soap_in_ngwt__tqStatus(soap, NULL, NULL, NULL);
+		{	*type = SOAP_TYPE_ngwt__Status;
+			return soap_in_ngwt__Status(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:SMimeOperation"))
 		{	*type = SOAP_TYPE_ngwt__SMimeOperation;
@@ -2665,8 +2665,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 			return soap_in_ngwt__RecurrenceDateType(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:RecipienStatus"))
-		{	*type = SOAP_TYPE_ngwt__RecipientqStatus;
-			return soap_in_ngwt__RecipientqStatus(soap, NULL, NULL, NULL);
+		{	*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;
@@ -2797,8 +2797,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 			return soap_in_ngwt__JunkEntry(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:ItemStatus"))
-		{	*type = SOAP_TYPE_ngwt__ItemtqStatus;
-			return soap_in_ngwt__ItemtqStatus(soap, NULL, NULL, NULL);
+		{	*type = SOAP_TYPE_ngwt__ItemStatus;
+			return soap_in_ngwt__ItemStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:Items"))
 		{	*type = SOAP_TYPE_ngwt__Items;
@@ -2945,12 +2945,12 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 			return soap_in_ngwt__DeltaInfo(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:DelegateeStatus"))
-		{	*type = SOAP_TYPE_ngwt__DelegateetqStatus;
-			return soap_in_ngwt__DelegateetqStatus(soap, NULL, NULL, NULL);
+		{	*type = SOAP_TYPE_ngwt__DelegateeStatus;
+			return soap_in_ngwt__DelegateeStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:DelegatedStatus"))
-		{	*type = SOAP_TYPE_ngwt__DelegatedtqStatus;
-			return soap_in_ngwt__DelegatedtqStatus(soap, NULL, NULL, NULL);
+		{	*type = SOAP_TYPE_ngwt__DelegatedStatus;
+			return soap_in_ngwt__DelegatedStatus(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:DayOfYearWeekList"))
 		{	*type = SOAP_TYPE_ngwt__DayOfYearWeekList;
@@ -2997,8 +2997,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_getelement(struct soap *soap, int *type)
 			return soap_in_ngwt__Contact(soap, NULL, NULL, NULL);
 		}
 		if (!soap_match_tag(soap, t, "ngwt:CommenStatus"))
-		{	*type = SOAP_TYPE_ngwt__CommentqStatus;
-			return soap_in_ngwt__CommentqStatus(soap, NULL, NULL, NULL);
+		{	*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;
@@ -3218,8 +3218,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_ngwe__EventType(soap, tag, id, (const enum ngwe__EventType *)ptr, "ngwe:EventType");
 	case SOAP_TYPE_ngwt__WeekDay:
 		return soap_out_ngwt__WeekDay(soap, tag, id, (const enum ngwt__WeekDay *)ptr, "ngwt:WeekDay");
-	case SOAP_TYPE_ngwt__VersiontqStatus:
-		return soap_out_ngwt__VersiontqStatus(soap, tag, id, (const enum ngwt__VersiontqStatus *)ptr, "ngwt:VersionStatus");
+	case SOAP_TYPE_ngwt__VersionStatus:
+		return soap_out_ngwt__VersionStatus(soap, tag, id, (const enum ngwt__VersionStatus *)ptr, "ngwt:VersionStatus");
 	case SOAP_TYPE_ngwt__VersionEventType:
 		return soap_out_ngwt__VersionEventType(soap, tag, id, (const enum ngwt__VersionEventType *)ptr, "ngwt:VersionEventType");
 	case SOAP_TYPE_ngwt__StatusTrackingOptions:
@@ -3260,8 +3260,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_ngwt__Frequency(soap, tag, id, (const enum ngwt__Frequency *)ptr, "ngwt:Frequency");
 	case SOAP_TYPE_ngwt__FolderType:
 		return soap_out_ngwt__FolderType(soap, tag, id, (const enum ngwt__FolderType *)ptr, "ngwt:FolderType");
-	case SOAP_TYPE_ngwt__FolderACLtqStatus:
-		return soap_out_ngwt__FolderACLtqStatus(soap, tag, id, (const enum ngwt__FolderACLtqStatus *)ptr, "ngwt:FolderACLStatus");
+	case SOAP_TYPE_ngwt__FolderACLStatus:
+		return soap_out_ngwt__FolderACLStatus(soap, tag, id, (const enum ngwt__FolderACLStatus *)ptr, "ngwt:FolderACLStatus");
 	case SOAP_TYPE_ngwt__FilterOp:
 		return soap_out_ngwt__FilterOp(soap, tag, id, (const enum ngwt__FilterOp *)ptr, "ngwt:FilterOp");
 	case SOAP_TYPE_ngwt__FilterDate:
@@ -3664,8 +3664,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__UserInfo *)ptr)->soap_out(soap, tag, id, "ngwt:UserInfo");
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		return ((ngwt__TrustedApplication *)ptr)->soap_out(soap, tag, id, "ngwt:TrustedApplication");
-	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
-		return ((ngwt__TransferFailedtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:TransferFailedStatus");
+	case SOAP_TYPE_ngwt__TransferFailedStatus:
+		return ((ngwt__TransferFailedStatus *)ptr)->soap_out(soap, tag, id, "ngwt:TransferFailedStatus");
 	case SOAP_TYPE_ngwt__TimezoneList:
 		return ((ngwt__TimezoneList *)ptr)->soap_out(soap, tag, id, "ngwt:TimezoneList");
 	case SOAP_TYPE_ngwt__TimezoneComponent:
@@ -3678,8 +3678,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__SystemFolder *)ptr)->soap_out(soap, tag, id, "ngwt:SystemFolder");
 	case SOAP_TYPE_ngwt__StatusTracking:
 		return ((ngwt__StatusTracking *)ptr)->soap_out(soap, tag, id, "ngwt:StatusTracking");
-	case SOAP_TYPE_ngwt__tqStatus:
-		return ((ngwt__tqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:Status");
+	case SOAP_TYPE_ngwt__Status:
+		return ((ngwt__Status *)ptr)->soap_out(soap, tag, id, "ngwt:Status");
 	case SOAP_TYPE_ngwt__SMimeOperation:
 		return ((ngwt__SMimeOperation *)ptr)->soap_out(soap, tag, id, "ngwt:SMimeOperation");
 	case SOAP_TYPE_ngwt__SignatureData:
@@ -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__RecipientqStatus:
-		return ((ngwt__RecipientqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:RecipienStatus");
+	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:
@@ -3792,8 +3792,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__JunkHandlingList *)ptr)->soap_out(soap, tag, id, "ngwt:JunkHandlingList");
 	case SOAP_TYPE_ngwt__JunkEntry:
 		return ((ngwt__JunkEntry *)ptr)->soap_out(soap, tag, id, "ngwt:JunkEntry");
-	case SOAP_TYPE_ngwt__ItemtqStatus:
-		return ((ngwt__ItemtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:ItemStatus");
+	case SOAP_TYPE_ngwt__ItemStatus:
+		return ((ngwt__ItemStatus *)ptr)->soap_out(soap, tag, id, "ngwt:ItemStatus");
 	case SOAP_TYPE_ngwt__Items:
 		return ((ngwt__Items *)ptr)->soap_out(soap, tag, id, "ngwt:Items");
 	case SOAP_TYPE_ngwt__ItemRefList:
@@ -3866,10 +3866,10 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return ((ngwt__Distribution *)ptr)->soap_out(soap, tag, id, "ngwt:Distribution");
 	case SOAP_TYPE_ngwt__DeltaInfo:
 		return ((ngwt__DeltaInfo *)ptr)->soap_out(soap, tag, id, "ngwt:DeltaInfo");
-	case SOAP_TYPE_ngwt__DelegateetqStatus:
-		return ((ngwt__DelegateetqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegateeStatus");
-	case SOAP_TYPE_ngwt__DelegatedtqStatus:
-		return ((ngwt__DelegatedtqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegatedStatus");
+	case SOAP_TYPE_ngwt__DelegateeStatus:
+		return ((ngwt__DelegateeStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegateeStatus");
+	case SOAP_TYPE_ngwt__DelegatedStatus:
+		return ((ngwt__DelegatedStatus *)ptr)->soap_out(soap, tag, id, "ngwt:DelegatedStatus");
 	case SOAP_TYPE_ngwt__DayOfYearWeekList:
 		return ((ngwt__DayOfYearWeekList *)ptr)->soap_out(soap, tag, id, "ngwt:DayOfYearWeekList");
 	case SOAP_TYPE_ngwt__DayOfYearWeek:
@@ -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__CommentqStatus:
-		return ((ngwt__CommentqStatus *)ptr)->soap_out(soap, tag, id, "ngwt:CommenStatus");
+	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:
@@ -4316,8 +4316,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__EmailAddressList(soap, tag, id, (ngwt__EmailAddressList *const*)ptr, "ngwt:EmailAddressList");
 	case SOAP_TYPE_PointerTongwt__FullName:
 		return soap_out_PointerTongwt__FullName(soap, tag, id, (ngwt__FullName *const*)ptr, "ngwt:FullName");
-	case SOAP_TYPE_PointerTongwt__VersiontqStatus:
-		return soap_out_PointerTongwt__VersiontqStatus(soap, tag, id, (enum ngwt__VersiontqStatus *const*)ptr, "ngwt:VersionStatus");
+	case SOAP_TYPE_PointerTongwt__VersionStatus:
+		return soap_out_PointerTongwt__VersionStatus(soap, tag, id, (enum ngwt__VersionStatus *const*)ptr, "ngwt:VersionStatus");
 	case SOAP_TYPE_PointerTongwt__FolderACL:
 		return soap_out_PointerTongwt__FolderACL(soap, tag, id, (ngwt__FolderACL *const*)ptr, "ngwt:FolderACL");
 	case SOAP_TYPE_PointerTongwt__RuleActionList:
@@ -4326,8 +4326,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__Execution(soap, tag, id, (enum ngwt__Execution *const*)ptr, "ngwt:Execution");
 	case SOAP_TYPE_PointerTongwt__Query:
 		return soap_out_PointerTongwt__Query(soap, tag, id, (ngwt__Query *const*)ptr, "ngwt:Query");
-	case SOAP_TYPE_PointerTongwt__FolderACLtqStatus:
-		return soap_out_PointerTongwt__FolderACLtqStatus(soap, tag, id, (enum ngwt__FolderACLtqStatus *const*)ptr, "ngwt:FolderACLStatus");
+	case SOAP_TYPE_PointerTongwt__FolderACLStatus:
+		return soap_out_PointerTongwt__FolderACLStatus(soap, tag, id, (enum ngwt__FolderACLStatus *const*)ptr, "ngwt:FolderACLStatus");
 	case SOAP_TYPE_PointerTongwt__AccessControlList:
 		return soap_out_PointerTongwt__AccessControlList(soap, tag, id, (ngwt__AccessControlList *const*)ptr, "ngwt:AccessControlList");
 	case SOAP_TYPE_PointerTongwt__WeekOfYear:
@@ -4340,12 +4340,12 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__ItemClass(soap, tag, id, (enum ngwt__ItemClass *const*)ptr, "ngwt:ItemClass");
 	case SOAP_TYPE_PointerTongwt__ItemSource:
 		return soap_out_PointerTongwt__ItemSource(soap, tag, id, (enum ngwt__ItemSource *const*)ptr, "ngwt:ItemSource");
-	case SOAP_TYPE_PointerTongwt__ItemtqStatus:
-		return soap_out_PointerTongwt__ItemtqStatus(soap, tag, id, (ngwt__ItemtqStatus *const*)ptr, "ngwt:ItemStatus");
+	case SOAP_TYPE_PointerTongwt__ItemStatus:
+		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__RecipientqStatus:
-		return soap_out_PointerTongwt__RecipientqStatus(soap, tag, id, (ngwt__RecipientqStatus *const*)ptr, "ngwt:RecipienStatus");
+	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:
@@ -4448,8 +4448,8 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__Distribution(soap, tag, id, (ngwt__Distribution *const*)ptr, "ngwt:Distribution");
 	case SOAP_TYPE_PointerTongwt__View:
 		return soap_out_PointerTongwt__View(soap, tag, id, (std::string *const*)ptr, "ngwt:View");
-	case SOAP_TYPE_PointerTongwt__tqStatus:
-		return soap_out_PointerTongwt__tqStatus(soap, tag, id, (ngwt__tqStatus *const*)ptr, "ngwt:Status");
+	case SOAP_TYPE_PointerTongwt__Status:
+		return soap_out_PointerTongwt__Status(soap, tag, id, (ngwt__Status *const*)ptr, "ngwt:Status");
 	case SOAP_TYPE_PointerTongwt__ItemRefList:
 		return soap_out_PointerTongwt__ItemRefList(soap, tag, id, (ngwt__ItemRefList *const*)ptr, "ngwt:ItemRefList");
 	case SOAP_TYPE_PointerTongwt__UserInfo:
@@ -4504,14 +4504,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_putelement(struct soap *soap, const void *ptr, co
 		return soap_out_PointerTongwt__DayOfYearWeekList(soap, tag, id, (ngwt__DayOfYearWeekList *const*)ptr, "ngwt:DayOfYearWeekList");
 	case SOAP_TYPE_PointerTongwt__Frequency:
 		return soap_out_PointerTongwt__Frequency(soap, tag, id, (enum ngwt__Frequency *const*)ptr, "ngwt:Frequency");
-	case SOAP_TYPE_PointerTongwt__DelegateetqStatus:
-		return soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, (ngwt__DelegateetqStatus *const*)ptr, "ngwt:DelegateeStatus");
-	case SOAP_TYPE_PointerTongwt__DelegatedtqStatus:
-		return soap_out_PointerTongwt__DelegatedtqStatus(soap, tag, id, (ngwt__DelegatedtqStatus *const*)ptr, "ngwt:DelegatedStatus");
-	case SOAP_TYPE_PointerTongwt__CommentqStatus:
-		return soap_out_PointerTongwt__CommentqStatus(soap, tag, id, (ngwt__CommentqStatus *const*)ptr, "ngwt:CommenStatus");
-	case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus:
-		return soap_out_PointerTongwt__TransferFailedtqStatus(soap, tag, id, (ngwt__TransferFailedtqStatus *const*)ptr, "ngwt:TransferFailedStatus");
+	case SOAP_TYPE_PointerTongwt__DelegateeStatus:
+		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__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:
 		return soap_out_PointerTongwt__Recipient(soap, tag, id, (ngwt__Recipient *const*)ptr, "ngwt:Recipient");
 	case SOAP_TYPE_PointerTongwt__Filter:
@@ -5175,8 +5175,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		((ngwt__TrustedApplication *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
-		((ngwt__TransferFailedtqStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__TransferFailedStatus:
+		((ngwt__TransferFailedStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__TimezoneList:
 		((ngwt__TimezoneList *)ptr)->soap_serialize(soap);
@@ -5196,8 +5196,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__StatusTracking:
 		((ngwt__StatusTracking *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__tqStatus:
-		((ngwt__tqStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__Status:
+		((ngwt__Status *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__SMimeOperation:
 		((ngwt__SMimeOperation *)ptr)->soap_serialize(soap);
@@ -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__RecipientqStatus:
-		((ngwt__RecipientqStatus *)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);
@@ -5367,8 +5367,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__JunkEntry:
 		((ngwt__JunkEntry *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__ItemtqStatus:
-		((ngwt__ItemtqStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__ItemStatus:
+		((ngwt__ItemStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__Items:
 		((ngwt__Items *)ptr)->soap_serialize(soap);
@@ -5478,11 +5478,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_ngwt__DeltaInfo:
 		((ngwt__DeltaInfo *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__DelegateetqStatus:
-		((ngwt__DelegateetqStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__DelegateeStatus:
+		((ngwt__DelegateeStatus *)ptr)->soap_serialize(soap);
 		break;
-	case SOAP_TYPE_ngwt__DelegatedtqStatus:
-		((ngwt__DelegatedtqStatus *)ptr)->soap_serialize(soap);
+	case SOAP_TYPE_ngwt__DelegatedStatus:
+		((ngwt__DelegatedStatus *)ptr)->soap_serialize(soap);
 		break;
 	case SOAP_TYPE_ngwt__DayOfYearWeekList:
 		((ngwt__DayOfYearWeekList *)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__CommentqStatus:
-		((ngwt__CommentqStatus *)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);
@@ -6402,8 +6402,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__FullName:
 		soap_serialize_PointerTongwt__FullName(soap, (ngwt__FullName *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__VersiontqStatus:
-		soap_serialize_PointerTongwt__VersiontqStatus(soap, (enum ngwt__VersiontqStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__VersionStatus:
+		soap_serialize_PointerTongwt__VersionStatus(soap, (enum ngwt__VersionStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__FolderACL:
 		soap_serialize_PointerTongwt__FolderACL(soap, (ngwt__FolderACL *const*)ptr);
@@ -6417,8 +6417,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__Query:
 		soap_serialize_PointerTongwt__Query(soap, (ngwt__Query *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__FolderACLtqStatus:
-		soap_serialize_PointerTongwt__FolderACLtqStatus(soap, (enum ngwt__FolderACLtqStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__FolderACLStatus:
+		soap_serialize_PointerTongwt__FolderACLStatus(soap, (enum ngwt__FolderACLStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__AccessControlList:
 		soap_serialize_PointerTongwt__AccessControlList(soap, (ngwt__AccessControlList *const*)ptr);
@@ -6438,14 +6438,14 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__ItemSource:
 		soap_serialize_PointerTongwt__ItemSource(soap, (enum ngwt__ItemSource *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__ItemtqStatus:
-		soap_serialize_PointerTongwt__ItemtqStatus(soap, (ngwt__ItemtqStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__ItemStatus:
+		soap_serialize_PointerTongwt__ItemStatus(soap, (ngwt__ItemStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__DeltaSyncType:
 		soap_serialize_PointerTongwt__DeltaSyncType(soap, (enum ngwt__DeltaSyncType *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__RecipientqStatus:
-		soap_serialize_PointerTongwt__RecipientqStatus(soap, (ngwt__RecipientqStatus *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);
@@ -6600,8 +6600,8 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__View:
 		soap_serialize_PointerTongwt__View(soap, (std::string *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__tqStatus:
-		soap_serialize_PointerTongwt__tqStatus(soap, (ngwt__tqStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__Status:
+		soap_serialize_PointerTongwt__Status(soap, (ngwt__Status *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__ItemRefList:
 		soap_serialize_PointerTongwt__ItemRefList(soap, (ngwt__ItemRefList *const*)ptr);
@@ -6684,17 +6684,17 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_markelement(struct soap *soap, const void *ptr,
 	case SOAP_TYPE_PointerTongwt__Frequency:
 		soap_serialize_PointerTongwt__Frequency(soap, (enum ngwt__Frequency *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__DelegateetqStatus:
-		soap_serialize_PointerTongwt__DelegateetqStatus(soap, (ngwt__DelegateetqStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__DelegateeStatus:
+		soap_serialize_PointerTongwt__DelegateeStatus(soap, (ngwt__DelegateeStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__DelegatedtqStatus:
-		soap_serialize_PointerTongwt__DelegatedtqStatus(soap, (ngwt__DelegatedtqStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__DelegatedStatus:
+		soap_serialize_PointerTongwt__DelegatedStatus(soap, (ngwt__DelegatedStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__CommentqStatus:
-		soap_serialize_PointerTongwt__CommentqStatus(soap, (ngwt__CommentqStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__CommenStatus:
+		soap_serialize_PointerTongwt__CommenStatus(soap, (ngwt__CommenStatus *const*)ptr);
 		break;
-	case SOAP_TYPE_PointerTongwt__TransferFailedtqStatus:
-		soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, (ngwt__TransferFailedtqStatus *const*)ptr);
+	case SOAP_TYPE_PointerTongwt__TransferFailedStatus:
+		soap_serialize_PointerTongwt__TransferFailedStatus(soap, (ngwt__TransferFailedStatus *const*)ptr);
 		break;
 	case SOAP_TYPE_PointerTongwt__Recipient:
 		soap_serialize_PointerTongwt__Recipient(soap, (ngwt__Recipient *const*)ptr);
@@ -6944,8 +6944,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__ItemRefList(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Items:
 		return (void*)soap_instantiate_ngwt__Items(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__ItemtqStatus:
-		return (void*)soap_instantiate_ngwt__ItemtqStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__ItemStatus:
+		return (void*)soap_instantiate_ngwt__ItemStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__JunkEntry:
 		return (void*)soap_instantiate_ngwt__JunkEntry(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__JunkHandlingList:
@@ -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__RecipientqStatus:
-		return (void*)soap_instantiate_ngwt__RecipientqStatus(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:
@@ -7026,8 +7026,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__SignatureData(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__SMimeOperation:
 		return (void*)soap_instantiate_ngwt__SMimeOperation(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__tqStatus:
-		return (void*)soap_instantiate_ngwt__tqStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__Status:
+		return (void*)soap_instantiate_ngwt__Status(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Timezone:
 		return (void*)soap_instantiate_ngwt__Timezone(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__TimezoneComponent:
@@ -7400,16 +7400,16 @@ 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__CommentqStatus:
-		return (void*)soap_instantiate_ngwt__CommentqStatus(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:
 		return (void*)soap_instantiate_ngwt__ContainerRef(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__DelegatedtqStatus:
-		return (void*)soap_instantiate_ngwt__DelegatedtqStatus(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__DelegateetqStatus:
-		return (void*)soap_instantiate_ngwt__DelegateetqStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__DelegatedStatus:
+		return (void*)soap_instantiate_ngwt__DelegatedStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__DelegateeStatus:
+		return (void*)soap_instantiate_ngwt__DelegateeStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__FilterEntry:
 		return (void*)soap_instantiate_ngwt__FilterEntry(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__FilterGroup:
@@ -7436,8 +7436,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_ngwt__ProxyUser(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__Recipient:
 		return (void*)soap_instantiate_ngwt__Recipient(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
-		return (void*)soap_instantiate_ngwt__TransferFailedtqStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_ngwt__TransferFailedStatus:
+		return (void*)soap_instantiate_ngwt__TransferFailedStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		return (void*)soap_instantiate_ngwt__TrustedApplication(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_ngwt__AddressBookItem:
@@ -7540,8 +7540,8 @@ SOAP_FMAC3 void * SOAP_FMAC4 soap_instantiate(struct soap *soap, int t, const ch
 		return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__RuleAction(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_std__vectorTemplateOfxsd__date:
 		return (void*)soap_instantiate_std__vectorTemplateOfxsd__date(soap, -1, type, arrayType, n);
-	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus:
-		return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, -1, type, arrayType, n);
+	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus:
+		return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient:
 		return (void*)soap_instantiate_std__vectorTemplateOfPointerTongwt__Recipient(soap, -1, type, arrayType, n);
 	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__ProxyUser:
@@ -7879,11 +7879,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__Items*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__ItemtqStatus:
+	case SOAP_TYPE_ngwt__ItemStatus:
 		if (p->size < 0)
-			delete (ngwt__ItemtqStatus*)p->ptr;
+			delete (ngwt__ItemStatus*)p->ptr;
 		else
-			delete[] (ngwt__ItemtqStatus*)p->ptr;
+			delete[] (ngwt__ItemStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__JunkEntry:
 		if (p->size < 0)
@@ -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__RecipientqStatus:
+	case SOAP_TYPE_ngwt__RecipienStatus:
 		if (p->size < 0)
-			delete (ngwt__RecipientqStatus*)p->ptr;
+			delete (ngwt__RecipienStatus*)p->ptr;
 		else
-			delete[] (ngwt__RecipientqStatus*)p->ptr;
+			delete[] (ngwt__RecipienStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__RecurrenceDateType:
 		if (p->size < 0)
@@ -8125,11 +8125,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__SMimeOperation*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__tqStatus:
+	case SOAP_TYPE_ngwt__Status:
 		if (p->size < 0)
-			delete (ngwt__tqStatus*)p->ptr;
+			delete (ngwt__Status*)p->ptr;
 		else
-			delete[] (ngwt__tqStatus*)p->ptr;
+			delete[] (ngwt__Status*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__Timezone:
 		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__CommentqStatus:
+	case SOAP_TYPE_ngwt__CommenStatus:
 		if (p->size < 0)
-			delete (ngwt__CommentqStatus*)p->ptr;
+			delete (ngwt__CommenStatus*)p->ptr;
 		else
-			delete[] (ngwt__CommentqStatus*)p->ptr;
+			delete[] (ngwt__CommenStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__ContainerItem:
 		if (p->size < 0)
@@ -9265,17 +9265,17 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__ContainerRef*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__DelegatedtqStatus:
+	case SOAP_TYPE_ngwt__DelegatedStatus:
 		if (p->size < 0)
-			delete (ngwt__DelegatedtqStatus*)p->ptr;
+			delete (ngwt__DelegatedStatus*)p->ptr;
 		else
-			delete[] (ngwt__DelegatedtqStatus*)p->ptr;
+			delete[] (ngwt__DelegatedStatus*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__DelegateetqStatus:
+	case SOAP_TYPE_ngwt__DelegateeStatus:
 		if (p->size < 0)
-			delete (ngwt__DelegateetqStatus*)p->ptr;
+			delete (ngwt__DelegateeStatus*)p->ptr;
 		else
-			delete[] (ngwt__DelegateetqStatus*)p->ptr;
+			delete[] (ngwt__DelegateeStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__FilterEntry:
 		if (p->size < 0)
@@ -9355,11 +9355,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (ngwt__Recipient*)p->ptr;
 		break;
-	case SOAP_TYPE_ngwt__TransferFailedtqStatus:
+	case SOAP_TYPE_ngwt__TransferFailedStatus:
 		if (p->size < 0)
-			delete (ngwt__TransferFailedtqStatus*)p->ptr;
+			delete (ngwt__TransferFailedStatus*)p->ptr;
 		else
-			delete[] (ngwt__TransferFailedtqStatus*)p->ptr;
+			delete[] (ngwt__TransferFailedStatus*)p->ptr;
 		break;
 	case SOAP_TYPE_ngwt__TrustedApplication:
 		if (p->size < 0)
@@ -9667,11 +9667,11 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_fdelete(struct soap_clist *p)
 		else
 			delete[] (std::vector<std::string >*)p->ptr;
 		break;
-	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus:
+	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus:
 		if (p->size < 0)
-			delete (std::vector<ngwt__DelegateetqStatus * >*)p->ptr;
+			delete (std::vector<ngwt__DelegateeStatus * >*)p->ptr;
 		else
-			delete[] (std::vector<ngwt__DelegateetqStatus * >*)p->ptr;
+			delete[] (std::vector<ngwt__DelegateeStatus * >*)p->ptr;
 		break;
 	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient:
 		if (p->size < 0)
@@ -9927,9 +9927,9 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_container_insert(struct soap *soap, int st, int
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q));
 		((std::vector<std::string >*)p)->insert(((std::vector<std::string >*)p)->end(), *(std::string *)q);
 		break;
-	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus:
+	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus:
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q));
-		((std::vector<ngwt__DelegateetqStatus * >*)p)->insert(((std::vector<ngwt__DelegateetqStatus * >*)p)->end(), *(ngwt__DelegateetqStatus **)q);
+		((std::vector<ngwt__DelegateeStatus * >*)p)->insert(((std::vector<ngwt__DelegateeStatus * >*)p)->end(), *(ngwt__DelegateeStatus **)q);
 		break;
 	case SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient:
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Container insert type=%d in %d location=%p object=%p\n", st, tt, p, q));
@@ -11031,25 +11031,25 @@ SOAP_FMAC3 enum ngwt__WeekDay * SOAP_FMAC4 soap_in_ngwt__WeekDay(struct soap *so
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *a)
 {
 (void)soap; /* appease -Wall -Werror */
-#ifdef SOAP_DEFAULT_ngwt__VersiontqStatus
-	*a = SOAP_DEFAULT_ngwt__VersiontqStatus;
+#ifdef SOAP_DEFAULT_ngwt__VersionStatus
+	*a = SOAP_DEFAULT_ngwt__VersionStatus;
 #else
-	*a = (enum ngwt__VersiontqStatus)0;
+	*a = (enum ngwt__VersionStatus)0;
 #endif
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersiontqStatus(struct soap *soap, const enum ngwt__VersiontqStatus *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersionStatus(struct soap *soap, const enum ngwt__VersionStatus *a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__VersiontqStatus);
-	if (soap_out_ngwt__VersiontqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__VersionStatus);
+	if (soap_out_ngwt__VersionStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-static const struct soap_code_map soap_codes_ngwt__VersiontqStatus[] =
+static const struct soap_code_map soap_codes_ngwt__VersionStatus[] =
 {	{ (long)available, "available" },
 	{ (long)checkedOut, "checkedOut" },
 	{ (long)inUse, "inUse" },
@@ -11060,44 +11060,44 @@ static const struct soap_code_map soap_codes_ngwt__VersiontqStatus[] =
 	{ 0, NULL }
 };
 
-SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersiontqStatus2s(struct soap *soap, enum ngwt__VersiontqStatus n)
-{	const char *s = soap_str_code(soap_codes_ngwt__VersiontqStatus, (long)n);
+SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersionStatus2s(struct soap *soap, enum ngwt__VersionStatus n)
+{	const char *s = soap_str_code(soap_codes_ngwt__VersionStatus, (long)n);
 	if (s)
 		return s;
 	return soap_long2s(soap, (long)n);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersiontqStatus(struct soap *soap, const char *tag, int id, const enum ngwt__VersiontqStatus *a, const char *type)
-{	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__VersiontqStatus), type);
-	soap_send(soap, soap_ngwt__VersiontqStatus2s(soap, *a));
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersionStatus(struct soap *soap, const char *tag, int id, const enum ngwt__VersionStatus *a, const char *type)
+{	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__VersionStatus), type);
+	soap_send(soap, soap_ngwt__VersionStatus2s(soap, *a));
 	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_get_ngwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_get_ngwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__VersiontqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__VersionStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersiontqStatus(struct soap *soap, const char *s, enum ngwt__VersiontqStatus *a)
+SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersionStatus(struct soap *soap, const char *s, enum ngwt__VersionStatus *a)
 {
 	const struct soap_code_map *map;
 	if (!s)
 		return SOAP_OK;
-	map = soap_code(soap_codes_ngwt__VersiontqStatus, s);
+	map = soap_code(soap_codes_ngwt__VersionStatus, s);
 	if (map)
-		*a = (enum ngwt__VersiontqStatus)map->code;
+		*a = (enum ngwt__VersionStatus)map->code;
 	else
 	{	long n;
 		if (soap_s2long(soap, s, &n))
 			return soap->error;
-		*a = (enum ngwt__VersiontqStatus)n;
+		*a = (enum ngwt__VersionStatus)n;
 	}
 	return SOAP_OK;
 }
 
-SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_in_ngwt__VersiontqStatus(struct soap *soap, const char *tag, enum ngwt__VersiontqStatus *a, const char *type)
+SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_in_ngwt__VersionStatus(struct soap *soap, const char *tag, enum ngwt__VersionStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
@@ -11105,15 +11105,15 @@ SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_in_ngwt__VersiontqStatus
 	{	soap->error = SOAP_TYPE;
 		return NULL;
 	}
-	a = (enum ngwt__VersiontqStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__VersiontqStatus, sizeof(enum ngwt__VersiontqStatus), 0, NULL, NULL, NULL);
+	a = (enum ngwt__VersionStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__VersionStatus, sizeof(enum ngwt__VersionStatus), 0, NULL, NULL, NULL);
 	if (!a)
 		return NULL;
 	if (soap->body && !*soap->href)
-	{	if (!a || soap_s2ngwt__VersiontqStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag))
+	{	if (!a || soap_s2ngwt__VersionStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	else
-	{	a = (enum ngwt__VersiontqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersiontqStatus, 0, sizeof(enum ngwt__VersiontqStatus), 0, NULL);
+	{	a = (enum ngwt__VersionStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersionStatus, 0, sizeof(enum ngwt__VersionStatus), 0, NULL);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -11148,7 +11148,7 @@ static const struct soap_code_map soap_codes_ngwt__VersionEventType[] =
 	{ (long)created, "created" },
 	{ (long)deleteVersion, "deleteVersion" },
 	{ (long)endAccess, "endAccess" },
-	{ (long)resetqStatus, "reseStatus" },
+	{ (long)reseStatus, "reseStatus" },
 	{ (long)restore, "restore" },
 	{ (long)retrieve, "retrieve" },
 	{ (long)securityModified, "securityModified" },
@@ -12877,25 +12877,25 @@ SOAP_FMAC3 enum ngwt__FolderType * SOAP_FMAC4 soap_in_ngwt__FolderType(struct so
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *a)
 {
 (void)soap; /* appease -Wall -Werror */
-#ifdef SOAP_DEFAULT_ngwt__FolderACLtqStatus
-	*a = SOAP_DEFAULT_ngwt__FolderACLtqStatus;
+#ifdef SOAP_DEFAULT_ngwt__FolderACLStatus
+	*a = SOAP_DEFAULT_ngwt__FolderACLStatus;
 #else
-	*a = (enum ngwt__FolderACLtqStatus)0;
+	*a = (enum ngwt__FolderACLStatus)0;
 #endif
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLtqStatus(struct soap *soap, const enum ngwt__FolderACLtqStatus *a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLStatus(struct soap *soap, const enum ngwt__FolderACLStatus *a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__FolderACLtqStatus);
-	if (soap_out_ngwt__FolderACLtqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_ngwt__FolderACLStatus);
+	if (soap_out_ngwt__FolderACLStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-static const struct soap_code_map soap_codes_ngwt__FolderACLtqStatus[] =
+static const struct soap_code_map soap_codes_ngwt__FolderACLStatus[] =
 {	{ (long)pending, "pending" },
 	{ (long)accepted, "accepted" },
 	{ (long)deleted, "deleted" },
@@ -12904,44 +12904,44 @@ static const struct soap_code_map soap_codes_ngwt__FolderACLtqStatus[] =
 	{ 0, NULL }
 };
 
-SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLtqStatus2s(struct soap *soap, enum ngwt__FolderACLtqStatus n)
-{	const char *s = soap_str_code(soap_codes_ngwt__FolderACLtqStatus, (long)n);
+SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLStatus2s(struct soap *soap, enum ngwt__FolderACLStatus n)
+{	const char *s = soap_str_code(soap_codes_ngwt__FolderACLStatus, (long)n);
 	if (s)
 		return s;
 	return soap_long2s(soap, (long)n);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLtqStatus(struct soap *soap, const char *tag, int id, const enum ngwt__FolderACLtqStatus *a, const char *type)
-{	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__FolderACLtqStatus), type);
-	soap_send(soap, soap_ngwt__FolderACLtqStatus2s(soap, *a));
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLStatus(struct soap *soap, const char *tag, int id, const enum ngwt__FolderACLStatus *a, const char *type)
+{	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__FolderACLStatus), type);
+	soap_send(soap, soap_ngwt__FolderACLStatus2s(soap, *a));
 	return soap_element_end_out(soap, tag);
 }
 
-SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__FolderACLtqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__FolderACLStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLtqStatus(struct soap *soap, const char *s, enum ngwt__FolderACLtqStatus *a)
+SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLStatus(struct soap *soap, const char *s, enum ngwt__FolderACLStatus *a)
 {
 	const struct soap_code_map *map;
 	if (!s)
 		return SOAP_OK;
-	map = soap_code(soap_codes_ngwt__FolderACLtqStatus, s);
+	map = soap_code(soap_codes_ngwt__FolderACLStatus, s);
 	if (map)
-		*a = (enum ngwt__FolderACLtqStatus)map->code;
+		*a = (enum ngwt__FolderACLStatus)map->code;
 	else
 	{	long n;
 		if (soap_s2long(soap, s, &n))
 			return soap->error;
-		*a = (enum ngwt__FolderACLtqStatus)n;
+		*a = (enum ngwt__FolderACLStatus)n;
 	}
 	return SOAP_OK;
 }
 
-SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLtqStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLtqStatus *a, const char *type)
+SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
@@ -12949,15 +12949,15 @@ SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLtqSt
 	{	soap->error = SOAP_TYPE;
 		return NULL;
 	}
-	a = (enum ngwt__FolderACLtqStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__FolderACLtqStatus, sizeof(enum ngwt__FolderACLtqStatus), 0, NULL, NULL, NULL);
+	a = (enum ngwt__FolderACLStatus *)soap_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__FolderACLStatus, sizeof(enum ngwt__FolderACLStatus), 0, NULL, NULL, NULL);
 	if (!a)
 		return NULL;
 	if (soap->body && !*soap->href)
-	{	if (!a || soap_s2ngwt__FolderACLtqStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag))
+	{	if (!a || soap_s2ngwt__FolderACLStatus(soap, soap_value(soap), a) || soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	else
-	{	a = (enum ngwt__FolderACLtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLtqStatus, 0, sizeof(enum ngwt__FolderACLtqStatus), 0, NULL);
+	{	a = (enum ngwt__FolderACLStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLStatus, 0, sizeof(enum ngwt__FolderACLStatus), 0, NULL);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -14261,7 +14261,7 @@ static const struct soap_code_map soap_codes_ngwe__FieldList[] =
 	{ (long)PhoneNumber, "PhoneNumber" },
 	{ (long)Place, "Place" },
 	{ (long)PostalAddress, "PostalAddress" },
-	{ (long)RecipientqStatus, "RecipienStatus" },
+	{ (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, "RecipientqStatus "); 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;
@@ -14377,7 +14377,7 @@ SOAP_FMAC3 enum ngwe__FieldList * SOAP_FMAC4 soap_in_ngwe__FieldList(struct soap
 			else if (!strcmp(s, "PostalAddress"))
 				i |= (LONG64)PostalAddress;
 			else if (!strcmp(s, "RecipienStatus"))
-				i |= (LONG64)RecipientqStatus;
+				i |= (LONG64)RecipienStatus;
 			else if (!strcmp(s, "Rights"))
 				i |= (LONG64)Rights;
 			else if (!strcmp(s, "Security"))
@@ -14873,8 +14873,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__View(struct soap *soap, int st, int t
 void _ngwe__removeEventsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwe__removeEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__removeEventsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__removeEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__removeEventsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -14901,7 +14901,7 @@ int _ngwe__removeEventsResponse::soap_out(struct soap *soap, const char *tag, in
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__removeEventsResponse(struct soap *soap, const char *tag, int id, const _ngwe__removeEventsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__removeEventsResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__removeEventsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__removeEventsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -14944,7 +14944,7 @@ SOAP_FMAC3 _ngwe__removeEventsResponse * SOAP_FMAC4 soap_in__ngwe__removeEventsR
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__removeEventsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__removeEventsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -15167,8 +15167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__removeEventsRequest(struct soap *soa
 void _ngwe__removeEventConfigurationResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__removeEventConfigurationResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -15195,7 +15195,7 @@ int _ngwe__removeEventConfigurationResponse::soap_out(struct soap *soap, const c
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__removeEventConfigurationResponse(struct soap *soap, const char *tag, int id, const _ngwe__removeEventConfigurationResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__removeEventConfigurationResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__removeEventConfigurationResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__removeEventConfigurationResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -15238,7 +15238,7 @@ SOAP_FMAC3 _ngwe__removeEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__r
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__removeEventConfigurationResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__removeEventConfigurationResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -15445,8 +15445,8 @@ void _ngwe__getEventsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->events, SOAP_TYPE_PointerTongwe__EventList);
 	soap_serialize_PointerTongwe__EventList(soap, &((_ngwe__getEventsResponse*)this)->events);
-	soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__getEventsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__getEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__getEventsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -15475,7 +15475,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__getEventsResponse(struct soap *soap, c
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__getEventsResponse), type);
 	soap_out_PointerTongwe__EventList(soap, "ngwe:events", -1, &(((_ngwe__getEventsResponse*)a)->events), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__getEventsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__getEventsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -15523,7 +15523,7 @@ SOAP_FMAC3 _ngwe__getEventsResponse * SOAP_FMAC4 soap_in__ngwe__getEventsRespons
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__getEventsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__getEventsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -15781,8 +15781,8 @@ void _ngwe__getEventConfigurationResponse::soap_serialize(struct soap *soap) con
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->events, SOAP_TYPE_PointerTongwe__EventsList);
 	soap_serialize_PointerTongwe__EventsList(soap, &((_ngwe__getEventConfigurationResponse*)this)->events);
-	soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__getEventConfigurationResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__getEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__getEventConfigurationResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -15811,7 +15811,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__getEventConfigurationResponse(struct s
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__getEventConfigurationResponse), type);
 	soap_out_PointerTongwe__EventsList(soap, "ngwe:events", -1, &(((_ngwe__getEventConfigurationResponse*)a)->events), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__getEventConfigurationResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__getEventConfigurationResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -15859,7 +15859,7 @@ SOAP_FMAC3 _ngwe__getEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__getE
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__getEventConfigurationResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__getEventConfigurationResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -16060,8 +16060,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__getEventConfigurationRequest(struct
 void _ngwe__configureEventsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwe__configureEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__configureEventsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__configureEventsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__configureEventsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -16088,7 +16088,7 @@ int _ngwe__configureEventsResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__configureEventsResponse(struct soap *soap, const char *tag, int id, const _ngwe__configureEventsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__configureEventsResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__configureEventsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__configureEventsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -16131,7 +16131,7 @@ SOAP_FMAC3 _ngwe__configureEventsResponse * SOAP_FMAC4 soap_in__ngwe__configureE
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__configureEventsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__configureEventsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -16332,8 +16332,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwe__configureEventsRequest(struct soap *
 void _ngwe__cleanEventConfigurationResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status);
+	soap_embedded(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwe__cleanEventConfigurationResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -16360,7 +16360,7 @@ int _ngwe__cleanEventConfigurationResponse::soap_out(struct soap *soap, const ch
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwe__cleanEventConfigurationResponse(struct soap *soap, const char *tag, int id, const _ngwe__cleanEventConfigurationResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwe__cleanEventConfigurationResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwe:status", -1, &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwe:status", -1, &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -16403,7 +16403,7 @@ SOAP_FMAC3 _ngwe__cleanEventConfigurationResponse * SOAP_FMAC4 soap_in__ngwe__cl
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwe:status", &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwe:status", &(((_ngwe__cleanEventConfigurationResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -17867,8 +17867,8 @@ void _ngwm__updateVersionStatusResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->part, SOAP_TYPE_PointerTongwt__SignatureData);
 	soap_serialize_PointerTongwt__SignatureData(soap, &((_ngwm__updateVersionStatusResponse*)this)->part);
-	soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__updateVersionStatusResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__updateVersionStatusResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__updateVersionStatusResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -17897,7 +17897,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__updateVersionStatusResponse(struct soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__updateVersionStatusResponse), type);
 	soap_out_PointerTongwt__SignatureData(soap, "ngwm:part", -1, &(((_ngwm__updateVersionStatusResponse*)a)->part), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__updateVersionStatusResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__updateVersionStatusResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -17945,7 +17945,7 @@ SOAP_FMAC3 _ngwm__updateVersionStatusResponse * SOAP_FMAC4 soap_in__ngwm__update
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__updateVersionStatusResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__updateVersionStatusResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -18167,8 +18167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__updateVersionStatusRequest(struct so
 void _ngwm__uncompleteResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__uncompleteResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__uncompleteResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__uncompleteResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__uncompleteResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -18195,7 +18195,7 @@ int _ngwm__uncompleteResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__uncompleteResponse(struct soap *soap, const char *tag, int id, const _ngwm__uncompleteResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__uncompleteResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__uncompleteResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__uncompleteResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -18238,7 +18238,7 @@ SOAP_FMAC3 _ngwm__uncompleteResponse * SOAP_FMAC4 soap_in__ngwm__uncompleteRespo
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__uncompleteResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__uncompleteResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -18443,8 +18443,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__uncompleteRequest(struct soap *soap,
 void _ngwm__unacceptResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__unacceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__unacceptResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__unacceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__unacceptResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -18471,7 +18471,7 @@ int _ngwm__unacceptResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__unacceptResponse(struct soap *soap, const char *tag, int id, const _ngwm__unacceptResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__unacceptResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__unacceptResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__unacceptResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -18514,7 +18514,7 @@ SOAP_FMAC3 _ngwm__unacceptResponse * SOAP_FMAC4 soap_in__ngwm__unacceptResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__unacceptResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__unacceptResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -18721,8 +18721,8 @@ void _ngwm__startFreeBusySessionResponse::soap_serialize(struct soap *soap) cons
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->freeBusySessionId, SOAP_TYPE_PointerToint);
 	soap_serialize_PointerToint(soap, &((_ngwm__startFreeBusySessionResponse*)this)->freeBusySessionId);
-	soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__startFreeBusySessionResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -18751,7 +18751,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__startFreeBusySessionResponse(struct so
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__startFreeBusySessionResponse), type);
 	soap_out_PointerToint(soap, "ngwm:freeBusySessionId", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->freeBusySessionId), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__startFreeBusySessionResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -18799,7 +18799,7 @@ SOAP_FMAC3 _ngwm__startFreeBusySessionResponse * SOAP_FMAC4 soap_in__ngwm__start
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__startFreeBusySessionResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__startFreeBusySessionResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -19022,8 +19022,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__startFreeBusySessionRequest(struct s
 void _ngwm__setTimestampResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__setTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__setTimestampResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__setTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__setTimestampResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -19050,7 +19050,7 @@ int _ngwm__setTimestampResponse::soap_out(struct soap *soap, const char *tag, in
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__setTimestampResponse(struct soap *soap, const char *tag, int id, const _ngwm__setTimestampResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__setTimestampResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__setTimestampResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__setTimestampResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -19093,7 +19093,7 @@ SOAP_FMAC3 _ngwm__setTimestampResponse * SOAP_FMAC4 soap_in__ngwm__setTimestampR
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__setTimestampResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__setTimestampResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -19304,8 +19304,8 @@ void _ngwm__sendItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__sendItemResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__sendItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__sendItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__sendItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__sendItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -19334,7 +19334,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__sendItemResponse(struct soap *soap, co
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__sendItemResponse), type);
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__sendItemResponse*)a)->id), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__sendItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__sendItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -19380,7 +19380,7 @@ SOAP_FMAC3 _ngwm__sendItemResponse * SOAP_FMAC4 soap_in__ngwm__sendItemResponse(
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__sendItemResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__sendItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__sendItemResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -19585,8 +19585,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__sendItemRequest(struct soap *soap, i
 void _ngwm__retractResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__retractResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__retractResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__retractResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__retractResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -19613,7 +19613,7 @@ int _ngwm__retractResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__retractResponse(struct soap *soap, const char *tag, int id, const _ngwm__retractResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__retractResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__retractResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__retractResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -19656,7 +19656,7 @@ SOAP_FMAC3 _ngwm__retractResponse * SOAP_FMAC4 soap_in__ngwm__retractResponse(st
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__retractResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__retractResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -19897,8 +19897,8 @@ void _ngwm__replyResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__replyResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item);
 	soap_serialize_PointerTongwt__Item(soap, &((_ngwm__replyResponse*)this)->item);
-	soap_embedded(soap, &((_ngwm__replyResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__replyResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__replyResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__replyResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -19927,7 +19927,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__replyResponse(struct soap *soap, const
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__replyResponse), type);
 	soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__replyResponse*)a)->item), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__replyResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__replyResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -19975,7 +19975,7 @@ SOAP_FMAC3 _ngwm__replyResponse * SOAP_FMAC4 soap_in__ngwm__replyResponse(struct
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__replyResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__replyResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -20189,8 +20189,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__replyRequest(struct soap *soap, int
 void _ngwm__removeSignatureResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeSignatureResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeSignatureResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -20217,7 +20217,7 @@ int _ngwm__removeSignatureResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeSignatureResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeSignatureResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeSignatureResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeSignatureResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeSignatureResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -20260,7 +20260,7 @@ SOAP_FMAC3 _ngwm__removeSignatureResponse * SOAP_FMAC4 soap_in__ngwm__removeSign
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeSignatureResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeSignatureResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -20478,8 +20478,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeSignatureRequest(struct soap *
 void _ngwm__removeProxyUserResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeProxyUserResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeProxyUserResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeProxyUserResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeProxyUserResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -20506,7 +20506,7 @@ int _ngwm__removeProxyUserResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeProxyUserResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeProxyUserResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeProxyUserResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeProxyUserResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeProxyUserResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -20549,7 +20549,7 @@ SOAP_FMAC3 _ngwm__removeProxyUserResponse * SOAP_FMAC4 soap_in__ngwm__removeProx
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeProxyUserResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeProxyUserResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -20754,8 +20754,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeProxyUserRequest(struct soap *
 void _ngwm__removeProxyAccessResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeProxyAccessResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeProxyAccessResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -20782,7 +20782,7 @@ int _ngwm__removeProxyAccessResponse::soap_out(struct soap *soap, const char *ta
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeProxyAccessResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeProxyAccessResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeProxyAccessResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeProxyAccessResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeProxyAccessResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -20825,7 +20825,7 @@ SOAP_FMAC3 _ngwm__removeProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__removePr
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeProxyAccessResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeProxyAccessResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -21030,8 +21030,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeProxyAccessRequest(struct soap
 void _ngwm__removeMembersResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeMembersResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeMembersResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -21058,7 +21058,7 @@ int _ngwm__removeMembersResponse::soap_out(struct soap *soap, const char *tag, i
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeMembersResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeMembersResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeMembersResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeMembersResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeMembersResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -21101,7 +21101,7 @@ SOAP_FMAC3 _ngwm__removeMembersResponse * SOAP_FMAC4 soap_in__ngwm__removeMember
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeMembersResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeMembersResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -21315,8 +21315,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeMembersRequest(struct soap *so
 void _ngwm__removeJunkEntryResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeJunkEntryResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeJunkEntryResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -21343,7 +21343,7 @@ int _ngwm__removeJunkEntryResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeJunkEntryResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeJunkEntryResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeJunkEntryResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeJunkEntryResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeJunkEntryResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -21386,7 +21386,7 @@ SOAP_FMAC3 _ngwm__removeJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__removeJunk
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeJunkEntryResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeJunkEntryResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -21591,8 +21591,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeJunkEntryRequest(struct soap *
 void _ngwm__removeItemsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -21619,7 +21619,7 @@ int _ngwm__removeItemsResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeItemsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeItemsResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -21662,7 +21662,7 @@ SOAP_FMAC3 _ngwm__removeItemsResponse * SOAP_FMAC4 soap_in__ngwm__removeItemsRes
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeItemsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -21876,8 +21876,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeItemsRequest(struct soap *soap
 void _ngwm__removeItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -21904,7 +21904,7 @@ int _ngwm__removeItemResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeItemResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeItemResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -21947,7 +21947,7 @@ SOAP_FMAC3 _ngwm__removeItemResponse * SOAP_FMAC4 soap_in__ngwm__removeItemRespo
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeItemResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -22161,8 +22161,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__removeItemRequest(struct soap *soap,
 void _ngwm__removeCustomDefinitionResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__removeCustomDefinitionResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -22189,7 +22189,7 @@ int _ngwm__removeCustomDefinitionResponse::soap_out(struct soap *soap, const cha
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__removeCustomDefinitionResponse(struct soap *soap, const char *tag, int id, const _ngwm__removeCustomDefinitionResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__removeCustomDefinitionResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -22232,7 +22232,7 @@ SOAP_FMAC3 _ngwm__removeCustomDefinitionResponse * SOAP_FMAC4 soap_in__ngwm__rem
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__removeCustomDefinitionResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -22451,8 +22451,8 @@ void _ngwm__readCursorResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->items, SOAP_TYPE_PointerTongwt__ItemList);
 	soap_serialize_PointerTongwt__ItemList(soap, &((_ngwm__readCursorResponse*)this)->items);
-	soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__readCursorResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__readCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__readCursorResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -22481,7 +22481,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__readCursorResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__readCursorResponse), type);
 	soap_out_PointerTongwt__ItemList(soap, "ngwm:items", -1, &(((_ngwm__readCursorResponse*)a)->items), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__readCursorResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__readCursorResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -22529,7 +22529,7 @@ SOAP_FMAC3 _ngwm__readCursorResponse * SOAP_FMAC4 soap_in__ngwm__readCursorRespo
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__readCursorResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__readCursorResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -22768,8 +22768,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__readCursorRequest(struct soap *soap,
 void _ngwm__purgeResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__purgeResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__purgeResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__purgeResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__purgeResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -22796,7 +22796,7 @@ int _ngwm__purgeResponse::soap_out(struct soap *soap, const char *tag, int id, c
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__purgeResponse(struct soap *soap, const char *tag, int id, const _ngwm__purgeResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__purgeResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__purgeResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__purgeResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -22839,7 +22839,7 @@ SOAP_FMAC3 _ngwm__purgeResponse * SOAP_FMAC4 soap_in__ngwm__purgeResponse(struct
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__purgeResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__purgeResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -23044,8 +23044,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__purgeRequest(struct soap *soap, int
 void _ngwm__purgeDeletedItemsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__purgeDeletedItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -23072,7 +23072,7 @@ int _ngwm__purgeDeletedItemsResponse::soap_out(struct soap *soap, const char *ta
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__purgeDeletedItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__purgeDeletedItemsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__purgeDeletedItemsResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -23115,7 +23115,7 @@ SOAP_FMAC3 _ngwm__purgeDeletedItemsResponse * SOAP_FMAC4 soap_in__ngwm__purgeDel
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__purgeDeletedItemsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -23306,8 +23306,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__purgeDeletedItemsRequest(struct soap
 void _ngwm__positionCursorResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__positionCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__positionCursorResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__positionCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__positionCursorResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -23334,7 +23334,7 @@ int _ngwm__positionCursorResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__positionCursorResponse(struct soap *soap, const char *tag, int id, const _ngwm__positionCursorResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__positionCursorResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__positionCursorResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__positionCursorResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -23377,7 +23377,7 @@ SOAP_FMAC3 _ngwm__positionCursorResponse * SOAP_FMAC4 soap_in__ngwm__positionCur
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__positionCursorResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__positionCursorResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -23606,8 +23606,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__positionCursorRequest(struct soap *s
 void _ngwm__moveItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__moveItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__moveItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__moveItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__moveItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -23634,7 +23634,7 @@ int _ngwm__moveItemResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__moveItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__moveItemResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__moveItemResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__moveItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__moveItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -23677,7 +23677,7 @@ SOAP_FMAC3 _ngwm__moveItemResponse * SOAP_FMAC4 soap_in__ngwm__moveItemResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__moveItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__moveItemResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -23900,8 +23900,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__moveItemRequest(struct soap *soap, i
 void _ngwm__modifySignaturesResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifySignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifySignaturesResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifySignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifySignaturesResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -23928,7 +23928,7 @@ int _ngwm__modifySignaturesResponse::soap_out(struct soap *soap, const char *tag
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifySignaturesResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifySignaturesResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifySignaturesResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifySignaturesResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifySignaturesResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -23971,7 +23971,7 @@ SOAP_FMAC3 _ngwm__modifySignaturesResponse * SOAP_FMAC4 soap_in__ngwm__modifySig
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifySignaturesResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifySignaturesResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -24176,8 +24176,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifySignaturesRequest(struct soap
 void _ngwm__modifySettingsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifySettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifySettingsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifySettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifySettingsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -24204,7 +24204,7 @@ int _ngwm__modifySettingsResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifySettingsResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifySettingsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifySettingsResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifySettingsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifySettingsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -24247,7 +24247,7 @@ SOAP_FMAC3 _ngwm__modifySettingsResponse * SOAP_FMAC4 soap_in__ngwm__modifySetti
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifySettingsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifySettingsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -24452,8 +24452,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifySettingsRequest(struct soap *s
 void _ngwm__modifyProxyAccessResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyProxyAccessResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -24480,7 +24480,7 @@ int _ngwm__modifyProxyAccessResponse::soap_out(struct soap *soap, const char *ta
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyProxyAccessResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyProxyAccessResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyProxyAccessResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyProxyAccessResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyProxyAccessResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -24523,7 +24523,7 @@ SOAP_FMAC3 _ngwm__modifyProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__modifyPr
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyProxyAccessResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyProxyAccessResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -24737,8 +24737,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyProxyAccessRequest(struct soap
 void _ngwm__modifyPasswordResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifyPasswordResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyPasswordResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyPasswordResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyPasswordResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -24765,7 +24765,7 @@ int _ngwm__modifyPasswordResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyPasswordResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyPasswordResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyPasswordResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyPasswordResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyPasswordResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -24808,7 +24808,7 @@ SOAP_FMAC3 _ngwm__modifyPasswordResponse * SOAP_FMAC4 soap_in__ngwm__modifyPassw
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyPasswordResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyPasswordResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -25018,8 +25018,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyPasswordRequest(struct soap *s
 void _ngwm__modifyJunkMailSettingsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyJunkMailSettingsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -25046,7 +25046,7 @@ int _ngwm__modifyJunkMailSettingsResponse::soap_out(struct soap *soap, const cha
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyJunkMailSettingsResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyJunkMailSettingsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyJunkMailSettingsResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -25089,7 +25089,7 @@ SOAP_FMAC3 _ngwm__modifyJunkMailSettingsResponse * SOAP_FMAC4 soap_in__ngwm__mod
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyJunkMailSettingsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -25294,8 +25294,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyJunkMailSettingsRequest(struct
 void _ngwm__modifyJunkEntryResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyJunkEntryResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -25322,7 +25322,7 @@ int _ngwm__modifyJunkEntryResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyJunkEntryResponse(struct soap *soap, const char *tag, int id, const _ngwm__modifyJunkEntryResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyJunkEntryResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkEntryResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyJunkEntryResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -25365,7 +25365,7 @@ SOAP_FMAC3 _ngwm__modifyJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__modifyJunk
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyJunkEntryResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyJunkEntryResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -25572,8 +25572,8 @@ void _ngwm__modifyItemsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_serialize_std__vectorTemplateOfstring(soap, &((_ngwm__modifyItemsResponse*)this)->ngwt__modified);
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__modifyItemsResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__modifyItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -25604,7 +25604,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyItemsResponse(struct soap *soap,
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyItemsResponse), type);
 	soap_out_std__vectorTemplateOfstring(soap, "ngwt:modified", -1, &(((_ngwm__modifyItemsResponse*)a)->ngwt__modified), "");
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__modifyItemsResponse*)a)->id), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -25653,7 +25653,7 @@ SOAP_FMAC3 _ngwm__modifyItemsResponse * SOAP_FMAC4 soap_in__ngwm__modifyItemsRes
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__modifyItemsResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyItemsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -25853,8 +25853,8 @@ void _ngwm__modifyItemResponse::soap_serialize(struct soap *soap) const
 	soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->ngwt__modified, SOAP_TYPE_string);
 	soap_serialize_string(soap, &((_ngwm__modifyItemResponse*)this)->ngwt__modified);
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__modifyItemResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__modifyItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__modifyItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__modifyItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -25885,7 +25885,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__modifyItemResponse(struct soap *soap,
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__modifyItemResponse), type);
 	soap_out_string(soap, "ngwt:modified", -1, &(((_ngwm__modifyItemResponse*)a)->ngwt__modified), "");
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__modifyItemResponse*)a)->id), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__modifyItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__modifyItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -25936,7 +25936,7 @@ SOAP_FMAC3 _ngwm__modifyItemResponse * SOAP_FMAC4 soap_in__ngwm__modifyItemRespo
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__modifyItemResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__modifyItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__modifyItemResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -26167,8 +26167,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__modifyItemRequest(struct soap *soap,
 void _ngwm__markUnReadResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__markUnReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markUnReadResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__markUnReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markUnReadResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -26195,7 +26195,7 @@ int _ngwm__markUnReadResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markUnReadResponse(struct soap *soap, const char *tag, int id, const _ngwm__markUnReadResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markUnReadResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markUnReadResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markUnReadResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -26238,7 +26238,7 @@ SOAP_FMAC3 _ngwm__markUnReadResponse * SOAP_FMAC4 soap_in__ngwm__markUnReadRespo
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markUnReadResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markUnReadResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -26443,8 +26443,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markUnReadRequest(struct soap *soap,
 void _ngwm__markUnPrivateResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__markUnPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markUnPrivateResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__markUnPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markUnPrivateResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -26471,7 +26471,7 @@ int _ngwm__markUnPrivateResponse::soap_out(struct soap *soap, const char *tag, i
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markUnPrivateResponse(struct soap *soap, const char *tag, int id, const _ngwm__markUnPrivateResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markUnPrivateResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markUnPrivateResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markUnPrivateResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -26514,7 +26514,7 @@ SOAP_FMAC3 _ngwm__markUnPrivateResponse * SOAP_FMAC4 soap_in__ngwm__markUnPrivat
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markUnPrivateResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markUnPrivateResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -26719,8 +26719,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markUnPrivateRequest(struct soap *so
 void _ngwm__markReadResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__markReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markReadResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__markReadResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markReadResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -26747,7 +26747,7 @@ int _ngwm__markReadResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markReadResponse(struct soap *soap, const char *tag, int id, const _ngwm__markReadResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markReadResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markReadResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markReadResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -26790,7 +26790,7 @@ SOAP_FMAC3 _ngwm__markReadResponse * SOAP_FMAC4 soap_in__ngwm__markReadResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markReadResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markReadResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -26995,8 +26995,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markReadRequest(struct soap *soap, i
 void _ngwm__markPrivateResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__markPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__markPrivateResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__markPrivateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__markPrivateResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -27023,7 +27023,7 @@ int _ngwm__markPrivateResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__markPrivateResponse(struct soap *soap, const char *tag, int id, const _ngwm__markPrivateResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__markPrivateResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__markPrivateResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__markPrivateResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -27066,7 +27066,7 @@ SOAP_FMAC3 _ngwm__markPrivateResponse * SOAP_FMAC4 soap_in__ngwm__markPrivateRes
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__markPrivateResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__markPrivateResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -27271,8 +27271,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__markPrivateRequest(struct soap *soap
 void _ngwm__logoutResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__logoutResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__logoutResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__logoutResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__logoutResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -27299,7 +27299,7 @@ int _ngwm__logoutResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__logoutResponse(struct soap *soap, const char *tag, int id, const _ngwm__logoutResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__logoutResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__logoutResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__logoutResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -27342,7 +27342,7 @@ SOAP_FMAC3 _ngwm__logoutResponse * SOAP_FMAC4 soap_in__ngwm__logoutResponse(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__logoutResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__logoutResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -27546,8 +27546,8 @@ void _ngwm__loginResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_std__vectorTemplateOfPointerTongwt__Host(soap, &((_ngwm__loginResponse*)this)->redirectToHost);
 	soap_embedded(soap, &((_ngwm__loginResponse*)this)->serverUTCTime, SOAP_TYPE_string);
 	soap_serialize_string(soap, &((_ngwm__loginResponse*)this)->serverUTCTime);
-	soap_embedded(soap, &((_ngwm__loginResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__loginResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__loginResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__loginResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -27588,7 +27588,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__loginResponse(struct soap *soap, const
 	soap_out_PointerTostd__string(soap, "ngwm:build", -1, &(((_ngwm__loginResponse*)a)->build), "");
 	soap_out_std__vectorTemplateOfPointerTongwt__Host(soap, "ngwm:redirectToHost", -1, &(((_ngwm__loginResponse*)a)->redirectToHost), "");
 	soap_out_string(soap, "ngwm:serverUTCTime", -1, &(((_ngwm__loginResponse*)a)->serverUTCTime), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__loginResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__loginResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -27664,7 +27664,7 @@ SOAP_FMAC3 _ngwm__loginResponse * SOAP_FMAC4 soap_in__ngwm__loginResponse(struct
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__loginResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__loginResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -27898,8 +27898,8 @@ void _ngwm__getUserListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->users, SOAP_TYPE_PointerTongwt__UserList);
 	soap_serialize_PointerTongwt__UserList(soap, &((_ngwm__getUserListResponse*)this)->users);
-	soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getUserListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getUserListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getUserListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -27928,7 +27928,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getUserListResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getUserListResponse), type);
 	soap_out_PointerTongwt__UserList(soap, "ngwm:users", -1, &(((_ngwm__getUserListResponse*)a)->users), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getUserListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getUserListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -27976,7 +27976,7 @@ SOAP_FMAC3 _ngwm__getUserListResponse * SOAP_FMAC4 soap_in__ngwm__getUserListRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getUserListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getUserListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -28188,8 +28188,8 @@ void _ngwm__getTimezoneListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->timezones, SOAP_TYPE_PointerTongwt__TimezoneList);
 	soap_serialize_PointerTongwt__TimezoneList(soap, &((_ngwm__getTimezoneListResponse*)this)->timezones);
-	soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getTimezoneListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getTimezoneListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getTimezoneListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -28218,7 +28218,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getTimezoneListResponse(struct soap *s
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getTimezoneListResponse), type);
 	soap_out_PointerTongwt__TimezoneList(soap, "ngwm:timezones", -1, &(((_ngwm__getTimezoneListResponse*)a)->timezones), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getTimezoneListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getTimezoneListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -28266,7 +28266,7 @@ SOAP_FMAC3 _ngwm__getTimezoneListResponse * SOAP_FMAC4 soap_in__ngwm__getTimezon
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getTimezoneListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getTimezoneListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -28461,8 +28461,8 @@ void _ngwm__getTimestampResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_string(soap, &((_ngwm__getTimestampResponse*)this)->backup);
 	soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->retention, SOAP_TYPE_string);
 	soap_serialize_string(soap, &((_ngwm__getTimestampResponse*)this)->retention);
-	soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getTimestampResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getTimestampResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getTimestampResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -28493,7 +28493,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getTimestampResponse(struct soap *soap
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getTimestampResponse), type);
 	soap_out_string(soap, "ngwm:backup", -1, &(((_ngwm__getTimestampResponse*)a)->backup), "");
 	soap_out_string(soap, "ngwm:retention", -1, &(((_ngwm__getTimestampResponse*)a)->retention), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getTimestampResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getTimestampResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -28546,7 +28546,7 @@ SOAP_FMAC3 _ngwm__getTimestampResponse * SOAP_FMAC4 soap_in__ngwm__getTimestampR
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getTimestampResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getTimestampResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -28767,8 +28767,8 @@ void _ngwm__getSignaturesResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->signatures, SOAP_TYPE_PointerTongwt__Signatures);
 	soap_serialize_PointerTongwt__Signatures(soap, &((_ngwm__getSignaturesResponse*)this)->signatures);
-	soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getSignaturesResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getSignaturesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getSignaturesResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -28797,7 +28797,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getSignaturesResponse(struct soap *soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getSignaturesResponse), type);
 	soap_out_PointerTongwt__Signatures(soap, "ngwm:signatures", -1, &(((_ngwm__getSignaturesResponse*)a)->signatures), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getSignaturesResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getSignaturesResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -28845,7 +28845,7 @@ SOAP_FMAC3 _ngwm__getSignaturesResponse * SOAP_FMAC4 soap_in__ngwm__getSignature
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getSignaturesResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getSignaturesResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -29047,8 +29047,8 @@ void _ngwm__getSettingsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->settings, SOAP_TYPE_PointerTongwt__Settings);
 	soap_serialize_PointerTongwt__Settings(soap, &((_ngwm__getSettingsResponse*)this)->settings);
-	soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getSettingsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getSettingsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -29077,7 +29077,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getSettingsResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getSettingsResponse), type);
 	soap_out_PointerTongwt__Settings(soap, "ngwm:settings", -1, &(((_ngwm__getSettingsResponse*)a)->settings), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getSettingsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getSettingsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -29125,7 +29125,7 @@ SOAP_FMAC3 _ngwm__getSettingsResponse * SOAP_FMAC4 soap_in__ngwm__getSettingsRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getSettingsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getSettingsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -29328,8 +29328,8 @@ void _ngwm__getRuleListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->rules, SOAP_TYPE_PointerTongwt__RuleList);
 	soap_serialize_PointerTongwt__RuleList(soap, &((_ngwm__getRuleListResponse*)this)->rules);
-	soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getRuleListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getRuleListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getRuleListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -29358,7 +29358,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getRuleListResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getRuleListResponse), type);
 	soap_out_PointerTongwt__RuleList(soap, "ngwm:rules", -1, &(((_ngwm__getRuleListResponse*)a)->rules), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getRuleListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getRuleListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -29406,7 +29406,7 @@ SOAP_FMAC3 _ngwm__getRuleListResponse * SOAP_FMAC4 soap_in__ngwm__getRuleListRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getRuleListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getRuleListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -29599,8 +29599,8 @@ void _ngwm__getProxyListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->proxies, SOAP_TYPE_PointerTongwt__ProxyList);
 	soap_serialize_PointerTongwt__ProxyList(soap, &((_ngwm__getProxyListResponse*)this)->proxies);
-	soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getProxyListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getProxyListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getProxyListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -29629,7 +29629,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getProxyListResponse(struct soap *soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getProxyListResponse), type);
 	soap_out_PointerTongwt__ProxyList(soap, "ngwm:proxies", -1, &(((_ngwm__getProxyListResponse*)a)->proxies), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getProxyListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getProxyListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -29677,7 +29677,7 @@ SOAP_FMAC3 _ngwm__getProxyListResponse * SOAP_FMAC4 soap_in__ngwm__getProxyListR
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getProxyListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getProxyListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -29870,8 +29870,8 @@ void _ngwm__getProxyAccessListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->accessRights, SOAP_TYPE_PointerTongwt__AccessRightList);
 	soap_serialize_PointerTongwt__AccessRightList(soap, &((_ngwm__getProxyAccessListResponse*)this)->accessRights);
-	soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getProxyAccessListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getProxyAccessListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getProxyAccessListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -29900,7 +29900,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getProxyAccessListResponse(struct soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getProxyAccessListResponse), type);
 	soap_out_PointerTongwt__AccessRightList(soap, "ngwm:accessRights", -1, &(((_ngwm__getProxyAccessListResponse*)a)->accessRights), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getProxyAccessListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getProxyAccessListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -29948,7 +29948,7 @@ SOAP_FMAC3 _ngwm__getProxyAccessListResponse * SOAP_FMAC4 soap_in__ngwm__getProx
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getProxyAccessListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getProxyAccessListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -30143,8 +30143,8 @@ void _ngwm__getQuickMessagesResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_string(soap, &((_ngwm__getQuickMessagesResponse*)this)->ngwt__startDate);
 	soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->items, SOAP_TYPE_PointerTongwt__Items);
 	soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getQuickMessagesResponse*)this)->items);
-	soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getQuickMessagesResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getQuickMessagesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getQuickMessagesResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -30175,7 +30175,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getQuickMessagesResponse(struct soap *
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getQuickMessagesResponse), type);
 	soap_out_string(soap, "ngwt:startDate", -1, &(((_ngwm__getQuickMessagesResponse*)a)->ngwt__startDate), "");
 	soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getQuickMessagesResponse*)a)->items), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getQuickMessagesResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getQuickMessagesResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -30228,7 +30228,7 @@ SOAP_FMAC3 _ngwm__getQuickMessagesResponse * SOAP_FMAC4 soap_in__ngwm__getQuickM
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getQuickMessagesResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getQuickMessagesResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -30487,8 +30487,8 @@ void _ngwm__getLibraryListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->libraries, SOAP_TYPE_PointerTongwt__LibraryList);
 	soap_serialize_PointerTongwt__LibraryList(soap, &((_ngwm__getLibraryListResponse*)this)->libraries);
-	soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getLibraryListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getLibraryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getLibraryListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -30517,7 +30517,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getLibraryListResponse(struct soap *so
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getLibraryListResponse), type);
 	soap_out_PointerTongwt__LibraryList(soap, "ngwm:libraries", -1, &(((_ngwm__getLibraryListResponse*)a)->libraries), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getLibraryListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getLibraryListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -30565,7 +30565,7 @@ SOAP_FMAC3 _ngwm__getLibraryListResponse * SOAP_FMAC4 soap_in__ngwm__getLibraryL
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getLibraryListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getLibraryListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -30758,8 +30758,8 @@ void _ngwm__getLibraryItemResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item);
 	soap_serialize_PointerTongwt__Item(soap, &((_ngwm__getLibraryItemResponse*)this)->item);
-	soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getLibraryItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getLibraryItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getLibraryItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -30788,7 +30788,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getLibraryItemResponse(struct soap *so
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getLibraryItemResponse), type);
 	soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__getLibraryItemResponse*)a)->item), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getLibraryItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getLibraryItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -30836,7 +30836,7 @@ SOAP_FMAC3 _ngwm__getLibraryItemResponse * SOAP_FMAC4 soap_in__ngwm__getLibraryI
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getLibraryItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getLibraryItemResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -31061,8 +31061,8 @@ void _ngwm__getJunkMailSettingsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->settings, SOAP_TYPE_PointerTongwt__SettingsList);
 	soap_serialize_PointerTongwt__SettingsList(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->settings);
-	soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getJunkMailSettingsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -31091,7 +31091,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getJunkMailSettingsResponse(struct soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getJunkMailSettingsResponse), type);
 	soap_out_PointerTongwt__SettingsList(soap, "ngwm:settings", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->settings), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -31139,7 +31139,7 @@ SOAP_FMAC3 _ngwm__getJunkMailSettingsResponse * SOAP_FMAC4 soap_in__ngwm__getJun
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getJunkMailSettingsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -31336,8 +31336,8 @@ void _ngwm__getJunkEntriesResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__JunkHandlingList(soap, &((_ngwm__getJunkEntriesResponse*)this)->block);
 	soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->trust, SOAP_TYPE_PointerTongwt__JunkHandlingList);
 	soap_serialize_PointerTongwt__JunkHandlingList(soap, &((_ngwm__getJunkEntriesResponse*)this)->trust);
-	soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getJunkEntriesResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getJunkEntriesResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getJunkEntriesResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -31370,7 +31370,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getJunkEntriesResponse(struct soap *so
 	soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:junk", -1, &(((_ngwm__getJunkEntriesResponse*)a)->junk), "");
 	soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:block", -1, &(((_ngwm__getJunkEntriesResponse*)a)->block), "");
 	soap_out_PointerTongwt__JunkHandlingList(soap, "ngwm:trust", -1, &(((_ngwm__getJunkEntriesResponse*)a)->trust), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getJunkEntriesResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getJunkEntriesResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -31428,7 +31428,7 @@ SOAP_FMAC3 _ngwm__getJunkEntriesResponse * SOAP_FMAC4 soap_in__ngwm__getJunkEntr
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getJunkEntriesResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getJunkEntriesResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -31631,8 +31631,8 @@ void _ngwm__getItemsResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->items, SOAP_TYPE_PointerTongwt__Items);
 	soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getItemsResponse*)this)->items);
-	soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -31661,7 +31661,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getItemsResponse(struct soap *soap, co
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getItemsResponse), type);
 	soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getItemsResponse*)a)->items), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -31709,7 +31709,7 @@ SOAP_FMAC3 _ngwm__getItemsResponse * SOAP_FMAC4 soap_in__ngwm__getItemsResponse(
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getItemsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -31947,8 +31947,8 @@ void _ngwm__getItemResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getItemResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item);
 	soap_serialize_PointerTongwt__Item(soap, &((_ngwm__getItemResponse*)this)->item);
-	soap_embedded(soap, &((_ngwm__getItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -31977,7 +31977,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getItemResponse(struct soap *soap, con
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getItemResponse), type);
 	soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__getItemResponse*)a)->item), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -32025,7 +32025,7 @@ SOAP_FMAC3 _ngwm__getItemResponse * SOAP_FMAC4 soap_in__ngwm__getItemResponse(st
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getItemResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -32243,8 +32243,8 @@ void _ngwm__getFreeBusyResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__FreeBusyStats(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyStats);
 	soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyInfo, SOAP_TYPE_PointerTongwt__FreeBusyInfoList);
 	soap_serialize_PointerTongwt__FreeBusyInfoList(soap, &((_ngwm__getFreeBusyResponse*)this)->freeBusyInfo);
-	soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFreeBusyResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getFreeBusyResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFreeBusyResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -32275,7 +32275,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFreeBusyResponse(struct soap *soap,
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFreeBusyResponse), type);
 	soap_out_PointerTongwt__FreeBusyStats(soap, "ngwm:freeBusyStats", -1, &(((_ngwm__getFreeBusyResponse*)a)->freeBusyStats), "");
 	soap_out_PointerTongwt__FreeBusyInfoList(soap, "ngwm:freeBusyInfo", -1, &(((_ngwm__getFreeBusyResponse*)a)->freeBusyInfo), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFreeBusyResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFreeBusyResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -32328,7 +32328,7 @@ SOAP_FMAC3 _ngwm__getFreeBusyResponse * SOAP_FMAC4 soap_in__ngwm__getFreeBusyRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFreeBusyResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFreeBusyResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -32535,8 +32535,8 @@ void _ngwm__getFolderListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->folders, SOAP_TYPE_PointerTongwt__FolderList);
 	soap_serialize_PointerTongwt__FolderList(soap, &((_ngwm__getFolderListResponse*)this)->folders);
-	soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFolderListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getFolderListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFolderListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -32565,7 +32565,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderListResponse(struct soap *soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderListResponse), type);
 	soap_out_PointerTongwt__FolderList(soap, "ngwm:folders", -1, &(((_ngwm__getFolderListResponse*)a)->folders), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFolderListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFolderListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -32613,7 +32613,7 @@ SOAP_FMAC3 _ngwm__getFolderListResponse * SOAP_FMAC4 soap_in__ngwm__getFolderLis
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFolderListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFolderListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -32853,8 +32853,8 @@ void _ngwm__getFolderResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->folder, SOAP_TYPE_PointerTongwt__Folder);
 	soap_serialize_PointerTongwt__Folder(soap, &((_ngwm__getFolderResponse*)this)->folder);
-	soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getFolderResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getFolderResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getFolderResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -32883,7 +32883,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderResponse(struct soap *soap, c
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderResponse), type);
 	soap_out_PointerTongwt__Folder(soap, "ngwm:folder", -1, &(((_ngwm__getFolderResponse*)a)->folder), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getFolderResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getFolderResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -32931,7 +32931,7 @@ SOAP_FMAC3 _ngwm__getFolderResponse * SOAP_FMAC4 soap_in__ngwm__getFolderRespons
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getFolderResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getFolderResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -33170,8 +33170,8 @@ void _ngwm__getDocumentTypeListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->items, SOAP_TYPE_PointerTongwt__DocumentTypeList);
 	soap_serialize_PointerTongwt__DocumentTypeList(soap, &((_ngwm__getDocumentTypeListResponse*)this)->items);
-	soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDocumentTypeListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -33200,7 +33200,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDocumentTypeListResponse(struct soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDocumentTypeListResponse), type);
 	soap_out_PointerTongwt__DocumentTypeList(soap, "ngwm:items", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->items), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDocumentTypeListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -33248,7 +33248,7 @@ SOAP_FMAC3 _ngwm__getDocumentTypeListResponse * SOAP_FMAC4 soap_in__ngwm__getDoc
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDocumentTypeListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDocumentTypeListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -33455,8 +33455,8 @@ void _ngwm__getDeltaInfoResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->deltaInfo, SOAP_TYPE_PointerTongwt__DeltaInfo);
 	soap_serialize_PointerTongwt__DeltaInfo(soap, &((_ngwm__getDeltaInfoResponse*)this)->deltaInfo);
-	soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDeltaInfoResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getDeltaInfoResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDeltaInfoResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -33485,7 +33485,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDeltaInfoResponse(struct soap *soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDeltaInfoResponse), type);
 	soap_out_PointerTongwt__DeltaInfo(soap, "ngwm:deltaInfo", -1, &(((_ngwm__getDeltaInfoResponse*)a)->deltaInfo), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDeltaInfoResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDeltaInfoResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -33533,7 +33533,7 @@ SOAP_FMAC3 _ngwm__getDeltaInfoResponse * SOAP_FMAC4 soap_in__ngwm__getDeltaInfoR
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDeltaInfoResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDeltaInfoResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -33742,8 +33742,8 @@ void _ngwm__getDeltasResponse::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTongwt__Items(soap, &((_ngwm__getDeltasResponse*)this)->items);
 	soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->deltaInfo, SOAP_TYPE_PointerTongwt__DeltaInfo);
 	soap_serialize_PointerTongwt__DeltaInfo(soap, &((_ngwm__getDeltasResponse*)this)->deltaInfo);
-	soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getDeltasResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getDeltasResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getDeltasResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -33774,7 +33774,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getDeltasResponse(struct soap *soap, c
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getDeltasResponse), type);
 	soap_out_PointerTongwt__Items(soap, "ngwm:items", -1, &(((_ngwm__getDeltasResponse*)a)->items), "");
 	soap_out_PointerTongwt__DeltaInfo(soap, "ngwm:deltaInfo", -1, &(((_ngwm__getDeltasResponse*)a)->deltaInfo), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getDeltasResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getDeltasResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -33827,7 +33827,7 @@ SOAP_FMAC3 _ngwm__getDeltasResponse * SOAP_FMAC4 soap_in__ngwm__getDeltasRespons
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getDeltasResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getDeltasResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -34052,8 +34052,8 @@ void _ngwm__getCustomListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->customs, SOAP_TYPE_PointerTongwt__CustomList);
 	soap_serialize_PointerTongwt__CustomList(soap, &((_ngwm__getCustomListResponse*)this)->customs);
-	soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getCustomListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getCustomListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getCustomListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -34082,7 +34082,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getCustomListResponse(struct soap *soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getCustomListResponse), type);
 	soap_out_PointerTongwt__CustomList(soap, "ngwm:customs", -1, &(((_ngwm__getCustomListResponse*)a)->customs), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getCustomListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getCustomListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -34130,7 +34130,7 @@ SOAP_FMAC3 _ngwm__getCustomListResponse * SOAP_FMAC4 soap_in__ngwm__getCustomLis
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getCustomListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getCustomListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -34323,8 +34323,8 @@ void _ngwm__getCategoryListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->categories, SOAP_TYPE_PointerTongwt__CategoryList);
 	soap_serialize_PointerTongwt__CategoryList(soap, &((_ngwm__getCategoryListResponse*)this)->categories);
-	soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getCategoryListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getCategoryListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getCategoryListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -34353,7 +34353,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getCategoryListResponse(struct soap *s
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getCategoryListResponse), type);
 	soap_out_PointerTongwt__CategoryList(soap, "ngwm:categories", -1, &(((_ngwm__getCategoryListResponse*)a)->categories), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getCategoryListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getCategoryListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -34401,7 +34401,7 @@ SOAP_FMAC3 _ngwm__getCategoryListResponse * SOAP_FMAC4 soap_in__ngwm__getCategor
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getCategoryListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getCategoryListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -34594,8 +34594,8 @@ void _ngwm__getAttachmentResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->part, SOAP_TYPE_PointerTongwt__MessagePart);
 	soap_serialize_PointerTongwt__MessagePart(soap, &((_ngwm__getAttachmentResponse*)this)->part);
-	soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getAttachmentResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getAttachmentResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getAttachmentResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -34624,7 +34624,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getAttachmentResponse(struct soap *soa
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getAttachmentResponse), type);
 	soap_out_PointerTongwt__MessagePart(soap, "ngwm:part", -1, &(((_ngwm__getAttachmentResponse*)a)->part), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getAttachmentResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getAttachmentResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -34672,7 +34672,7 @@ SOAP_FMAC3 _ngwm__getAttachmentResponse * SOAP_FMAC4 soap_in__ngwm__getAttachmen
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getAttachmentResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getAttachmentResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -34895,8 +34895,8 @@ void _ngwm__getAddressBookListResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->books, SOAP_TYPE_PointerTongwt__AddressBookList);
 	soap_serialize_PointerTongwt__AddressBookList(soap, &((_ngwm__getAddressBookListResponse*)this)->books);
-	soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__getAddressBookListResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__getAddressBookListResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__getAddressBookListResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -34925,7 +34925,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getAddressBookListResponse(struct soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getAddressBookListResponse), type);
 	soap_out_PointerTongwt__AddressBookList(soap, "ngwm:books", -1, &(((_ngwm__getAddressBookListResponse*)a)->books), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__getAddressBookListResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__getAddressBookListResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -34973,7 +34973,7 @@ SOAP_FMAC3 _ngwm__getAddressBookListResponse * SOAP_FMAC4 soap_in__ngwm__getAddr
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__getAddressBookListResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__getAddressBookListResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -35166,8 +35166,8 @@ void _ngwm__forwardResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__forwardResponse*)this)->item, SOAP_TYPE_PointerTongwt__Item);
 	soap_serialize_PointerTongwt__Item(soap, &((_ngwm__forwardResponse*)this)->item);
-	soap_embedded(soap, &((_ngwm__forwardResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__forwardResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__forwardResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__forwardResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -35196,7 +35196,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__forwardResponse(struct soap *soap, con
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__forwardResponse), type);
 	soap_out_PointerTongwt__Item(soap, "ngwm:item", -1, &(((_ngwm__forwardResponse*)a)->item), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__forwardResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__forwardResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -35244,7 +35244,7 @@ SOAP_FMAC3 _ngwm__forwardResponse * SOAP_FMAC4 soap_in__ngwm__forwardResponse(st
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__forwardResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__forwardResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -35466,8 +35466,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__forwardRequest(struct soap *soap, in
 void _ngwm__executeRuleResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__executeRuleResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__executeRuleResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__executeRuleResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__executeRuleResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -35494,7 +35494,7 @@ int _ngwm__executeRuleResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__executeRuleResponse(struct soap *soap, const char *tag, int id, const _ngwm__executeRuleResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__executeRuleResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__executeRuleResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__executeRuleResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -35537,7 +35537,7 @@ SOAP_FMAC3 _ngwm__executeRuleResponse * SOAP_FMAC4 soap_in__ngwm__executeRuleRes
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__executeRuleResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__executeRuleResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -35742,8 +35742,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__executeRuleRequest(struct soap *soap
 void _ngwm__destroyCursorResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__destroyCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__destroyCursorResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__destroyCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__destroyCursorResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -35770,7 +35770,7 @@ int _ngwm__destroyCursorResponse::soap_out(struct soap *soap, const char *tag, i
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__destroyCursorResponse(struct soap *soap, const char *tag, int id, const _ngwm__destroyCursorResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__destroyCursorResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__destroyCursorResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__destroyCursorResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -35813,7 +35813,7 @@ SOAP_FMAC3 _ngwm__destroyCursorResponse * SOAP_FMAC4 soap_in__ngwm__destroyCurso
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__destroyCursorResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__destroyCursorResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -36026,8 +36026,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__destroyCursorRequest(struct soap *so
 void _ngwm__delegateResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__delegateResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__delegateResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__delegateResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__delegateResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -36054,7 +36054,7 @@ int _ngwm__delegateResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__delegateResponse(struct soap *soap, const char *tag, int id, const _ngwm__delegateResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__delegateResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__delegateResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__delegateResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -36097,7 +36097,7 @@ SOAP_FMAC3 _ngwm__delegateResponse * SOAP_FMAC4 soap_in__ngwm__delegateResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__delegateResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__delegateResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -36337,8 +36337,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__delegateRequest(struct soap *soap, i
 void _ngwm__declineResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__declineResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__declineResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__declineResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__declineResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -36365,7 +36365,7 @@ int _ngwm__declineResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__declineResponse(struct soap *soap, const char *tag, int id, const _ngwm__declineResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__declineResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__declineResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__declineResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -36408,7 +36408,7 @@ SOAP_FMAC3 _ngwm__declineResponse * SOAP_FMAC4 soap_in__ngwm__declineResponse(st
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__declineResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__declineResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -36630,8 +36630,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__declineRequest(struct soap *soap, in
 void _ngwm__createSignatureResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__createSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createSignatureResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createSignatureResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createSignatureResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -36658,7 +36658,7 @@ int _ngwm__createSignatureResponse::soap_out(struct soap *soap, const char *tag,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createSignatureResponse(struct soap *soap, const char *tag, int id, const _ngwm__createSignatureResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createSignatureResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createSignatureResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createSignatureResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -36701,7 +36701,7 @@ SOAP_FMAC3 _ngwm__createSignatureResponse * SOAP_FMAC4 soap_in__ngwm__createSign
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createSignatureResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createSignatureResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -36908,8 +36908,8 @@ void _ngwm__createProxyAccessResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid);
 	soap_serialize_PointerTongwt__uid(soap, &((_ngwm__createProxyAccessResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createProxyAccessResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createProxyAccessResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createProxyAccessResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -36938,7 +36938,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createProxyAccessResponse(struct soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createProxyAccessResponse), type);
 	soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createProxyAccessResponse*)a)->id), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createProxyAccessResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createProxyAccessResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -36986,7 +36986,7 @@ SOAP_FMAC3 _ngwm__createProxyAccessResponse * SOAP_FMAC4 soap_in__ngwm__createPr
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createProxyAccessResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createProxyAccessResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -37193,8 +37193,8 @@ void _ngwm__createJunkEntryResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid);
 	soap_serialize_PointerTongwt__uid(soap, &((_ngwm__createJunkEntryResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createJunkEntryResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createJunkEntryResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createJunkEntryResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -37223,7 +37223,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createJunkEntryResponse(struct soap *s
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createJunkEntryResponse), type);
 	soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createJunkEntryResponse*)a)->id), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createJunkEntryResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createJunkEntryResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -37271,7 +37271,7 @@ SOAP_FMAC3 _ngwm__createJunkEntryResponse * SOAP_FMAC4 soap_in__ngwm__createJunk
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createJunkEntryResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createJunkEntryResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -37477,8 +37477,8 @@ void _ngwm__createItemsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__createItemsResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__createItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -37507,7 +37507,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createItemsResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createItemsResponse), type);
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createItemsResponse*)a)->id), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -37553,7 +37553,7 @@ SOAP_FMAC3 _ngwm__createItemsResponse * SOAP_FMAC4 soap_in__ngwm__createItemsRes
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__createItemsResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createItemsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -37751,8 +37751,8 @@ void _ngwm__createItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
 	soap_serialize_std__vectorTemplateOfngwt__uid(soap, &((_ngwm__createItemResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__createItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -37781,7 +37781,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createItemResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createItemResponse), type);
 	soap_out_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", -1, &(((_ngwm__createItemResponse*)a)->id), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -37827,7 +37827,7 @@ SOAP_FMAC3 _ngwm__createItemResponse * SOAP_FMAC4 soap_in__ngwm__createItemRespo
 				if (soap_in_std__vectorTemplateOfngwt__uid(soap, "ngwm:id", &(((_ngwm__createItemResponse*)a)->id), "ngwt:uid"))
 					continue;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createItemResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -38043,8 +38043,8 @@ void _ngwm__createCursorResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->cursor, SOAP_TYPE_PointerToint);
 	soap_serialize_PointerToint(soap, &((_ngwm__createCursorResponse*)this)->cursor);
-	soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__createCursorResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__createCursorResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__createCursorResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -38073,7 +38073,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__createCursorResponse(struct soap *soap
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__createCursorResponse), type);
 	soap_out_PointerToint(soap, "ngwm:cursor", -1, &(((_ngwm__createCursorResponse*)a)->cursor), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__createCursorResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__createCursorResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -38121,7 +38121,7 @@ SOAP_FMAC3 _ngwm__createCursorResponse * SOAP_FMAC4 soap_in__ngwm__createCursorR
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__createCursorResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__createCursorResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -38344,8 +38344,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__createCursorRequest(struct soap *soa
 void _ngwm__completeResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__completeResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__completeResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__completeResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__completeResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -38372,7 +38372,7 @@ int _ngwm__completeResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__completeResponse(struct soap *soap, const char *tag, int id, const _ngwm__completeResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__completeResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__completeResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__completeResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -38415,7 +38415,7 @@ SOAP_FMAC3 _ngwm__completeResponse * SOAP_FMAC4 soap_in__ngwm__completeResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__completeResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__completeResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -38620,8 +38620,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__completeRequest(struct soap *soap, i
 void _ngwm__closeFreeBusySessionResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__closeFreeBusySessionResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -38648,7 +38648,7 @@ int _ngwm__closeFreeBusySessionResponse::soap_out(struct soap *soap, const char
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__closeFreeBusySessionResponse(struct soap *soap, const char *tag, int id, const _ngwm__closeFreeBusySessionResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__closeFreeBusySessionResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -38691,7 +38691,7 @@ SOAP_FMAC3 _ngwm__closeFreeBusySessionResponse * SOAP_FMAC4 soap_in__ngwm__close
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__closeFreeBusySessionResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -38895,8 +38895,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__closeFreeBusySessionRequest(struct s
 void _ngwm__addMembersResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__addMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addMembersResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__addMembersResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addMembersResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -38923,7 +38923,7 @@ int _ngwm__addMembersResponse::soap_out(struct soap *soap, const char *tag, int
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addMembersResponse(struct soap *soap, const char *tag, int id, const _ngwm__addMembersResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addMembersResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addMembersResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addMembersResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -38966,7 +38966,7 @@ SOAP_FMAC3 _ngwm__addMembersResponse * SOAP_FMAC4 soap_in__ngwm__addMembersRespo
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addMembersResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addMembersResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -39180,8 +39180,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__addMembersRequest(struct soap *soap,
 void _ngwm__addItemsResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__addItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addItemsResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__addItemsResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addItemsResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -39208,7 +39208,7 @@ int _ngwm__addItemsResponse::soap_out(struct soap *soap, const char *tag, int id
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addItemsResponse(struct soap *soap, const char *tag, int id, const _ngwm__addItemsResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addItemsResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addItemsResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addItemsResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -39251,7 +39251,7 @@ SOAP_FMAC3 _ngwm__addItemsResponse * SOAP_FMAC4 soap_in__ngwm__addItemsResponse(
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addItemsResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addItemsResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -39465,8 +39465,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__addItemsRequest(struct soap *soap, i
 void _ngwm__addItemResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__addItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__addItemResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__addItemResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__addItemResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -39493,7 +39493,7 @@ int _ngwm__addItemResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__addItemResponse(struct soap *soap, const char *tag, int id, const _ngwm__addItemResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__addItemResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__addItemResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__addItemResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -39536,7 +39536,7 @@ SOAP_FMAC3 _ngwm__addItemResponse * SOAP_FMAC4 soap_in__ngwm__addItemResponse(st
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__addItemResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__addItemResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -39752,8 +39752,8 @@ void _ngwm__acceptShareResponse::soap_serialize(struct soap *soap) const
 	(void)soap; /* appease -Wall -Werror */
 	soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->id, SOAP_TYPE_PointerTongwt__uid);
 	soap_serialize_PointerTongwt__uid(soap, &((_ngwm__acceptShareResponse*)this)->id);
-	soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__acceptShareResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__acceptShareResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__acceptShareResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -39782,7 +39782,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__acceptShareResponse(struct soap *soap,
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__acceptShareResponse), type);
 	soap_out_PointerTongwt__uid(soap, "ngwm:id", -1, &(((_ngwm__acceptShareResponse*)a)->id), "");
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__acceptShareResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__acceptShareResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -39830,7 +39830,7 @@ SOAP_FMAC3 _ngwm__acceptShareResponse * SOAP_FMAC4 soap_in__ngwm__acceptShareRes
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__acceptShareResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__acceptShareResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -40062,8 +40062,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__acceptShareRequest(struct soap *soap
 void _ngwm__acceptResponse::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((_ngwm__acceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__tqStatus);
-	soap_serialize_PointerTongwt__tqStatus(soap, &((_ngwm__acceptResponse*)this)->status);
+	soap_embedded(soap, &((_ngwm__acceptResponse*)this)->status, SOAP_TYPE_PointerTongwt__Status);
+	soap_serialize_PointerTongwt__Status(soap, &((_ngwm__acceptResponse*)this)->status);
 	/* transient soap skipped */
 }
 
@@ -40090,7 +40090,7 @@ int _ngwm__acceptResponse::soap_out(struct soap *soap, const char *tag, int id,
 SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__acceptResponse(struct soap *soap, const char *tag, int id, const _ngwm__acceptResponse *a, const char *type)
 {
 	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__acceptResponse), type);
-	soap_out_PointerTongwt__tqStatus(soap, "ngwm:status", -1, &(((_ngwm__acceptResponse*)a)->status), "");
+	soap_out_PointerTongwt__Status(soap, "ngwm:status", -1, &(((_ngwm__acceptResponse*)a)->status), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
@@ -40133,7 +40133,7 @@ SOAP_FMAC3 _ngwm__acceptResponse * SOAP_FMAC4 soap_in__ngwm__acceptResponse(stru
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__tqStatus(soap, "ngwm:status", &(((_ngwm__acceptResponse*)a)->status), "ngwt:Status"))
+				if (soap_in_PointerTongwt__Status(soap, "ngwm:status", &(((_ngwm__acceptResponse*)a)->status), "ngwt:Status"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -40644,8 +40644,8 @@ void ngwt__Version::soap_serialize(struct soap *soap) const
 	soap_embedded(soap, &((ngwt__Version*)this)->versionNumber, SOAP_TYPE_unsignedLong);
 	soap_embedded(soap, &((ngwt__Version*)this)->versionDescription, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__Version*)this)->versionDescription);
-	soap_embedded(soap, &((ngwt__Version*)this)->versiontqStatus, SOAP_TYPE_PointerTongwt__VersiontqStatus);
-	soap_serialize_PointerTongwt__VersiontqStatus(soap, &((ngwt__Version*)this)->versiontqStatus);
+	soap_embedded(soap, &((ngwt__Version*)this)->versionStatus, SOAP_TYPE_PointerTongwt__VersionStatus);
+	soap_serialize_PointerTongwt__VersionStatus(soap, &((ngwt__Version*)this)->versionStatus);
 	soap_embedded(soap, &((ngwt__Version*)this)->life, SOAP_TYPE_PointerTounsignedLong);
 	soap_serialize_PointerTounsignedLong(soap, &((ngwt__Version*)this)->life);
 	soap_embedded(soap, &((ngwt__Version*)this)->ageAction, SOAP_TYPE_PointerTongwt__AgeAction);
@@ -40684,7 +40684,7 @@ void ngwt__Version::soap_default(struct soap *soap)
 	soap_default_string(soap, &((ngwt__Version*)this)->retrievedDate);
 	soap_default_unsignedLong(soap, &((ngwt__Version*)this)->versionNumber);
 	((ngwt__Version*)this)->versionDescription = NULL;
-	((ngwt__Version*)this)->versiontqStatus = NULL;
+	((ngwt__Version*)this)->versionStatus = NULL;
 	((ngwt__Version*)this)->life = NULL;
 	((ngwt__Version*)this)->ageAction = NULL;
 	((ngwt__Version*)this)->fileSize = NULL;
@@ -40734,7 +40734,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Version(struct soap *soap, const char *
 	soap_out_string(soap, "ngwt:retrievedDate", -1, &(((ngwt__Version*)a)->retrievedDate), "");
 	soap_out_unsignedLong(soap, "ngwt:versionNumber", -1, &(((ngwt__Version*)a)->versionNumber), "");
 	soap_out_PointerTostd__string(soap, "ngwt:versionDescription", -1, &(((ngwt__Version*)a)->versionDescription), "");
-	soap_out_PointerTongwt__VersiontqStatus(soap, "ngwt:versionStatus", -1, &(((ngwt__Version*)a)->versiontqStatus), "");
+	soap_out_PointerTongwt__VersionStatus(soap, "ngwt:versionStatus", -1, &(((ngwt__Version*)a)->versionStatus), "");
 	soap_out_PointerTounsignedLong(soap, "ngwt:life", -1, &(((ngwt__Version*)a)->life), "");
 	soap_out_PointerTongwt__AgeAction(soap, "ngwt:ageAction", -1, &(((ngwt__Version*)a)->ageAction), "");
 	soap_out_PointerTounsignedLong(soap, "ngwt:fileSize", -1, &(((ngwt__Version*)a)->fileSize), "");
@@ -40774,7 +40774,7 @@ SOAP_FMAC3 ngwt__Version * SOAP_FMAC4 soap_in_ngwt__Version(struct soap *soap, c
 			return (ngwt__Version *)a->soap_in(soap, tag, type);
 		}
 	}
-	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_categories2 = 1, soap_flag_created2 = 1, soap_flag_customs2 = 1, soap_flag_library1 = 1, soap_flag_documentNumber1 = 1, soap_flag_versionCreator1 = 1, soap_flag_retrievedBy1 = 1, soap_flag_retrievedDate1 = 1, soap_flag_versionNumber1 = 1, soap_flag_versionDescription1 = 1, soap_flag_versiontqStatus1 = 1, soap_flag_life1 = 1, soap_flag_ageAction1 = 1, soap_flag_fileSize1 = 1, soap_flag_filename1 = 1;
+	short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_categories2 = 1, soap_flag_created2 = 1, soap_flag_customs2 = 1, soap_flag_library1 = 1, soap_flag_documentNumber1 = 1, soap_flag_versionCreator1 = 1, soap_flag_retrievedBy1 = 1, soap_flag_retrievedDate1 = 1, soap_flag_versionNumber1 = 1, soap_flag_versionDescription1 = 1, soap_flag_versionStatus1 = 1, soap_flag_life1 = 1, soap_flag_ageAction1 = 1, soap_flag_fileSize1 = 1, soap_flag_filename1 = 1;
 	if (soap->body && !*soap->href)
 	{
 		for (;;)
@@ -40858,9 +40858,9 @@ SOAP_FMAC3 ngwt__Version * SOAP_FMAC4 soap_in_ngwt__Version(struct soap *soap, c
 				{	soap_flag_versionDescription1 = 0;
 					continue;
 				}
-			if (soap_flag_versiontqStatus1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__VersiontqStatus(soap, "ngwt:versionStatus", &(((ngwt__Version*)a)->versiontqStatus), ""))
-				{	soap_flag_versiontqStatus1 = 0;
+			if (soap_flag_versionStatus1 && soap->error == SOAP_TAG_MISMATCH)
+				if (soap_in_PointerTongwt__VersionStatus(soap, "ngwt:versionStatus", &(((ngwt__Version*)a)->versionStatus), ""))
+				{	soap_flag_versionStatus1 = 0;
 					continue;
 				}
 			if (soap_flag_life1 && soap->error == SOAP_TAG_MISMATCH)
@@ -41402,167 +41402,167 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap *soap,
 	*(ngwt__TrustedApplication*)p = *(ngwt__TrustedApplication*)q;
 }
 
-void ngwt__TransferFailedtqStatus::soap_serialize(struct soap *soap) const
+void ngwt__TransferFailedStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus);
-	soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus);
-	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus);
-	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus);
-	soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__TransferFailedtqStatus::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__TransferFailedStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	((ngwt__TransferFailedtqStatus*)this)->FailureReason = NULL;
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
-	((ngwt__RecipientqStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
-	((ngwt__RecipientqStatus*)this)->accepted = NULL;
-	((ngwt__RecipientqStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
-	((ngwt__RecipientqStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__TransferFailedtqStatus::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__TransferFailedtqStatus);
+	((ngwt__TransferFailedStatus*)this)->FailureReason = NULL;
+	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__TransferFailedStatus::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__TransferFailedStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__TransferFailedtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__TransferFailedStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__TransferFailedtqStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__TransferFailedStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedtqStatus(struct soap *soap, const char *tag, int id, const ngwt__TransferFailedtqStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap *soap, const char *tag, int id, const ngwt__TransferFailedStatus *a, const char *type)
 {
-	if (((ngwt__TransferFailedtqStatus *)a)->FailureReason)
-		soap_set_attr(soap, "FailureReason", ((ngwt__TransferFailedtqStatus *)a)->FailureReason->c_str());
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__TransferFailedtqStatus), "ngwt:TransferFailedStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "");
+	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__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__TransferFailedtqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__TransferFailedStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__TransferFailedtqStatus(soap, this, tag, type);
+	return soap_get_ngwt__TransferFailedStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__TransferFailedtqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__TransferFailedStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__TransferFailedtqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__TransferFailedtqStatus(soap, tag, this, type);
+void *ngwt__TransferFailedStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__TransferFailedStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedtqStatus(struct soap *soap, const char *tag, ngwt__TransferFailedtqStatus *a, const char *type)
+SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedStatus(struct soap *soap, const char *tag, ngwt__TransferFailedStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__TransferFailedtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__TransferFailedtqStatus, sizeof(ngwt__TransferFailedtqStatus), soap->type, soap->arrayType);
+	a = (ngwt__TransferFailedStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__TransferFailedStatus, sizeof(ngwt__TransferFailedStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__TransferFailedtqStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__TransferFailedStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__TransferFailedtqStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__TransferFailedStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	{	const char *t = soap_attr_value(soap, "FailureReason", 0);
 		if (t)
-		{	if (!(((ngwt__TransferFailedtqStatus *)a)->FailureReason = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__TransferFailedStatus *)a)->FailureReason = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -41570,8 +41570,8 @@ SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFaile
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__TransferFailedtqStatus *)a)->FailureReason = soap_new_std__string(soap, -1);
-			((ngwt__TransferFailedtqStatus *)a)->FailureReason->assign(s);
+		{	((ngwt__TransferFailedStatus *)a)->FailureReason = soap_new_std__string(soap, -1);
+			((ngwt__TransferFailedStatus *)a)->FailureReason->assign(s);
 		}
 		}
 	}
@@ -41581,117 +41581,117 @@ SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFaile
 		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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommenStatus"))
+				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__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommenStatus"))
+				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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)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__DelegateetqStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "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)
@@ -41705,48 +41705,48 @@ SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFaile
 			return NULL;
 	}
 	else
-	{	a = (ngwt__TransferFailedtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedtqStatus, 0, sizeof(ngwt__TransferFailedtqStatus), 0, soap_copy_ngwt__TransferFailedtqStatus);
+	{	a = (ngwt__TransferFailedStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedStatus, 0, sizeof(ngwt__TransferFailedStatus), 0, soap_copy_ngwt__TransferFailedStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedtqStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__TransferFailedtqStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__TransferFailedStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__TransferFailedtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__TransferFailedtqStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__TransferFailedStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__TransferFailedStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__TransferFailedtqStatus;
+	{	cp->ptr = (void*)new ngwt__TransferFailedStatus;
 		if (size)
-			*size = sizeof(ngwt__TransferFailedtqStatus);
-		((ngwt__TransferFailedtqStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__TransferFailedStatus);
+		((ngwt__TransferFailedStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__TransferFailedtqStatus[n];
+	{	cp->ptr = (void*)new ngwt__TransferFailedStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__TransferFailedtqStatus);
+			*size = n * sizeof(ngwt__TransferFailedStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__TransferFailedtqStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__TransferFailedStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__TransferFailedtqStatus*)cp->ptr;
+	return (ngwt__TransferFailedStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__TransferFailedtqStatus %p -> %p\n", q, p));
-	*(ngwt__TransferFailedtqStatus*)p = *(ngwt__TransferFailedtqStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__TransferFailedStatus %p -> %p\n", q, p));
+	*(ngwt__TransferFailedStatus*)p = *(ngwt__TransferFailedStatus*)q;
 }
 
 void ngwt__TimezoneList::soap_serialize(struct soap *soap) const
@@ -42278,8 +42278,8 @@ void ngwt__Task::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -42392,7 +42392,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Task(struct soap *soap, const char *tag
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -42510,7 +42510,7 @@ SOAP_FMAC3 ngwt__Task * SOAP_FMAC4 soap_in_ngwt__Task(struct soap *soap, const c
 					continue;
 				}
 			if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status4 = 0;
 					continue;
 				}
@@ -43151,83 +43151,83 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__StatusTracking(struct soap *soap, int
 	*(ngwt__StatusTracking*)p = *(ngwt__StatusTracking*)q;
 }
 
-void ngwt__tqStatus::soap_serialize(struct soap *soap) const
+void ngwt__Status::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__tqStatus*)this)->code, SOAP_TYPE_int);
-	soap_embedded(soap, &((ngwt__tqStatus*)this)->description, SOAP_TYPE_PointerTostd__string);
-	soap_serialize_PointerTostd__string(soap, &((ngwt__tqStatus*)this)->description);
-	soap_embedded(soap, &((ngwt__tqStatus*)this)->info, SOAP_TYPE_PointerTostd__string);
-	soap_serialize_PointerTostd__string(soap, &((ngwt__tqStatus*)this)->info);
-	soap_embedded(soap, &((ngwt__tqStatus*)this)->problems, SOAP_TYPE_PointerTongwt__ProblemList);
-	soap_serialize_PointerTongwt__ProblemList(soap, &((ngwt__tqStatus*)this)->problems);
+	soap_embedded(soap, &((ngwt__Status*)this)->code, SOAP_TYPE_int);
+	soap_embedded(soap, &((ngwt__Status*)this)->description, SOAP_TYPE_PointerTostd__string);
+	soap_serialize_PointerTostd__string(soap, &((ngwt__Status*)this)->description);
+	soap_embedded(soap, &((ngwt__Status*)this)->info, SOAP_TYPE_PointerTostd__string);
+	soap_serialize_PointerTostd__string(soap, &((ngwt__Status*)this)->info);
+	soap_embedded(soap, &((ngwt__Status*)this)->problems, SOAP_TYPE_PointerTongwt__ProblemList);
+	soap_serialize_PointerTongwt__ProblemList(soap, &((ngwt__Status*)this)->problems);
 	/* transient soap skipped */
 }
 
-void ngwt__tqStatus::soap_default(struct soap *soap)
+void ngwt__Status::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_int(soap, &((ngwt__tqStatus*)this)->code);
-	((ngwt__tqStatus*)this)->description = NULL;
-	((ngwt__tqStatus*)this)->info = NULL;
-	((ngwt__tqStatus*)this)->problems = NULL;
+	soap_default_int(soap, &((ngwt__Status*)this)->code);
+	((ngwt__Status*)this)->description = NULL;
+	((ngwt__Status*)this)->info = NULL;
+	((ngwt__Status*)this)->problems = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__tqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__Status::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__tqStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__Status);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__tqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__Status::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__tqStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__Status(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__tqStatus(struct soap *soap, const char *tag, int id, const ngwt__tqStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Status(struct soap *soap, const char *tag, int id, const ngwt__Status *a, const char *type)
 {
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__tqStatus), type);
-	soap_out_int(soap, "ngwt:code", -1, &(((ngwt__tqStatus*)a)->code), "");
-	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__tqStatus*)a)->description), "");
-	soap_out_PointerTostd__string(soap, "ngwt:info", -1, &(((ngwt__tqStatus*)a)->info), "");
-	soap_out_PointerTongwt__ProblemList(soap, "ngwt:problems", -1, &(((ngwt__tqStatus*)a)->problems), "");
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__Status), type);
+	soap_out_int(soap, "ngwt:code", -1, &(((ngwt__Status*)a)->code), "");
+	soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Status*)a)->description), "");
+	soap_out_PointerTostd__string(soap, "ngwt:info", -1, &(((ngwt__Status*)a)->info), "");
+	soap_out_PointerTongwt__ProblemList(soap, "ngwt:problems", -1, &(((ngwt__Status*)a)->problems), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__tqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__Status::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__tqStatus(soap, this, tag, type);
+	return soap_get_ngwt__Status(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_get_ngwt__tqStatus(struct soap *soap, ngwt__tqStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_get_ngwt__Status(struct soap *soap, ngwt__Status *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__tqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__Status(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__tqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__tqStatus(soap, tag, this, type);
+void *ngwt__Status::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__Status(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap *soap, const char *tag, ngwt__tqStatus *a, const char *type)
+SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_in_ngwt__Status(struct soap *soap, const char *tag, ngwt__Status *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__tqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__tqStatus, sizeof(ngwt__tqStatus), soap->type, soap->arrayType);
+	a = (ngwt__Status *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__Status, sizeof(ngwt__Status), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__tqStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__Status)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__tqStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__Status *)a->soap_in(soap, tag, type);
 		}
 	}
 	short soap_flag_code1 = 1, soap_flag_description1 = 1, soap_flag_info1 = 1, soap_flag_problems1 = 1;
@@ -43236,22 +43236,22 @@ SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap *soap,
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_code1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_int(soap, "ngwt:code", &(((ngwt__tqStatus*)a)->code), ""))
+				if (soap_in_int(soap, "ngwt:code", &(((ngwt__Status*)a)->code), ""))
 				{	soap_flag_code1 = 0;
 					continue;
 				}
 			if (soap_flag_description1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_PointerTostd__string(soap, "ngwt:description", &(((ngwt__tqStatus*)a)->description), ""))
+				if (soap_in_PointerTostd__string(soap, "ngwt:description", &(((ngwt__Status*)a)->description), ""))
 				{	soap_flag_description1 = 0;
 					continue;
 				}
 			if (soap_flag_info1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
-				if (soap_in_PointerTostd__string(soap, "ngwt:info", &(((ngwt__tqStatus*)a)->info), ""))
+				if (soap_in_PointerTostd__string(soap, "ngwt:info", &(((ngwt__Status*)a)->info), ""))
 				{	soap_flag_info1 = 0;
 					continue;
 				}
 			if (soap_flag_problems1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ProblemList(soap, "ngwt:problems", &(((ngwt__tqStatus*)a)->problems), "ngwt:ProblemList"))
+				if (soap_in_PointerTongwt__ProblemList(soap, "ngwt:problems", &(((ngwt__Status*)a)->problems), "ngwt:ProblemList"))
 				{	soap_flag_problems1 = 0;
 					continue;
 				}
@@ -43271,48 +43271,48 @@ SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap *soap,
 			return NULL;
 	}
 	else
-	{	a = (ngwt__tqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__tqStatus, 0, sizeof(ngwt__tqStatus), 0, soap_copy_ngwt__tqStatus);
+	{	a = (ngwt__Status *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__Status, 0, sizeof(ngwt__Status), 0, soap_copy_ngwt__Status);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_new_ngwt__tqStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__tqStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_new_ngwt__Status(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__Status(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__tqStatus(struct soap *soap, ngwt__tqStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Status(struct soap *soap, ngwt__Status *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_instantiate_ngwt__tqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_instantiate_ngwt__Status(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__tqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__tqStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__Status(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__Status, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__tqStatus;
+	{	cp->ptr = (void*)new ngwt__Status;
 		if (size)
-			*size = sizeof(ngwt__tqStatus);
-		((ngwt__tqStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__Status);
+		((ngwt__Status*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__tqStatus[n];
+	{	cp->ptr = (void*)new ngwt__Status[n];
 		if (size)
-			*size = n * sizeof(ngwt__tqStatus);
+			*size = n * sizeof(ngwt__Status);
 		for (int i = 0; i < n; i++)
-			((ngwt__tqStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__Status*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__tqStatus*)cp->ptr;
+	return (ngwt__Status*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__tqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Status(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__tqStatus %p -> %p\n", q, p));
-	*(ngwt__tqStatus*)p = *(ngwt__tqStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__Status %p -> %p\n", q, p));
+	*(ngwt__Status*)p = *(ngwt__Status*)q;
 }
 
 void ngwt__SMimeOperation::soap_serialize(struct soap *soap) const
@@ -43931,8 +43931,8 @@ void ngwt__SharedNotification::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -44038,7 +44038,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SharedNotification(struct soap *soap, c
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -44149,7 +44149,7 @@ SOAP_FMAC3 ngwt__SharedNotification * SOAP_FMAC4 soap_in_ngwt__SharedNotificatio
 					continue;
 				}
 			if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status3 = 0;
 					continue;
 				}
@@ -47486,159 +47486,159 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecurrenceDateType(struct soap *soap,
 	*(ngwt__RecurrenceDateType*)p = *(ngwt__RecurrenceDateType*)q;
 }
 
-void ngwt__RecipientqStatus::soap_serialize(struct soap *soap) const
+void ngwt__RecipienStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus);
-	soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus);
-	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus);
-	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus);
-	soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__RecipientqStatus::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__RecipientqStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
-	((ngwt__RecipientqStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
-	((ngwt__RecipientqStatus*)this)->accepted = NULL;
-	((ngwt__RecipientqStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
-	((ngwt__RecipientqStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__RecipientqStatus::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__RecipientqStatus);
+	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__RecipientqStatus::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__RecipientqStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__RecipienStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientqStatus(struct soap *soap, const char *tag, int id, const ngwt__RecipientqStatus *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__RecipientqStatus), type);
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "");
+	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__RecipientqStatus::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__RecipientqStatus(soap, this, tag, type);
+	return soap_get_ngwt__RecipienStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_get_ngwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *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__RecipientqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__RecipienStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__RecipientqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__RecipientqStatus(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__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(struct soap *soap, const char *tag, ngwt__RecipientqStatus *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__RecipientqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__RecipientqStatus, sizeof(ngwt__RecipientqStatus), 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__RecipientqStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__RecipienStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__RecipientqStatus *)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__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(st
 		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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommenStatus"))
+				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__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommenStatus"))
+				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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)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__DelegateetqStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "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,84 +47771,84 @@ SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(st
 			return NULL;
 	}
 	else
-	{	a = (ngwt__RecipientqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientqStatus, 0, sizeof(ngwt__RecipientqStatus), 0, soap_copy_ngwt__RecipientqStatus);
+	{	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__RecipientqStatus * SOAP_FMAC6 soap_new_ngwt__RecipientqStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__RecipientqStatus(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__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipienStatus(struct soap *soap, ngwt__RecipienStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientqStatus(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__RecipientqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__RecipientqStatus, 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"))
-	{	cp->type = SOAP_TYPE_ngwt__DelegateetqStatus;
+	{	cp->type = SOAP_TYPE_ngwt__DelegateeStatus;
 		if (n < 0)
-		{	cp->ptr = (void*)new ngwt__DelegateetqStatus;
+		{	cp->ptr = (void*)new ngwt__DelegateeStatus;
 			if (size)
-				*size = sizeof(ngwt__DelegateetqStatus);
-			((ngwt__DelegateetqStatus*)cp->ptr)->soap = soap;
+				*size = sizeof(ngwt__DelegateeStatus);
+			((ngwt__DelegateeStatus*)cp->ptr)->soap = soap;
 		}
 		else
-		{	cp->ptr = (void*)new ngwt__DelegateetqStatus[n];
+		{	cp->ptr = (void*)new ngwt__DelegateeStatus[n];
 			if (size)
-				*size = n * sizeof(ngwt__DelegateetqStatus);
+				*size = n * sizeof(ngwt__DelegateeStatus);
 			for (int i = 0; i < n; i++)
-				((ngwt__DelegateetqStatus*)cp->ptr)[i].soap = soap;
+				((ngwt__DelegateeStatus*)cp->ptr)[i].soap = soap;
 		}
 	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-		return (ngwt__DelegateetqStatus*)cp->ptr;
+		return (ngwt__DelegateeStatus*)cp->ptr;
 	}
 	if (type && !soap_match_tag(soap, type, "ngwt:TransferFailedStatus"))
-	{	cp->type = SOAP_TYPE_ngwt__TransferFailedtqStatus;
+	{	cp->type = SOAP_TYPE_ngwt__TransferFailedStatus;
 		if (n < 0)
-		{	cp->ptr = (void*)new ngwt__TransferFailedtqStatus;
+		{	cp->ptr = (void*)new ngwt__TransferFailedStatus;
 			if (size)
-				*size = sizeof(ngwt__TransferFailedtqStatus);
-			((ngwt__TransferFailedtqStatus*)cp->ptr)->soap = soap;
+				*size = sizeof(ngwt__TransferFailedStatus);
+			((ngwt__TransferFailedStatus*)cp->ptr)->soap = soap;
 		}
 		else
-		{	cp->ptr = (void*)new ngwt__TransferFailedtqStatus[n];
+		{	cp->ptr = (void*)new ngwt__TransferFailedStatus[n];
 			if (size)
-				*size = n * sizeof(ngwt__TransferFailedtqStatus);
+				*size = n * sizeof(ngwt__TransferFailedStatus);
 			for (int i = 0; i < n; i++)
-				((ngwt__TransferFailedtqStatus*)cp->ptr)[i].soap = soap;
+				((ngwt__TransferFailedStatus*)cp->ptr)[i].soap = soap;
 		}
 	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-		return (ngwt__TransferFailedtqStatus*)cp->ptr;
+		return (ngwt__TransferFailedStatus*)cp->ptr;
 	}
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__RecipientqStatus;
+	{	cp->ptr = (void*)new ngwt__RecipienStatus;
 		if (size)
-			*size = sizeof(ngwt__RecipientqStatus);
-		((ngwt__RecipientqStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__RecipienStatus);
+		((ngwt__RecipienStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__RecipientqStatus[n];
+	{	cp->ptr = (void*)new ngwt__RecipienStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__RecipientqStatus);
+			*size = n * sizeof(ngwt__RecipienStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__RecipientqStatus*)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__RecipientqStatus*)cp->ptr;
+	return (ngwt__RecipienStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientqStatus(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__RecipientqStatus %p -> %p\n", q, p));
-	*(ngwt__RecipientqStatus*)p = *(ngwt__RecipientqStatus*)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)->recipientqStatus, SOAP_TYPE_PointerTongwt__RecipientqStatus);
-	soap_serialize_PointerTongwt__RecipientqStatus(soap, &((ngwt__Recipient*)this)->recipientqStatus);
+	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)->recipientqStatus = 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__RecipientqStatus(soap, "ngwt:recipienStatus", -1, &(((ngwt__Recipient*)a)->recipientqStatus), "");
+	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_recipientqStatus1 = 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_recipientqStatus1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__RecipientqStatus(soap, "ngwt:recipienStatus", &(((ngwt__Recipient*)a)->recipientqStatus), "ngwt:RecipienStatus"))
-				{	soap_flag_recipientqStatus1 = 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)
@@ -50061,8 +50061,8 @@ void ngwt__PhoneMessage::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -50169,7 +50169,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__PhoneMessage(struct soap *soap, const c
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -50281,7 +50281,7 @@ SOAP_FMAC3 ngwt__PhoneMessage * SOAP_FMAC4 soap_in_ngwt__PhoneMessage(struct soa
 					continue;
 				}
 			if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status3 = 0;
 					continue;
 				}
@@ -51464,8 +51464,8 @@ void ngwt__Note::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -51574,7 +51574,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Note(struct soap *soap, const char *tag
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -51688,7 +51688,7 @@ SOAP_FMAC3 ngwt__Note * SOAP_FMAC4 soap_in_ngwt__Note(struct soap *soap, const c
 					continue;
 				}
 			if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status4 = 0;
 					continue;
 				}
@@ -52798,8 +52798,8 @@ void ngwt__Mail::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -52902,7 +52902,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Mail(struct soap *soap, const char *tag
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -53010,7 +53010,7 @@ SOAP_FMAC3 ngwt__Mail * SOAP_FMAC4 soap_in_ngwt__Mail(struct soap *soap, const c
 					continue;
 				}
 			if (soap_flag_status2 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status2 = 0;
 					continue;
 				}
@@ -54112,104 +54112,104 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__JunkEntry(struct soap *soap, int st,
 	*(ngwt__JunkEntry*)p = *(ngwt__JunkEntry*)q;
 }
 
-void ngwt__ItemtqStatus::soap_serialize(struct soap *soap) const
+void ngwt__ItemStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->accepted, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->completed, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->delegated, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->delegated);
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->deleted, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->forwarded, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->private_, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->private_);
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->opened, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->read, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->read);
-	soap_embedded(soap, &((ngwt__ItemtqStatus*)this)->replied, SOAP_TYPE_PointerTobool);
-	soap_serialize_PointerTobool(soap, &((ngwt__ItemtqStatus*)this)->replied);
-	/* transient soap skipped */
-}
-
-void ngwt__ItemtqStatus::soap_default(struct soap *soap)
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->accepted, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->accepted);
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->completed, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->completed);
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->delegated, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->delegated);
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->deleted, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->deleted);
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->forwarded, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->forwarded);
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->private_, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->private_);
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->opened, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->opened);
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->read, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->read);
+	soap_embedded(soap, &((ngwt__ItemStatus*)this)->replied, SOAP_TYPE_PointerTobool);
+	soap_serialize_PointerTobool(soap, &((ngwt__ItemStatus*)this)->replied);
+	/* transient soap skipped */
+}
+
+void ngwt__ItemStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	((ngwt__ItemtqStatus*)this)->accepted = NULL;
-	((ngwt__ItemtqStatus*)this)->completed = NULL;
-	((ngwt__ItemtqStatus*)this)->delegated = NULL;
-	((ngwt__ItemtqStatus*)this)->deleted = NULL;
-	((ngwt__ItemtqStatus*)this)->forwarded = NULL;
-	((ngwt__ItemtqStatus*)this)->private_ = NULL;
-	((ngwt__ItemtqStatus*)this)->opened = NULL;
-	((ngwt__ItemtqStatus*)this)->read = NULL;
-	((ngwt__ItemtqStatus*)this)->replied = NULL;
+	((ngwt__ItemStatus*)this)->accepted = NULL;
+	((ngwt__ItemStatus*)this)->completed = NULL;
+	((ngwt__ItemStatus*)this)->delegated = NULL;
+	((ngwt__ItemStatus*)this)->deleted = NULL;
+	((ngwt__ItemStatus*)this)->forwarded = NULL;
+	((ngwt__ItemStatus*)this)->private_ = NULL;
+	((ngwt__ItemStatus*)this)->opened = NULL;
+	((ngwt__ItemStatus*)this)->read = NULL;
+	((ngwt__ItemStatus*)this)->replied = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__ItemtqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__ItemStatus::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__ItemtqStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__ItemStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__ItemtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__ItemStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__ItemtqStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__ItemStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemtqStatus(struct soap *soap, const char *tag, int id, const ngwt__ItemtqStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemStatus(struct soap *soap, const char *tag, int id, const ngwt__ItemStatus *a, const char *type)
 {
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__ItemtqStatus), type);
-	soap_out_PointerTobool(soap, "ngwt:accepted", -1, &(((ngwt__ItemtqStatus*)a)->accepted), "");
-	soap_out_PointerTobool(soap, "ngwt:completed", -1, &(((ngwt__ItemtqStatus*)a)->completed), "");
-	soap_out_PointerTobool(soap, "ngwt:delegated", -1, &(((ngwt__ItemtqStatus*)a)->delegated), "");
-	soap_out_PointerTobool(soap, "ngwt:deleted", -1, &(((ngwt__ItemtqStatus*)a)->deleted), "");
-	soap_out_PointerTobool(soap, "ngwt:forwarded", -1, &(((ngwt__ItemtqStatus*)a)->forwarded), "");
-	soap_out_PointerTobool(soap, "ngwt:private", -1, &(((ngwt__ItemtqStatus*)a)->private_), "");
-	soap_out_PointerTobool(soap, "ngwt:opened", -1, &(((ngwt__ItemtqStatus*)a)->opened), "");
-	soap_out_PointerTobool(soap, "ngwt:read", -1, &(((ngwt__ItemtqStatus*)a)->read), "");
-	soap_out_PointerTobool(soap, "ngwt:replied", -1, &(((ngwt__ItemtqStatus*)a)->replied), "");
+	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__ItemStatus), type);
+	soap_out_PointerTobool(soap, "ngwt:accepted", -1, &(((ngwt__ItemStatus*)a)->accepted), "");
+	soap_out_PointerTobool(soap, "ngwt:completed", -1, &(((ngwt__ItemStatus*)a)->completed), "");
+	soap_out_PointerTobool(soap, "ngwt:delegated", -1, &(((ngwt__ItemStatus*)a)->delegated), "");
+	soap_out_PointerTobool(soap, "ngwt:deleted", -1, &(((ngwt__ItemStatus*)a)->deleted), "");
+	soap_out_PointerTobool(soap, "ngwt:forwarded", -1, &(((ngwt__ItemStatus*)a)->forwarded), "");
+	soap_out_PointerTobool(soap, "ngwt:private", -1, &(((ngwt__ItemStatus*)a)->private_), "");
+	soap_out_PointerTobool(soap, "ngwt:opened", -1, &(((ngwt__ItemStatus*)a)->opened), "");
+	soap_out_PointerTobool(soap, "ngwt:read", -1, &(((ngwt__ItemStatus*)a)->read), "");
+	soap_out_PointerTobool(soap, "ngwt:replied", -1, &(((ngwt__ItemStatus*)a)->replied), "");
 	/* transient soap skipped */
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
 
-void *ngwt__ItemtqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__ItemStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__ItemtqStatus(soap, this, tag, type);
+	return soap_get_ngwt__ItemStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_get_ngwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_get_ngwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__ItemtqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__ItemStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__ItemtqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__ItemtqStatus(soap, tag, this, type);
+void *ngwt__ItemStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__ItemStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soap *soap, const char *tag, ngwt__ItemtqStatus *a, const char *type)
+SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_in_ngwt__ItemStatus(struct soap *soap, const char *tag, ngwt__ItemStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__ItemtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__ItemtqStatus, sizeof(ngwt__ItemtqStatus), soap->type, soap->arrayType);
+	a = (ngwt__ItemStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__ItemStatus, sizeof(ngwt__ItemStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__ItemtqStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__ItemStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__ItemtqStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__ItemStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	short soap_flag_accepted1 = 1, soap_flag_completed1 = 1, soap_flag_delegated1 = 1, soap_flag_deleted1 = 1, soap_flag_forwarded1 = 1, soap_flag_private_1 = 1, soap_flag_opened1 = 1, soap_flag_read1 = 1, soap_flag_replied1 = 1;
@@ -54218,47 +54218,47 @@ SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soa
 		for (;;)
 		{	soap->error = SOAP_TAG_MISMATCH;
 			if (soap_flag_accepted1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:accepted", &(((ngwt__ItemtqStatus*)a)->accepted), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:accepted", &(((ngwt__ItemStatus*)a)->accepted), ""))
 				{	soap_flag_accepted1 = 0;
 					continue;
 				}
 			if (soap_flag_completed1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:completed", &(((ngwt__ItemtqStatus*)a)->completed), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:completed", &(((ngwt__ItemStatus*)a)->completed), ""))
 				{	soap_flag_completed1 = 0;
 					continue;
 				}
 			if (soap_flag_delegated1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:delegated", &(((ngwt__ItemtqStatus*)a)->delegated), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:delegated", &(((ngwt__ItemStatus*)a)->delegated), ""))
 				{	soap_flag_delegated1 = 0;
 					continue;
 				}
 			if (soap_flag_deleted1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:deleted", &(((ngwt__ItemtqStatus*)a)->deleted), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:deleted", &(((ngwt__ItemStatus*)a)->deleted), ""))
 				{	soap_flag_deleted1 = 0;
 					continue;
 				}
 			if (soap_flag_forwarded1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:forwarded", &(((ngwt__ItemtqStatus*)a)->forwarded), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:forwarded", &(((ngwt__ItemStatus*)a)->forwarded), ""))
 				{	soap_flag_forwarded1 = 0;
 					continue;
 				}
 			if (soap_flag_private_1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:private", &(((ngwt__ItemtqStatus*)a)->private_), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:private", &(((ngwt__ItemStatus*)a)->private_), ""))
 				{	soap_flag_private_1 = 0;
 					continue;
 				}
 			if (soap_flag_opened1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:opened", &(((ngwt__ItemtqStatus*)a)->opened), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:opened", &(((ngwt__ItemStatus*)a)->opened), ""))
 				{	soap_flag_opened1 = 0;
 					continue;
 				}
 			if (soap_flag_read1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:read", &(((ngwt__ItemtqStatus*)a)->read), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:read", &(((ngwt__ItemStatus*)a)->read), ""))
 				{	soap_flag_read1 = 0;
 					continue;
 				}
 			if (soap_flag_replied1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTobool(soap, "ngwt:replied", &(((ngwt__ItemtqStatus*)a)->replied), ""))
+				if (soap_in_PointerTobool(soap, "ngwt:replied", &(((ngwt__ItemStatus*)a)->replied), ""))
 				{	soap_flag_replied1 = 0;
 					continue;
 				}
@@ -54274,48 +54274,48 @@ SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soa
 			return NULL;
 	}
 	else
-	{	a = (ngwt__ItemtqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemtqStatus, 0, sizeof(ngwt__ItemtqStatus), 0, soap_copy_ngwt__ItemtqStatus);
+	{	a = (ngwt__ItemStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemStatus, 0, sizeof(ngwt__ItemStatus), 0, soap_copy_ngwt__ItemStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_new_ngwt__ItemtqStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__ItemtqStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_new_ngwt__ItemStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__ItemStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__ItemtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__ItemtqStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__ItemStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__ItemStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__ItemtqStatus;
+	{	cp->ptr = (void*)new ngwt__ItemStatus;
 		if (size)
-			*size = sizeof(ngwt__ItemtqStatus);
-		((ngwt__ItemtqStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__ItemStatus);
+		((ngwt__ItemStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__ItemtqStatus[n];
+	{	cp->ptr = (void*)new ngwt__ItemStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__ItemtqStatus);
+			*size = n * sizeof(ngwt__ItemStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__ItemtqStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__ItemStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__ItemtqStatus*)cp->ptr;
+	return (ngwt__ItemStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__ItemtqStatus %p -> %p\n", q, p));
-	*(ngwt__ItemtqStatus*)p = *(ngwt__ItemtqStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__ItemStatus %p -> %p\n", q, p));
+	*(ngwt__ItemStatus*)p = *(ngwt__ItemStatus*)q;
 }
 
 void ngwt__Items::soap_serialize(struct soap *soap) const
@@ -58192,8 +58192,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__FolderList(struct soap *soap, int st,
 void ngwt__FolderACLEntry::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__FolderACLEntry*)this)->status, SOAP_TYPE_PointerTongwt__FolderACLtqStatus);
-	soap_serialize_PointerTongwt__FolderACLtqStatus(soap, &((ngwt__FolderACLEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__FolderACLEntry*)this)->status, SOAP_TYPE_PointerTongwt__FolderACLStatus);
+	soap_serialize_PointerTongwt__FolderACLStatus(soap, &((ngwt__FolderACLEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__AccessControlListEntry*)this)->rights, SOAP_TYPE_PointerTongwt__Rights);
 	soap_serialize_PointerTongwt__Rights(soap, &((ngwt__AccessControlListEntry*)this)->rights);
 	soap_embedded(soap, &((ngwt__NameAndEmail*)this)->displayName, SOAP_TYPE_PointerTostd__string);
@@ -58237,7 +58237,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLEntry(struct soap *soap, const
 	soap_out_PointerTongwt__UUID(soap, "ngwt:uuid", -1, &(((ngwt__NameAndEmail*)a)->uuid), "");
 	/* transient soap skipped */
 	soap_out_PointerTongwt__Rights(soap, "ngwt:rights", -1, &(((ngwt__AccessControlListEntry*)a)->rights), "");
-	soap_out_PointerTongwt__FolderACLtqStatus(soap, "ngwt:status", -1, &(((ngwt__FolderACLEntry*)a)->status), "");
+	soap_out_PointerTongwt__FolderACLStatus(soap, "ngwt:status", -1, &(((ngwt__FolderACLEntry*)a)->status), "");
 	soap_element_end_out(soap, tag);
 	return SOAP_OK;
 }
@@ -58300,7 +58300,7 @@ SOAP_FMAC3 ngwt__FolderACLEntry * SOAP_FMAC4 soap_in_ngwt__FolderACLEntry(struct
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__FolderACLtqStatus(soap, "ngwt:status", &(((ngwt__FolderACLEntry*)a)->status), ""))
+				if (soap_in_PointerTongwt__FolderACLStatus(soap, "ngwt:status", &(((ngwt__FolderACLEntry*)a)->status), ""))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -59926,8 +59926,8 @@ void ngwt__DocumentRef::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -60042,7 +60042,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DocumentRef(struct soap *soap, const ch
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -60162,7 +60162,7 @@ SOAP_FMAC3 ngwt__DocumentRef * SOAP_FMAC4 soap_in_ngwt__DocumentRef(struct soap
 					continue;
 				}
 			if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status3 = 0;
 					continue;
 				}
@@ -61040,167 +61040,167 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap *soap, int st,
 	*(ngwt__DeltaInfo*)p = *(ngwt__DeltaInfo*)q;
 }
 
-void ngwt__DelegateetqStatus::soap_serialize(struct soap *soap) const
+void ngwt__DelegateeStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delivered, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeliverable, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferred, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->transferFailed, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus);
-	soap_serialize_PointerTongwt__TransferFailedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->transferFailed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloaded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retractRequested, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->retracted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->opened, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->deleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->undeleted, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->purged, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->accepted, SOAP_TYPE_PointerTongwt__CommentqStatus);
-	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->accepted);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->declined, SOAP_TYPE_PointerTongwt__CommentqStatus);
-	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__RecipientqStatus*)this)->declined);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->replied, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->forwarded, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->shared, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->started, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->started);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->completed, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->incomplete, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
-	soap_embedded(soap, &((ngwt__RecipientqStatus*)this)->delegated, SOAP_TYPE_PointerTongwt__DelegatedtqStatus);
-	soap_serialize_PointerTongwt__DelegatedtqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegated);
-	soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
-	/* transient soap skipped */
-}
-
-void ngwt__DelegateetqStatus::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__DelegateeStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	((ngwt__DelegateetqStatus*)this)->userid = NULL;
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->delivered);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeliverable);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferred);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->transferDelayed);
-	((ngwt__RecipientqStatus*)this)->transferFailed = NULL;
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloaded);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->downloadedByThirdParty);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retractRequested);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->retracted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->opened);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->deleted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->undeleted);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->purged);
-	((ngwt__RecipientqStatus*)this)->accepted = NULL;
-	((ngwt__RecipientqStatus*)this)->declined = NULL;
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->replied);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->forwarded);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->shared);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->started);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->completed);
-	soap_default_string(soap, &((ngwt__RecipientqStatus*)this)->incomplete);
-	((ngwt__RecipientqStatus*)this)->delegated = NULL;
-	soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, &((ngwt__RecipientqStatus*)this)->delegateetqStatus);
-	/* transient soap skipped */
-}
-
-int ngwt__DelegateetqStatus::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__DelegateetqStatus);
+	((ngwt__DelegateeStatus*)this)->userid = NULL;
+	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__DelegateeStatus::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__DelegateeStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__DelegateetqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__DelegateeStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__DelegateetqStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__DelegateeStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegateetqStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegateeStatus *a, const char *type)
 {
-	if (((ngwt__DelegateetqStatus *)a)->userid)
-		soap_set_attr(soap, "userid", ((ngwt__DelegateetqStatus *)a)->userid->c_str());
-	soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE_ngwt__DelegateetqStatus), "ngwt:DelegateeStatus");
-	soap_out_string(soap, "ngwt:delivered", -1, &(((ngwt__RecipientqStatus*)a)->delivered), "");
-	soap_out_string(soap, "ngwt:undeliverable", -1, &(((ngwt__RecipientqStatus*)a)->undeliverable), "");
-	soap_out_string(soap, "ngwt:transferred", -1, &(((ngwt__RecipientqStatus*)a)->transferred), "");
-	soap_out_string(soap, "ngwt:transferDelayed", -1, &(((ngwt__RecipientqStatus*)a)->transferDelayed), "");
-	soap_out_PointerTongwt__TransferFailedtqStatus(soap, "ngwt:transferFailed", -1, &(((ngwt__RecipientqStatus*)a)->transferFailed), "");
-	soap_out_string(soap, "ngwt:downloaded", -1, &(((ngwt__RecipientqStatus*)a)->downloaded), "");
-	soap_out_string(soap, "ngwt:downloadedByThirdParty", -1, &(((ngwt__RecipientqStatus*)a)->downloadedByThirdParty), "");
-	soap_out_string(soap, "ngwt:retractRequested", -1, &(((ngwt__RecipientqStatus*)a)->retractRequested), "");
-	soap_out_string(soap, "ngwt:retracted", -1, &(((ngwt__RecipientqStatus*)a)->retracted), "");
-	soap_out_string(soap, "ngwt:opened", -1, &(((ngwt__RecipientqStatus*)a)->opened), "");
-	soap_out_string(soap, "ngwt:deleted", -1, &(((ngwt__RecipientqStatus*)a)->deleted), "");
-	soap_out_string(soap, "ngwt:undeleted", -1, &(((ngwt__RecipientqStatus*)a)->undeleted), "");
-	soap_out_string(soap, "ngwt:purged", -1, &(((ngwt__RecipientqStatus*)a)->purged), "");
-	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:accepted", -1, &(((ngwt__RecipientqStatus*)a)->accepted), "");
-	soap_out_PointerTongwt__CommentqStatus(soap, "ngwt:declined", -1, &(((ngwt__RecipientqStatus*)a)->declined), "");
-	soap_out_string(soap, "ngwt:replied", -1, &(((ngwt__RecipientqStatus*)a)->replied), "");
-	soap_out_string(soap, "ngwt:forwarded", -1, &(((ngwt__RecipientqStatus*)a)->forwarded), "");
-	soap_out_string(soap, "ngwt:shared", -1, &(((ngwt__RecipientqStatus*)a)->shared), "");
-	soap_out_string(soap, "ngwt:started", -1, &(((ngwt__RecipientqStatus*)a)->started), "");
-	soap_out_string(soap, "ngwt:completed", -1, &(((ngwt__RecipientqStatus*)a)->completed), "");
-	soap_out_string(soap, "ngwt:incomplete", -1, &(((ngwt__RecipientqStatus*)a)->incomplete), "");
-	soap_out_PointerTongwt__DelegatedtqStatus(soap, "ngwt:delegated", -1, &(((ngwt__RecipientqStatus*)a)->delegated), "");
-	soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, "ngwt:delegateeStatus", -1, &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "");
+	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__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__DelegateetqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__DelegateeStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__DelegateetqStatus(soap, this, tag, type);
+	return soap_get_ngwt__DelegateeStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_get_ngwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_get_ngwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__DelegateetqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__DelegateeStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__DelegateetqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__DelegateetqStatus(soap, tag, this, type);
+void *ngwt__DelegateeStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__DelegateeStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(struct soap *soap, const char *tag, ngwt__DelegateetqStatus *a, const char *type)
+SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(struct soap *soap, const char *tag, ngwt__DelegateeStatus *a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 0))
 		return NULL;
-	a = (ngwt__DelegateetqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), soap->type, soap->arrayType);
+	a = (ngwt__DelegateeStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), soap->type, soap->arrayType);
 	if (!a)
 		return NULL;
 	if (soap->alloced)
 	{	a->soap_default(soap);
-		if (soap->clist->type != SOAP_TYPE_ngwt__DelegateetqStatus)
+		if (soap->clist->type != SOAP_TYPE_ngwt__DelegateeStatus)
 		{	soap_revert(soap);
 			*soap->id = '\0';
-			return (ngwt__DelegateetqStatus *)a->soap_in(soap, tag, type);
+			return (ngwt__DelegateeStatus *)a->soap_in(soap, tag, type);
 		}
 	}
 	{	const char *t = soap_attr_value(soap, "userid", 0);
 		if (t)
-		{	if (!(((ngwt__DelegateetqStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__DelegateeStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -61208,8 +61208,8 @@ SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__DelegateetqStatus *)a)->userid = soap_new_std__string(soap, -1);
-			((ngwt__DelegateetqStatus *)a)->userid->assign(s);
+		{	((ngwt__DelegateeStatus *)a)->userid = soap_new_std__string(soap, -1);
+			((ngwt__DelegateeStatus *)a)->userid->assign(s);
 		}
 		}
 	}
@@ -61219,117 +61219,117 @@ SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(
 		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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__TransferFailedtqStatus(soap, "ngwt:transferFailed", &(((ngwt__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__CommentqStatus(soap, "ngwt:accepted", &(((ngwt__RecipientqStatus*)a)->accepted), "ngwt:CommenStatus"))
+				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__CommentqStatus(soap, "ngwt:declined", &(((ngwt__RecipientqStatus*)a)->declined), "ngwt:CommenStatus"))
+				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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__RecipientqStatus*)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__DelegatedtqStatus(soap, "ngwt:delegated", &(((ngwt__RecipientqStatus*)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__DelegateetqStatus(soap, "ngwt:delegateeStatus", &(((ngwt__RecipientqStatus*)a)->delegateetqStatus), "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)
@@ -61343,120 +61343,120 @@ SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(
 			return NULL;
 	}
 	else
-	{	a = (ngwt__DelegateetqStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateetqStatus, 0, sizeof(ngwt__DelegateetqStatus), 0, soap_copy_ngwt__DelegateetqStatus);
+	{	a = (ngwt__DelegateeStatus *)soap_id_forward(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateeStatus, 0, sizeof(ngwt__DelegateeStatus), 0, soap_copy_ngwt__DelegateeStatus);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_new_ngwt__DelegateetqStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__DelegateetqStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_new_ngwt__DelegateeStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__DelegateeStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateetqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateeStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegateetqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegateetqStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegateeStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegateeStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__DelegateetqStatus;
+	{	cp->ptr = (void*)new ngwt__DelegateeStatus;
 		if (size)
-			*size = sizeof(ngwt__DelegateetqStatus);
-		((ngwt__DelegateetqStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__DelegateeStatus);
+		((ngwt__DelegateeStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__DelegateetqStatus[n];
+	{	cp->ptr = (void*)new ngwt__DelegateeStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__DelegateetqStatus);
+			*size = n * sizeof(ngwt__DelegateeStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__DelegateetqStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__DelegateeStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__DelegateetqStatus*)cp->ptr;
+	return (ngwt__DelegateeStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateetqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegateetqStatus %p -> %p\n", q, p));
-	*(ngwt__DelegateetqStatus*)p = *(ngwt__DelegateetqStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegateeStatus %p -> %p\n", q, p));
+	*(ngwt__DelegateeStatus*)p = *(ngwt__DelegateeStatus*)q;
 }
 
-void ngwt__DelegatedtqStatus::soap_serialize(struct soap *soap) const
+void ngwt__DelegatedStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__DelegatedtqStatus*)this)->__item, SOAP_TYPE_PointerTongwt__CommentqStatus);
-	soap_serialize_PointerTongwt__CommentqStatus(soap, &((ngwt__DelegatedtqStatus*)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 */
 }
 
-void ngwt__DelegatedtqStatus::soap_default(struct soap *soap)
+void ngwt__DelegatedStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	((ngwt__DelegatedtqStatus*)this)->__item = NULL;
-	((ngwt__DelegatedtqStatus*)this)->userid = NULL;
+	((ngwt__DelegatedStatus*)this)->__item = NULL;
+	((ngwt__DelegatedStatus*)this)->userid = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__DelegatedtqStatus::soap_put(struct soap *soap, const char *tag, const  char *type) const
+int ngwt__DelegatedStatus::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__DelegatedtqStatus);
+	register int id = soap_embed(soap, (void*)this, NULL, 0, tag, SOAP_TYPE_ngwt__DelegatedStatus);
 	if (this->soap_out(soap, tag, id, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-int ngwt__DelegatedtqStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
+int ngwt__DelegatedStatus::soap_out(struct soap *soap, const char *tag, int id, const char *type) const
 {
-	return soap_out_ngwt__DelegatedtqStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__DelegatedStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedtqStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegatedtqStatus *a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap *soap, const char *tag, int id, const ngwt__DelegatedStatus *a, const char *type)
 {
-	if (((ngwt__DelegatedtqStatus *)a)->userid)
-		soap_set_attr(soap, "userid", ((ngwt__DelegatedtqStatus *)a)->userid->c_str());
-	soap_out_PointerTongwt__CommentqStatus(soap, tag, id, &(((ngwt__DelegatedtqStatus*)a)->__item), "");
+	if (((ngwt__DelegatedStatus *)a)->userid)
+		soap_set_attr(soap, "userid", ((ngwt__DelegatedStatus *)a)->userid->c_str());
+	soap_out_PointerTongwt__CommenStatus(soap, tag, id, &(((ngwt__DelegatedStatus*)a)->__item), "");
 	return SOAP_OK;
 }
 
-void *ngwt__DelegatedtqStatus::soap_get(struct soap *soap, const char *tag, const char *type)
+void *ngwt__DelegatedStatus::soap_get(struct soap *soap, const char *tag, const char *type)
 {
-	return soap_get_ngwt__DelegatedtqStatus(soap, this, tag, type);
+	return soap_get_ngwt__DelegatedStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *p, const char *tag, const char *type)
 {
-	if ((p = soap_in_ngwt__DelegatedtqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__DelegatedStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__DelegatedtqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__DelegatedtqStatus(soap, tag, this, type);
+void *ngwt__DelegatedStatus::soap_in(struct soap *soap, const char *tag, const char *type)
+{	return soap_in_ngwt__DelegatedStatus(soap, tag, this, type);
 }
 
-SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedtqStatus(struct soap *soap, const char *tag, ngwt__DelegatedtqStatus *a, const char *type)
+SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(struct soap *soap, const char *tag, ngwt__DelegatedStatus *a, const char *type)
 {
 	if (soap_peek_element(soap))
 		return NULL;
-	if (!(a = (ngwt__DelegatedtqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegatedtqStatus, sizeof(ngwt__DelegatedtqStatus), soap->type, soap->arrayType)))
+	if (!(a = (ngwt__DelegatedStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__DelegatedStatus, sizeof(ngwt__DelegatedStatus), 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__DelegatedtqStatus)
-			return (ngwt__DelegatedtqStatus *)a->soap_in(soap, tag, type);
+		if (soap->clist->type != SOAP_TYPE_ngwt__DelegatedStatus)
+			return (ngwt__DelegatedStatus *)a->soap_in(soap, tag, type);
 	}
 	{	const char *t = soap_attr_value(soap, "userid", 0);
 		if (t)
-		{	if (!(((ngwt__DelegatedtqStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string))))
+		{	if (!(((ngwt__DelegatedStatus *)a)->userid = (std::string *)soap_malloc(soap, sizeof(std::string))))
 			{	soap->error = SOAP_EOM;
 				return NULL;
 			}
@@ -61464,51 +61464,51 @@ SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedtqStatus(
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__DelegatedtqStatus *)a)->userid = soap_new_std__string(soap, -1);
-			((ngwt__DelegatedtqStatus *)a)->userid->assign(s);
+		{	((ngwt__DelegatedStatus *)a)->userid = soap_new_std__string(soap, -1);
+			((ngwt__DelegatedStatus *)a)->userid->assign(s);
 		}
 		}
 	}
-	if (!soap_in_PointerTongwt__CommentqStatus(soap, tag, &(((ngwt__DelegatedtqStatus*)a)->__item), "ngwt:DelegatedStatus"))
+	if (!soap_in_PointerTongwt__CommenStatus(soap, tag, &(((ngwt__DelegatedStatus*)a)->__item), "ngwt:DelegatedStatus"))
 		return NULL;
 	return a;
 }
 
-SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedtqStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__DelegatedtqStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedStatus(struct soap *soap, int n)
+{	return soap_instantiate_ngwt__DelegatedStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedtqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegatedtqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegatedtqStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_ngwt__DelegatedStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__DelegatedStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new ngwt__DelegatedtqStatus;
+	{	cp->ptr = (void*)new ngwt__DelegatedStatus;
 		if (size)
-			*size = sizeof(ngwt__DelegatedtqStatus);
-		((ngwt__DelegatedtqStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__DelegatedStatus);
+		((ngwt__DelegatedStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__DelegatedtqStatus[n];
+	{	cp->ptr = (void*)new ngwt__DelegatedStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__DelegatedtqStatus);
+			*size = n * sizeof(ngwt__DelegatedStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__DelegatedtqStatus*)cp->ptr)[i].soap = soap;
+			((ngwt__DelegatedStatus*)cp->ptr)[i].soap = soap;
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (ngwt__DelegatedtqStatus*)cp->ptr;
+	return (ngwt__DelegatedStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedtqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegatedtqStatus %p -> %p\n", q, p));
-	*(ngwt__DelegatedtqStatus*)p = *(ngwt__DelegatedtqStatus*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying ngwt__DelegatedStatus %p -> %p\n", q, p));
+	*(ngwt__DelegatedStatus*)p = *(ngwt__DelegatedStatus*)q;
 }
 
 void ngwt__DayOfYearWeekList::soap_serialize(struct soap *soap) const
@@ -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__CommentqStatus::soap_serialize(struct soap *soap) const
+void ngwt__CommenStatus::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__CommentqStatus*)this)->__item, SOAP_TYPE_string);
-	soap_serialize_string(soap, &((ngwt__CommentqStatus*)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__CommentqStatus::soap_default(struct soap *soap)
+void ngwt__CommenStatus::soap_default(struct soap *soap)
 {
 	this->soap = soap;
-	soap_default_string(soap, &((ngwt__CommentqStatus*)this)->__item);
-	((ngwt__CommentqStatus*)this)->comment = NULL;
+	soap_default_string(soap, &((ngwt__CommenStatus*)this)->__item);
+	((ngwt__CommenStatus*)this)->comment = NULL;
 	/* transient soap skipped */
 }
 
-int ngwt__CommentqStatus::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__CommentqStatus);
+	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__CommentqStatus::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__CommentqStatus(soap, tag, id, this, type);
+	return soap_out_ngwt__CommenStatus(soap, tag, id, this, type);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentqStatus(struct soap *soap, const char *tag, int id, const ngwt__CommentqStatus *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__CommentqStatus *)a)->comment)
-		soap_set_attr(soap, "comment", ((ngwt__CommentqStatus *)a)->comment->c_str());
-	soap_out_string(soap, tag, id, &(((ngwt__CommentqStatus*)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__CommentqStatus::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__CommentqStatus(soap, this, tag, type);
+	return soap_get_ngwt__CommenStatus(soap, this, tag, type);
 }
 
-SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_get_ngwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *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__CommentqStatus(soap, tag, p, type)))
+	if ((p = soap_in_ngwt__CommenStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-void *ngwt__CommentqStatus::soap_in(struct soap *soap, const char *tag, const char *type)
-{	return soap_in_ngwt__CommentqStatus(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__CommentqStatus * SOAP_FMAC4 soap_in_ngwt__CommentqStatus(struct soap *soap, const char *tag, ngwt__CommentqStatus *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__CommentqStatus *)soap_class_id_enter(soap, soap->id, a, SOAP_TYPE_ngwt__CommentqStatus, sizeof(ngwt__CommentqStatus), 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__CommentqStatus)
-			return (ngwt__CommentqStatus *)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__CommentqStatus *)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__CommentqStatus * SOAP_FMAC4 soap_in_ngwt__CommentqStatus(struct
 		if (soap_s2string(soap, t, &s))
 			return NULL;
 		if (s)
-		{	((ngwt__CommentqStatus *)a)->comment = soap_new_std__string(soap, -1);
-			((ngwt__CommentqStatus *)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__CommentqStatus*)a)->__item), "ngwt:CommenStatus"))
+	if (!soap_in_string(soap, tag, &(((ngwt__CommenStatus*)a)->__item), "ngwt:CommenStatus"))
 		return NULL;
 	return a;
 }
 
-SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_new_ngwt__CommentqStatus(struct soap *soap, int n)
-{	return soap_instantiate_ngwt__CommentqStatus(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__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommenStatus(struct soap *soap, ngwt__CommenStatus *p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentqStatus(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__CommentqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_ngwt__CommentqStatus, 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__CommentqStatus;
+	{	cp->ptr = (void*)new ngwt__CommenStatus;
 		if (size)
-			*size = sizeof(ngwt__CommentqStatus);
-		((ngwt__CommentqStatus*)cp->ptr)->soap = soap;
+			*size = sizeof(ngwt__CommenStatus);
+		((ngwt__CommenStatus*)cp->ptr)->soap = soap;
 	}
 	else
-	{	cp->ptr = (void*)new ngwt__CommentqStatus[n];
+	{	cp->ptr = (void*)new ngwt__CommenStatus[n];
 		if (size)
-			*size = n * sizeof(ngwt__CommentqStatus);
+			*size = n * sizeof(ngwt__CommenStatus);
 		for (int i = 0; i < n; i++)
-			((ngwt__CommentqStatus*)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__CommentqStatus*)cp->ptr;
+	return (ngwt__CommenStatus*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentqStatus(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__CommentqStatus %p -> %p\n", q, p));
-	*(ngwt__CommentqStatus*)p = *(ngwt__CommentqStatus*)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
@@ -64330,8 +64330,8 @@ void ngwt__CalendarItem::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -64439,7 +64439,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CalendarItem(struct soap *soap, const c
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -64552,7 +64552,7 @@ SOAP_FMAC3 ngwt__CalendarItem * SOAP_FMAC4 soap_in_ngwt__CalendarItem(struct soa
 					continue;
 				}
 			if (soap_flag_status3 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status3 = 0;
 					continue;
 				}
@@ -64951,8 +64951,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CalendarFolderAttribute(struct soap *
 void ngwt__BoxEntry::soap_serialize(struct soap *soap) const
 {
 	(void)soap; /* appease -Wall -Werror */
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -65042,7 +65042,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__BoxEntry(struct soap *soap, const char
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -65137,7 +65137,7 @@ SOAP_FMAC3 ngwt__BoxEntry * SOAP_FMAC4 soap_in_ngwt__BoxEntry(struct soap *soap,
 					continue;
 				}
 			if (soap_flag_status1 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status1 = 0;
 					continue;
 				}
@@ -66068,8 +66068,8 @@ void ngwt__Appointment::soap_serialize(struct soap *soap) const
 	soap_serialize_PointerTobool(soap, &((ngwt__Mail*)this)->nntpOrImap);
 	soap_embedded(soap, &((ngwt__Mail*)this)->smimeType, SOAP_TYPE_PointerTongwt__SMimeOperation);
 	soap_serialize_PointerTongwt__SMimeOperation(soap, &((ngwt__Mail*)this)->smimeType);
-	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	soap_serialize_PointerTongwt__ItemtqStatus(soap, &((ngwt__BoxEntry*)this)->status);
+	soap_embedded(soap, &((ngwt__BoxEntry*)this)->status, SOAP_TYPE_PointerTongwt__ItemStatus);
+	soap_serialize_PointerTongwt__ItemStatus(soap, &((ngwt__BoxEntry*)this)->status);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->thread, SOAP_TYPE_PointerTostd__string);
 	soap_serialize_PointerTostd__string(soap, &((ngwt__BoxEntry*)this)->thread);
 	soap_embedded(soap, &((ngwt__BoxEntry*)this)->msgId, SOAP_TYPE_PointerTostd__string);
@@ -66186,7 +66186,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Appointment(struct soap *soap, const ch
 	soap_out_PointerTongwt__CategoryRefList(soap, "ngwt:categories", -1, &(((ngwt__ContainerItem*)a)->categories), "");
 	soap_out_string(soap, "ngwt:created", -1, &(((ngwt__ContainerItem*)a)->created), "");
 	soap_out_PointerTongwt__CustomList(soap, "ngwt:customs", -1, &(((ngwt__ContainerItem*)a)->customs), "");
-	soap_out_PointerTongwt__ItemtqStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
+	soap_out_PointerTongwt__ItemStatus(soap, "ngwt:status", -1, &(((ngwt__BoxEntry*)a)->status), "");
 	soap_out_PointerTostd__string(soap, "ngwt:thread", -1, &(((ngwt__BoxEntry*)a)->thread), "");
 	soap_out_PointerTostd__string(soap, "ngwt:msgId", -1, &(((ngwt__BoxEntry*)a)->msgId), "");
 	soap_out_PointerTostd__string(soap, "ngwt:messageId", -1, &(((ngwt__BoxEntry*)a)->messageId), "");
@@ -66308,7 +66308,7 @@ SOAP_FMAC3 ngwt__Appointment * SOAP_FMAC4 soap_in_ngwt__Appointment(struct soap
 					continue;
 				}
 			if (soap_flag_status4 && soap->error == SOAP_TAG_MISMATCH)
-				if (soap_in_PointerTongwt__ItemtqStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
+				if (soap_in_PointerTongwt__ItemStatus(soap, "ngwt:status", &(((ngwt__BoxEntry*)a)->status), "ngwt:ItemStatus"))
 				{	soap_flag_status4 = 0;
 					continue;
 				}
@@ -84091,49 +84091,49 @@ SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_in_PointerTongwt__FullName(struct s
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *const*a)
 {
-	soap_reference(soap, *a, SOAP_TYPE_ngwt__VersiontqStatus);
+	soap_reference(soap, *a, SOAP_TYPE_ngwt__VersionStatus);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__VersiontqStatus);
-	if (soap_out_PointerTongwt__VersiontqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__VersionStatus);
+	if (soap_out_PointerTongwt__VersionStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersiontqStatus(struct soap *soap, const char *tag, int id, enum ngwt__VersiontqStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersionStatus(struct soap *soap, const char *tag, int id, enum ngwt__VersionStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__VersiontqStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__VersionStatus);
 	if (id < 0)
 		return soap->error;
-	return soap_out_ngwt__VersiontqStatus(soap, tag, id, *a, type);
+	return soap_out_ngwt__VersionStatus(soap, tag, id, *a, type);
 }
 
-SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersiontqStatus(struct soap *soap, enum ngwt__VersiontqStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersionStatus(struct soap *soap, enum ngwt__VersionStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__VersiontqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__VersionStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersiontqStatus(struct soap *soap, const char *tag, enum ngwt__VersiontqStatus **a, const char *type)
+SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersionStatus(struct soap *soap, const char *tag, enum ngwt__VersionStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (enum ngwt__VersiontqStatus **)soap_malloc(soap, sizeof(enum ngwt__VersiontqStatus *))))
+		if (!(a = (enum ngwt__VersionStatus **)soap_malloc(soap, sizeof(enum ngwt__VersionStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = soap_in_ngwt__VersiontqStatus(soap, tag, *a, type)))
+		if (!(*a = soap_in_ngwt__VersionStatus(soap, tag, *a, type)))
 			return NULL;
 	}
 	else
-	{	a = (enum ngwt__VersiontqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersiontqStatus, sizeof(enum ngwt__VersiontqStatus), 0);
+	{	a = (enum ngwt__VersionStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__VersionStatus, sizeof(enum ngwt__VersionStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -84348,49 +84348,49 @@ SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_in_PointerTongwt__Query(struct soap *s
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *const*a)
 {
-	soap_reference(soap, *a, SOAP_TYPE_ngwt__FolderACLtqStatus);
+	soap_reference(soap, *a, SOAP_TYPE_ngwt__FolderACLStatus);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__FolderACLtqStatus);
-	if (soap_out_PointerTongwt__FolderACLtqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__FolderACLStatus);
+	if (soap_out_PointerTongwt__FolderACLStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLtqStatus(struct soap *soap, const char *tag, int id, enum ngwt__FolderACLtqStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLStatus(struct soap *soap, const char *tag, int id, enum ngwt__FolderACLStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__FolderACLtqStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__FolderACLStatus);
 	if (id < 0)
 		return soap->error;
-	return soap_out_ngwt__FolderACLtqStatus(soap, tag, id, *a, type);
+	return soap_out_ngwt__FolderACLStatus(soap, tag, id, *a, type);
 }
 
-SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLtqStatus(struct soap *soap, enum ngwt__FolderACLtqStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLStatus(struct soap *soap, enum ngwt__FolderACLStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__FolderACLtqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__FolderACLStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLtqStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLtqStatus **a, const char *type)
+SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLStatus(struct soap *soap, const char *tag, enum ngwt__FolderACLStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (enum ngwt__FolderACLtqStatus **)soap_malloc(soap, sizeof(enum ngwt__FolderACLtqStatus *))))
+		if (!(a = (enum ngwt__FolderACLStatus **)soap_malloc(soap, sizeof(enum ngwt__FolderACLStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = soap_in_ngwt__FolderACLtqStatus(soap, tag, *a, type)))
+		if (!(*a = soap_in_ngwt__FolderACLStatus(soap, tag, *a, type)))
 			return NULL;
 	}
 	else
-	{	a = (enum ngwt__FolderACLtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLtqStatus, sizeof(enum ngwt__FolderACLtqStatus), 0);
+	{	a = (enum ngwt__FolderACLStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__FolderACLStatus, sizeof(enum ngwt__FolderACLStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -84695,53 +84695,53 @@ SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_in_PointerTongwt__ItemSource
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__ItemtqStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__ItemStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__ItemtqStatus);
-	if (soap_out_PointerTongwt__ItemtqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__ItemStatus);
+	if (soap_out_PointerTongwt__ItemStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemtqStatus(struct soap *soap, const char *tag, int id, ngwt__ItemtqStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemStatus(struct soap *soap, const char *tag, int id, ngwt__ItemStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__ItemtqStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__ItemStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemtqStatus(struct soap *soap, ngwt__ItemtqStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemStatus(struct soap *soap, ngwt__ItemStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__ItemtqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__ItemStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemtqStatus(struct soap *soap, const char *tag, ngwt__ItemtqStatus **a, const char *type)
+SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemStatus(struct soap *soap, const char *tag, ngwt__ItemStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__ItemtqStatus **)soap_malloc(soap, sizeof(ngwt__ItemtqStatus *))))
+		if (!(a = (ngwt__ItemStatus **)soap_malloc(soap, sizeof(ngwt__ItemStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__ItemtqStatus *)soap_instantiate_ngwt__ItemtqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__ItemStatus *)soap_instantiate_ngwt__ItemStatus(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__ItemtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemtqStatus, sizeof(ngwt__ItemtqStatus), 0);
+	{	a = (ngwt__ItemStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__ItemStatus, sizeof(ngwt__ItemStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -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__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *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__RecipientqStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__RecipienStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus *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__RecipientqStatus);
-	if (soap_out_PointerTongwt__RecipientqStatus(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__RecipientqStatus(struct soap *soap, const char *tag, int id, ngwt__RecipientqStatus *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__RecipientqStatus);
+	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__RecipientqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientqStatus(struct soap *soap, ngwt__RecipientqStatus **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__RecipientqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__RecipienStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientqStatus(struct soap *soap, const char *tag, ngwt__RecipientqStatus **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__RecipientqStatus **)soap_malloc(soap, sizeof(ngwt__RecipientqStatus *))))
+		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__RecipientqStatus *)soap_instantiate_ngwt__RecipientqStatus(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__RecipientqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__RecipientqStatus, sizeof(ngwt__RecipientqStatus), 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;
 	}
@@ -87507,53 +87507,53 @@ SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_in_PointerTongwt__View(struct soap *so
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__Status(struct soap *soap, ngwt__Status *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__tqStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__Status))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__Status(struct soap *soap, ngwt__Status *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__tqStatus);
-	if (soap_out_PointerTongwt__tqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__Status);
+	if (soap_out_PointerTongwt__Status(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__tqStatus(struct soap *soap, const char *tag, int id, ngwt__tqStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Status(struct soap *soap, const char *tag, int id, ngwt__Status *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__tqStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__Status);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__tqStatus(struct soap *soap, ngwt__tqStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_get_PointerTongwt__Status(struct soap *soap, ngwt__Status **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__tqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__Status(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__tqStatus(struct soap *soap, const char *tag, ngwt__tqStatus **a, const char *type)
+SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_in_PointerTongwt__Status(struct soap *soap, const char *tag, ngwt__Status **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__tqStatus **)soap_malloc(soap, sizeof(ngwt__tqStatus *))))
+		if (!(a = (ngwt__Status **)soap_malloc(soap, sizeof(ngwt__Status *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__tqStatus *)soap_instantiate_ngwt__tqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__Status *)soap_instantiate_ngwt__Status(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__tqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__tqStatus, sizeof(ngwt__tqStatus), 0);
+	{	a = (ngwt__Status **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__Status, sizeof(ngwt__Status), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -88967,212 +88967,212 @@ SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_in_PointerTongwt__Frequency(s
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegateetqStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegateeStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegateetqStatus);
-	if (soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegateeStatus);
+	if (soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, ngwt__DelegateetqStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, int id, ngwt__DelegateeStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegateetqStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegateeStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateetqStatus(struct soap *soap, ngwt__DelegateetqStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateeStatus(struct soap *soap, ngwt__DelegateeStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__DelegateetqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__DelegateeStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, ngwt__DelegateetqStatus **a, const char *type)
+SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, ngwt__DelegateeStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__DelegateetqStatus **)soap_malloc(soap, sizeof(ngwt__DelegateetqStatus *))))
+		if (!(a = (ngwt__DelegateeStatus **)soap_malloc(soap, sizeof(ngwt__DelegateeStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__DelegateetqStatus *)soap_instantiate_ngwt__DelegateetqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__DelegateeStatus *)soap_instantiate_ngwt__DelegateeStatus(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__DelegateetqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), 0);
+	{	a = (ngwt__DelegateeStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegatedtqStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__DelegatedStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegatedtqStatus);
-	if (soap_out_PointerTongwt__DelegatedtqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__DelegatedStatus);
+	if (soap_out_PointerTongwt__DelegatedStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedtqStatus(struct soap *soap, const char *tag, int id, ngwt__DelegatedtqStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap *soap, const char *tag, int id, ngwt__DelegatedStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegatedtqStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__DelegatedStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedtqStatus(struct soap *soap, ngwt__DelegatedtqStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedStatus(struct soap *soap, ngwt__DelegatedStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__DelegatedtqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__DelegatedStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedtqStatus(struct soap *soap, const char *tag, ngwt__DelegatedtqStatus **a, const char *type)
+SOAP_FMAC3 ngwt__DelegatedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedStatus(struct soap *soap, const char *tag, ngwt__DelegatedStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__DelegatedtqStatus **)soap_malloc(soap, sizeof(ngwt__DelegatedtqStatus *))))
+		if (!(a = (ngwt__DelegatedStatus **)soap_malloc(soap, sizeof(ngwt__DelegatedStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__DelegatedtqStatus *)soap_instantiate_ngwt__DelegatedtqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__DelegatedStatus *)soap_instantiate_ngwt__DelegatedStatus(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__DelegatedtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegatedtqStatus, sizeof(ngwt__DelegatedtqStatus), 0);
+	{	a = (ngwt__DelegatedStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__DelegatedStatus, sizeof(ngwt__DelegatedStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *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__CommentqStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__CommenStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus *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__CommentqStatus);
-	if (soap_out_PointerTongwt__CommentqStatus(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__CommentqStatus(struct soap *soap, const char *tag, int id, ngwt__CommentqStatus *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__CommentqStatus);
+	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__CommentqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentqStatus(struct soap *soap, ngwt__CommentqStatus **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__CommentqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__CommenStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentqStatus(struct soap *soap, const char *tag, ngwt__CommentqStatus **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__CommentqStatus **)soap_malloc(soap, sizeof(ngwt__CommentqStatus *))))
+		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__CommentqStatus *)soap_instantiate_ngwt__CommentqStatus(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__CommentqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__CommentqStatus, sizeof(ngwt__CommentqStatus), 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;
 	}
 	return a;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *const*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *const*a)
 {
-	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__TransferFailedtqStatus))
+	if (!soap_reference(soap, *a, SOAP_TYPE_ngwt__TransferFailedStatus))
 		(*a)->soap_serialize(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus *const*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus *const*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__TransferFailedtqStatus);
-	if (soap_out_PointerTongwt__TransferFailedtqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_PointerTongwt__TransferFailedStatus);
+	if (soap_out_PointerTongwt__TransferFailedStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedtqStatus(struct soap *soap, const char *tag, int id, ngwt__TransferFailedtqStatus *const*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedStatus(struct soap *soap, const char *tag, int id, ngwt__TransferFailedStatus *const*a, const char *type)
 {
-	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__TransferFailedtqStatus);
+	id = soap_element_id(soap, tag, id, *a, NULL, 0, type, SOAP_TYPE_ngwt__TransferFailedStatus);
 	if (id < 0)
 		return soap->error;
 	return (*a)->soap_out(soap, tag, id, type);
 }
 
-SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedtqStatus(struct soap *soap, ngwt__TransferFailedtqStatus **p, const char *tag, const char *type)
+SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedStatus(struct soap *soap, ngwt__TransferFailedStatus **p, const char *tag, const char *type)
 {
-	if ((p = soap_in_PointerTongwt__TransferFailedtqStatus(soap, tag, p, type)))
+	if ((p = soap_in_PointerTongwt__TransferFailedStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedtqStatus(struct soap *soap, const char *tag, ngwt__TransferFailedtqStatus **a, const char *type)
+SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedStatus(struct soap *soap, const char *tag, ngwt__TransferFailedStatus **a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
 	if (!a)
-		if (!(a = (ngwt__TransferFailedtqStatus **)soap_malloc(soap, sizeof(ngwt__TransferFailedtqStatus *))))
+		if (!(a = (ngwt__TransferFailedStatus **)soap_malloc(soap, sizeof(ngwt__TransferFailedStatus *))))
 			return NULL;
 	*a = NULL;
 	if (!soap->null && *soap->href != '#')
 	{	soap_revert(soap);
-		if (!(*a = (ngwt__TransferFailedtqStatus *)soap_instantiate_ngwt__TransferFailedtqStatus(soap, -1, soap->type, soap->arrayType, NULL)))
+		if (!(*a = (ngwt__TransferFailedStatus *)soap_instantiate_ngwt__TransferFailedStatus(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__TransferFailedtqStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedtqStatus, sizeof(ngwt__TransferFailedtqStatus), 0);
+	{	a = (ngwt__TransferFailedStatus **)soap_id_lookup(soap, soap->href, (void**)a, SOAP_TYPE_ngwt__TransferFailedStatus, sizeof(ngwt__TransferFailedStatus), 0);
 		if (soap->body && soap_element_end_in(soap, tag))
 			return NULL;
 	}
@@ -93265,61 +93265,61 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfxsd__date(struct soap
 	*(std::vector<std::string >*)p = *(std::vector<std::string >*)q;
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const std::vector<ngwt__DelegateetqStatus * >*a)
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const std::vector<ngwt__DelegateeStatus * >*a)
 {
-	for (std::vector<ngwt__DelegateetqStatus * >::const_iterator i = a->begin(); i != a->end(); ++i)
-		soap_serialize_PointerTongwt__DelegateetqStatus(soap, &(*i));
+	for (std::vector<ngwt__DelegateeStatus * >::const_iterator i = a->begin(); i != a->end(); ++i)
+		soap_serialize_PointerTongwt__DelegateeStatus(soap, &(*i));
 }
 
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p)
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p)
 {
 	p->clear();
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const std::vector<ngwt__DelegateetqStatus * >*a, const char *tag, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const std::vector<ngwt__DelegateeStatus * >*a, const char *tag, const char *type)
 {
-	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus);
-	if (soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, tag, id, a, type))
+	register int id = soap_embed(soap, (void*)a, NULL, 0, tag, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus);
+	if (soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, tag, id, a, type))
 		return soap->error;
 	return soap_putindependent(soap);
 }
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, int id, const std::vector<ngwt__DelegateetqStatus * >*a, const char *type)
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, int id, const std::vector<ngwt__DelegateeStatus * >*a, const char *type)
 {
-	for (std::vector<ngwt__DelegateetqStatus * >::const_iterator i = a->begin(); i != a->end(); ++i)
+	for (std::vector<ngwt__DelegateeStatus * >::const_iterator i = a->begin(); i != a->end(); ++i)
 	{
-		if (soap_out_PointerTongwt__DelegateetqStatus(soap, tag, id, &(*i), ""))
+		if (soap_out_PointerTongwt__DelegateeStatus(soap, tag, id, &(*i), ""))
 			return soap->error;
 	}
 	return SOAP_OK;
 }
 
-SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p, const char *tag, const char *type)
+SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p, const char *tag, const char *type)
 {
-	if ((p = soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, tag, p, type)))
+	if ((p = soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, tag, p, type)))
 		soap_getindependent(soap);
 	return p;
 }
 
-SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, const char *tag, std::vector<ngwt__DelegateetqStatus * >*a, const char *type)
+SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, const char *tag, std::vector<ngwt__DelegateeStatus * >*a, const char *type)
 {
 	if (soap_element_begin_in(soap, tag, 1))
 		return NULL;
-	if (!a && !(a = soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, -1)))
+	if (!a && !(a = soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, -1)))
 		return NULL;
-	ngwt__DelegateetqStatus *n;
-	ngwt__DelegateetqStatus **p;
+	ngwt__DelegateeStatus *n;
+	ngwt__DelegateeStatus **p;
 	do
 	{	soap_revert(soap);
 		if (*soap->id || *soap->href)
-		{	if (!soap_container_id_forward(soap, *soap->id?soap->id:soap->href, a, SOAP_TYPE_ngwt__DelegateetqStatus, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus, sizeof(ngwt__DelegateetqStatus), 1))
+		{	if (!soap_container_id_forward(soap, *soap->id?soap->id:soap->href, a, SOAP_TYPE_ngwt__DelegateeStatus, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus, sizeof(ngwt__DelegateeStatus), 1))
 				break;
-			if (!(p = soap_in_PointerTongwt__DelegateetqStatus(soap, tag, NULL, "ngwt:DelegateeStatus")))
+			if (!(p = soap_in_PointerTongwt__DelegateeStatus(soap, tag, NULL, "ngwt:DelegateeStatus")))
 				break;
 		}
 		else
 		{	n = NULL;
-			if (!soap_in_PointerTongwt__DelegateetqStatus(soap, tag, &n, "ngwt:DelegateeStatus"))
+			if (!soap_in_PointerTongwt__DelegateeStatus(soap, tag, &n, "ngwt:DelegateeStatus"))
 				break;
 			a->insert(a->end(), n);
 		}
@@ -93332,38 +93332,38 @@ SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_in_std__vect
 	return NULL;
 }
 
-SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int n)
-{	return soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(soap, n, NULL, NULL, NULL);
+SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int n)
+{	return soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(soap, n, NULL, NULL, NULL);
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, std::vector<ngwt__DelegateetqStatus * >*p)
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, std::vector<ngwt__DelegateeStatus * >*p)
 {	soap_delete(soap, p);
 }
 
-SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
+SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int n, const char *type, const char *arrayType, size_t *size)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
-	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus, n, soap_fdelete);
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(%d, %s, %s)\n", n, type?type:"", arrayType?arrayType:""));
+	struct soap_clist *cp = soap_link(soap, NULL, SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus, n, soap_fdelete);
 	if (!cp)
 		return NULL;
 	if (n < 0)
-	{	cp->ptr = (void*)new std::vector<ngwt__DelegateetqStatus * >;
+	{	cp->ptr = (void*)new std::vector<ngwt__DelegateeStatus * >;
 		if (size)
-			*size = sizeof(std::vector<ngwt__DelegateetqStatus * >);
+			*size = sizeof(std::vector<ngwt__DelegateeStatus * >);
 	}
 	else
-	{	cp->ptr = (void*)new std::vector<ngwt__DelegateetqStatus * >[n];
+	{	cp->ptr = (void*)new std::vector<ngwt__DelegateeStatus * >[n];
 		if (size)
-			*size = n * sizeof(std::vector<ngwt__DelegateetqStatus * >);
+			*size = n * sizeof(std::vector<ngwt__DelegateeStatus * >);
 	}
 		DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Instantiated location=%p\n", cp->ptr));
-	return (std::vector<ngwt__DelegateetqStatus * >*)cp->ptr;
+	return (std::vector<ngwt__DelegateeStatus * >*)cp->ptr;
 }
 
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap *soap, int st, int tt, void *p, const void *q, size_t n)
 {
-	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying std::vector<ngwt__DelegateetqStatus * > %p -> %p\n", q, p));
-	*(std::vector<ngwt__DelegateetqStatus * >*)p = *(std::vector<ngwt__DelegateetqStatus * >*)q;
+	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Copying std::vector<ngwt__DelegateeStatus * > %p -> %p\n", q, p));
+	*(std::vector<ngwt__DelegateeStatus * >*)p = *(std::vector<ngwt__DelegateeStatus * >*)q;
 }
 
 SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__Recipient(struct soap *soap, const std::vector<ngwt__Recipient * >*a)
diff --git a/kresources/groupwise/soap/soapH.h b/kresources/groupwise/soap/soapH.h
index 175b59521..b31edcc9e 100644
--- a/kresources/groupwise/soap/soapH.h
+++ b/kresources/groupwise/soap/soapH.h
@@ -225,18 +225,18 @@ SOAP_FMAC3 enum ngwt__WeekDay * SOAP_FMAC4 soap_in_ngwt__WeekDay(struct soap*, c
 
 SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__WeekDay(struct soap*, const char*, enum ngwt__WeekDay *);
 
-#ifndef SOAP_TYPE_ngwt__VersiontqStatus
-#define SOAP_TYPE_ngwt__VersiontqStatus (385)
+#ifndef SOAP_TYPE_ngwt__VersionStatus
+#define SOAP_TYPE_ngwt__VersionStatus (385)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersiontqStatus(struct soap*, const enum ngwt__VersiontqStatus *, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersiontqStatus(struct soap*, const char*, int, const enum ngwt__VersiontqStatus *, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__VersionStatus(struct soap*, const enum ngwt__VersionStatus *, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__VersionStatus(struct soap*, const char*, int, const enum ngwt__VersionStatus *, const char*);
 
-SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersiontqStatus2s(struct soap*, enum ngwt__VersiontqStatus);
-SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_get_ngwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *, const char*, const char*);
-SOAP_FMAC3 enum ngwt__VersiontqStatus * SOAP_FMAC4 soap_in_ngwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus *, const char*);
+SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__VersionStatus2s(struct soap*, enum ngwt__VersionStatus);
+SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_get_ngwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *, const char*, const char*);
+SOAP_FMAC3 enum ngwt__VersionStatus * SOAP_FMAC4 soap_in_ngwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus *, const char*);
 
-SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus *);
+SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus *);
 
 #ifndef SOAP_TYPE_ngwt__VersionEventType
 #define SOAP_TYPE_ngwt__VersionEventType (384)
@@ -498,18 +498,18 @@ SOAP_FMAC3 enum ngwt__FolderType * SOAP_FMAC4 soap_in_ngwt__FolderType(struct so
 
 SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderType(struct soap*, const char*, enum ngwt__FolderType *);
 
-#ifndef SOAP_TYPE_ngwt__FolderACLtqStatus
-#define SOAP_TYPE_ngwt__FolderACLtqStatus (358)
+#ifndef SOAP_TYPE_ngwt__FolderACLStatus
+#define SOAP_TYPE_ngwt__FolderACLStatus (358)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLtqStatus(struct soap*, const enum ngwt__FolderACLtqStatus *, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLtqStatus(struct soap*, const char*, int, const enum ngwt__FolderACLtqStatus *, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_ngwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_ngwt__FolderACLStatus(struct soap*, const enum ngwt__FolderACLStatus *, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__FolderACLStatus(struct soap*, const char*, int, const enum ngwt__FolderACLStatus *, const char*);
 
-SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLtqStatus2s(struct soap*, enum ngwt__FolderACLtqStatus);
-SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *, const char*, const char*);
-SOAP_FMAC3 enum ngwt__FolderACLtqStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus *, const char*);
+SOAP_FMAC3S const char* SOAP_FMAC4S soap_ngwt__FolderACLStatus2s(struct soap*, enum ngwt__FolderACLStatus);
+SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_get_ngwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *, const char*, const char*);
+SOAP_FMAC3 enum ngwt__FolderACLStatus * SOAP_FMAC4 soap_in_ngwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus *, const char*);
 
-SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus *);
+SOAP_FMAC3S int SOAP_FMAC4S soap_s2ngwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus *);
 
 #ifndef SOAP_TYPE_ngwt__FilterOp
 #define SOAP_TYPE_ngwt__FilterOp (357)
@@ -2930,17 +2930,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TrustedApplication(struct soap*, ng
 SOAP_FMAC5 ngwt__TrustedApplication * SOAP_FMAC6 soap_instantiate_ngwt__TrustedApplication(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TrustedApplication(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__TransferFailedtqStatus
-#define SOAP_TYPE_ngwt__TransferFailedtqStatus (154)
+#ifndef SOAP_TYPE_ngwt__TransferFailedStatus
+#define SOAP_TYPE_ngwt__TransferFailedStatus (154)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedtqStatus(struct soap*, const char*, int, const ngwt__TransferFailedtqStatus *, const char*);
-SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__TransferFailedtqStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedtqStatus(struct soap*, const char*, ngwt__TransferFailedtqStatus *, const char*);
-SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedtqStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus*);
-SOAP_FMAC5 ngwt__TransferFailedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedtqStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedtqStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__TransferFailedStatus(struct soap*, const char*, int, const ngwt__TransferFailedStatus *, const char*);
+SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_get_ngwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__TransferFailedStatus * SOAP_FMAC4 soap_in_ngwt__TransferFailedStatus(struct soap*, const char*, ngwt__TransferFailedStatus *, const char*);
+SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_new_ngwt__TransferFailedStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus*);
+SOAP_FMAC5 ngwt__TransferFailedStatus * SOAP_FMAC6 soap_instantiate_ngwt__TransferFailedStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__TransferFailedStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__TimezoneList
 #define SOAP_TYPE_ngwt__TimezoneList (153)
@@ -3014,17 +3014,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__StatusTracking(struct soap*, ngwt__
 SOAP_FMAC5 ngwt__StatusTracking * SOAP_FMAC6 soap_instantiate_ngwt__StatusTracking(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__StatusTracking(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__tqStatus
-#define SOAP_TYPE_ngwt__tqStatus (147)
+#ifndef SOAP_TYPE_ngwt__Status
+#define SOAP_TYPE_ngwt__Status (147)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__tqStatus(struct soap*, const char*, int, const ngwt__tqStatus *, const char*);
-SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_get_ngwt__tqStatus(struct soap*, ngwt__tqStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__tqStatus * SOAP_FMAC4 soap_in_ngwt__tqStatus(struct soap*, const char*, ngwt__tqStatus *, const char*);
-SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_new_ngwt__tqStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__tqStatus(struct soap*, ngwt__tqStatus*);
-SOAP_FMAC5 ngwt__tqStatus * SOAP_FMAC6 soap_instantiate_ngwt__tqStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__tqStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Status(struct soap*, const char*, int, const ngwt__Status *, const char*);
+SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_get_ngwt__Status(struct soap*, ngwt__Status *, const char*, const char*);
+SOAP_FMAC3 ngwt__Status * SOAP_FMAC4 soap_in_ngwt__Status(struct soap*, const char*, ngwt__Status *, const char*);
+SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_new_ngwt__Status(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__Status(struct soap*, ngwt__Status*);
+SOAP_FMAC5 ngwt__Status * SOAP_FMAC6 soap_instantiate_ngwt__Status(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__Status(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__SMimeOperation
 #define SOAP_TYPE_ngwt__SMimeOperation (146)
@@ -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__RecipientqStatus
-#define SOAP_TYPE_ngwt__RecipientqStatus (123)
+#ifndef SOAP_TYPE_ngwt__RecipienStatus
+#define SOAP_TYPE_ngwt__RecipienStatus (123)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__RecipientqStatus(struct soap*, const char*, int, const ngwt__RecipientqStatus *, const char*);
-SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_get_ngwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipientqStatus * SOAP_FMAC4 soap_in_ngwt__RecipientqStatus(struct soap*, const char*, ngwt__RecipientqStatus *, const char*);
-SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_new_ngwt__RecipientqStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus*);
-SOAP_FMAC5 ngwt__RecipientqStatus * SOAP_FMAC6 soap_instantiate_ngwt__RecipientqStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__RecipientqStatus(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)
@@ -3698,17 +3698,17 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__JunkEntry(struct soap*, ngwt__JunkE
 SOAP_FMAC5 ngwt__JunkEntry * SOAP_FMAC6 soap_instantiate_ngwt__JunkEntry(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__JunkEntry(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__ItemtqStatus
-#define SOAP_TYPE_ngwt__ItemtqStatus (90)
+#ifndef SOAP_TYPE_ngwt__ItemStatus
+#define SOAP_TYPE_ngwt__ItemStatus (90)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemtqStatus(struct soap*, const char*, int, const ngwt__ItemtqStatus *, const char*);
-SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_get_ngwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__ItemtqStatus * SOAP_FMAC4 soap_in_ngwt__ItemtqStatus(struct soap*, const char*, ngwt__ItemtqStatus *, const char*);
-SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_new_ngwt__ItemtqStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus*);
-SOAP_FMAC5 ngwt__ItemtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemtqStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemtqStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ItemStatus(struct soap*, const char*, int, const ngwt__ItemStatus *, const char*);
+SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_get_ngwt__ItemStatus(struct soap*, ngwt__ItemStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__ItemStatus * SOAP_FMAC4 soap_in_ngwt__ItemStatus(struct soap*, const char*, ngwt__ItemStatus *, const char*);
+SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_new_ngwt__ItemStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__ItemStatus(struct soap*, ngwt__ItemStatus*);
+SOAP_FMAC5 ngwt__ItemStatus * SOAP_FMAC6 soap_instantiate_ngwt__ItemStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__ItemStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__Items
 #define SOAP_TYPE_ngwt__Items (89)
@@ -4142,29 +4142,29 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DeltaInfo(struct soap*, ngwt__Delta
 SOAP_FMAC5 ngwt__DeltaInfo * SOAP_FMAC6 soap_instantiate_ngwt__DeltaInfo(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DeltaInfo(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__DelegateetqStatus
-#define SOAP_TYPE_ngwt__DelegateetqStatus (53)
+#ifndef SOAP_TYPE_ngwt__DelegateeStatus
+#define SOAP_TYPE_ngwt__DelegateeStatus (53)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateetqStatus(struct soap*, const char*, int, const ngwt__DelegateetqStatus *, const char*);
-SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_get_ngwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__DelegateetqStatus * SOAP_FMAC4 soap_in_ngwt__DelegateetqStatus(struct soap*, const char*, ngwt__DelegateetqStatus *, const char*);
-SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_new_ngwt__DelegateetqStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus*);
-SOAP_FMAC5 ngwt__DelegateetqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateetqStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateetqStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegateeStatus(struct soap*, const char*, int, const ngwt__DelegateeStatus *, const char*);
+SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_get_ngwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__DelegateeStatus * SOAP_FMAC4 soap_in_ngwt__DelegateeStatus(struct soap*, const char*, ngwt__DelegateeStatus *, const char*);
+SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_new_ngwt__DelegateeStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus*);
+SOAP_FMAC5 ngwt__DelegateeStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegateeStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegateeStatus(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_ngwt__DelegatedtqStatus
-#define SOAP_TYPE_ngwt__DelegatedtqStatus (52)
+#ifndef SOAP_TYPE_ngwt__DelegatedStatus
+#define SOAP_TYPE_ngwt__DelegatedStatus (52)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedtqStatus(struct soap*, const char*, int, const ngwt__DelegatedtqStatus *, const char*);
-SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__DelegatedtqStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedtqStatus(struct soap*, const char*, ngwt__DelegatedtqStatus *, const char*);
-SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedtqStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus*);
-SOAP_FMAC5 ngwt__DelegatedtqStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedtqStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedtqStatus(struct soap*, int, int, void*, const void*, size_t);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__DelegatedStatus(struct soap*, const char*, int, const ngwt__DelegatedStatus *, const char*);
+SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_get_ngwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *, const char*, const char*);
+SOAP_FMAC3 ngwt__DelegatedStatus * SOAP_FMAC4 soap_in_ngwt__DelegatedStatus(struct soap*, const char*, ngwt__DelegatedStatus *, const char*);
+SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_new_ngwt__DelegatedStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus*);
+SOAP_FMAC5 ngwt__DelegatedStatus * SOAP_FMAC6 soap_instantiate_ngwt__DelegatedStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__DelegatedStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_ngwt__DayOfYearWeekList
 #define SOAP_TYPE_ngwt__DayOfYearWeekList (51)
@@ -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__CommentqStatus
-#define SOAP_TYPE_ngwt__CommentqStatus (40)
+#ifndef SOAP_TYPE_ngwt__CommenStatus
+#define SOAP_TYPE_ngwt__CommenStatus (40)
 #endif
 
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__CommentqStatus(struct soap*, const char*, int, const ngwt__CommentqStatus *, const char*);
-SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_get_ngwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *, const char*, const char*);
-SOAP_FMAC3 ngwt__CommentqStatus * SOAP_FMAC4 soap_in_ngwt__CommentqStatus(struct soap*, const char*, ngwt__CommentqStatus *, const char*);
-SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_new_ngwt__CommentqStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_ngwt__CommentqStatus(struct soap*, ngwt__CommentqStatus*);
-SOAP_FMAC5 ngwt__CommentqStatus * SOAP_FMAC6 soap_instantiate_ngwt__CommentqStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__CommentqStatus(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)
@@ -7218,14 +7218,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FullName(struct soap*, const c
 SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_get_PointerTongwt__FullName(struct soap*, ngwt__FullName **, const char*, const char*);
 SOAP_FMAC3 ngwt__FullName ** SOAP_FMAC4 soap_in_PointerTongwt__FullName(struct soap*, const char*, ngwt__FullName **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__VersiontqStatus
-#define SOAP_TYPE_PointerTongwt__VersiontqStatus (584)
+#ifndef SOAP_TYPE_PointerTongwt__VersionStatus
+#define SOAP_TYPE_PointerTongwt__VersionStatus (584)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersiontqStatus(struct soap*, const char *, int, enum ngwt__VersiontqStatus *const*, const char *);
-SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersiontqStatus(struct soap*, enum ngwt__VersiontqStatus **, const char*, const char*);
-SOAP_FMAC3 enum ngwt__VersiontqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersiontqStatus(struct soap*, const char*, enum ngwt__VersiontqStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__VersionStatus(struct soap*, const char *, int, enum ngwt__VersionStatus *const*, const char *);
+SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_get_PointerTongwt__VersionStatus(struct soap*, enum ngwt__VersionStatus **, const char*, const char*);
+SOAP_FMAC3 enum ngwt__VersionStatus ** SOAP_FMAC4 soap_in_PointerTongwt__VersionStatus(struct soap*, const char*, enum ngwt__VersionStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__FolderACL
 #define SOAP_TYPE_PointerTongwt__FolderACL (583)
@@ -7263,14 +7263,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Query(struct soap*, const char
 SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_get_PointerTongwt__Query(struct soap*, ngwt__Query **, const char*, const char*);
 SOAP_FMAC3 ngwt__Query ** SOAP_FMAC4 soap_in_PointerTongwt__Query(struct soap*, const char*, ngwt__Query **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__FolderACLtqStatus
-#define SOAP_TYPE_PointerTongwt__FolderACLtqStatus (579)
+#ifndef SOAP_TYPE_PointerTongwt__FolderACLStatus
+#define SOAP_TYPE_PointerTongwt__FolderACLStatus (579)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLtqStatus(struct soap*, const char *, int, enum ngwt__FolderACLtqStatus *const*, const char *);
-SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLtqStatus(struct soap*, enum ngwt__FolderACLtqStatus **, const char*, const char*);
-SOAP_FMAC3 enum ngwt__FolderACLtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLtqStatus(struct soap*, const char*, enum ngwt__FolderACLtqStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__FolderACLStatus(struct soap*, const char *, int, enum ngwt__FolderACLStatus *const*, const char *);
+SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_get_PointerTongwt__FolderACLStatus(struct soap*, enum ngwt__FolderACLStatus **, const char*, const char*);
+SOAP_FMAC3 enum ngwt__FolderACLStatus ** SOAP_FMAC4 soap_in_PointerTongwt__FolderACLStatus(struct soap*, const char*, enum ngwt__FolderACLStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__AccessControlList
 #define SOAP_TYPE_PointerTongwt__AccessControlList (578)
@@ -7326,14 +7326,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemSource(struct soap*, const
 SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_get_PointerTongwt__ItemSource(struct soap*, enum ngwt__ItemSource **, const char*, const char*);
 SOAP_FMAC3 enum ngwt__ItemSource ** SOAP_FMAC4 soap_in_PointerTongwt__ItemSource(struct soap*, const char*, enum ngwt__ItemSource **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__ItemtqStatus
-#define SOAP_TYPE_PointerTongwt__ItemtqStatus (572)
+#ifndef SOAP_TYPE_PointerTongwt__ItemStatus
+#define SOAP_TYPE_PointerTongwt__ItemStatus (572)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemtqStatus(struct soap*, const char *, int, ngwt__ItemtqStatus *const*, const char *);
-SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemtqStatus(struct soap*, ngwt__ItemtqStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__ItemtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemtqStatus(struct soap*, const char*, ngwt__ItemtqStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__ItemStatus(struct soap*, const char *, int, ngwt__ItemStatus *const*, const char *);
+SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_get_PointerTongwt__ItemStatus(struct soap*, ngwt__ItemStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__ItemStatus ** SOAP_FMAC4 soap_in_PointerTongwt__ItemStatus(struct soap*, const char*, ngwt__ItemStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__DeltaSyncType
 #define SOAP_TYPE_PointerTongwt__DeltaSyncType (571)
@@ -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__RecipientqStatus
-#define SOAP_TYPE_PointerTongwt__RecipientqStatus (570)
+#ifndef SOAP_TYPE_PointerTongwt__RecipienStatus
+#define SOAP_TYPE_PointerTongwt__RecipienStatus (570)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__RecipientqStatus(struct soap*, const char *, int, ngwt__RecipientqStatus *const*, const char *);
-SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__RecipientqStatus(struct soap*, ngwt__RecipientqStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__RecipientqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__RecipientqStatus(struct soap*, const char*, ngwt__RecipientqStatus **, 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)
@@ -7812,14 +7812,14 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__View(struct soap*, const char
 SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_get_PointerTongwt__View(struct soap*, std::string **, const char*, const char*);
 SOAP_FMAC3 std::string ** SOAP_FMAC4 soap_in_PointerTongwt__View(struct soap*, const char*, std::string **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__tqStatus
-#define SOAP_TYPE_PointerTongwt__tqStatus (510)
+#ifndef SOAP_TYPE_PointerTongwt__Status
+#define SOAP_TYPE_PointerTongwt__Status (510)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__tqStatus(struct soap*, const char *, int, ngwt__tqStatus *const*, const char *);
-SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__tqStatus(struct soap*, ngwt__tqStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__tqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__tqStatus(struct soap*, const char*, ngwt__tqStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__Status(struct soap*, ngwt__Status *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__Status(struct soap*, ngwt__Status *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Status(struct soap*, const char *, int, ngwt__Status *const*, const char *);
+SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_get_PointerTongwt__Status(struct soap*, ngwt__Status **, const char*, const char*);
+SOAP_FMAC3 ngwt__Status ** SOAP_FMAC4 soap_in_PointerTongwt__Status(struct soap*, const char*, ngwt__Status **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__ItemRefList
 #define SOAP_TYPE_PointerTongwt__ItemRefList (509)
@@ -8064,41 +8064,41 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__Frequency(struct soap*, const
 SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_get_PointerTongwt__Frequency(struct soap*, enum ngwt__Frequency **, const char*, const char*);
 SOAP_FMAC3 enum ngwt__Frequency ** SOAP_FMAC4 soap_in_PointerTongwt__Frequency(struct soap*, const char*, enum ngwt__Frequency **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__DelegateetqStatus
-#define SOAP_TYPE_PointerTongwt__DelegateetqStatus (474)
+#ifndef SOAP_TYPE_PointerTongwt__DelegateeStatus
+#define SOAP_TYPE_PointerTongwt__DelegateeStatus (474)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateetqStatus(struct soap*, const char *, int, ngwt__DelegateetqStatus *const*, const char *);
-SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateetqStatus(struct soap*, ngwt__DelegateetqStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__DelegateetqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateetqStatus(struct soap*, const char*, ngwt__DelegateetqStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegateeStatus(struct soap*, const char *, int, ngwt__DelegateeStatus *const*, const char *);
+SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegateeStatus(struct soap*, ngwt__DelegateeStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__DelegateeStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegateeStatus(struct soap*, const char*, ngwt__DelegateeStatus **, const char*);
 
-#ifndef SOAP_TYPE_PointerTongwt__DelegatedtqStatus
-#define SOAP_TYPE_PointerTongwt__DelegatedtqStatus (473)
+#ifndef SOAP_TYPE_PointerTongwt__DelegatedStatus
+#define SOAP_TYPE_PointerTongwt__DelegatedStatus (473)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedtqStatus(struct soap*, const char *, int, ngwt__DelegatedtqStatus *const*, const char *);
-SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__DelegatedtqStatus(struct soap*, ngwt__DelegatedtqStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__DelegatedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__DelegatedtqStatus(struct soap*, const char*, ngwt__DelegatedtqStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__DelegatedStatus(struct soap*, ngwt__DelegatedStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__DelegatedStatus(struct soap*, const char *, int, ngwt__DelegatedStatus *const*, const char *);
+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__CommentqStatus
-#define SOAP_TYPE_PointerTongwt__CommentqStatus (472)
+#ifndef SOAP_TYPE_PointerTongwt__CommenStatus
+#define SOAP_TYPE_PointerTongwt__CommenStatus (472)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__CommentqStatus(struct soap*, const char *, int, ngwt__CommentqStatus *const*, const char *);
-SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__CommentqStatus(struct soap*, ngwt__CommentqStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__CommentqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__CommentqStatus(struct soap*, const char*, ngwt__CommentqStatus **, 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__TransferFailedtqStatus
-#define SOAP_TYPE_PointerTongwt__TransferFailedtqStatus (471)
+#ifndef SOAP_TYPE_PointerTongwt__TransferFailedStatus
+#define SOAP_TYPE_PointerTongwt__TransferFailedStatus (471)
 #endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *const*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus *const*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedtqStatus(struct soap*, const char *, int, ngwt__TransferFailedtqStatus *const*, const char *);
-SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedtqStatus(struct soap*, ngwt__TransferFailedtqStatus **, const char*, const char*);
-SOAP_FMAC3 ngwt__TransferFailedtqStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedtqStatus(struct soap*, const char*, ngwt__TransferFailedtqStatus **, const char*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *const*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus *const*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_PointerTongwt__TransferFailedStatus(struct soap*, const char *, int, ngwt__TransferFailedStatus *const*, const char *);
+SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_get_PointerTongwt__TransferFailedStatus(struct soap*, ngwt__TransferFailedStatus **, const char*, const char*);
+SOAP_FMAC3 ngwt__TransferFailedStatus ** SOAP_FMAC4 soap_in_PointerTongwt__TransferFailedStatus(struct soap*, const char*, ngwt__TransferFailedStatus **, const char*);
 
 #ifndef SOAP_TYPE_PointerTongwt__Recipient
 #define SOAP_TYPE_PointerTongwt__Recipient (469)
@@ -8762,19 +8762,19 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfxsd__date(struct soa
 SOAP_FMAC5 std::vector<std::string > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfxsd__date(struct soap*, int, const char*, const char*, size_t*);
 SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfxsd__date(struct soap*, int, int, void*, const void*, size_t);
 
-#ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus
-#define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateetqStatus (475)
-#endif
-SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const std::vector<ngwt__DelegateetqStatus * >*);
-SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const std::vector<ngwt__DelegateetqStatus * >*, const char*, const char*);
-SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const char*, int, const std::vector<ngwt__DelegateetqStatus * >*, const char*);
-SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*, const char*, const char*);
-SOAP_FMAC3 std::vector<ngwt__DelegateetqStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, const char*, std::vector<ngwt__DelegateetqStatus * >*, const char*);
-SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int);
-SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, std::vector<ngwt__DelegateetqStatus * >*);
-SOAP_FMAC5 std::vector<ngwt__DelegateetqStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int, const char*, const char*, size_t*);
-SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateetqStatus(struct soap*, int, int, void*, const void*, size_t);
+#ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus
+#define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__DelegateeStatus (475)
+#endif
+SOAP_FMAC3 void SOAP_FMAC4 soap_serialize_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const std::vector<ngwt__DelegateeStatus * >*);
+SOAP_FMAC3 void SOAP_FMAC4 soap_default_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_put_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const std::vector<ngwt__DelegateeStatus * >*, const char*, const char*);
+SOAP_FMAC3 int SOAP_FMAC4 soap_out_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const char*, int, const std::vector<ngwt__DelegateeStatus * >*, const char*);
+SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_get_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*, const char*, const char*);
+SOAP_FMAC3 std::vector<ngwt__DelegateeStatus * >* SOAP_FMAC4 soap_in_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, const char*, std::vector<ngwt__DelegateeStatus * >*, const char*);
+SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_new_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int);
+SOAP_FMAC5 void SOAP_FMAC6 soap_delete_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, std::vector<ngwt__DelegateeStatus * >*);
+SOAP_FMAC5 std::vector<ngwt__DelegateeStatus * > * SOAP_FMAC6 soap_instantiate_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int, const char*, const char*, size_t*);
+SOAP_FMAC5 void SOAP_FMAC6 soap_copy_std__vectorTemplateOfPointerTongwt__DelegateeStatus(struct soap*, int, int, void*, const void*, size_t);
 
 #ifndef SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient
 #define SOAP_TYPE_std__vectorTemplateOfPointerTongwt__Recipient (470)
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index 46461d08e..7fdb0f68c 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -31,7 +31,7 @@ enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference
 #ifndef SOAP_TYPE_ngwe__FieldList
 #define SOAP_TYPE_ngwe__FieldList (339)
 /* Bimask 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, RecipientqStatus = 2097152, Rights = 4194304, Security = 8388608, SendPriority = 16777216, StartDate = 33554432, Subject = 67108864, TaskCategory = 134217728, TaskPriority = 268435456};
+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
@@ -118,10 +118,10 @@ enum ngwt__FilterDate {Today = 0, Tomorrow = 1, ThisMonth = 2, ThisWeek = 3, Thi
 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};
 #endif
 
-#ifndef SOAP_TYPE_ngwt__FolderACLtqStatus
-#define SOAP_TYPE_ngwt__FolderACLtqStatus (358)
-/* ngwt:FolderACLtqStatus */
-enum ngwt__FolderACLtqStatus {pending = 0, accepted = 1, deleted = 2, opened = 3, owner = 4};
+#ifndef SOAP_TYPE_ngwt__FolderACLStatus
+#define SOAP_TYPE_ngwt__FolderACLStatus (358)
+/* ngwt:FolderACLStatus */
+enum ngwt__FolderACLStatus {pending = 0, accepted = 1, deleted = 2, opened = 3, owner = 4};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__FolderType
@@ -241,13 +241,13 @@ 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, resetqStatus = 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__VersiontqStatus
-#define SOAP_TYPE_ngwt__VersiontqStatus (385)
-/* ngwt:VersiontqStatus */
-enum ngwt__VersiontqStatus {available = 0, checkedOut = 1, inUse = 2, deleted_ = 3, archived = 4, massInUse = 5, unavailable = 6};
+#ifndef SOAP_TYPE_ngwt__VersionStatus
+#define SOAP_TYPE_ngwt__VersionStatus (385)
+/* ngwt:VersionStatus */
+enum ngwt__VersionStatus {available = 0, checkedOut = 1, inUse = 2, deleted_ = 3, archived = 4, massInUse = 5, unavailable = 6};
 #endif
 
 #ifndef SOAP_TYPE_ngwt__WeekDay
@@ -1278,10 +1278,10 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__ItemtqStatus
-#define SOAP_TYPE_ngwt__ItemtqStatus (90)
-/* ngwt:ItemtqStatus */
-class SOAP_CMAC ngwt__ItemtqStatus
+#ifndef SOAP_TYPE_ngwt__ItemStatus
+#define SOAP_TYPE_ngwt__ItemStatus (90)
+/* ngwt:ItemStatus */
+class SOAP_CMAC ngwt__ItemStatus
 {
 public:
 	bool *accepted;	/* optional element of type xsd:boolean */
@@ -1295,15 +1295,15 @@ public:
 	bool *replied;	/* optional element of type xsd:boolean */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 90; } /* = unique id SOAP_TYPE_ngwt__ItemtqStatus */
+	virtual int soap_type() const { return 90; } /* = unique id SOAP_TYPE_ngwt__ItemStatus */
 	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__ItemtqStatus() { }
-	virtual ~ngwt__ItemtqStatus() { }
+	         ngwt__ItemStatus() { }
+	virtual ~ngwt__ItemStatus() { }
 };
 #endif
 
@@ -1764,17 +1764,17 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__RecipientqStatus
-#define SOAP_TYPE_ngwt__RecipientqStatus (123)
-/* ngwt:RecipientqStatus */
-class SOAP_CMAC ngwt__RecipientqStatus
+#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 */
 	char *undeliverable;	/* optional element of type xsd:string */
 	char *transferred;	/* optional element of type xsd:string */
 	char *transferDelayed;	/* optional element of type xsd:string */
-	class ngwt__TransferFailedtqStatus *transferFailed;	/* optional element of type ngwt:TransferFailedtqStatus */
+	class ngwt__TransferFailedStatus *transferFailed;	/* optional element of type ngwt:TransferFailedStatus */
 	char *downloaded;	/* optional element of type xsd:string */
 	char *downloadedByThirdParty;	/* optional element of type xsd:string */
 	char *retractRequested;	/* optional element of type xsd:string */
@@ -1783,27 +1783,27 @@ 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__CommentqStatus *accepted;	/* optional element of type ngwt:CommentqStatus */
-	ngwt__CommentqStatus *declined;	/* optional element of type ngwt:CommentqStatus */
+	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 */
 	char *started;	/* optional element of type xsd:string */
 	char *completed;	/* optional element of type xsd:string */
 	char *incomplete;	/* optional element of type xsd:string */
-	class ngwt__DelegatedtqStatus *delegated;	/* optional element of type ngwt:DelegatedtqStatus */
-	std::vector<class ngwt__DelegateetqStatus * >delegateetqStatus;	/* optional element of type ngwt:DelegateetqStatus */
+	class ngwt__DelegatedStatus *delegated;	/* optional element of type ngwt:DelegatedStatus */
+	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__RecipientqStatus */
+	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__RecipientqStatus() { }
-	virtual ~ngwt__RecipientqStatus() { }
+	         ngwt__RecipienStatus() { }
+	virtual ~ngwt__RecipienStatus() { }
 };
 #endif
 
@@ -2244,10 +2244,10 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__tqStatus
-#define SOAP_TYPE_ngwt__tqStatus (147)
-/* ngwt:tqStatus */
-class SOAP_CMAC ngwt__tqStatus
+#ifndef SOAP_TYPE_ngwt__Status
+#define SOAP_TYPE_ngwt__Status (147)
+/* ngwt:Status */
+class SOAP_CMAC ngwt__Status
 {
 public:
 	int code;	/* required element of type xsd:int */
@@ -2256,15 +2256,15 @@ public:
 	ngwt__ProblemList *problems;	/* optional element of type ngwt:ProblemList */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 147; } /* = unique id SOAP_TYPE_ngwt__tqStatus */
+	virtual int soap_type() const { return 147; } /* = unique id SOAP_TYPE_ngwt__Status */
 	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__tqStatus() { }
-	virtual ~ngwt__tqStatus() { }
+	         ngwt__Status() { }
+	virtual ~ngwt__Status() { }
 };
 #endif
 
@@ -2418,7 +2418,7 @@ public:
 class SOAP_CMAC _ngwm__acceptResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 161; } /* = unique id SOAP_TYPE__ngwm__acceptResponse */
@@ -2465,7 +2465,7 @@ class SOAP_CMAC _ngwm__acceptShareResponse
 {
 public:
 	std::string *id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 163; } /* = unique id SOAP_TYPE__ngwm__acceptShareResponse */
@@ -2509,7 +2509,7 @@ public:
 class SOAP_CMAC _ngwm__addItemResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 165; } /* = unique id SOAP_TYPE__ngwm__addItemResponse */
@@ -2553,7 +2553,7 @@ public:
 class SOAP_CMAC _ngwm__addItemsResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 167; } /* = unique id SOAP_TYPE__ngwm__addItemsResponse */
@@ -2597,7 +2597,7 @@ public:
 class SOAP_CMAC _ngwm__addMembersResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 169; } /* = unique id SOAP_TYPE__ngwm__addMembersResponse */
@@ -2639,7 +2639,7 @@ public:
 class SOAP_CMAC _ngwm__closeFreeBusySessionResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 171; } /* = unique id SOAP_TYPE__ngwm__closeFreeBusySessionResponse */
@@ -2681,7 +2681,7 @@ public:
 class SOAP_CMAC _ngwm__completeResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 173; } /* = unique id SOAP_TYPE__ngwm__completeResponse */
@@ -2727,7 +2727,7 @@ class SOAP_CMAC _ngwm__createCursorResponse
 {
 public:
 	int *cursor;	/* RPC return element */	/* optional element of type xsd:int */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 175; } /* = unique id SOAP_TYPE__ngwm__createCursorResponse */
@@ -2771,7 +2771,7 @@ class SOAP_CMAC _ngwm__createItemResponse
 {
 public:
 	std::vector<std::string >id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 177; } /* = unique id SOAP_TYPE__ngwm__createItemResponse */
@@ -2814,7 +2814,7 @@ class SOAP_CMAC _ngwm__createItemsResponse
 {
 public:
 	std::vector<std::string >id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 179; } /* = unique id SOAP_TYPE__ngwm__createItemsResponse */
@@ -2857,7 +2857,7 @@ class SOAP_CMAC _ngwm__createJunkEntryResponse
 {
 public:
 	std::string *id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 181; } /* = unique id SOAP_TYPE__ngwm__createJunkEntryResponse */
@@ -2900,7 +2900,7 @@ class SOAP_CMAC _ngwm__createProxyAccessResponse
 {
 public:
 	std::string *id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 183; } /* = unique id SOAP_TYPE__ngwm__createProxyAccessResponse */
@@ -2942,7 +2942,7 @@ public:
 class SOAP_CMAC _ngwm__createSignatureResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 185; } /* = unique id SOAP_TYPE__ngwm__createSignatureResponse */
@@ -2986,7 +2986,7 @@ public:
 class SOAP_CMAC _ngwm__declineResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 187; } /* = unique id SOAP_TYPE__ngwm__declineResponse */
@@ -3033,7 +3033,7 @@ public:
 class SOAP_CMAC _ngwm__delegateResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 189; } /* = unique id SOAP_TYPE__ngwm__delegateResponse */
@@ -3077,7 +3077,7 @@ public:
 class SOAP_CMAC _ngwm__destroyCursorResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 191; } /* = unique id SOAP_TYPE__ngwm__destroyCursorResponse */
@@ -3120,7 +3120,7 @@ public:
 class SOAP_CMAC _ngwm__executeRuleResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 193; } /* = unique id SOAP_TYPE__ngwm__executeRuleResponse */
@@ -3166,7 +3166,7 @@ class SOAP_CMAC _ngwm__forwardResponse
 {
 public:
 	ngwt__Item *item;	/* RPC return element */	/* optional element of type ngwt:Item */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 195; } /* = unique id SOAP_TYPE__ngwm__forwardResponse */
@@ -3208,7 +3208,7 @@ class SOAP_CMAC _ngwm__getAddressBookListResponse
 {
 public:
 	ngwt__AddressBookList *books;	/* RPC return element */	/* optional element of type ngwt:AddressBookList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 197; } /* = unique id SOAP_TYPE__ngwm__getAddressBookListResponse */
@@ -3254,7 +3254,7 @@ class SOAP_CMAC _ngwm__getAttachmentResponse
 {
 public:
 	ngwt__MessagePart *part;	/* RPC return element */	/* optional element of type ngwt:MessagePart */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 199; } /* = unique id SOAP_TYPE__ngwm__getAttachmentResponse */
@@ -3296,7 +3296,7 @@ class SOAP_CMAC _ngwm__getCategoryListResponse
 {
 public:
 	ngwt__CategoryList *categories;	/* RPC return element */	/* optional element of type ngwt:CategoryList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 201; } /* = unique id SOAP_TYPE__ngwm__getCategoryListResponse */
@@ -3338,7 +3338,7 @@ class SOAP_CMAC _ngwm__getCustomListResponse
 {
 public:
 	ngwt__CustomList *customs;	/* RPC return element */	/* optional element of type ngwt:CustomList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 203; } /* = unique id SOAP_TYPE__ngwm__getCustomListResponse */
@@ -3385,7 +3385,7 @@ class SOAP_CMAC _ngwm__getDeltasResponse
 public:
 	ngwt__Items *items;	/* RPC return element */	/* optional element of type ngwt:Items */
 	ngwt__DeltaInfo *deltaInfo;	/* required element of type ngwt:DeltaInfo */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 205; } /* = unique id SOAP_TYPE__ngwm__getDeltasResponse */
@@ -3429,7 +3429,7 @@ class SOAP_CMAC _ngwm__getDeltaInfoResponse
 {
 public:
 	ngwt__DeltaInfo *deltaInfo;	/* RPC return element */	/* required element of type ngwt:DeltaInfo */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 207; } /* = unique id SOAP_TYPE__ngwm__getDeltaInfoResponse */
@@ -3473,7 +3473,7 @@ class SOAP_CMAC _ngwm__getDocumentTypeListResponse
 {
 public:
 	ngwt__DocumentTypeList *items;	/* RPC return element */	/* optional element of type ngwt:DocumentTypeList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 209; } /* = unique id SOAP_TYPE__ngwm__getDocumentTypeListResponse */
@@ -3520,7 +3520,7 @@ class SOAP_CMAC _ngwm__getFolderResponse
 {
 public:
 	ngwt__Folder *folder;	/* RPC return element */	/* optional element of type ngwt:Folder */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 211; } /* = unique id SOAP_TYPE__ngwm__getFolderResponse */
@@ -3568,7 +3568,7 @@ class SOAP_CMAC _ngwm__getFolderListResponse
 {
 public:
 	ngwt__FolderList *folders;	/* RPC return element */	/* optional element of type ngwt:FolderList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 213; } /* = unique id SOAP_TYPE__ngwm__getFolderListResponse */
@@ -3613,7 +3613,7 @@ class SOAP_CMAC _ngwm__getFreeBusyResponse
 public:
 	ngwt__FreeBusyStats *freeBusyStats;	/* RPC return element */	/* optional element of type ngwt:FreeBusyStats */
 	ngwt__FreeBusyInfoList *freeBusyInfo;	/* optional element of type ngwt:FreeBusyInfoList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 215; } /* = unique id SOAP_TYPE__ngwm__getFreeBusyResponse */
@@ -3658,7 +3658,7 @@ class SOAP_CMAC _ngwm__getItemResponse
 {
 public:
 	ngwt__Item *item;	/* RPC return element */	/* optional element of type ngwt:Item */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 217; } /* = unique id SOAP_TYPE__ngwm__getItemResponse */
@@ -3705,7 +3705,7 @@ class SOAP_CMAC _ngwm__getItemsResponse
 {
 public:
 	ngwt__Items *items;	/* RPC return element */	/* optional element of type ngwt:Items */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 219; } /* = unique id SOAP_TYPE__ngwm__getItemsResponse */
@@ -3750,7 +3750,7 @@ public:
 	ngwt__JunkHandlingList *junk;	/* RPC return element */	/* optional element of type ngwt:JunkHandlingList */
 	ngwt__JunkHandlingList *block;	/* optional element of type ngwt:JunkHandlingList */
 	ngwt__JunkHandlingList *trust;	/* optional element of type ngwt:JunkHandlingList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 221; } /* = unique id SOAP_TYPE__ngwm__getJunkEntriesResponse */
@@ -3792,7 +3792,7 @@ class SOAP_CMAC _ngwm__getJunkMailSettingsResponse
 {
 public:
 	ngwt__SettingsList *settings;	/* RPC return element */	/* optional element of type ngwt:SettingsList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 223; } /* = unique id SOAP_TYPE__ngwm__getJunkMailSettingsResponse */
@@ -3838,7 +3838,7 @@ class SOAP_CMAC _ngwm__getLibraryItemResponse
 {
 public:
 	ngwt__Item *item;	/* RPC return element */	/* optional element of type ngwt:Item */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 225; } /* = unique id SOAP_TYPE__ngwm__getLibraryItemResponse */
@@ -3880,7 +3880,7 @@ class SOAP_CMAC _ngwm__getLibraryListResponse
 {
 public:
 	ngwt__LibraryList *libraries;	/* RPC return element */	/* optional element of type ngwt:LibraryList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 227; } /* = unique id SOAP_TYPE__ngwm__getLibraryListResponse */
@@ -3930,7 +3930,7 @@ class SOAP_CMAC _ngwm__getQuickMessagesResponse
 public:
 	char *ngwt__startDate;	/* RPC return element */	/* optional element of type xsd:string */
 	ngwt__Items *items;	/* optional element of type ngwt:Items */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 229; } /* = unique id SOAP_TYPE__ngwm__getQuickMessagesResponse */
@@ -3972,7 +3972,7 @@ class SOAP_CMAC _ngwm__getProxyAccessListResponse
 {
 public:
 	ngwt__AccessRightList *accessRights;	/* RPC return element */	/* optional element of type ngwt:AccessRightList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 231; } /* = unique id SOAP_TYPE__ngwm__getProxyAccessListResponse */
@@ -4014,7 +4014,7 @@ class SOAP_CMAC _ngwm__getProxyListResponse
 {
 public:
 	ngwt__ProxyList *proxies;	/* RPC return element */	/* optional element of type ngwt:ProxyList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 233; } /* = unique id SOAP_TYPE__ngwm__getProxyListResponse */
@@ -4056,7 +4056,7 @@ class SOAP_CMAC _ngwm__getRuleListResponse
 {
 public:
 	ngwt__RuleList *rules;	/* RPC return element */	/* optional element of type ngwt:RuleList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 235; } /* = unique id SOAP_TYPE__ngwm__getRuleListResponse */
@@ -4099,7 +4099,7 @@ class SOAP_CMAC _ngwm__getSettingsResponse
 {
 public:
 	ngwt__Settings *settings;	/* RPC return element */	/* optional element of type ngwt:Settings */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 237; } /* = unique id SOAP_TYPE__ngwm__getSettingsResponse */
@@ -4142,7 +4142,7 @@ class SOAP_CMAC _ngwm__getSignaturesResponse
 {
 public:
 	ngwt__Signatures *signatures;	/* RPC return element */	/* optional element of type ngwt:Signatures */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 239; } /* = unique id SOAP_TYPE__ngwm__getSignaturesResponse */
@@ -4188,7 +4188,7 @@ class SOAP_CMAC _ngwm__getTimestampResponse
 public:
 	char *backup;	/* RPC return element */	/* optional element of type xsd:string */
 	char *retention;	/* optional element of type xsd:string */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 241; } /* = unique id SOAP_TYPE__ngwm__getTimestampResponse */
@@ -4230,7 +4230,7 @@ class SOAP_CMAC _ngwm__getTimezoneListResponse
 {
 public:
 	ngwt__TimezoneList *timezones;	/* RPC return element */	/* optional element of type ngwt:TimezoneList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 243; } /* = unique id SOAP_TYPE__ngwm__getTimezoneListResponse */
@@ -4274,7 +4274,7 @@ class SOAP_CMAC _ngwm__getUserListResponse
 {
 public:
 	ngwt__UserList *users;	/* RPC return element */	/* optional element of type ngwt:UserList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 245; } /* = unique id SOAP_TYPE__ngwm__getUserListResponse */
@@ -4327,7 +4327,7 @@ public:
 	std::string *build;	/* optional element of type xsd:string */
 	std::vector<ngwt__Host * >redirectToHost;	/* optional element of type ngwt:Host */
 	char *serverUTCTime;	/* optional element of type xsd:string */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 247; } /* = unique id SOAP_TYPE__ngwm__loginResponse */
@@ -4368,7 +4368,7 @@ public:
 class SOAP_CMAC _ngwm__logoutResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 249; } /* = unique id SOAP_TYPE__ngwm__logoutResponse */
@@ -4410,7 +4410,7 @@ public:
 class SOAP_CMAC _ngwm__markPrivateResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 251; } /* = unique id SOAP_TYPE__ngwm__markPrivateResponse */
@@ -4452,7 +4452,7 @@ public:
 class SOAP_CMAC _ngwm__markReadResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 253; } /* = unique id SOAP_TYPE__ngwm__markReadResponse */
@@ -4494,7 +4494,7 @@ public:
 class SOAP_CMAC _ngwm__markUnPrivateResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 255; } /* = unique id SOAP_TYPE__ngwm__markUnPrivateResponse */
@@ -4536,7 +4536,7 @@ public:
 class SOAP_CMAC _ngwm__markUnReadResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 257; } /* = unique id SOAP_TYPE__ngwm__markUnReadResponse */
@@ -4584,7 +4584,7 @@ class SOAP_CMAC _ngwm__modifyItemResponse
 public:
 	char *ngwt__modified;	/* RPC return element */	/* optional element of type xsd:string */
 	std::vector<std::string >id;	/* optional element of type ngwt:uid */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 259; } /* = unique id SOAP_TYPE__ngwm__modifyItemResponse */
@@ -4628,7 +4628,7 @@ class SOAP_CMAC _ngwm__modifyItemsResponse
 public:
 	std::vector<char * >ngwt__modified;	/* optional element of type xsd:string */
 	std::vector<std::string >id;	/* optional element of type ngwt:uid */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 261; } /* = unique id SOAP_TYPE__ngwm__modifyItemsResponse */
@@ -4670,7 +4670,7 @@ public:
 class SOAP_CMAC _ngwm__modifyJunkEntryResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 263; } /* = unique id SOAP_TYPE__ngwm__modifyJunkEntryResponse */
@@ -4712,7 +4712,7 @@ public:
 class SOAP_CMAC _ngwm__modifyJunkMailSettingsResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 265; } /* = unique id SOAP_TYPE__ngwm__modifyJunkMailSettingsResponse */
@@ -4755,7 +4755,7 @@ public:
 class SOAP_CMAC _ngwm__modifyPasswordResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 267; } /* = unique id SOAP_TYPE__ngwm__modifyPasswordResponse */
@@ -4799,7 +4799,7 @@ public:
 class SOAP_CMAC _ngwm__modifyProxyAccessResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 269; } /* = unique id SOAP_TYPE__ngwm__modifyProxyAccessResponse */
@@ -4841,7 +4841,7 @@ public:
 class SOAP_CMAC _ngwm__modifySettingsResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 271; } /* = unique id SOAP_TYPE__ngwm__modifySettingsResponse */
@@ -4883,7 +4883,7 @@ public:
 class SOAP_CMAC _ngwm__modifySignaturesResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 273; } /* = unique id SOAP_TYPE__ngwm__modifySignaturesResponse */
@@ -4928,7 +4928,7 @@ public:
 class SOAP_CMAC _ngwm__moveItemResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 275; } /* = unique id SOAP_TYPE__ngwm__moveItemResponse */
@@ -4974,7 +4974,7 @@ public:
 class SOAP_CMAC _ngwm__positionCursorResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 277; } /* = unique id SOAP_TYPE__ngwm__positionCursorResponse */
@@ -5015,7 +5015,7 @@ public:
 class SOAP_CMAC _ngwm__purgeDeletedItemsResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 279; } /* = unique id SOAP_TYPE__ngwm__purgeDeletedItemsResponse */
@@ -5057,7 +5057,7 @@ public:
 class SOAP_CMAC _ngwm__purgeResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 281; } /* = unique id SOAP_TYPE__ngwm__purgeResponse */
@@ -5105,7 +5105,7 @@ class SOAP_CMAC _ngwm__readCursorResponse
 {
 public:
 	ngwt__ItemList *items;	/* RPC return element */	/* optional element of type ngwt:ItemList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 283; } /* = unique id SOAP_TYPE__ngwm__readCursorResponse */
@@ -5149,7 +5149,7 @@ public:
 class SOAP_CMAC _ngwm__removeCustomDefinitionResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 285; } /* = unique id SOAP_TYPE__ngwm__removeCustomDefinitionResponse */
@@ -5193,7 +5193,7 @@ public:
 class SOAP_CMAC _ngwm__removeItemResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 287; } /* = unique id SOAP_TYPE__ngwm__removeItemResponse */
@@ -5237,7 +5237,7 @@ public:
 class SOAP_CMAC _ngwm__removeItemsResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 289; } /* = unique id SOAP_TYPE__ngwm__removeItemsResponse */
@@ -5280,7 +5280,7 @@ public:
 class SOAP_CMAC _ngwm__removeJunkEntryResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 291; } /* = unique id SOAP_TYPE__ngwm__removeJunkEntryResponse */
@@ -5324,7 +5324,7 @@ public:
 class SOAP_CMAC _ngwm__removeMembersResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 293; } /* = unique id SOAP_TYPE__ngwm__removeMembersResponse */
@@ -5367,7 +5367,7 @@ public:
 class SOAP_CMAC _ngwm__removeProxyAccessResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 295; } /* = unique id SOAP_TYPE__ngwm__removeProxyAccessResponse */
@@ -5410,7 +5410,7 @@ public:
 class SOAP_CMAC _ngwm__removeProxyUserResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 297; } /* = unique id SOAP_TYPE__ngwm__removeProxyUserResponse */
@@ -5454,7 +5454,7 @@ public:
 class SOAP_CMAC _ngwm__removeSignatureResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 299; } /* = unique id SOAP_TYPE__ngwm__removeSignatureResponse */
@@ -5499,7 +5499,7 @@ class SOAP_CMAC _ngwm__replyResponse
 {
 public:
 	ngwt__Item *item;	/* RPC return element */	/* optional element of type ngwt:Item */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 301; } /* = unique id SOAP_TYPE__ngwm__replyResponse */
@@ -5545,7 +5545,7 @@ public:
 class SOAP_CMAC _ngwm__retractResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 303; } /* = unique id SOAP_TYPE__ngwm__retractResponse */
@@ -5588,7 +5588,7 @@ class SOAP_CMAC _ngwm__sendItemResponse
 {
 public:
 	std::vector<std::string >id;	/* RPC return element */	/* optional element of type ngwt:uid */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 305; } /* = unique id SOAP_TYPE__ngwm__sendItemResponse */
@@ -5631,7 +5631,7 @@ public:
 class SOAP_CMAC _ngwm__setTimestampResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 307; } /* = unique id SOAP_TYPE__ngwm__setTimestampResponse */
@@ -5676,7 +5676,7 @@ class SOAP_CMAC _ngwm__startFreeBusySessionResponse
 {
 public:
 	int *freeBusySessionId;	/* RPC return element */	/* optional element of type xsd:int */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 309; } /* = unique id SOAP_TYPE__ngwm__startFreeBusySessionResponse */
@@ -5718,7 +5718,7 @@ public:
 class SOAP_CMAC _ngwm__unacceptResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 311; } /* = unique id SOAP_TYPE__ngwm__unacceptResponse */
@@ -5760,7 +5760,7 @@ public:
 class SOAP_CMAC _ngwm__uncompleteResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 313; } /* = unique id SOAP_TYPE__ngwm__uncompleteResponse */
@@ -5806,7 +5806,7 @@ class SOAP_CMAC _ngwm__updateVersionStatusResponse
 {
 public:
 	ngwt__SignatureData *part;	/* RPC return element */	/* optional element of type ngwt:SignatureData */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 315; } /* = unique id SOAP_TYPE__ngwm__updateVersionStatusResponse */
@@ -6038,7 +6038,7 @@ public:
 class SOAP_CMAC _ngwe__cleanEventConfigurationResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 325; } /* = unique id SOAP_TYPE__ngwe__cleanEventConfigurationResponse */
@@ -6080,7 +6080,7 @@ public:
 class SOAP_CMAC _ngwe__configureEventsResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 327; } /* = unique id SOAP_TYPE__ngwe__configureEventsResponse */
@@ -6123,7 +6123,7 @@ class SOAP_CMAC _ngwe__getEventConfigurationResponse
 {
 public:
 	ngwe__EventsList *events;	/* RPC return element */	/* optional element of type ngwe:EventsList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 329; } /* = unique id SOAP_TYPE__ngwe__getEventConfigurationResponse */
@@ -6173,7 +6173,7 @@ class SOAP_CMAC _ngwe__getEventsResponse
 {
 public:
 	ngwe__EventList *events;	/* RPC return element */	/* optional element of type ngwe:EventList */
-	ngwt__tqStatus *status;	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 331; } /* = unique id SOAP_TYPE__ngwe__getEventsResponse */
@@ -6216,7 +6216,7 @@ public:
 class SOAP_CMAC _ngwe__removeEventConfigurationResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 333; } /* = unique id SOAP_TYPE__ngwe__removeEventConfigurationResponse */
@@ -6261,7 +6261,7 @@ public:
 class SOAP_CMAC _ngwe__removeEventsResponse
 {
 public:
-	ngwt__tqStatus *status;	/* RPC return element */	/* required element of type ngwt:tqStatus */
+	ngwt__Status *status;	/* RPC return element */	/* required element of type ngwt:Status */
 	struct soap *soap;	/* transient */
 public:
 	virtual int soap_type() const { return 335; } /* = unique id SOAP_TYPE__ngwe__removeEventsResponse */
@@ -6386,25 +6386,25 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__CommentqStatus
-#define SOAP_TYPE_ngwt__CommentqStatus (40)
-/* Primitive ngwt:CommentqStatus schema type: */
-class SOAP_CMAC ngwt__CommentqStatus
+#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__CommentqStatus */
+	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__CommentqStatus() { }
-	virtual ~ngwt__CommentqStatus() { }
+	         ngwt__CommenStatus() { }
+	virtual ~ngwt__CommenStatus() { }
 };
 #endif
 
@@ -6454,45 +6454,45 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__DelegatedtqStatus
-#define SOAP_TYPE_ngwt__DelegatedtqStatus (52)
-/* Primitive ngwt:DelegatedtqStatus schema type: */
-class SOAP_CMAC ngwt__DelegatedtqStatus
+#ifndef SOAP_TYPE_ngwt__DelegatedStatus
+#define SOAP_TYPE_ngwt__DelegatedStatus (52)
+/* Primitive ngwt:DelegatedStatus schema type: */
+class SOAP_CMAC ngwt__DelegatedStatus
 {
 public:
-	ngwt__CommentqStatus *__item;
+	ngwt__CommenStatus *__item;
 	std::string *userid;	/* optional attribute */
 	struct soap *soap;	/* transient */
 public:
-	virtual int soap_type() const { return 52; } /* = unique id SOAP_TYPE_ngwt__DelegatedtqStatus */
+	virtual int soap_type() const { return 52; } /* = unique id SOAP_TYPE_ngwt__DelegatedStatus */
 	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__DelegatedtqStatus() { }
-	virtual ~ngwt__DelegatedtqStatus() { }
+	         ngwt__DelegatedStatus() { }
+	virtual ~ngwt__DelegatedStatus() { }
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__DelegateetqStatus
-#define SOAP_TYPE_ngwt__DelegateetqStatus (53)
-/* ngwt:DelegateetqStatus */
-class SOAP_CMAC ngwt__DelegateetqStatus : public ngwt__RecipientqStatus
+#ifndef SOAP_TYPE_ngwt__DelegateeStatus
+#define SOAP_TYPE_ngwt__DelegateeStatus (53)
+/* ngwt:DelegateeStatus */
+class SOAP_CMAC ngwt__DelegateeStatus : public ngwt__RecipienStatus
 {
 public:
 	std::string *userid;	/* optional attribute */
 public:
-	virtual int soap_type() const { return 53; } /* = unique id SOAP_TYPE_ngwt__DelegateetqStatus */
+	virtual int soap_type() const { return 53; } /* = unique id SOAP_TYPE_ngwt__DelegateeStatus */
 	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__DelegateetqStatus() { }
-	virtual ~ngwt__DelegateetqStatus() { }
+	         ngwt__DelegateeStatus() { }
+	virtual ~ngwt__DelegateeStatus() { }
 };
 #endif
 
@@ -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__RecipientqStatus *recipientqStatus;	/* optional element of type ngwt:RecipientqStatus */
+	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 */
@@ -6789,23 +6789,23 @@ public:
 };
 #endif
 
-#ifndef SOAP_TYPE_ngwt__TransferFailedtqStatus
-#define SOAP_TYPE_ngwt__TransferFailedtqStatus (154)
-/* ngwt:TransferFailedtqStatus */
-class SOAP_CMAC ngwt__TransferFailedtqStatus : public ngwt__RecipientqStatus
+#ifndef SOAP_TYPE_ngwt__TransferFailedStatus
+#define SOAP_TYPE_ngwt__TransferFailedStatus (154)
+/* ngwt:TransferFailedStatus */
+class SOAP_CMAC ngwt__TransferFailedStatus : public ngwt__RecipienStatus
 {
 public:
 	std::string *FailureReason;	/* optional attribute */
 public:
-	virtual int soap_type() const { return 154; } /* = unique id SOAP_TYPE_ngwt__TransferFailedtqStatus */
+	virtual int soap_type() const { return 154; } /* = unique id SOAP_TYPE_ngwt__TransferFailedStatus */
 	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__TransferFailedtqStatus() { }
-	virtual ~ngwt__TransferFailedtqStatus() { }
+	         ngwt__TransferFailedStatus() { }
+	virtual ~ngwt__TransferFailedStatus() { }
 };
 #endif
 
@@ -6886,7 +6886,7 @@ public:
 class SOAP_CMAC ngwt__BoxEntry : public ngwt__ContainerItem
 {
 public:
-	ngwt__ItemtqStatus *status;	/* optional element of type ngwt:ItemtqStatus */
+	ngwt__ItemStatus *status;	/* optional element of type ngwt:ItemStatus */
 	std::string *thread;	/* optional element of type xsd:string */
 	std::string *msgId;	/* optional element of type xsd:string */
 	std::string *messageId;	/* optional element of type xsd:string */
@@ -6989,7 +6989,7 @@ public:
 class SOAP_CMAC ngwt__FolderACLEntry : public ngwt__AccessControlListEntry
 {
 public:
-	enum ngwt__FolderACLtqStatus *status;	/* optional element of type ngwt:FolderACLtqStatus */
+	enum ngwt__FolderACLStatus *status;	/* optional element of type ngwt:FolderACLStatus */
 public:
 	virtual int soap_type() const { return 67; } /* = unique id SOAP_TYPE_ngwt__FolderACLEntry */
 	virtual void soap_default(struct soap*);
@@ -7133,7 +7133,7 @@ public:
 	char *retrievedDate;	/* optional element of type xsd:string */
 	unsigned long versionNumber;	/* required element of type xsd:unsignedLong */
 	std::string *versionDescription;	/* optional element of type xsd:string */
-	enum ngwt__VersiontqStatus *versiontqStatus;	/* optional element of type ngwt:VersiontqStatus */
+	enum ngwt__VersionStatus *versionStatus;	/* optional element of type ngwt:VersionStatus */
 	unsigned long *life;	/* optional element of type xsd:unsignedLong */
 	enum ngwt__AgeAction *ageAction;	/* optional element of type ngwt:AgeAction */
 	unsigned long *fileSize;	/* optional element of type xsd:unsignedLong */
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index 7dee722a1..4ff4725a7 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -1350,8 +1350,8 @@ struct soap
   std::ostream *os;
   std::istream *is;
 #else
-  void *os;	/* preserve tqalignment */
-  void *is;	/* preserve tqalignment */
+  void *os;	/* preserve alignment */
+  void *is;	/* preserve alignment */
 #endif
 #ifndef UNDER_CE
   int sendfd;
diff --git a/kresources/kolab/kabc/contact.cpp b/kresources/kolab/kabc/contact.cpp
index 7a26f62f7..796099025 100644
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@@ -293,12 +293,12 @@ TQDate Contact::anniversary() const
   return mAnniversary;
 }
 
-void Contact::setChildren( const TQString& tqchildren )
+void Contact::setChildren( const TQString& children )
 {
-  mChildren = tqchildren;
+  mChildren = children;
 }
 
-TQString Contact::tqchildren() const
+TQString Contact::children() const
 {
   return mChildren;
 }
@@ -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::tqfromLatin1( "FreeBusyURL" ) ) {
+      if ( (*it).name == TQString::fromLatin1( "FreeBusyURL" ) ) {
         continue;
       }
 
@@ -619,7 +619,7 @@ bool Contact::loadAttribute( TQDomElement& element )
     }
     break;
   case 'c':
-    if ( tagName == "tqchildren" ) {
+    if ( tagName == "children" ) {
       setChildren( element.text() );
       return true;
     }
@@ -798,7 +798,7 @@ bool Contact::saveAttributes( TQDomElement& element ) const
       writeString( element, "x-logo", mLogoAttachmentName );
     if ( !sound().isNull() )
       writeString( element, "x-sound", mSoundAttachmentName );
-    writeString( element, "tqchildren", tqchildren() );
+    writeString( element, "children", children() );
     writeString( element, "gender", gender() );
     writeString( element, "language", language() );
     savePhoneAttributes( element );
@@ -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::tqfromLatin1( *p );
+    knownCustoms << TQString::fromLatin1( *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
@@ -1146,7 +1146,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
   // mailer, timezone, productId, sortString, agent, rfc2426 name()
 
   // Things KAddressBook can't handle, so they are saved as unhandled tags:
-  // initials, tqchildren, gender, language
+  // initials, children, gender, language
 }
 
 // The loading is: xml -> Contact -> addressee, this is the second part
@@ -1253,7 +1253,7 @@ void Contact::saveTo( KABC::Addressee* addressee )
   }
 
   for( TQValueList<Custom>::ConstIterator it = mCustomList.begin(); it != mCustomList.end(); ++it ) {
-    TQString app = (*it).app.isEmpty() ? TQString::tqfromLatin1( "KADDRESSBOOK" ) : (*it).app;
+    TQString app = (*it).app.isEmpty() ? TQString::fromLatin1( "KADDRESSBOOK" ) : (*it).app;
     addressee->insertCustom( app, (*it).name, (*it).value );
   }
   //kdDebug(5006) << addressee->customs() << endl;
diff --git a/kresources/kolab/kabc/contact.h b/kresources/kolab/kabc/contact.h
index 60c399335..6e0de80bc 100644
--- a/kresources/kolab/kabc/contact.h
+++ b/kresources/kolab/kabc/contact.h
@@ -154,8 +154,8 @@ public:
   TQString soundAttachmentName() const { return mSoundAttachmentName; }
   TQByteArray sound() const { return mSound; }
 
-  void setChildren( const TQString& tqchildren );
-  TQString tqchildren() const;
+  void setChildren( const TQString& children );
+  TQString children() const;
 
   void setGender( const TQString& gender );
   TQString gender() const;
diff --git a/kresources/kolab/kcal/event.cpp b/kresources/kolab/kcal/event.cpp
index fedeca0c2..5f85cde22 100644
--- a/kresources/kolab/kcal/event.cpp
+++ b/kresources/kolab/kcal/event.cpp
@@ -82,18 +82,18 @@ void Event::setEndDate( const TQDateTime& date )
 {
   mEndDate = date;
   mHasEndDate = true;
-  if ( mFloatingtqStatus == AllDay )
+  if ( mFloatingStatus == AllDay )
     kdDebug() << "ERROR: Time on end date but no time on the event\n";
-  mFloatingtqStatus = HasTime;
+  mFloatingStatus = HasTime;
 }
 
 void Event::setEndDate( const TQDate& date )
 {
   mEndDate = date;
   mHasEndDate = true;
-  if ( mFloatingtqStatus == HasTime )
+  if ( mFloatingStatus == HasTime )
     kdDebug() << "ERROR: No time on end date but time on the event\n";
-  mFloatingtqStatus = AllDay;
+  mFloatingStatus = AllDay;
 }
 
 void Event::setEndDate( const TQString& endDate )
@@ -142,7 +142,7 @@ bool Event::saveAttributes( TQDomElement& element ) const
   else
     writeString( element, "show-time-as", "busy" );
   if ( mHasEndDate ) {
-    if ( mFloatingtqStatus == HasTime )
+    if ( mFloatingStatus == HasTime )
       writeString( element, "end-date", dateTimeToString( endDate() ) );
     else
       writeString( element, "end-date", dateToString( endDate().date() ) );
@@ -195,10 +195,10 @@ void Event::setFields( const KCal::Event* event )
   if ( event->hasEndDate() || event->hasDuration() ) {
     if ( event->doesFloat() ) {
       // This is a floating event. Don't timezone move this one
-      mFloatingtqStatus = AllDay;
+      mFloatingStatus = AllDay;
       setEndDate( event->dtEnd().date() );
     } else {
-      mFloatingtqStatus = HasTime;
+      mFloatingStatus = HasTime;
       setEndDate( localToUTC( event->dtEnd() ) );
     }
   } else {
@@ -213,7 +213,7 @@ void Event::saveTo( KCal::Event* event )
 
   event->setHasEndDate( mHasEndDate );
   if ( mHasEndDate ) {
-    if ( mFloatingtqStatus == AllDay )
+    if ( mFloatingStatus == AllDay )
       // This is a floating event. Don't timezone move this one
       event->setDtEnd( endDate() );
     else
diff --git a/kresources/kolab/kcal/incidence.cpp b/kresources/kolab/kcal/incidence.cpp
index 602321795..2617da4a1 100644
--- a/kresources/kolab/kcal/incidence.cpp
+++ b/kresources/kolab/kcal/incidence.cpp
@@ -51,7 +51,7 @@ using namespace Kolab;
 
 Incidence::Incidence( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 sernum,
                       const TQString& tz )
-  : KolabBase( tz ), mFloatingtqStatus( Unset ), mHasAlarm( false ),
+  : KolabBase( tz ), mFloatingStatus( Unset ), mHasAlarm( false ),
     mResource( res ),
     mSubResource( subResource ),
     mSernum( sernum )
@@ -95,17 +95,17 @@ KolabBase::Email Incidence::organizer() const
 void Incidence::setStartDate( const TQDateTime& startDate )
 {
   mStartDate = startDate;
-  if ( mFloatingtqStatus == AllDay )
+  if ( mFloatingStatus == AllDay )
     kdDebug() << "ERROR: Time on start date but no time on the event\n";
-  mFloatingtqStatus = HasTime;
+  mFloatingStatus = HasTime;
 }
 
 void Incidence::setStartDate( const TQDate& startDate )
 {
   mStartDate = startDate;
-  if ( mFloatingtqStatus == HasTime )
+  if ( mFloatingStatus == HasTime )
     kdDebug() << "ERROR: No time on start date but time on the event\n";
-  mFloatingtqStatus = AllDay;
+  mFloatingStatus = AllDay;
 }
 
 void Incidence::setStartDate( const TQString& startDate )
@@ -546,7 +546,7 @@ bool Incidence::saveAttributes( TQDomElement& element ) const
   // Save the base class elements
   KolabBase::saveAttributes( element );
 
-  if ( mFloatingtqStatus == HasTime )
+  if ( mFloatingStatus == HasTime )
     writeString( element, "start-date", dateTimeToString( startDate() ) );
   else
     writeString( element, "start-date", dateToString( startDate().date() ) );
@@ -595,7 +595,7 @@ void Incidence::loadCustomAttributes( TQDomElement& element )
   mCustomList.append( custom );
 }
 
-static KCal::Attendee::PartStat attendeeStringTotqStatus( const TQString& s )
+static KCal::Attendee::PartStat attendeeStringToStatus( const TQString& s )
 {
   if ( s == "none" )
     return KCal::Attendee::NeedsAction;
@@ -771,10 +771,10 @@ void Incidence::setFields( const KCal::Incidence* incidence )
 
   if ( incidence->doesFloat() ) {
     // This is a floating event. Don't timezone move this one
-    mFloatingtqStatus = AllDay;
+    mFloatingStatus = AllDay;
     setStartDate( incidence->dtStart().date() );
   } else {
-    mFloatingtqStatus = HasTime;
+    mFloatingStatus = HasTime;
     setStartDate( localToUTC( incidence->dtStart() ) );
   }
 
@@ -856,7 +856,7 @@ void Incidence::setFields( const KCal::Incidence* incidence )
   if ( incidence->pilotId() != 0 )
     setPilotSyncId( incidence->pilotId() );
 
-  setPilotSynctqStatus( incidence->synctqStatus() );
+  setPilotSyncStatus( incidence->syncStatus() );
 
   // Unhandled tags and other custom properties (see libkcal/customproperties.h)
   const TQMap<TQCString, TQString> map = incidence->customProperties();
@@ -886,7 +886,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
 {
   KolabBase::saveTo( incidence );
 
-  if ( mFloatingtqStatus == AllDay ) {
+  if ( mFloatingStatus == AllDay ) {
     // This is a floating event. Don't timezone move this one
     incidence->setDtStart( startDate() );
     incidence->setFloats( true );
@@ -920,7 +920,7 @@ void Incidence::saveTo( KCal::Incidence* incidence )
   incidence->clearAttendees();
   TQValueList<Attendee>::ConstIterator it;
   for ( it = mAttendees.begin(); it != mAttendees.end(); ++it ) {
-    KCal::Attendee::PartStat status = attendeeStringTotqStatus( (*it).status );
+    KCal::Attendee::PartStat status = attendeeStringToStatus( (*it).status );
     KCal::Attendee::Role role = attendeeStringToRole( (*it).role );
     KCal::Attendee* attendee = new KCal::Attendee( (*it).displayName,
                                                    (*it).smtpAddress,
@@ -994,8 +994,8 @@ void Incidence::saveTo( KCal::Incidence* incidence )
   }
   if ( hasPilotSyncId() )
     incidence->setPilotId( pilotSyncId() );
-  if ( hasPilotSynctqStatus() )
-    incidence->setSynctqStatus( pilotSynctqStatus() );
+  if ( hasPilotSyncStatus() )
+    incidence->setSyncStatus( pilotSyncStatus() );
 
   for( TQValueList<Custom>::ConstIterator it = mCustomList.constBegin(); it != mCustomList.constEnd(); ++it ) {
     incidence->setNonKDECustomProperty( (*it).key, (*it).value );
@@ -1030,7 +1030,7 @@ void Incidence::loadAttachments()
 
 TQString Incidence::productID() const
 {
-  return TQString( "KOrganizer %1, Kolab resource" ).tqarg( korgVersion );
+  return TQString( "KOrganizer %1, Kolab resource" ).arg( korgVersion );
 }
 
 // Unhandled KCal::Incidence fields:
diff --git a/kresources/kolab/kcal/incidence.h b/kresources/kolab/kcal/incidence.h
index e5df23820..926ec1e4f 100644
--- a/kresources/kolab/kcal/incidence.h
+++ b/kresources/kolab/kcal/incidence.h
@@ -123,7 +123,7 @@ public:
   virtual bool saveAttributes( TQDomElement& ) const;
 
 protected:
-  enum FloatingtqStatus { Unset, AllDay, HasTime };
+  enum FloatingStatus { Unset, AllDay, HasTime };
 
   // Read all known fields from this ical incidence
   void setFields( const KCal::Incidence* );
@@ -150,7 +150,7 @@ protected:
   TQString mLocation;
   Email mOrganizer;
   TQDateTime mStartDate;
-  FloatingtqStatus mFloatingtqStatus;
+  FloatingStatus mFloatingStatus;
   float mAlarm;
   bool mHasAlarm;
   Recurrence mRecurrence;
diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index e0ea6d164..edd94303c 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::tqfromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
+    mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ),mResourceChangedTimer( 0,
         "mResourceChangedTimer" ), mBatchAddingInProgress( false )
 {
   if ( !config ) {
@@ -370,7 +370,7 @@ void ResourceKolab::incidenceUpdated( KCal::IncidenceBase* incidencebase )
   }
 
   incidencebase->setSyncStatusSilent( KCal::Event::SYNCMOD );
-  incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
+  incidencebase->setLastModified( TQDateTime::currentDateTime() );
 
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
@@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
      addedIncidence = inc;
    } else if ( result == 0 ) { // take both
      addedIncidence = inc;
-     addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) );
+     addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) );
      addedIncidence->setUid( CalFormat::createUniqueId() );
      localIncidence = local;
    }
@@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
       text += "<font></b><br>";
       if ( !incidence->summary().isEmpty() )
-        text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>";
+        text += i18n( "<b>Summary:</b> %1" ).arg( incidence->summary() ) + "<br>";
       if ( !incidence->location().isEmpty() )
-        text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() );
+        text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() );
       text += "<br>";
       if ( !incidence->doesFloat() )
         text += i18n( "<b>Start:</b> %1, %2" )
-                .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
+                .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
       else
-        text += i18n( "<b>Start:</b> %1" ).tqarg( incidence->dtStartDateStr() );
+        text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() );
       text += "<br>";
       if ( incidence->type() == "Event" ) {
         Event* event = static_cast<Event*>( incidence );
         if ( event->hasEndDate() ) {
           if ( !event->doesFloat() ) {
             text += i18n( "<b>End:</b> %1, %2" )
-                    .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() );
+                    .arg( event->dtEndDateStr(), event->dtEndTimeStr() );
           } else {
-            text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() );
+            text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() );
           }
         }
         text += "<br>";
diff --git a/kresources/kolab/kcal/task.cpp b/kresources/kolab/kcal/task.cpp
index 570bb47bc..488daf4af 100644
--- a/kresources/kolab/kcal/task.cpp
+++ b/kresources/kolab/kcal/task.cpp
@@ -94,7 +94,7 @@ Task::Task( KCal::ResourceKolab *res, const TQString &subResource, TQ_UINT32 ser
             const TQString& tz, KCal::Todo* task )
   : Incidence( res, subResource, sernum, tz ),
     mPriority( 5 ), mPercentCompleted( 0 ),
-    mtqStatus( KCal::Incidence::StatusNone ),
+    mStatus( KCal::Incidence::StatusNone ),
     mHasStartDate( false ), mHasDueDate( false ),
     mHasCompletedDate( false )
 {
@@ -126,14 +126,14 @@ int Task::percentCompleted() const
   return mPercentCompleted;
 }
 
-void Task::setqStatus( KCal::Incidence::tqStatus status )
+void Task::seStatus( KCal::Incidence::Status status )
 {
-  mtqStatus = status;
+  mStatus = status;
 }
 
-KCal::Incidence::tqStatus Task::status() const
+KCal::Incidence::Status Task::status() const
 {
-  return mtqStatus;
+  return mStatus;
 }
 
 void Task::setParent( const TQString& parentUid )
@@ -150,14 +150,14 @@ void Task::setDueDate( const TQDateTime& date )
 {
   mDueDate = date;
   mHasDueDate = true;
-  mFloatingtqStatus = HasTime;
+  mFloatingStatus = HasTime;
 }
 
 void Task::setDueDate( const TQDate &date )
 {
   mDueDate = date;
   mHasDueDate = true;
-  mFloatingtqStatus = AllDay;
+  mFloatingStatus = AllDay;
 }
 
 
@@ -234,17 +234,17 @@ bool Task::loadAttribute( TQDomElement& element )
     setPercentCompleted( percent );
   } else if ( tagName == "status" ) {
     if ( element.text() == "in-progress" )
-      setqStatus( KCal::Incidence::StatusInProcess );
+      seStatus( KCal::Incidence::StatusInProcess );
     else if ( element.text() == "completed" )
-      setqStatus( KCal::Incidence::StatusCompleted );
+      seStatus( KCal::Incidence::StatusCompleted );
     else if ( element.text() == "waiting-on-someone-else" )
-      setqStatus( KCal::Incidence::StatusNeedsAction );
+      seStatus( KCal::Incidence::StatusNeedsAction );
     else if ( element.text() == "deferred" )
       // Guessing a status here
-      setqStatus( KCal::Incidence::StatusCanceled );
+      seStatus( KCal::Incidence::StatusCanceled );
     else
       // Default
-      setqStatus( KCal::Incidence::StatusNone );
+      seStatus( KCal::Incidence::StatusNone );
   } else if ( tagName == "due-date" ) {
     setDueDate( element.text() );
   } else if ( tagName == "parent" ) {
@@ -300,7 +300,7 @@ bool Task::saveAttributes( TQDomElement& element ) const
   }
 
   if ( hasDueDate() ) {
-    if ( mFloatingtqStatus == HasTime ) {
+    if ( mFloatingStatus == HasTime ) {
       writeString( element, "due-date", dateTimeToString( dueDate() ) );
     } else {
       writeString( element, "due-date", dateToString( dueDate().date() ) );
@@ -374,17 +374,17 @@ void Task::setFields( const KCal::Todo* task )
 
   setPriority( task->priority() );
   setPercentCompleted( task->percentComplete() );
-  setqStatus( task->status() );
+  seStatus( task->status() );
   setHasStartDate( task->hasStartDate() );
 
   if ( task->hasDueDate() ) {
     setDueDate( localToUTC( task->dtDue() ) );
     if ( task->doesFloat() ) {
       // This is a floating task. Don't timezone move this one
-      mFloatingtqStatus = AllDay;
+      mFloatingStatus = AllDay;
       setDueDate( task->dtDue().date() );
     } else {
-      mFloatingtqStatus = HasTime;
+      mFloatingStatus = HasTime;
       setDueDate( localToUTC( task->dtDue() ) );
     }
   } else {
@@ -447,7 +447,7 @@ void Task::saveTo( KCal::Todo* task )
 
   task->setPriority( priority() );
   task->setPercentComplete( percentCompleted() );
-  task->setqStatus( 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 43780c00e..981c56ab7 100644
--- a/kresources/kolab/kcal/task.h
+++ b/kresources/kolab/kcal/task.h
@@ -77,8 +77,8 @@ public:
   virtual void setPercentCompleted( int percent );
   virtual int percentCompleted() const;
 
-  virtual void setqStatus( KCal::Incidence::tqStatus status );
-  virtual KCal::Incidence::tqStatus status() const;
+  virtual void seStatus( KCal::Incidence::Status status );
+  virtual KCal::Incidence::Status status() const;
 
   virtual void setParent( const TQString& parentUid );
   virtual TQString parent() const;
@@ -126,7 +126,7 @@ protected:
   int mKCalPriorityFromDom;
 
   int mPercentCompleted;
-  KCal::Incidence::tqStatus mtqStatus;
+  KCal::Incidence::Status mStatus;
   TQString mParent;
 
   bool mHasStartDate;
diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp
index ea5f6b285..e456e43be 100644
--- a/kresources/kolab/knotes/note.cpp
+++ b/kresources/kolab/knotes/note.cpp
@@ -225,5 +225,5 @@ void Note::saveTo( KCal::Journal* journal )
 
 TQString Note::productID() const
 {
-  return TQString( "KNotes %1, Kolab resource" ).tqarg( KNOTES_VERSION );
+  return TQString( "KNotes %1, Kolab resource" ).arg( KNOTES_VERSION );
 }
diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp
index 132decdf5..b92a723a5 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::tqfromLatin1("UTC") )
+    mCalendar( TQString::fromLatin1("UTC") )
 {
   if ( !config ) {
     setResourceName( i18n( "Kolab Server" ) );
diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index 09ec2cd6b..a0f32529f 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -44,10 +44,10 @@ using namespace Kolab;
 
 
 KolabBase::KolabBase( const TQString& tz )
-  : mCreationDate( TQDateTime::tqcurrentDateTime() ),
-    mLastModified( TQDateTime::tqcurrentDateTime() ),
+  : mCreationDate( TQDateTime::currentDateTime() ),
+    mLastModified( TQDateTime::currentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
-    mHasPilotSyncId( false ),  mHasPilotSynctqStatus( false )
+    mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
 {
 }
 
@@ -58,7 +58,7 @@ KolabBase::~KolabBase()
 void KolabBase::setFields( const KCal::Incidence* incidence )
 {
   // So far unhandled KCal::IncidenceBase fields:
-  // mPilotID, mSynctqStatus, mFloats
+  // mPilotID, mSyncStatus, mFloats
 
   setUid( incidence->uid() );
   setBody( incidence->description() );
@@ -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::tqcurrentDateTime();
+    creationDate = TQDateTime::currentDateTime();
     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::tqcurrentDateTime();
+    modified = TQDateTime::currentDateTime();
   setLastModified( modified );
   if ( modified < creationDate ) {
     // It's not possible that the modification date is earlier than creation
@@ -233,20 +233,20 @@ unsigned long KolabBase::pilotSyncId() const
   return mPilotSyncId;
 }
 
-void KolabBase::setPilotSynctqStatus( int status )
+void KolabBase::setPilotSyncStatus( int status )
 {
-  mHasPilotSynctqStatus = true;
-  mPilotSynctqStatus = status;
+  mHasPilotSyncStatus = true;
+  mPilotSyncStatus = status;
 }
 
-bool KolabBase::hasPilotSynctqStatus() const
+bool KolabBase::hasPilotSyncStatus() const
 {
-  return mHasPilotSynctqStatus;
+  return mHasPilotSyncStatus;
 }
 
-int KolabBase::pilotSynctqStatus() const
+int KolabBase::pilotSyncStatus() const
 {
-  return mPilotSynctqStatus;
+  return mPilotSyncStatus;
 }
 
 bool KolabBase::loadEmailAttribute( TQDomElement& element, Email& email )
@@ -335,7 +335,7 @@ bool KolabBase::loadAttribute( TQDomElement& element )
       return true;
     }
     if ( tagName == "pilot-sync-status" ) {
-      setPilotSynctqStatus( element.text().toInt() );
+      setPilotSyncStatus( element.text().toInt() );
       return true;
     }
     break;
@@ -357,8 +357,8 @@ bool KolabBase::saveAttributes( TQDomElement& element ) const
   writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
   if ( hasPilotSyncId() )
     writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
-  if ( hasPilotSynctqStatus() )
-    writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) );
+  if ( hasPilotSyncStatus() )
+    writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
   return true;
 }
 
diff --git a/kresources/kolab/shared/kolabbase.h b/kresources/kolab/shared/kolabbase.h
index d4621c722..294a7d81b 100644
--- a/kresources/kolab/shared/kolabbase.h
+++ b/kresources/kolab/shared/kolabbase.h
@@ -94,9 +94,9 @@ public:
   virtual bool hasPilotSyncId() const;
   virtual unsigned long pilotSyncId() const;
 
-  virtual void setPilotSynctqStatus( int status );
-  virtual bool hasPilotSynctqStatus() const;
-  virtual int pilotSynctqStatus() const;
+  virtual void setPilotSyncStatus( int status );
+  virtual bool hasPilotSyncStatus() const;
+  virtual int pilotSyncStatus() const;
 
   // String - Date conversion methods
   static TQString dateTimeToString( const TQDateTime& time );
@@ -167,9 +167,9 @@ protected:
   TQString mTimeZoneId;
 
   // KPilot synchronization stuff
-  bool mHasPilotSyncId,  mHasPilotSynctqStatus;
+  bool mHasPilotSyncId,  mHasPilotSyncStatus;
   unsigned long mPilotSyncId;
-  int mPilotSynctqStatus;
+  int mPilotSyncStatus;
 };
 
 }
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index a357b0d62..a56383af8 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -42,7 +42,7 @@
 #include <kurl.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kdebug.h>
 
 using namespace Kolab;
@@ -126,8 +126,8 @@ 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::tqfromLatin1( firstPartTextToTranslate ).tqarg( url );
-  TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url );
+  TQString firstPartTextUntranslated = TQString::fromLatin1( firstPartTextToTranslate ).arg( url );
+  TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
   if ( firstPartText != firstPartTextUntranslated ) {
     firstPartText.append("\n\n-----------------------------------------------------\n\n");
     firstPartText.append( firstPartTextUntranslated );
@@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource,
 TQString ResourceKolabBase::configFile( const TQString& type ) const
 {
   return locateLocal( "config",
-                      TQString( "kresources/kolab/%1rc" ).tqarg( type ) );
+                      TQString( "kresources/kolab/%1rc" ).arg( type ) );
 }
 
 bool ResourceKolabBase::connectToKMail() const
diff --git a/kresources/lib/folderconfig.cpp b/kresources/lib/folderconfig.cpp
index 20fa6fa1b..c82f39757 100644
--- a/kresources/lib/folderconfig.cpp
+++ b/kresources/lib/folderconfig.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
diff --git a/kresources/lib/folderlister.cpp b/kresources/lib/folderlister.cpp
index eec969c26..affc6af57 100644
--- a/kresources/lib/folderlister.cpp
+++ b/kresources/lib/folderlister.cpp
@@ -137,7 +137,7 @@ void FolderLister::readConfig( KPIM::GroupwarePrefsBase *newprefs )
 
   for ( int i=0; i<nr; ++i ) {
     TQStringList l( newprefs->folder( i ) );
-//     TQStringList l( cfgg.readListEntry( TQString("Folder%1").tqarg( i ) ) );
+//     TQStringList l( cfgg.readListEntry( TQString("Folder%1").arg( i ) ) );
     Entry e;
     if ( l.count()>0 ) {
       e.id = l.first();
@@ -186,7 +186,7 @@ void FolderLister::writeConfig( GroupwarePrefsBase *newprefs )
     lst << (*it).name;
     lst += contentTypeToStrings( (*it).type );
     newprefs->setFolder( nr, lst );
-//     cfgg.writeEntry( TQString("Folder%1").tqarg( nr ), lst );
+//     cfgg.writeEntry( TQString("Folder%1").arg( nr ), lst );
     if ( (*it).active ) active.append( (*it).id );
     nr++;
   }
diff --git a/kresources/lib/folderlistview.cpp b/kresources/lib/folderlistview.cpp
index 8cbdffd5e..b29e61c9d 100644
--- a/kresources/lib/folderlistview.cpp
+++ b/kresources/lib/folderlistview.cpp
@@ -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(tqitemRect(i).topLeft()) );
+    showPopupMenu( (FolderListItem*)i, viewport()->mapToGlobal(itemRect(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, tqitemRect(i).top() ) );
+      ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
 //     } else {
 //       KListView::slotMousePressed( btn, i, pos, c );
     }
@@ -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()->tqcolorGroup();
+//   TQColorGroup mcg = lv->viewport()->colorGroup();
   FolderListView::Property prop( mFolderListView->typeForColumn(col) );
 
   if ( prop == FolderListView::FolderName ) {
diff --git a/kresources/lib/folderselectdialog.cpp b/kresources/lib/folderselectdialog.cpp
index f05dccf0a..44fbeb6b9 100644
--- a/kresources/lib/folderselectdialog.cpp
+++ b/kresources/lib/folderselectdialog.cpp
@@ -32,7 +32,7 @@
 
 #include "folderselectdialog.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 using namespace KPIM;
@@ -42,16 +42,16 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString&
   : KDialogBase(0, 0, true, caption, Ok|Cancel, Ok, true)
 {
   TQFrame* frame = makeMainWidget();
-  TQVBoxLayout* tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout* layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   TQLabel* labelWidget = new TQLabel( label, frame );
-  tqlayout->addWidget( labelWidget );
+  layout->addWidget( labelWidget );
 
   mListBox = new KListBox( frame );
   mListBox->insertStringList( list );
   mListBox->setSelected( 0, true );
   mListBox->ensureCurrentVisible();
-  tqlayout->addWidget( mListBox, 10 );
+  layout->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();
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   setMinimumWidth( 320 );
 }
diff --git a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
index 6609a3b28..2997ae021 100644
--- a/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kabc_resourcegroupwarebaseconfig.cpp
@@ -33,7 +33,7 @@
 #include <kurlrequester.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KABC;
 
diff --git a/kresources/lib/kcal_cachesettingsdlg.cpp b/kresources/lib/kcal_cachesettingsdlg.cpp
index 20b48ad9e..7eafa5307 100644
--- a/kresources/lib/kcal_cachesettingsdlg.cpp
+++ b/kresources/lib/kcal_cachesettingsdlg.cpp
@@ -33,7 +33,7 @@
 #include <kdialog.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 
 using namespace KCal;
diff --git a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
index ed8a63f92..8ad00e62b 100644
--- a/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/kresources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -36,7 +36,7 @@
 #include <kpushbutton.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 
 
diff --git a/kresources/newexchange/Incidence.mapping b/kresources/newexchange/Incidence.mapping
index 145ca4802..ef0914b56 100644
--- a/kresources/newexchange/Incidence.mapping
+++ b/kresources/newexchange/Incidence.mapping
@@ -104,7 +104,7 @@ DAV:id
 
 
 Incidence::pilotId()
-Incidence::synctqStatus()
+Incidence::syncStatus()
 Incidence::relatedToUid()
 
 
@@ -156,7 +156,7 @@ h1:0x00008101 b:dt='int'                     |  status:  0_Open, 1_InProgress, 2
 No correspondence:
 ==================
 Incidence::pilotId()
-Incidence::synctqStatus()
+Incidence::syncStatus()
 Incidence::relatedToUid()
 Incidence::custom()
 
diff --git a/kresources/newexchange/exchangeconvertercalendar.cpp b/kresources/newexchange/exchangeconvertercalendar.cpp
index 53cc7e78d..529409362 100644
--- a/kresources/newexchange/exchangeconvertercalendar.cpp
+++ b/kresources/newexchange/exchangeconvertercalendar.cpp
@@ -34,7 +34,7 @@
 using namespace KCal;
 
 #define TaskNamespace1 "http://schemas.microsoft.com/mapi/id/{00062003-0000-0000-C000-000000000046}/"
-#define TaskProp_tqStatus            "0x00008101"
+#define TaskProp_Status            "0x00008101"
 #define TaskProp_PercentCompleted  "0x00008102"
 #define TaskProp_DtStart           "0x00008104"
 #define TaskProp_DtDue             "0x00008105"
@@ -164,7 +164,7 @@ void ExchangeConverterCalendar::createRequestTask( TQDomDocument &doc, TQDomElem
   propertyTask2( TaskProp_ReminderTime );
   propertyTask2( TaskProp_ReminderPlaySound );
   propertyTask2( TaskProp_ReminderSoundFile );
-  propertyTask1( TaskProp_tqStatus );
+  propertyTask1( TaskProp_Status );
 }
 #undef propertyTask1
 #undef propertyTask2
@@ -497,7 +497,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<<endl
   // What to do about recurrence rules?
 
   // FIXME: Reminders, use TaskProp_ReminderSet, TaskProp_ReminderTime,
-  //        TaskProp_ReminderPlaySound, TaskProp_ReminderSoundFile, TaskProp_tqStatus
+  //        TaskProp_ReminderPlaySound, TaskProp_ReminderSoundFile, TaskProp_Status
   //        But how do I get the offset?
 
   return true;
@@ -747,7 +747,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis
   propertyTask2( TaskProp_ReminderTime );
   propertyTask2( TaskProp_ReminderPlaySound );
   propertyTask2( TaskProp_ReminderSoundFile );
-  propertyTask1( TaskProp_tqStatus );*/
+  propertyTask1( TaskProp_Status );*/
       return true;
     }
     bool visit( Journal *journal )
diff --git a/kresources/remote/resourceremote.cpp b/kresources/remote/resourceremote.cpp
index 18b8782e1..229dd86bf 100644
--- a/kresources/remote/resourceremote.cpp
+++ b/kresources/remote/resourceremote.cpp
@@ -330,7 +330,7 @@ void ResourceRemote::dump() const
 void ResourceRemote::addInfoText( TQString &txt ) const
 {
   txt += "<br>";
-  txt += i18n("URL: %1").tqarg( mDownloadUrl.prettyURL() );
+  txt += i18n("URL: %1").arg( mDownloadUrl.prettyURL() );
 }
 
 bool ResourceRemote::setValue( const TQString &key, const TQString &value )
diff --git a/kresources/remote/resourceremoteconfig.cpp b/kresources/remote/resourceremoteconfig.cpp
index 67d7f4b94..a84c709ba 100644
--- a/kresources/remote/resourceremoteconfig.cpp
+++ b/kresources/remote/resourceremoteconfig.cpp
@@ -22,7 +22,7 @@
 #include <typeinfo>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp
index 762d4b9fe..9f38674ef 100644
--- a/kresources/scalix/kabc/contact.cpp
+++ b/kresources/scalix/kabc/contact.cpp
@@ -103,19 +103,19 @@ TQString Contact::toXml( const KABC::Addressee &addr )
         comment = addr.formattedName();
         display = emails[ i ];
       } else {
-        comment = custom( TQString( "email%1_address_with_comment" ).tqarg( i + 1 ), addr );
-        display = custom( TQString( "email%1_display_name" ).tqarg( i + 1 ), addr );
+        comment = custom( TQString( "email%1_address_with_comment" ).arg( i + 1 ), addr );
+        display = custom( TQString( "email%1_display_name" ).arg( i + 1 ), addr );
       }
     }
 
-    xml += TQString( "<email%1_address_type>" ).tqarg( i + 1 ) + type +
-           TQString( "</email%1_address_type>" ).tqarg( i + 1 ) +"\n";
-    xml += TQString( "<email%1_address>" ).tqarg( i + 1 ) + address +
-           TQString( "</email%1_address>" ).tqarg( i + 1 ) +"\n";
-    xml += TQString( "<email%1_address_with_comment>" ).tqarg( i + 1 ) + comment +
-           TQString( "</email%1_address_with_comment>" ).tqarg( i + 1 ) + "\n";
-    xml += TQString( "<email%1_display_name>" ).tqarg( i + 1 ) + display +
-           TQString( "</email%1_display_name>" ).tqarg( i + 1 ) + "\n";
+    xml += TQString( "<email%1_address_type>" ).arg( i + 1 ) + type +
+           TQString( "</email%1_address_type>" ).arg( i + 1 ) +"\n";
+    xml += TQString( "<email%1_address>" ).arg( i + 1 ) + address +
+           TQString( "</email%1_address>" ).arg( i + 1 ) +"\n";
+    xml += TQString( "<email%1_address_with_comment>" ).arg( i + 1 ) + comment +
+           TQString( "</email%1_address_with_comment>" ).arg( i + 1 ) + "\n";
+    xml += TQString( "<email%1_display_name>" ).arg( i + 1 ) + display +
+           TQString( "</email%1_display_name>" ).arg( i + 1 ) + "\n";
   }
 
   KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 645c5b88e..eeebb32f8 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::tqfromLatin1("UTC") ), mOpen( false )
+    mCalendar( TQString::fromLatin1("UTC") ), mOpen( false )
 {
   setType( "scalix" );
   connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ),
@@ -268,8 +268,8 @@ bool ResourceScalix::doSave()
 void ResourceScalix::incidenceUpdated( KCal::IncidenceBase* incidencebase )
 {
   if ( incidencebase->isReadOnly() ) return; // Should not happen (TM)
-  incidencebase->setSynctqStatus( KCal::Event::SYNCMOD );
-  incidencebase->setLastModified( TQDateTime::tqcurrentDateTime() );
+  incidencebase->setSyncStatus( KCal::Event::SYNCMOD );
+  incidencebase->setLastModified( TQDateTime::currentDateTime() );
   // we should probably update the revision number here,
   // or internally in the Event itself when certain things change.
   // need to verify with ical documentation.
@@ -325,7 +325,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
       } else if ( result == 0 ) { // take both
           localIncidence = local->clone();
           localIncidence->recreate();
-          localIncidence->setSummary( i18n("Copy of: %1").tqarg(localIncidence->summary()) );
+          localIncidence->setSummary( i18n("Copy of: %1").arg(localIncidence->summary()) );
           addedIncidence = inc;
       }
       bool silent = mSilent;
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index acfa088e6..c5631f78c 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -104,14 +104,14 @@ void Scalix::retrieveFreeBusy( const KURL &url )
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
 
-  const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).tqarg( requestUser );
-  const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).tqarg( argument.length() );
+  const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).arg( requestUser );
+  const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() );
 
   stream << (int) 'X' << 'E' << command << argument;
 
-  TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
+  TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
                                                    url.user() : url.user() + ":" + url.pass() )
-                                                .tqarg( url.host() );
+                                                .arg( url.host() );
 
   mFreeBusyData = TQString();
 
@@ -173,13 +173,13 @@ void Scalix::publishFreeBusy( const KURL &url )
   TQDataStream stream( packedArgs, IO_WriteOnly );
 
   const TQString argument = TQString::fromUtf8( data );
-  const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).tqarg( argument.length() );
+  const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).arg( argument.length() );
 
   stream << (int) 'X' << 'E' << command << argument;
 
-  TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
+  TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
                                                    url.user() : url.user() + ":" + url.pass() )
-                                                .tqarg( url.host() );
+                                                .arg( url.host() );
 
   KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
   connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index 69922283e..0289fab0a 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::tqfromLatin1("UTC") )
+    mCalendar( TQString::fromLatin1("UTC") )
 {
   setType( "scalix" );
 }
diff --git a/kresources/scalix/scalixadmin/delegatedialog.cpp b/kresources/scalix/scalixadmin/delegatedialog.cpp
index d0a9644e8..3b24f2d4c 100644
--- a/kresources/scalix/scalixadmin/delegatedialog.cpp
+++ b/kresources/scalix/scalixadmin/delegatedialog.cpp
@@ -20,7 +20,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqtoolbutton.h>
 
@@ -35,18 +35,18 @@ DelegateDialog::DelegateDialog( TQWidget *parent )
   : KDialogBase( parent, "", true, "", Ok | Cancel, Ok, true )
 {
   TQWidget *page = new TQWidget( this );
-  TQGridLayout *tqlayout = new TQGridLayout( page, 5, 3, 11, 6 );
+  TQGridLayout *layout = new TQGridLayout( page, 5, 3, 11, 6 );
 
   TQLabel *label = new TQLabel( i18n( "User:" ), page );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   mEmail = new TQLineEdit( page );
-  tqlayout->addWidget( mEmail, 0, 1 );
+  layout->addWidget( mEmail, 0, 1 );
 
   TQToolButton *emailSelector = new TQToolButton( page );
   emailSelector->setUsesTextLabel( true );
   emailSelector->setTextLabel( i18n( "..." ) );
-  tqlayout->addWidget( emailSelector, 0, 2 );
+  layout->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 );
-    tqlayout->addMultiCellWidget( box, row, row, 1, 2 );
+    layout->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 32b29d465..d1610d232 100644
--- a/kresources/scalix/scalixadmin/delegatepage.cpp
+++ b/kresources/scalix/scalixadmin/delegatepage.cpp
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kinputdialog.h>
@@ -37,21 +37,21 @@
 DelegatePage::DelegatePage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
+  TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
 
   mView = new DelegateView( &mManager, this );
-  tqlayout->addMultiCellWidget( mView, 0, 0, 0, 2 );
+  layout->addMultiCellWidget( mView, 0, 0, 0, 2 );
 
   mAddButton = new TQPushButton( i18n( "Add Delegate..." ), this );
-  tqlayout->addWidget( mAddButton, 1, 0 );
+  layout->addWidget( mAddButton, 1, 0 );
 
   mEditButton = new TQPushButton( i18n( "Edit Delegate..." ), this );
   mEditButton->setEnabled( false );
-  tqlayout->addWidget( mEditButton, 1, 1 );
+  layout->addWidget( mEditButton, 1, 1 );
 
   mRemoveButton = new TQPushButton( i18n( "Remove Delegate" ), this );
   mRemoveButton->setEnabled( false );
-  tqlayout->addWidget( mRemoveButton, 1, 2 );
+  layout->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/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp
index 2d6823918..f1bce9f2c 100644
--- a/kresources/scalix/scalixadmin/jobs.cpp
+++ b/kresources/scalix/scalixadmin/jobs.cpp
@@ -73,7 +73,7 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url,
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'X' << (int)'N'
-         << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).tqarg( oldPassword ).tqarg( newPassword );
+         << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword );
 
   SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false );
   KIO::Scheduler::assignJobToSlave( slave, job );
@@ -95,7 +95,7 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'X' << (int)'N'
-         << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).tqarg( email ).tqarg( types.join( " " ) );
+         << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) );
 
   SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false );
   KIO::Scheduler::assignJobToSlave( slave, job );
@@ -164,9 +164,9 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url )
 SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg )
 {
   const TQString argument = msg;
-  const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).tqarg( enabled ? "ENABLED" : "DISABLED" )
-                                                .tqarg( "UTF-8" )
-                                                .tqarg( msg.utf8().length() );
+  const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" )
+                                                .arg( "UTF-8" )
+                                                .arg( msg.utf8().length() );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index b52c0aad9..adf2fe3fa 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -85,8 +85,8 @@ void LdapView::setQuery( const TQString &query )
 
 void LdapView::entryAdded( const KABC::LdapObject &obj )
 {
-  const TQString text = TQString( "%1 (%2)" ).tqarg( TQString(obj.attrs[ "surname" ].first()) )
-                                           .tqarg( TQString(obj.attrs[ "mail" ].first()) );
+  const TQString text = TQString( "%1 (%2)" ).arg( TQString(obj.attrs[ "surname" ].first()) )
+                                           .arg( TQString(obj.attrs[ "mail" ].first()) );
 
   new LdapItem( this, text, obj.attrs[ "mail" ].first() );
 }
diff --git a/kresources/scalix/scalixadmin/otheruserpage.cpp b/kresources/scalix/scalixadmin/otheruserpage.cpp
index ab5a417a9..daec37f2d 100644
--- a/kresources/scalix/scalixadmin/otheruserpage.cpp
+++ b/kresources/scalix/scalixadmin/otheruserpage.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tqapplication.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <dcopref.h>
@@ -40,17 +40,17 @@
 OtherUserPage::OtherUserPage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2, 11, 6 );
+  TQGridLayout *layout = new TQGridLayout( this, 2, 2, 11, 6 );
 
   mView = new OtherUserView( &mManager, this );
-  tqlayout->addMultiCellWidget( mView, 0, 0, 0, 1 );
+  layout->addMultiCellWidget( mView, 0, 0, 0, 1 );
 
   mAddButton = new TQPushButton( i18n( "Add Account..." ), this );
-  tqlayout->addWidget( mAddButton, 1, 0 );
+  layout->addWidget( mAddButton, 1, 0 );
 
   mDeleteButton = new TQPushButton( i18n( "Remove Account" ), this );
   mDeleteButton->setEnabled( false );
-  tqlayout->addWidget( mDeleteButton, 1, 1 );
+  layout->addWidget( mDeleteButton, 1, 1 );
 
   connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) );
   connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) );
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index 401d4de18..deb01a7d6 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -20,10 +20,10 @@
 
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -36,7 +36,7 @@
 OutOfOfficePage::OutOfOfficePage( TQWidget *parent )
   : TQWidget( parent )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
+  TQGridLayout *layout = 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 );
 
-  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 );
+  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 );
 
   statusChanged();
 
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index 51b11f6ff..ba7f25a07 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -20,7 +20,7 @@
 
 #include <tqapplication.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
@@ -38,29 +38,29 @@
 PasswordPage::PasswordPage( TQWidget *parent )
   : TQWidget( parent ), mJob( 0 )
 {
-  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, 11, 6 );
+  TQGridLayout *layout = new TQGridLayout( this, 2, 3, 11, 6 );
 
   TQLabel *label = new TQLabel( i18n( "New password:" ), this );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   mPassword = new TQLineEdit( this );
   mPassword->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPassword );
-  tqlayout->addWidget( mPassword, 0, 1 );
+  layout->addWidget( mPassword, 0, 1 );
 
   label = new TQLabel( i18n( "Retype new password:" ), this );
-  tqlayout->addWidget( label, 1, 0 );
+  layout->addWidget( label, 1, 0 );
 
   mPasswordRetype = new TQLineEdit( this );
   mPasswordRetype->setEchoMode( TQLineEdit::Password );
   label->setBuddy( mPasswordRetype );
-  tqlayout->addWidget( mPasswordRetype, 1, 1 );
+  layout->addWidget( mPasswordRetype, 1, 1 );
 
   mButton = new TQPushButton( i18n( "Change" ), this );
   mButton->setEnabled( false );
-  tqlayout->addWidget( mButton, 2, 1 );
+  layout->addWidget( mButton, 2, 1 );
 
-  tqlayout->setRowSpacing( 3, 1 );
+  layout->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() ) );
@@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job )
         group.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
       }
 
-      KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).tqarg( group.readNumEntry( "Folder" ) ) );
+      KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
       fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
     }
   }
diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index d5c5cdb1c..52f72296f 100644
--- a/kresources/scalix/scalixadmin/settings.cpp
+++ b/kresources/scalix/scalixadmin/settings.cpp
@@ -92,8 +92,8 @@ TQString Settings::rulesWizardUrl() const
   TQString url = group.readEntry( "rulesWizardUrl" );
   if ( url.isEmpty() ) {
     KConfigGroup group( &config, "Account" );
-    url = TQString( "http://%1/Scalix/rw/?username=%2" ).tqarg( group.readEntry( "host" ) )
-                                                       .tqarg( group.readEntry( "user" ) );
+    url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
+                                                       .arg( group.readEntry( "user" ) );
   }
 
   return url;
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index c9bfca350..5f1c36497 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -41,7 +41,7 @@
 #include <kurl.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kdebug.h>
 
 using namespace Scalix;
@@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource,
 TQString ResourceScalixBase::configFile( const TQString& type ) const
 {
   return locateLocal( "config",
-                      TQString( "kresources/scalix/%1rc" ).tqarg( type ) );
+                      TQString( "kresources/scalix/%1rc" ).arg( type ) );
 }
 
 bool ResourceScalixBase::connectToKMail() const
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 5a23623bc..0d305c0af 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -42,10 +42,10 @@ using namespace Scalix;
 
 
 ScalixBase::ScalixBase( const TQString& tz )
-  : mCreationDate( TQDateTime::tqcurrentDateTime() ),
-    mLastModified( TQDateTime::tqcurrentDateTime() ),
+  : mCreationDate( TQDateTime::currentDateTime() ),
+    mLastModified( TQDateTime::currentDateTime() ),
     mSensitivity( Public ), mTimeZoneId( tz ),
-    mHasPilotSyncId( false ),  mHasPilotSynctqStatus( false )
+    mHasPilotSyncId( false ),  mHasPilotSyncStatus( false )
 {
 }
 
@@ -56,7 +56,7 @@ ScalixBase::~ScalixBase()
 void ScalixBase::setFields( const KCal::Incidence* incidence )
 {
   // So far unhandled KCal::IncidenceBase fields:
-  // mPilotID, mSynctqStatus, mFloats
+  // mPilotID, mSyncStatus, mFloats
 
   setUid( incidence->uid() );
   setBody( incidence->description() );
@@ -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::tqcurrentDateTime();
+    creationDate = TQDateTime::currentDateTime();
     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::tqcurrentDateTime();
+    modified = TQDateTime::currentDateTime();
   setLastModified( modified );
   if ( modified < creationDate ) {
     // It's not possible that the modification date is earlier than creation
@@ -231,20 +231,20 @@ unsigned long ScalixBase::pilotSyncId() const
   return mPilotSyncId;
 }
 
-void ScalixBase::setPilotSynctqStatus( int status )
+void ScalixBase::setPilotSyncStatus( int status )
 {
-  mHasPilotSynctqStatus = true;
-  mPilotSynctqStatus = status;
+  mHasPilotSyncStatus = true;
+  mPilotSyncStatus = status;
 }
 
-bool ScalixBase::hasPilotSynctqStatus() const
+bool ScalixBase::hasPilotSyncStatus() const
 {
-  return mHasPilotSynctqStatus;
+  return mHasPilotSyncStatus;
 }
 
-int ScalixBase::pilotSynctqStatus() const
+int ScalixBase::pilotSyncStatus() const
 {
-  return mPilotSynctqStatus;
+  return mPilotSyncStatus;
 }
 
 bool ScalixBase::loadEmailAttribute( TQDomElement& element, Email& email )
@@ -300,7 +300,7 @@ bool ScalixBase::loadAttribute( TQDomElement& element )
   else if ( tagName == "pilot-sync-id" )
     setPilotSyncId( element.text().toULong() );
   else if ( tagName == "pilot-sync-status" )
-    setPilotSynctqStatus( element.text().toInt() );
+    setPilotSyncStatus( element.text().toInt() );
   else
     return false;
 
@@ -320,8 +320,8 @@ bool ScalixBase::saveAttributes( TQDomElement& element ) const
   writeString( element, "sensitivity", sensitivityToString( sensitivity() ) );
   if ( hasPilotSyncId() )
     writeString( element, "pilot-sync-id", TQString::number( pilotSyncId() ) );
-  if ( hasPilotSynctqStatus() )
-    writeString( element, "pilot-sync-status", TQString::number( pilotSynctqStatus() ) );
+  if ( hasPilotSyncStatus() )
+    writeString( element, "pilot-sync-status", TQString::number( pilotSyncStatus() ) );
   return true;
 }
 
diff --git a/kresources/scalix/shared/scalixbase.h b/kresources/scalix/shared/scalixbase.h
index b837ab03e..7bff80a4b 100644
--- a/kresources/scalix/shared/scalixbase.h
+++ b/kresources/scalix/shared/scalixbase.h
@@ -93,9 +93,9 @@ public:
   virtual bool hasPilotSyncId() const;
   virtual unsigned long pilotSyncId() const;
 
-  virtual void setPilotSynctqStatus( int status );
-  virtual bool hasPilotSynctqStatus() const;
-  virtual int pilotSynctqStatus() const;
+  virtual void setPilotSyncStatus( int status );
+  virtual bool hasPilotSyncStatus() const;
+  virtual int pilotSyncStatus() const;
 
   // String - Date conversion methods
   static TQString dateTimeToString( const TQDateTime& time );
@@ -166,9 +166,9 @@ protected:
   TQString mTimeZoneId;
 
   // KPilot synchronization stuff
-  bool mHasPilotSyncId,  mHasPilotSynctqStatus;
+  bool mHasPilotSyncId,  mHasPilotSyncStatus;
   unsigned long mPilotSyncId;
-  int mPilotSynctqStatus;
+  int mPilotSyncStatus;
 };
 
 }
diff --git a/kresources/slox/kabcresourceslox.cpp b/kresources/slox/kabcresourceslox.cpp
index f45108b42..6412de4a0 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::tqcurrentDateTime() );
+  mPrefs->setLastSync( TQDateTime::currentDateTime() );
 
   return true;
 }
@@ -255,7 +255,7 @@ void ResourceSlox::slotResult( KIO::Job *job )
         Addressee a;
         a.setUid( uid );
 
-        mWebdavHandler.clearSloxAttributetqStatus();
+        mWebdavHandler.clearSloxAttributeStatus();
 
         TQDomNode n;
         for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
diff --git a/kresources/slox/kabcresourcesloxconfig.cpp b/kresources/slox/kabcresourcesloxconfig.cpp
index d9e32a556..0ae1f431f 100644
--- a/kresources/slox/kabcresourcesloxconfig.cpp
+++ b/kresources/slox/kabcresourcesloxconfig.cpp
@@ -35,7 +35,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KABC;
 
diff --git a/kresources/slox/kcalresourceslox.cpp b/kresources/slox/kcalresourceslox.cpp
index a47c64b6f..14f3bab62 100644
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@@ -177,7 +177,7 @@ bool KCalResourceSlox::doLoad()
 
   TQString p = KURL( mPrefs->url() ).protocol();
   if ( p != "http" && p != "https" && p != "webdav" && p != "webdavs" ) {
-    TQString err = i18n("Non-http protocol: '%1'").tqarg( p );
+    TQString err = i18n("Non-http protocol: '%1'").arg( p );
     kdDebug() << "KCalResourceSlox::load(): " << err << endl;
     loadError( err );
     return false;
@@ -237,7 +237,7 @@ void KCalResourceSlox::requestEvents()
            TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
            TQT_SLOT( cancelLoadEvents() ) );
 
-  mPrefs->setLastEventSync( TQDateTime::tqcurrentDateTime() );
+  mPrefs->setLastEventSync( TQDateTime::currentDateTime() );
 }
 
 void KCalResourceSlox::requestTodos()
@@ -282,7 +282,7 @@ void KCalResourceSlox::requestTodos()
            TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
            TQT_SLOT( cancelLoadTodos() ) );
 
-  mPrefs->setLastTodoSync( TQDateTime::tqcurrentDateTime() );
+  mPrefs->setLastTodoSync( TQDateTime::currentDateTime() );
 }
 
 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->setqStatus( Attendee::Accepted );
+          a->seStatus( Attendee::Accepted );
         } else if ( status == "decline" ) {
-          a->setqStatus( Attendee::Declined );
+          a->seStatus( Attendee::Declined );
         } else {
-          a->setqStatus( Attendee::NeedsAction );
+          a->seStatus( Attendee::NeedsAction );
         }
       }
     } else {
@@ -953,7 +953,7 @@ void KCalResourceSlox::slotLoadTodosResult( KIO::Job *job )
 
         todo->setCustomProperty( "SLOX", "ID", item.sloxId );
 
-        mWebdavHandler.clearSloxAttributetqStatus();
+        mWebdavHandler.clearSloxAttributeStatus();
 
         TQDomNode n;
         for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
@@ -1032,7 +1032,7 @@ void KCalResourceSlox::slotLoadEventsResult( KIO::Job *job )
 
         bool doesRecur = false;
 
-        mWebdavHandler.clearSloxAttributetqStatus();
+        mWebdavHandler.clearSloxAttributeStatus();
 
         for( n = item.domNode.firstChild(); !n.isNull(); n = n.nextSibling() ) {
           TQDomElement e = n.toElement();
diff --git a/kresources/slox/kcalresourcesloxconfig.cpp b/kresources/slox/kcalresourcesloxconfig.cpp
index e09cf85c1..9038d4f16 100644
--- a/kresources/slox/kcalresourcesloxconfig.cpp
+++ b/kresources/slox/kcalresourcesloxconfig.cpp
@@ -21,7 +21,7 @@
 #include <typeinfo>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
diff --git a/kresources/slox/sloxbase.h b/kresources/slox/sloxbase.h
index 6f291c8f6..8e9309c9d 100644
--- a/kresources/slox/sloxbase.h
+++ b/kresources/slox/sloxbase.h
@@ -35,7 +35,7 @@ class KDE_EXPORT SloxBase {
       FolderId,
       LastSync,
       ObjectType,
-      ObjectqStatus,
+      ObjecStatus,
       CreatedBy,
       Categories,
       IncidenceTitle, // incidence fields
diff --git a/kresources/slox/webdavhandler.cpp b/kresources/slox/webdavhandler.cpp
index cb8acde02..6b2c733a4 100644
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@@ -129,9 +129,9 @@ TQValueList<SloxItem> WebdavHandler::getSloxItems( SloxBase *res, const TQDomDoc
           item.status = SloxItem::New;
       }
 
-      TQDomNode sloxtqStatus = prop.namedItem( res->fieldName( SloxBase::ObjectqStatus ) );
-      if ( !sloxtqStatus.isNull() ) {
-        TQDomElement sloxStatusElement = sloxtqStatus.toElement();
+      TQDomNode sloxStatus = prop.namedItem( res->fieldName( SloxBase::ObjecStatus ) );
+      if ( !sloxStatus.isNull() ) {
+        TQDomElement sloxStatusElement = sloxStatus.toElement();
         if ( sloxStatusElement.text() == "DELETE" ) {
           item.status = SloxItem::Delete;
         } else if ( sloxStatusElement.text() == "CREATE" ) {
@@ -276,7 +276,7 @@ void WebdavHandler::parseSloxAttribute( const TQDomElement &e )
   }
 }
 
-void WebdavHandler::clearSloxAttributetqStatus()
+void WebdavHandler::clearSloxAttributeStatus()
 {
   if ( mRes->resType() == "ox" )
     mWritable = true; // parseSloxAttribute() won't work for OX
diff --git a/kresources/slox/webdavhandler.h b/kresources/slox/webdavhandler.h
index 8dedf0a72..136be879e 100644
--- a/kresources/slox/webdavhandler.h
+++ b/kresources/slox/webdavhandler.h
@@ -37,14 +37,14 @@ class SloxBase;
 class KDE_EXPORT SloxItem
 {
   public:
-    enum tqStatus { Invalid, Delete, Create, New };
+    enum Status { Invalid, Delete, Create, New };
 
     SloxItem();
 
     TQDomNode domNode;
     TQString sloxId;
     TQString clientId;
-    tqStatus status;
+    Status status;
     TQString response;
     TQString responseDescription;
 };
@@ -78,7 +78,7 @@ class KDE_EXPORT WebdavHandler
 
     static TQValueList<SloxItem> getSloxItems( SloxBase *res, const TQDomDocument &doc );
 
-    void clearSloxAttributetqStatus();
+    void clearSloxAttributeStatus();
     void parseSloxAttribute( const TQDomElement & );
     void setSloxAttributes( KCal::Incidence * );
     void setSloxAttributes( KABC::Addressee & );
diff --git a/kresources/tvanytime/kcal_resourcetvanytime.cpp b/kresources/tvanytime/kcal_resourcetvanytime.cpp
index f819bba5a..4933768ab 100644
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@@ -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::tqcurrentDate().toString( "yyyyMMdd" );
+  TQString todaysDate = TQDate::currentDate().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,7 +328,7 @@ 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::tqcurrentDate() || ( entryDate > TQDate::tqcurrentDate().addDays( prefs()->days() - 1 ) ) )
+      if ( entryDate < TQDate::currentDate() || ( entryDate > TQDate::currentDate().addDays( prefs()->days() - 1 ) ) )
         continue;
 
       if ( !dates.contains( re.cap( 1 ) ) )
diff --git a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
index 110a62f9e..c667f95c3 100644
--- a/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytimeconfig.cpp
@@ -21,7 +21,7 @@
 #include <typeinfo>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>