Psst.. new poll here.
Psst.. new forums here.
Microsoft is blocking us again (TY IP Reputation!) so just use oauth login instead. :)
Paste
Pasted as text by Alexander ( 18 years ago )
Index: protocol/oscar/icq/emoticonmenu.cpp
===================================================================
--- protocol/oscar/icq/emoticonmenu.cpp (revision 59)
+++ protocol/oscar/icq/emoticonmenu.cpp (working copy)
@@ -34,7 +34,7 @@
emotList = list;
emotPath = path;
clearList();
- int sq = std::ceil(std::sqrt(list.count()));
+ int sq = std::ceil(std::sqrt((float)list.count()));
Index: protocol/oscar/icq/snacchannel.cpp
===================================================================
--- protocol/oscar/icq/snacchannel.cpp (revision 59)
+++ protocol/oscar/icq/snacchannel.cpp (working copy)
@@ -431,19 +431,14 @@
{
int arrayLength = length / 2;
- quint16 familyList[arrayLength];
- for ( int i = 0; length; ++i)
- {
- familyList[i] = convertToInt16(socket->read(2));
- length -= 2;
- }
QByteArray famVers;
for (int i = 0; i < arrayLength; i++)
{
- famVers.append(convertToByteArray(familyList[i]));
- if ( familyList[i] == 0x0001 )
+ quint16 family = convertToInt16(socket->read(2));
+ famVers.append(convertToByteArray(family));
+ if ( family == 0x0001 )
famVers.append(convertToByteArray((quint16)0x0004));
- else if ( familyList[i] == 0x0013 )
+ else if ( family == 0x0013 )
famVers.append(convertToByteArray((quint16)0x0004));
else
famVers.append(convertToByteArray((quint16)0x0001));
@@ -488,13 +483,6 @@
{
quint16 arrayLength = convertToInt16(socket->read(2));
length = 0;
- quint16 classArray[arrayLength];
- for (int i = 0; i < arrayLength; i++)
- {
- classArray[i] = convertToInt16(socket->read(2));
- socket->read(33);
- }
- socket->readAll();
QByteArray packet;
packet[0] = 0x2A;
packet[1] = 0x02;
@@ -507,7 +495,12 @@
infoSnac.setReqId(returnSnacReqId());
packet.append(infoSnac.getData());
for (int i = 0; i < arrayLength; i++)
- packet.append(convertToByteArray(classArray[i]));
+ {
+ quint16 classValue = convertToInt16(socket->read(2));
+ socket->read(33);
+ packet.append(convertToByteArray(classValue));
+ }
+ socket->readAll();
tcpSocket->write(packet);
emit incFlapSeq();
Index: protocol/oscar/icq/userinformation.cpp
===================================================================
--- protocol/oscar/icq/userinformation.cpp (revision 59)
+++ protocol/oscar/icq/userinformation.cpp (working copy)
@@ -273,7 +273,7 @@
- if ( !avatarPath.isEmpty() );
+ if ( !avatarPath.isEmpty() )
{
QSize picSize = getPictureSize(avatarPath);
ui.pictureLabel->setText(tr("<img src='%1' height='%2' width='%3'>").arg(avatarPath).arg(picSize.height()).arg(picSize.width()));
@@ -296,7 +296,7 @@
- if ( !avatarPath.isEmpty() );
+ if ( !avatarPath.isEmpty() )
{
QSize picSize = getPictureSize(avatarPath);
ui.pictureLabel->setText(tr("<img src='%1' height='%2' width='%3'>").arg(avatarPath).arg(picSize.height()).arg(picSize.width()));
@@ -1959,6 +1959,8 @@
if ( index == 4 )
return ui.interestsEdit4->text();
+
+ return QString();
}
@@ -2361,7 +2363,7 @@
e->type() == QEvent::MouseButtonDblClick ||
e->type() == QEvent::MouseButtonRelease ||
e->type() == QEvent::KeyPress||
- e->type() == QEvent::QEvent::KeyRelease ||
+ e->type() == QEvent::KeyRelease ||
e->type() == QEvent::Wheel))
{
e->ignore();
Revise this Paste