diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:33:51 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 15:53:28 +0200 |
commit | 4b54ad17739d1075235f2960ecde230a58b5621c (patch) | |
tree | 041d34c2e70d106209f97f8607698ccfe907c9b4 /kopete/libkopete/kopetenotifydataobject.cpp | |
parent | 6f21bc7511005a69a8ef14c2ad4e74857baf59f3 (diff) | |
download | tdenetwork-4b54ad17739d1075235f2960ecde230a58b5621c.tar.gz tdenetwork-4b54ad17739d1075235f2960ecde230a58b5621c.zip |
Rename old tq methods that no longer need a unique name
(cherry picked from commit 089118c18533dfa3e6ce5065dbebdd4db94051f1)
Diffstat (limited to 'kopete/libkopete/kopetenotifydataobject.cpp')
-rw-r--r-- | kopete/libkopete/kopetenotifydataobject.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/kopete/libkopete/kopetenotifydataobject.cpp b/kopete/libkopete/kopetenotifydataobject.cpp index 16ec1889..68f2a0b9 100644 --- a/kopete/libkopete/kopetenotifydataobject.cpp +++ b/kopete/libkopete/kopetenotifydataobject.cpp @@ -60,14 +60,14 @@ TQDomElement Kopete::NotifyDataObject::notifyDataToXML() if ( !d->events.isEmpty() ) { //<custom-notifications> - notifications = notify.createElement( TQString::tqfromLatin1( "custom-notifications" ) ); + notifications = notify.createElement( TQString::fromLatin1( "custom-notifications" ) ); TQDictIterator<Kopete::NotifyEvent> it( d->events ); for ( ; it.current(); ++it ) { //<event name="..." suppress-common="true|false"> - TQDomElement event = notify.createElement( TQString::tqfromLatin1( "event" ) ); - event.setAttribute( TQString::tqfromLatin1( "name" ), it.currentKey() ); - event.setAttribute( TQString::tqfromLatin1( "suppress-common" ), TQString::tqfromLatin1( it.current()->suppressCommon() ? "true" : "false" ) ); + TQDomElement event = notify.createElement( TQString::fromLatin1( "event" ) ); + event.setAttribute( TQString::fromLatin1( "name" ), it.currentKey() ); + event.setAttribute( TQString::fromLatin1( "suppress-common" ), TQString::fromLatin1( it.current()->suppressCommon() ? "true" : "false" ) ); TQValueList<TQDomElement> presentations = it.current()->toXML(); //<sound-notification enabled="true|false" src="..." single-shot=""> for ( TQValueList<TQDomElement>::Iterator it = presentations.begin(); it != presentations.end(); ++it ) @@ -80,57 +80,57 @@ TQDomElement Kopete::NotifyDataObject::notifyDataToXML() bool Kopete::NotifyDataObject::notifyDataFromXML( const TQDomElement& element ) { - if ( element.tagName() == TQString::tqfromLatin1( "custom-notifications" ) ) + if ( element.tagName() == TQString::fromLatin1( "custom-notifications" ) ) { TQDomNode field = element.firstChild(); while( !field.isNull() ) { //read an event TQDomElement fieldElement = field.toElement(); - if ( fieldElement.tagName() == TQString::tqfromLatin1( "event" ) ) + if ( fieldElement.tagName() == TQString::fromLatin1( "event" ) ) { // get its attributes - TQString name = fieldElement.attribute( TQString::tqfromLatin1( "name" ), TQString() ); - TQString suppress = fieldElement.attribute( TQString::tqfromLatin1( "suppress-common" ), TQString() ); - Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::tqfromLatin1( "true" ) ); + TQString name = fieldElement.attribute( TQString::fromLatin1( "name" ), TQString() ); + TQString suppress = fieldElement.attribute( TQString::fromLatin1( "suppress-common" ), TQString() ); + Kopete::NotifyEvent *evt = new Kopete::NotifyEvent( suppress == TQString::fromLatin1( "true" ) ); // get its tqchildren TQDomNode child = fieldElement.firstChild(); while( !child.isNull() ) { TQDomElement childElement = child.toElement(); - if ( childElement.tagName() == TQString::tqfromLatin1( "sound-presentation" ) ) + if ( childElement.tagName() == TQString::fromLatin1( "sound-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: sound" << endl; - TQString src = childElement.attribute( TQString::tqfromLatin1( "src" ) ); - TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); + TQString src = childElement.attribute( TQString::fromLatin1( "src" ) ); + TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Sound, src, - ( singleShot == TQString::tqfromLatin1( "true" ) ), - ( enabled == TQString::tqfromLatin1( "true" ) ) ); + ( singleShot == TQString::fromLatin1( "true" ) ), + ( enabled == TQString::fromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Sound, pres ); // kdDebug(14010) << k_funcinfo << "after sound: " << evt->toString() << endl; } - if ( childElement.tagName() == TQString::tqfromLatin1( "message-presentation" ) ) + if ( childElement.tagName() == TQString::fromLatin1( "message-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: msg" << endl; - TQString src = childElement.attribute( TQString::tqfromLatin1( "src" ) ); - TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); + TQString src = childElement.attribute( TQString::fromLatin1( "src" ) ); + TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Message, src, - ( singleShot == TQString::tqfromLatin1( "true" ) ), - ( enabled == TQString::tqfromLatin1( "true" ) ) ); + ( singleShot == TQString::fromLatin1( "true" ) ), + ( enabled == TQString::fromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Message, pres ); // kdDebug(14010) << k_funcinfo << "after message: " << evt->toString() << endl; } - if ( childElement.tagName() == TQString::tqfromLatin1( "chat-presentation" ) ) + if ( childElement.tagName() == TQString::fromLatin1( "chat-presentation" ) ) { // kdDebug(14010) << k_funcinfo << "read: chat" << endl; - TQString enabled = childElement.attribute( TQString::tqfromLatin1( "enabled" ) ); - TQString singleShot = childElement.attribute( TQString::tqfromLatin1( "single-shot" ) ); + TQString enabled = childElement.attribute( TQString::fromLatin1( "enabled" ) ); + TQString singleShot = childElement.attribute( TQString::fromLatin1( "single-shot" ) ); Kopete::EventPresentation *pres = new Kopete::EventPresentation( Kopete::EventPresentation::Chat, TQString(), - ( singleShot == TQString::tqfromLatin1( "true" ) ), - ( enabled == TQString::tqfromLatin1( "true" ) ) ); + ( singleShot == TQString::fromLatin1( "true" ) ), + ( enabled == TQString::fromLatin1( "true" ) ) ); evt->setPresentation( Kopete::EventPresentation::Chat, pres ); // kdDebug(14010) << k_funcinfo << "after chat: " << evt->toString() << endl; } |