summaryrefslogtreecommitdiffstats
path: root/kresources/groupwise
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/groupwise')
-rw-r--r--kresources/groupwise/groupwisesettingswidget.cpp4
-rw-r--r--kresources/groupwise/groupwisesettingswidget.h2
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.cpp8
-rw-r--r--kresources/groupwise/kabc_resourcegroupwiseconfig.h2
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.cpp6
-rw-r--r--kresources/groupwise/kcal_resourcegroupwiseconfig.h2
-rw-r--r--kresources/groupwise/soap/groupwiseserver.cpp10
-rw-r--r--kresources/groupwise/soap/groupwiseserver.h2
-rw-r--r--kresources/groupwise/soap/gwjobs.cpp2
-rw-r--r--kresources/groupwise/soap/ksslsocket.cpp2
-rw-r--r--kresources/groupwise/soap/patches/utf8_entities.diff2
-rw-r--r--kresources/groupwise/soap/soapC.cpp108
-rw-r--r--kresources/groupwise/soap/soapStub.h12
-rw-r--r--kresources/groupwise/soap/stdsoap2.cpp10
-rw-r--r--kresources/groupwise/soap/stdsoap2.h6
15 files changed, 89 insertions, 89 deletions
diff --git a/kresources/groupwise/groupwisesettingswidget.cpp b/kresources/groupwise/groupwisesettingswidget.cpp
index 53f3b0957..60d047123 100644
--- a/kresources/groupwise/groupwisesettingswidget.cpp
+++ b/kresources/groupwise/groupwisesettingswidget.cpp
@@ -24,8 +24,8 @@
#include "groupwisesettingswidget.h"
-GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * tqparent )
-: GroupWiseSettingsWidgetBase( tqparent )
+GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent )
+: GroupWiseSettingsWidgetBase( parent )
{
connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ),
this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) );
diff --git a/kresources/groupwise/groupwisesettingswidget.h b/kresources/groupwise/groupwisesettingswidget.h
index 37027c64c..46c6ca6d9 100644
--- a/kresources/groupwise/groupwisesettingswidget.h
+++ b/kresources/groupwise/groupwisesettingswidget.h
@@ -33,7 +33,7 @@ class GroupWiseSettingsWidget : public GroupWiseSettingsWidgetBase
Q_OBJECT
TQ_OBJECT
public:
- GroupWiseSettingsWidget( TQWidget * tqparent );
+ GroupWiseSettingsWidget( TQWidget * parent );
TQMap<TQString, TQString> dirtySettings();
void reset();
protected slots:
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
index 220769077..42896bb01 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.cpp
@@ -39,8 +39,8 @@ using namespace KABC;
class AddressBookItem : public TQCheckListItem
{
public:
- AddressBookItem( KListView *tqparent, GroupWise::AddressBook ab )
- : TQCheckListItem( tqparent, "", CheckBox ),
+ AddressBookItem( KListView *parent, GroupWise::AddressBook ab )
+ : TQCheckListItem( parent, "", CheckBox ),
mId( ab.id )
{
setText( 0, ab.name );
@@ -56,8 +56,8 @@ class AddressBookItem : public TQCheckListItem
TQString mId;
};
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* tqparent, const char* name )
- : KRES::ConfigWidget( tqparent, name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* name )
+ : KRES::ConfigWidget( parent, name )
{
TQGridLayout *mainLayout = new TQGridLayout( this, 7, 2, 0, KDialog::spacingHint() );
diff --git a/kresources/groupwise/kabc_resourcegroupwiseconfig.h b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
index d120f3164..06278834e 100644
--- a/kresources/groupwise/kabc_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kabc_resourcegroupwiseconfig.h
@@ -42,7 +42,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
TQ_OBJECT
public:
- ResourceGroupwiseConfig( TQWidget* tqparent = 0, const char* name = 0 );
+ ResourceGroupwiseConfig( TQWidget* parent = 0, const char* name = 0 );
public slots:
void loadSettings( KRES::Resource* );
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
index e02cf2c52..78f049e85 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.cpp
@@ -41,8 +41,8 @@
using namespace KCal;
-ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* tqparent, const char* name )
- : KRES::ConfigWidget( tqparent, name )
+ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* name )
+ : KRES::ConfigWidget( parent, name )
{
resize( 245, 115 );
TQGridLayout *mainLayout = new TQGridLayout( this, 2, 2 );
@@ -123,7 +123,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings()
if ( s )
{
- KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(tqparent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
+ KDialogBase * dialog = new KDialogBase( ::tqqt_cast<TQWidget*>(parent() ), "gwsettingswidget", true, i18n( "GroupWise Settings" ) );
// TQVBoxLayout * tqlayout = new TQVBoxLayout( dialog );
GroupWiseSettingsWidget * settingsWidget = new GroupWiseSettingsWidget( dialog );
dialog->setMainWidget( settingsWidget );
diff --git a/kresources/groupwise/kcal_resourcegroupwiseconfig.h b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
index 1687095c5..c27ac5dbb 100644
--- a/kresources/groupwise/kcal_resourcegroupwiseconfig.h
+++ b/kresources/groupwise/kcal_resourcegroupwiseconfig.h
@@ -44,7 +44,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget
Q_OBJECT
TQ_OBJECT
public:
- ResourceGroupwiseConfig( TQWidget *tqparent = 0, const char *name = 0 );
+ ResourceGroupwiseConfig( TQWidget *parent = 0, const char *name = 0 );
public slots:
virtual void loadSettings( KRES::Resource *resource );
diff --git a/kresources/groupwise/soap/groupwiseserver.cpp b/kresources/groupwise/soap/groupwiseserver.cpp
index 93a3f0a27..31a89a70a 100644
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@@ -264,8 +264,8 @@ size_t GroupwiseServer::gSoapReceiveCallback( struct soap *soap, char *s,
}
GroupwiseServer::GroupwiseServer( const TQString &url, const TQString &user,
- const TQString &password, TQObject *tqparent )
- : TQObject( tqparent, "GroupwiseServer" ),
+ const TQString &password, TQObject *parent )
+ : TQObject( parent, "GroupwiseServer" ),
mUrl( url ), mUser( user ), mPassword( password ),
mSSL( url.left(6)=="https:" ), m_sock( 0 ),
mError( 0 )
@@ -477,7 +477,7 @@ void GroupwiseServer::dumpFolderList()
{
mSoap->header->ngwt__session = mSession;
_ngwm__getFolderListRequest folderListReq;
- folderListReq.tqparent = "folders";
+ folderListReq.parent = "folders";
folderListReq.recurse = true;
_ngwm__getFolderListResponse folderListRes;
soap_call___ngw__getFolderListRequest( mSoap, mUrl.latin1(), 0,
@@ -589,7 +589,7 @@ void GroupwiseServer::dumpAppointment( ngwt__Appointment *a )
void GroupwiseServer::dumpFolder( ngwt__Folder *f )
{
dumpItem( f );
- kdDebug() << " PARENT: " << f->tqparent.c_str() << endl;
+ kdDebug() << " PARENT: " << f->parent.c_str() << endl;
if ( f->description ) {
kdDebug() << " DESCRIPTION: " << f->description->c_str() << endl;
}
@@ -763,7 +763,7 @@ std::string GroupwiseServer::getFullIDFor( const TQString & gwRecordIDFromIcal )
std::string calendarFolderID;
_ngwm__getFolderListRequest folderListReq;
_ngwm__getFolderListResponse folderListRes;
- folderListReq.tqparent = "folders";
+ folderListReq.parent = "folders";
folderListReq.view = soap_new_std__string( mSoap, -1 );
folderListReq.view->append( "id type" );
folderListReq.recurse = false;
diff --git a/kresources/groupwise/soap/groupwiseserver.h b/kresources/groupwise/soap/groupwiseserver.h
index 373c94e40..2c537661a 100644
--- a/kresources/groupwise/soap/groupwiseserver.h
+++ b/kresources/groupwise/soap/groupwiseserver.h
@@ -100,7 +100,7 @@ class GroupwiseServer : public TQObject
bool checkResponse( int result, ngwt__tqStatus *status );
enum RetractCause { DueToResend, Other };
GroupwiseServer( const TQString &url, const TQString &user,
- const TQString &password, TQObject *tqparent );
+ const TQString &password, TQObject *parent );
~GroupwiseServer();
int error() const { return mError; }
diff --git a/kresources/groupwise/soap/gwjobs.cpp b/kresources/groupwise/soap/gwjobs.cpp
index 6f5918597..4610b0e2a 100644
--- a/kresources/groupwise/soap/gwjobs.cpp
+++ b/kresources/groupwise/soap/gwjobs.cpp
@@ -351,7 +351,7 @@ void ReadCalendarJob::run()
mSoap->header->ngwt__session = mSession;
_ngwm__getFolderListRequest folderListReq;
- folderListReq.tqparent = "folders";
+ folderListReq.parent = "folders";
folderListReq.view = 0;
folderListReq.recurse = true;
_ngwm__getFolderListResponse folderListRes;
diff --git a/kresources/groupwise/soap/ksslsocket.cpp b/kresources/groupwise/soap/ksslsocket.cpp
index 30e8bb643..c6fe2a4f6 100644
--- a/kresources/groupwise/soap/ksslsocket.cpp
+++ b/kresources/groupwise/soap/ksslsocket.cpp
@@ -279,7 +279,7 @@ int KSSLSocket::verifyCertificate()
setMetaData("ssl_action", "accept");
}
- // Since we're the tqparent, we need to teach the child.
+ // Since we're the parent, we need to teach the child.
setMetaData("ssl_parent_ip", ourIp );
setMetaData("ssl_parent_cert", pc.toString());
diff --git a/kresources/groupwise/soap/patches/utf8_entities.diff b/kresources/groupwise/soap/patches/utf8_entities.diff
index 85d7283a2..b8600a9dd 100644
--- a/kresources/groupwise/soap/patches/utf8_entities.diff
+++ b/kresources/groupwise/soap/patches/utf8_entities.diff
@@ -3,7 +3,7 @@
@@ -6470,7 +6470,11 @@
}
#endif
- if (c & tqmask)
+ if (c & mask)
- { if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
+ {
+ char S[2];
diff --git a/kresources/groupwise/soap/soapC.cpp b/kresources/groupwise/soap/soapC.cpp
index b446bc4ba..13dd8b841 100644
--- a/kresources/groupwise/soap/soapC.cpp
+++ b/kresources/groupwise/soap/soapC.cpp
@@ -32680,8 +32680,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy__ngwm__getFolderListResponse(struct soap *s
void _ngwm__getFolderListRequest::soap_serialize(struct soap *soap) const
{
(void)soap; /* appease -Wall -Werror */
- soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->tqparent, SOAP_TYPE_ngwt__uid);
- soap_serialize_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->tqparent);
+ soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->parent, SOAP_TYPE_ngwt__uid);
+ soap_serialize_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->parent);
soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->view, SOAP_TYPE_PointerTongwt__View);
soap_serialize_PointerTongwt__View(soap, &((_ngwm__getFolderListRequest*)this)->view);
soap_embedded(soap, &((_ngwm__getFolderListRequest*)this)->recurse, SOAP_TYPE_bool);
@@ -32693,7 +32693,7 @@ void _ngwm__getFolderListRequest::soap_serialize(struct soap *soap) const
void _ngwm__getFolderListRequest::soap_default(struct soap *soap)
{
this->soap = soap;
- soap_default_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->tqparent);
+ soap_default_ngwt__uid(soap, &((_ngwm__getFolderListRequest*)this)->parent);
((_ngwm__getFolderListRequest*)this)->view = NULL;
soap_default_bool(soap, &((_ngwm__getFolderListRequest*)this)->recurse);
((_ngwm__getFolderListRequest*)this)->imap = (bool)0;
@@ -32717,7 +32717,7 @@ int _ngwm__getFolderListRequest::soap_out(struct soap *soap, const char *tag, in
SOAP_FMAC3 int SOAP_FMAC4 soap_out__ngwm__getFolderListRequest(struct soap *soap, const char *tag, int id, const _ngwm__getFolderListRequest *a, const char *type)
{
soap_element_begin_out(soap, tag, soap_embedded_id(soap, id, a, SOAP_TYPE__ngwm__getFolderListRequest), type);
- soap_out_ngwt__uid(soap, "ngwm:tqparent", -1, &(((_ngwm__getFolderListRequest*)a)->tqparent), "");
+ soap_out_ngwt__uid(soap, "ngwm:parent", -1, &(((_ngwm__getFolderListRequest*)a)->parent), "");
soap_out_PointerTongwt__View(soap, "ngwm:view", -1, &(((_ngwm__getFolderListRequest*)a)->view), "");
soap_out_bool(soap, "ngwm:recurse", -1, &(((_ngwm__getFolderListRequest*)a)->recurse), "");
soap_out_bool(soap, "ngwm:imap", -1, &(((_ngwm__getFolderListRequest*)a)->imap), "");
@@ -32758,14 +32758,14 @@ SOAP_FMAC3 _ngwm__getFolderListRequest * SOAP_FMAC4 soap_in__ngwm__getFolderList
return (_ngwm__getFolderListRequest *)a->soap_in(soap, tag, type);
}
}
- short soap_flag_tqparent1 = 1, soap_flag_view1 = 1, soap_flag_recurse1 = 1, soap_flag_imap1 = 1, soap_flag_nntp1 = 1;
+ short soap_flag_parent1 = 1, soap_flag_view1 = 1, soap_flag_recurse1 = 1, soap_flag_imap1 = 1, soap_flag_nntp1 = 1;
if (soap->body && !*soap->href)
{
for (;;)
{ soap->error = SOAP_TAG_MISMATCH;
- if (soap_flag_tqparent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
- if (soap_in_ngwt__uid(soap, "ngwm:tqparent", &(((_ngwm__getFolderListRequest*)a)->tqparent), "ngwt:uid"))
- { soap_flag_tqparent1 = 0;
+ if (soap_flag_parent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+ if (soap_in_ngwt__uid(soap, "ngwm:parent", &(((_ngwm__getFolderListRequest*)a)->parent), "ngwt:uid"))
+ { soap_flag_parent1 = 0;
continue;
}
if (soap_flag_view1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -32796,7 +32796,7 @@ SOAP_FMAC3 _ngwm__getFolderListRequest * SOAP_FMAC4 soap_in__ngwm__getFolderList
if (soap->error)
return NULL;
}
- if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent1 || soap_flag_recurse1))
+ if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent1 || soap_flag_recurse1))
{ soap->error = SOAP_OCCURS;
return NULL;
}
@@ -42744,8 +42744,8 @@ void ngwt__SystemFolder::soap_serialize(struct soap *soap) const
soap_serialize_PointerTongwt__FolderACL(soap, &((ngwt__SystemFolder*)this)->acl);
soap_embedded(soap, &((ngwt__SystemFolder*)this)->isSharedByMe, SOAP_TYPE_PointerTobool);
soap_serialize_PointerTobool(soap, &((ngwt__SystemFolder*)this)->isSharedByMe);
- soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
- soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+ soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -42780,7 +42780,7 @@ void ngwt__SystemFolder::soap_default(struct soap *soap)
((ngwt__SystemFolder*)this)->folderType = NULL;
((ngwt__SystemFolder*)this)->acl = NULL;
((ngwt__SystemFolder*)this)->isSharedByMe = NULL;
- soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
((ngwt__Folder*)this)->description = NULL;
((ngwt__Folder*)this)->count = NULL;
((ngwt__Folder*)this)->hasUnread = NULL;
@@ -42818,7 +42818,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SystemFolder(struct soap *soap, const c
soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
/* transient soap skipped */
- soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+ soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -42865,7 +42865,7 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
return (ngwt__SystemFolder *)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_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_isSystemFolder1 = 1, soap_flag_folderType1 = 1, soap_flag_acl1 = 1, soap_flag_isSharedByMe1 = 1;
+ short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_isSystemFolder1 = 1, soap_flag_folderType1 = 1, soap_flag_acl1 = 1, soap_flag_isSharedByMe1 = 1;
if (soap->body && !*soap->href)
{
for (;;)
@@ -42896,9 +42896,9 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
continue;
}
/* transient soap skipped */
- if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
- if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
- { soap_flag_tqparent2 = 0;
+ if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+ if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+ { soap_flag_parent2 = 0;
continue;
}
if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -42963,7 +42963,7 @@ SOAP_FMAC3 ngwt__SystemFolder * SOAP_FMAC4 soap_in_ngwt__SystemFolder(struct soa
if (soap->error)
return NULL;
}
- if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
+ if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
{ soap->error = SOAP_OCCURS;
return NULL;
}
@@ -44502,8 +44502,8 @@ void ngwt__SharedFolder::soap_serialize(struct soap *soap) const
soap_serialize_PointerTobool(soap, &((ngwt__SharedFolder*)this)->isSharedByMe);
soap_embedded(soap, &((ngwt__SharedFolder*)this)->isSharedToMe, SOAP_TYPE_PointerTobool);
soap_serialize_PointerTobool(soap, &((ngwt__SharedFolder*)this)->isSharedToMe);
- soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
- soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+ soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -44539,7 +44539,7 @@ void ngwt__SharedFolder::soap_default(struct soap *soap)
((ngwt__SharedFolder*)this)->owner = NULL;
((ngwt__SharedFolder*)this)->isSharedByMe = NULL;
((ngwt__SharedFolder*)this)->isSharedToMe = NULL;
- soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
((ngwt__Folder*)this)->description = NULL;
((ngwt__Folder*)this)->count = NULL;
((ngwt__Folder*)this)->hasUnread = NULL;
@@ -44577,7 +44577,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__SharedFolder(struct soap *soap, const c
soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
/* transient soap skipped */
- soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+ soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -44625,7 +44625,7 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
return (ngwt__SharedFolder *)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_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_rights1 = 1, soap_flag_acl1 = 1, soap_flag_owner1 = 1, soap_flag_isSharedByMe1 = 1, soap_flag_isSharedToMe1 = 1;
+ short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_rights1 = 1, soap_flag_acl1 = 1, soap_flag_owner1 = 1, soap_flag_isSharedByMe1 = 1, soap_flag_isSharedToMe1 = 1;
if (soap->body && !*soap->href)
{
for (;;)
@@ -44656,9 +44656,9 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
continue;
}
/* transient soap skipped */
- if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
- if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
- { soap_flag_tqparent2 = 0;
+ if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+ if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+ { soap_flag_parent2 = 0;
continue;
}
if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -44728,7 +44728,7 @@ SOAP_FMAC3 ngwt__SharedFolder * SOAP_FMAC4 soap_in_ngwt__SharedFolder(struct soa
if (soap->error)
return NULL;
}
- if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
+ if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
{ soap->error = SOAP_OCCURS;
return NULL;
}
@@ -48314,8 +48314,8 @@ void ngwt__QueryFolder::soap_serialize(struct soap *soap) const
soap_serialize_PointerTongwt__FolderType(soap, &((ngwt__QueryFolder*)this)->folderType);
soap_embedded(soap, &((ngwt__QueryFolder*)this)->query, SOAP_TYPE_PointerTongwt__Query);
soap_serialize_PointerTongwt__Query(soap, &((ngwt__QueryFolder*)this)->query);
- soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
- soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+ soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -48348,7 +48348,7 @@ void ngwt__QueryFolder::soap_default(struct soap *soap)
this->soap = soap;
((ngwt__QueryFolder*)this)->folderType = NULL;
((ngwt__QueryFolder*)this)->query = NULL;
- soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
((ngwt__Folder*)this)->description = NULL;
((ngwt__Folder*)this)->count = NULL;
((ngwt__Folder*)this)->hasUnread = NULL;
@@ -48386,7 +48386,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__QueryFolder(struct soap *soap, const ch
soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
/* transient soap skipped */
- soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+ soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -48431,7 +48431,7 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
return (ngwt__QueryFolder *)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_tqparent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_folderType1 = 1, soap_flag_query1 = 1;
+ short soap_flag_id3 = 1, soap_flag_name3 = 1, soap_flag_version3 = 1, soap_flag_modified3 = 1, soap_flag_changes3 = 1, soap_flag_parent2 = 1, soap_flag_description2 = 1, soap_flag_count2 = 1, soap_flag_hasUnread2 = 1, soap_flag_unreadCount2 = 1, soap_flag_sequence2 = 1, soap_flag_settings2 = 1, soap_flag_calendarAttribute2 = 1, soap_flag_folderType1 = 1, soap_flag_query1 = 1;
if (soap->body && !*soap->href)
{
for (;;)
@@ -48462,9 +48462,9 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
continue;
}
/* transient soap skipped */
- if (soap_flag_tqparent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
- if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
- { soap_flag_tqparent2 = 0;
+ if (soap_flag_parent2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+ if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+ { soap_flag_parent2 = 0;
continue;
}
if (soap_flag_description2 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -48519,7 +48519,7 @@ SOAP_FMAC3 ngwt__QueryFolder * SOAP_FMAC4 soap_in_ngwt__QueryFolder(struct soap
if (soap->error)
return NULL;
}
- if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent2))
+ if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent2))
{ soap->error = SOAP_OCCURS;
return NULL;
}
@@ -58496,8 +58496,8 @@ SOAP_FMAC5 void SOAP_FMAC6 soap_copy_ngwt__FolderACL(struct soap *soap, int st,
void ngwt__Folder::soap_serialize(struct soap *soap) const
{
(void)soap; /* appease -Wall -Werror */
- soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
- soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+ soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -58528,7 +58528,7 @@ void ngwt__Folder::soap_serialize(struct soap *soap) const
void ngwt__Folder::soap_default(struct soap *soap)
{
this->soap = soap;
- soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
((ngwt__Folder*)this)->description = NULL;
((ngwt__Folder*)this)->count = NULL;
((ngwt__Folder*)this)->hasUnread = NULL;
@@ -58566,7 +58566,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__Folder(struct soap *soap, const char *t
soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
/* transient soap skipped */
- soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+ soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -58609,7 +58609,7 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
return (ngwt__Folder *)a->soap_in(soap, tag, type);
}
}
- short soap_flag_id2 = 1, soap_flag_name2 = 1, soap_flag_version2 = 1, soap_flag_modified2 = 1, soap_flag_changes2 = 1, soap_flag_tqparent1 = 1, soap_flag_description1 = 1, soap_flag_count1 = 1, soap_flag_hasUnread1 = 1, soap_flag_unreadCount1 = 1, soap_flag_sequence1 = 1, soap_flag_settings1 = 1, soap_flag_calendarAttribute1 = 1;
+ short soap_flag_id2 = 1, soap_flag_name2 = 1, soap_flag_version2 = 1, soap_flag_modified2 = 1, soap_flag_changes2 = 1, soap_flag_parent1 = 1, soap_flag_description1 = 1, soap_flag_count1 = 1, soap_flag_hasUnread1 = 1, soap_flag_unreadCount1 = 1, soap_flag_sequence1 = 1, soap_flag_settings1 = 1, soap_flag_calendarAttribute1 = 1;
if (soap->body && !*soap->href)
{
for (;;)
@@ -58640,9 +58640,9 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
continue;
}
/* transient soap skipped */
- if (soap_flag_tqparent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
- if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
- { soap_flag_tqparent1 = 0;
+ if (soap_flag_parent1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+ if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+ { soap_flag_parent1 = 0;
continue;
}
if (soap_flag_description1 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -58687,7 +58687,7 @@ SOAP_FMAC3 ngwt__Folder * SOAP_FMAC4 soap_in_ngwt__Folder(struct soap *soap, con
if (soap->error)
return NULL;
}
- if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent1))
+ if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent1))
{ soap->error = SOAP_OCCURS;
return NULL;
}
@@ -63087,8 +63087,8 @@ void ngwt__ContactFolder::soap_serialize(struct soap *soap) const
soap_serialize_PointerTongwt__FolderACL(soap, &((ngwt__SystemFolder*)this)->acl);
soap_embedded(soap, &((ngwt__SystemFolder*)this)->isSharedByMe, SOAP_TYPE_PointerTobool);
soap_serialize_PointerTobool(soap, &((ngwt__SystemFolder*)this)->isSharedByMe);
- soap_embedded(soap, &((ngwt__Folder*)this)->tqparent, SOAP_TYPE_ngwt__uid);
- soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_embedded(soap, &((ngwt__Folder*)this)->parent, SOAP_TYPE_ngwt__uid);
+ soap_serialize_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
soap_embedded(soap, &((ngwt__Folder*)this)->description, SOAP_TYPE_PointerTostd__string);
soap_serialize_PointerTostd__string(soap, &((ngwt__Folder*)this)->description);
soap_embedded(soap, &((ngwt__Folder*)this)->count, SOAP_TYPE_PointerToint);
@@ -63124,7 +63124,7 @@ void ngwt__ContactFolder::soap_default(struct soap *soap)
((ngwt__SystemFolder*)this)->folderType = NULL;
((ngwt__SystemFolder*)this)->acl = NULL;
((ngwt__SystemFolder*)this)->isSharedByMe = NULL;
- soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->tqparent);
+ soap_default_ngwt__uid(soap, &((ngwt__Folder*)this)->parent);
((ngwt__Folder*)this)->description = NULL;
((ngwt__Folder*)this)->count = NULL;
((ngwt__Folder*)this)->hasUnread = NULL;
@@ -63162,7 +63162,7 @@ SOAP_FMAC3 int SOAP_FMAC4 soap_out_ngwt__ContactFolder(struct soap *soap, const
soap_out_string(soap, "ngwt:modified", -1, &(((ngwt__Item*)a)->modified), "");
soap_out_PointerTongwt__ItemChanges(soap, "ngwt:changes", -1, &(((ngwt__Item*)a)->changes), "");
/* transient soap skipped */
- soap_out_ngwt__uid(soap, "ngwt:tqparent", -1, &(((ngwt__Folder*)a)->tqparent), "");
+ soap_out_ngwt__uid(soap, "ngwt:parent", -1, &(((ngwt__Folder*)a)->parent), "");
soap_out_PointerTostd__string(soap, "ngwt:description", -1, &(((ngwt__Folder*)a)->description), "");
soap_out_PointerToint(soap, "ngwt:count", -1, &(((ngwt__Folder*)a)->count), "");
soap_out_PointerTobool(soap, "ngwt:hasUnread", -1, &(((ngwt__Folder*)a)->hasUnread), "");
@@ -63210,7 +63210,7 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
return (ngwt__ContactFolder *)a->soap_in(soap, tag, type);
}
}
- short soap_flag_id4 = 1, soap_flag_name4 = 1, soap_flag_version4 = 1, soap_flag_modified4 = 1, soap_flag_changes4 = 1, soap_flag_tqparent3 = 1, soap_flag_description3 = 1, soap_flag_count3 = 1, soap_flag_hasUnread3 = 1, soap_flag_unreadCount3 = 1, soap_flag_sequence3 = 1, soap_flag_settings3 = 1, soap_flag_calendarAttribute3 = 1, soap_flag_isSystemFolder2 = 1, soap_flag_folderType2 = 1, soap_flag_acl2 = 1, soap_flag_isSharedByMe2 = 1, soap_flag_addressBook1 = 1;
+ short soap_flag_id4 = 1, soap_flag_name4 = 1, soap_flag_version4 = 1, soap_flag_modified4 = 1, soap_flag_changes4 = 1, soap_flag_parent3 = 1, soap_flag_description3 = 1, soap_flag_count3 = 1, soap_flag_hasUnread3 = 1, soap_flag_unreadCount3 = 1, soap_flag_sequence3 = 1, soap_flag_settings3 = 1, soap_flag_calendarAttribute3 = 1, soap_flag_isSystemFolder2 = 1, soap_flag_folderType2 = 1, soap_flag_acl2 = 1, soap_flag_isSharedByMe2 = 1, soap_flag_addressBook1 = 1;
if (soap->body && !*soap->href)
{
for (;;)
@@ -63241,9 +63241,9 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
continue;
}
/* transient soap skipped */
- if (soap_flag_tqparent3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
- if (soap_in_ngwt__uid(soap, "ngwt:tqparent", &(((ngwt__Folder*)a)->tqparent), "ngwt:uid"))
- { soap_flag_tqparent3 = 0;
+ if (soap_flag_parent3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
+ if (soap_in_ngwt__uid(soap, "ngwt:parent", &(((ngwt__Folder*)a)->parent), "ngwt:uid"))
+ { soap_flag_parent3 = 0;
continue;
}
if (soap_flag_description3 && (soap->error == SOAP_TAG_MISMATCH || soap->error == SOAP_NO_TAG))
@@ -63313,7 +63313,7 @@ SOAP_FMAC3 ngwt__ContactFolder * SOAP_FMAC4 soap_in_ngwt__ContactFolder(struct s
if (soap->error)
return NULL;
}
- if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_tqparent3))
+ if ((soap->mode & SOAP_XML_STRICT) && (soap_flag_parent3))
{ soap->error = SOAP_OCCURS;
return NULL;
}
diff --git a/kresources/groupwise/soap/soapStub.h b/kresources/groupwise/soap/soapStub.h
index 829237fda..46461d08e 100644
--- a/kresources/groupwise/soap/soapStub.h
+++ b/kresources/groupwise/soap/soapStub.h
@@ -18,25 +18,25 @@
#ifndef SOAP_TYPE_ngwt__ItemSourceList
#define SOAP_TYPE_ngwt__ItemSourceList (336)
-/* Bitqmask ngwt:ItemSourceList */
+/* Bimask ngwt:ItemSourceList */
enum ngwt__ItemSourceList {received = 1, sent = 2, draft = 4, personal = 8};
#endif
#ifndef SOAP_TYPE_ngwt__MessageTypeList
#define SOAP_TYPE_ngwt__MessageTypeList (337)
-/* Bitqmask ngwt:MessageTypeList */
+/* Bimask ngwt:MessageTypeList */
enum ngwt__MessageTypeList {Appointment = 1, CalendarItem = 2, DocumentReference = 4, Mail = 8, Note = 16, PhoneMessage = 32, Task = 64};
#endif
#ifndef SOAP_TYPE_ngwe__FieldList
#define SOAP_TYPE_ngwe__FieldList (339)
-/* Bitqmask ngwe:FieldList */
+/* 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};
#endif
#ifndef SOAP_TYPE_ngwe__ItemTypeList
#define SOAP_TYPE_ngwe__ItemTypeList (340)
-/* Bitqmask ngwe:ItemTypeList */
+/* Bimask ngwe:ItemTypeList */
enum ngwe__ItemTypeList {AddressBookItem = 1, Appointment_ = 2, CalendarItem_ = 4, Contact_ = 8, Group = 16, Mail_ = 32, Note_ = 64, Organization_ = 128, PhoneMessage_ = 256, Resource = 512, Task_ = 1024, DocumentRef = 2048};
#endif
@@ -3541,7 +3541,7 @@ public:
class SOAP_CMAC _ngwm__getFolderListRequest
{
public:
- std::string tqparent; /* required element of type ngwt:uid */
+ std::string parent; /* required element of type ngwt:uid */
public:
std::string *view; /* optional element of type ngwt:View */
bool recurse; /* required element of type xsd:boolean */
@@ -6545,7 +6545,7 @@ public:
class SOAP_CMAC ngwt__Folder : public ngwt__Item
{
public:
- std::string tqparent; /* required element of type ngwt:uid */
+ std::string parent; /* required element of type ngwt:uid */
public:
std::string *description; /* optional element of type xsd:string */
int *count; /* optional element of type xsd:int */
diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index dd43419b0..dd2ac0103 100644
--- a/kresources/groupwise/soap/stdsoap2.cpp
+++ b/kresources/groupwise/soap/stdsoap2.cpp
@@ -3316,7 +3316,7 @@ again:
{ short v;
unsigned int k = soap->omode; /* make sure we only parse HTTP */
size_t n = soap->count; /* save the content length */
- soap->omode &= ~SOAP_ENC; /* tqmask IO and ENC */
+ soap->omode &= ~SOAP_ENC; /* mask IO and ENC */
soap->omode |= SOAP_IO_BUFFER;
soap_begin_send(soap);
DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connecting to proxy server\n"));
@@ -3337,7 +3337,7 @@ again:
return SOAP_INVALID_SOCKET;
soap->omode = k;
k = soap->imode;
- soap->imode &= ~SOAP_ENC; /* tqmask IO and ENC */
+ soap->imode &= ~SOAP_ENC; /* mask IO and ENC */
v = soap->version; /* preserve */
if (soap_begin_recv(soap))
return SOAP_INVALID_SOCKET;
@@ -6957,7 +6957,7 @@ SOAP_FMAC2
soap_string_out(struct soap *soap, const char *s, int flag)
{ register const char *t;
register soap_wchar c;
- register soap_wchar tqmask = 0xFFFFFF80UL;
+ register soap_wchar mask = 0xFFFFFF80UL;
#ifdef WITH_DOM
if ((soap->mode & SOAP_XML_DOM) && soap->dom)
{ soap->dom->data = soap_strdup(soap, s); /* check EOM */
@@ -6965,7 +6965,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
}
#endif
if (soap->mode & SOAP_C_UTFSTRING)
- tqmask = 0;
+ mask = 0;
t = s;
while ((c = *t++))
{ switch (c)
@@ -7028,7 +7028,7 @@ soap_string_out(struct soap *soap, const char *s, int flag)
}
#endif
#endif
- if (c & tqmask)
+ if (c & mask)
{ if (soap_send_raw(soap, s, t - s - 1) || soap_pututf8(soap, (unsigned char)c))
return soap->error;
s = t;
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index 603d4def9..7dee722a1 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -896,7 +896,7 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
typedef soap_int32 soap_mode;
-#define SOAP_IO 0x00000003 /* IO tqmask */
+#define SOAP_IO 0x00000003 /* IO mask */
#define SOAP_IO_FLUSH 0x00000000 /* flush output immediately, no buffering */
#define SOAP_IO_BUFFER 0x00000001 /* buffer output in packets of size SOAP_BUFLEN */
#define SOAP_IO_STORE 0x00000002 /* store entire output to determine length for transport */
@@ -914,7 +914,7 @@ typedef soap_int32 soap_mode;
#define SOAP_ENC_ZLIB 0x00000400
#define SOAP_ENC_SSL 0x00000800
-#define SOAP_ENC 0x00000FFF /* IO and ENC tqmask */
+#define SOAP_ENC 0x00000FFF /* IO and ENC mask */
#define SOAP_XML_STRICT 0x00001000 /* strict validation */
#define SOAP_XML_CANONICAL 0x00002000 /* C14N canonical XML */
@@ -1236,7 +1236,7 @@ class soap_dom_iterator
#ifndef WITH_LEANER
struct soap_dom_element
{ struct soap_dom_element *next; /* next sibling */
- struct soap_dom_element *prnt; /* tqparent */
+ struct soap_dom_element *prnt; /* parent */
struct soap_dom_element *elts; /* first child element */
struct soap_dom_attribute *atts; /* first child attribute */
const char *nstr; /* namespace string */
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 14:56:29 +0000