← Back to branch summary

~ubuntu-branches/ubuntu/utopic/psi/utopic

« back to all changes in this revision

Viewing changes to src/avatars.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2010-02-19 09:37:12 UTC
  • mfrom: (6.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100219093712-e225xvm1wjcf1cgi
Tags: 0.14-2
* comment out only function which uses va_list to work around build
  problems on armel
* Set Standards-Version to 3.8.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/avatars.cpp
62
62
{
63
63
        //int maxSize = (LEGOPTS.avatarsSize > MAX_AVATAR_SIZE ? MAX_AVATAR_SIZE : LEGOPTS.avatarsSize);
64
64
        int maxSize = AvatarFactory::maxAvatarSize();
65
 
        QImage i(b);
 
65
        QImage i = QImage::fromData(b);
66
66
        if (i.isNull()) {
67
67
                qWarning("AvatarFactory::scaleAvatar(): Null image (unrecognized format?)");
68
68
                return QByteArray();
99
99
void Avatar::setImage(const QImage& i)
100
100
{
101
101
        if (i.width() > MAX_AVATAR_DISPLAY_SIZE || i.height() > MAX_AVATAR_DISPLAY_SIZE)
102
 
                pixmap_.convertFromImage(i.scaled(MAX_AVATAR_DISPLAY_SIZE,MAX_AVATAR_DISPLAY_SIZE,Qt::KeepAspectRatio,Qt::SmoothTransformation));
 
102
                pixmap_ = QPixmap::fromImage(i.scaled(MAX_AVATAR_DISPLAY_SIZE,MAX_AVATAR_DISPLAY_SIZE,Qt::KeepAspectRatio,Qt::SmoothTransformation));
103
103
        else
104
 
                pixmap_.convertFromImage(i);
 
104
                pixmap_ = QPixmap::fromImage(i);
105
105
 
106
106
}
107
107
 
108
108
void Avatar::setImage(const QByteArray& ba)
109
109
{
110
 
        setImage(QImage(ba));
 
110
        setImage(QImage::fromData(ba));
111
111
}
112
112
 
113
113
void Avatar::setImage(const QPixmap& p)
196
196
        // printf("Saving %s to cache.\n",hash.latin1());
197
197
        QString fn = QDir(AvatarFactory::getCacheDir()).filePath(hash);
198
198
        QFile f(fn);
199
 
        if (f.open(IO_WriteOnly)) {
200
 
                f.writeBlock(data);
 
199
        if (f.open(QIODevice::WriteOnly)) {
 
200
                f.write(data);
201
201
                f.close();
202
202
        }
203
203
        else
204
 
                printf("Error opening %s for writing.\n",f.name().latin1());
 
204
                printf("Error opening %s for writing.\n", qPrintable(f.fileName()));
205
205
        
206
206
}
207
207
 
552
552
                        return;
553
553
                
554
554
                QByteArray avatar_data = scaleAvatar(avatar_file.readAll());
555
 
                QImage avatar_image(avatar_data);
 
555
                QImage avatar_image = QImage::fromData(avatar_data);
556
556
                if(!avatar_image.isNull()) {
557
557
                        // Publish data
558
558
                        QDomDocument* doc = account()->client()->doc();
672
672
        if (n == "http://www.xmpp.org/extensions/xep-0084.html#ns-data" && item.id() == selfAvatarHash_) {
673
673
                // Publish metadata
674
674
                QDomDocument* doc = account()->client()->doc();
675
 
                QImage avatar_image(selfAvatarData_);
 
675
                QImage avatar_image = QImage::fromData(selfAvatarData_);
676
676
                QDomElement meta_el = doc->createElement("metadata");
677
677
                meta_el.setAttribute("xmlns","http://www.xmpp.org/extensions/xep-0084.html#ns-metadata");
678
678
                QDomElement info_el = doc->createElement("info");