diff options
Diffstat (limited to 'kopete/libkopete/kopetegroup.cpp')
| -rw-r--r-- | kopete/libkopete/kopetegroup.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/kopete/libkopete/kopetegroup.cpp b/kopete/libkopete/kopetegroup.cpp index 6206545a..ac221223 100644 --- a/kopete/libkopete/kopetegroup.cpp +++ b/kopete/libkopete/kopetegroup.cpp @@ -93,7 +93,7 @@ TQPtrList<MetaContact> Group::members() const // members is a *copy* of the meta contacts, so using first(), next() and remove() is fine. for( members.first(); members.current(); ) { - if ( members.current()->groups().contains( this ) ) + if ( members.current()->groups().tqcontains( this ) ) members.next(); else members.remove(); @@ -104,27 +104,27 @@ TQPtrList<MetaContact> Group::members() const const TQDomElement Group::toXML() { TQDomDocument group; - group.appendChild( group.createElement( TQString::fromLatin1( "kopete-group" ) ) ); - group.documentElement().setAttribute( TQString::fromLatin1( "groupId" ), TQString::number( groupId() ) ); + group.appendChild( group.createElement( TQString::tqfromLatin1( "kopete-group" ) ) ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "groupId" ), TQString::number( groupId() ) ); TQString type; switch ( d->type ) { case Temporary: - type = TQString::fromLatin1( "temporary" ); + type = TQString::tqfromLatin1( "temporary" ); break; case TopLevel: - type = TQString::fromLatin1( "top-level" ); + type = TQString::tqfromLatin1( "top-level" ); break; default: - type = TQString::fromLatin1( "standard" ); // == Normal + type = TQString::tqfromLatin1( "standard" ); // == Normal break; } - group.documentElement().setAttribute( TQString::fromLatin1( "type" ), type ); - group.documentElement().setAttribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( d->expanded ? "expanded" : "collapsed" ) ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "type" ), type ); + group.documentElement().setAttribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( d->expanded ? "expanded" : "collapsed" ) ); - TQDomElement displayName = group.createElement( TQString::fromLatin1( "display-name" ) ); + TQDomElement displayName = group.createElement( TQString::tqfromLatin1( "display-name" ) ); displayName.appendChild( group.createTextNode( d->displayName ) ); group.documentElement().appendChild( displayName ); @@ -143,7 +143,7 @@ const TQDomElement Group::toXML() bool Group::fromXML( const TQDomElement &data ) { - TQString strGroupId = data.attribute( TQString::fromLatin1( "groupId" ) ); + TQString strGroupId = data.attribute( TQString::tqfromLatin1( "groupId" ) ); if ( !strGroupId.isEmpty() ) { d->groupId = strGroupId.toUInt(); @@ -154,8 +154,8 @@ bool Group::fromXML( const TQDomElement &data ) // Don't overwrite type for Temporary and TopLevel groups if ( d->type != Temporary && d->type != TopLevel ) { - TQString type = data.attribute( TQString::fromLatin1( "type" ), TQString::fromLatin1( "standard" ) ); - if ( type == TQString::fromLatin1( "temporary" ) ) + TQString type = data.attribute( TQString::tqfromLatin1( "type" ), TQString::tqfromLatin1( "standard" ) ); + if ( type == TQString::tqfromLatin1( "temporary" ) ) { if ( d->type != Temporary ) { @@ -163,7 +163,7 @@ bool Group::fromXML( const TQDomElement &data ) return false; } } - else if ( type == TQString::fromLatin1( "top-level" ) ) + else if ( type == TQString::tqfromLatin1( "top-level" ) ) { if ( d->type != TopLevel ) { @@ -177,20 +177,20 @@ bool Group::fromXML( const TQDomElement &data ) } } - TQString view = data.attribute( TQString::fromLatin1( "view" ), TQString::fromLatin1( "expanded" ) ); - d->expanded = ( view != TQString::fromLatin1( "collapsed" ) ); + TQString view = data.attribute( TQString::tqfromLatin1( "view" ), TQString::tqfromLatin1( "expanded" ) ); + d->expanded = ( view != TQString::tqfromLatin1( "collapsed" ) ); TQDomNode groupData = data.firstChild(); while ( !groupData.isNull() ) { TQDomElement groupElement = groupData.toElement(); - if ( groupElement.tagName() == TQString::fromLatin1( "display-name" ) ) + if ( groupElement.tagName() == TQString::tqfromLatin1( "display-name" ) ) { // Don't set display name for temporary or top-level items if ( d->type == Normal ) d->displayName = groupElement.text(); } - else if( groupElement.tagName() == TQString::fromLatin1( "custom-notifications" ) ) + else if( groupElement.tagName() == TQString::tqfromLatin1( "custom-notifications" ) ) { Kopete::NotifyDataObject::notifyDataFromXML( groupElement ); } @@ -208,10 +208,10 @@ bool Group::fromXML( const TQDomElement &data ) switch ( d->type ) { case Temporary: - d->displayName = TQString::fromLatin1( "Temporary" ); + d->displayName = TQString::tqfromLatin1( "Temporary" ); break; case TopLevel: - d->displayName = TQString::fromLatin1( "Top-Level" ); + d->displayName = TQString::tqfromLatin1( "Top-Level" ); break; default: d->displayName = i18n( "(Unnamed Group)" ); |