diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:23:09 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 15:53:43 +0200 |
| commit | 81d696e1ee26cfc46fb4c97989575a7376b2d246 (patch) | |
| tree | 08aba6fcefaed9220ebfcd71eb069179434e1df1 /kopete/protocols/oscar | |
| parent | e7bee19a9f42cffe3a0792348a60e5bee1d3da71 (diff) | |
| download | tdenetwork-81d696e1ee26cfc46fb4c97989575a7376b2d246.tar.gz tdenetwork-81d696e1ee26cfc46fb4c97989575a7376b2d246.zip | |
Rename obsolete tq methods to standard names
(cherry picked from commit 8a143ab9f846e910c583ea8e770cd05495e0c58d)
Diffstat (limited to 'kopete/protocols/oscar')
| -rw-r--r-- | kopete/protocols/oscar/aim/ui/aimeditaccountui.ui | 4 | ||||
| -rw-r--r-- | kopete/protocols/oscar/aim/ui/aiminfobase.ui | 6 | ||||
| -rw-r--r-- | kopete/protocols/oscar/icq/ui/icqadd.ui | 4 | ||||
| -rw-r--r-- | kopete/protocols/oscar/icq/ui/icqauthreplyui.ui | 6 | ||||
| -rw-r--r-- | kopete/protocols/oscar/icq/ui/icqeditaccountui.ui | 2 | ||||
| -rw-r--r-- | kopete/protocols/oscar/liboscar/sendmessagetask.cpp | 6 |
6 files changed, 14 insertions, 14 deletions
diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index 87450fc8..c2ec9844 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -72,7 +72,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -242,7 +242,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout58</cstring> + <cstring>layout58</cstring> </property> <hbox> <property name="name"> diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index 125c711b..188e4aad 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui index 6ae1f092..9ee07372 100644 --- a/kopete/protocols/oscar/icq/ui/icqadd.ui +++ b/kopete/protocols/oscar/icq/ui/icqadd.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui index 370bef8b..5296c154 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui +++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -150,7 +150,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui index b60974e7..bd9f2f8e 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui @@ -53,7 +53,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> diff --git a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp index 596e6791..1b8cbfbc 100644 --- a/kopete/protocols/oscar/liboscar/sendmessagetask.cpp +++ b/kopete/protocols/oscar/liboscar/sendmessagetask.cpp @@ -379,8 +379,8 @@ if ( !codec && ( contact->hasCap(CAP_UTF8) || !contact->encoding() ) ) utfMessage=new unsigned char[length]; for(unsigned int l=0; l<message.length(); l++) { - utfMessage[l*2]=message.tqunicode()[l].row(); - utfMessage[(l*2)+1]=message.tqunicode()[l].cell(); + utfMessage[l*2]=message.unicode()[l].row(); + utfMessage[(l*2)+1]=message.unicode()[l].cell(); } charset=0x0002; // send UTF-16BE } @@ -393,7 +393,7 @@ if(!codec && charset != 0x0002 && contact->encoding() != 0) charset=0x0003; //send as ISO-8859-1 } -if(!codec && charset != 0x0002) // it's neither tqunicode nor did we find a codec so far! +if(!codec && charset != 0x0002) // it's neither unicode nor did we find a codec so far! { kdDebug(14151) << k_funcinfo << "Couldn't find suitable encoding for outgoing message, " << |