← Back to branch summary

~ubuntu-branches/ubuntu/karmic/psi/karmic

« back to all changes in this revision

Viewing changes to libpsi/iconset/iconset.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2006-01-20 00:20:36 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060120002036-7nw6yo6totip0ee5
Tags: 0.10-2
http://bugs.debian.org/327748
http://bugs.debian.org/204416
* Added upstream changelog (Closes: Bug#327748)
* Mention --no-gpg and --no-gpg-agent in manpage (Closes: Bug#204416)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpsi/iconset/iconset.cpp
536
536
        if ( doDetach )
537
537
                detach();
538
538
 
 
539
        d->unloadAnim();
539
540
        d->anim = new Anim(anim);
540
541
 
541
542
        if ( d->anim->numFrames() > 0 )
947
948
        {
948
949
                init();
949
950
 
950
 
                name = from.name;
951
 
                version = from.version;
952
 
                description = from.description;
953
 
                creation = from.creation;
954
 
                homeUrl = from.homeUrl;
955
 
                filename = from.filename;
956
 
                authors = from.authors;
957
 
                info = from.info;
 
951
                setInformation(from);
958
952
 
959
953
                QDictIterator<Icon> it( from.dict );
960
954
                for ( ; it.current(); ++it)
1255
1249
 
1256
1250
                return success;
1257
1251
        }
 
1252
        
 
1253
        void setInformation(const Private &from) {
 
1254
                name = from.name;
 
1255
                version = from.version;
 
1256
                description = from.description;
 
1257
                creation = from.creation;
 
1258
                homeUrl = from.homeUrl;
 
1259
                filename = from.filename;
 
1260
                authors = from.authors;
 
1261
                info = from.info;
 
1262
        }
1258
1263
};
1259
1264
//! \endif
1260
1265
 
1498
1503
        d->filename = f;
1499
1504
}
1500
1505
 
 
1506
/**
 
1507
 * Sets the information (meta-data) of this iconset to the information from the given iconset.
 
1508
 */
 
1509
void Iconset::setInformation(const Iconset &from) {
 
1510
        detach();
 
1511
        d->setInformation( *(from.d) );
 
1512
}
 
1513
 
1501
1514
//!
1502
1515
//! Returns additional Iconset information.
1503
1516
//! \sa setInfo()