← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to digikam/digikammodelcollection.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/digikammodelcollection.cpp
40
40
 
41
41
public:
42
42
 
43
 
    AlbumModel     *albumModel;
44
 
    TagModel       *tagModel;
45
 
    TagModel       *tagFilterModel;
46
 
    SearchModel    *searchModel;
47
 
    DateAlbumModel *dateAlbumModel;
 
43
    AlbumModel*     albumModel;
 
44
    TagModel*       tagModel;
 
45
    TagModel*       tagFilterModel;
 
46
    SearchModel*    searchModel;
 
47
    DateAlbumModel* dateAlbumModel;
48
48
};
49
49
 
50
50
DigikamModelCollection::DigikamModelCollection() :
80
80
    delete d;
81
81
}
82
82
 
83
 
AlbumModel *DigikamModelCollection::getAlbumModel() const
 
83
AlbumModel* DigikamModelCollection::getAlbumModel() const
84
84
{
85
85
    return d->albumModel;
86
86
}
87
87
 
88
 
TagModel *DigikamModelCollection::getTagModel() const
 
88
TagModel* DigikamModelCollection::getTagModel() const
89
89
{
90
90
    return d->tagModel;
91
91
}
92
92
 
93
 
TagModel *DigikamModelCollection::getTagFilterModel() const
 
93
TagModel* DigikamModelCollection::getTagFilterModel() const
94
94
{
95
95
    return d->tagFilterModel;
96
96
}
97
97
 
98
 
SearchModel *DigikamModelCollection::getSearchModel() const
 
98
SearchModel* DigikamModelCollection::getSearchModel() const
99
99
{
100
100
    return d->searchModel;
101
101
}
102
102
 
103
 
DateAlbumModel *DigikamModelCollection::getDateAlbumModel() const
 
103
DateAlbumModel* DigikamModelCollection::getDateAlbumModel() const
104
104
{
105
105
    return d->dateAlbumModel;
106
106
}
109
109
{
110
110
 
111
111
    d->dateAlbumModel->setPixmaps(
112
 
                    SmallIcon(
113
 
                                    "view-calendar-list",
114
 
                                    AlbumSettings::instance()->getTreeViewIconSize()),
115
 
                    SmallIcon(
116
 
                                    "view-calendar-month",
117
 
                                    AlbumSettings::instance()->getTreeViewIconSize()));
 
112
        SmallIcon(
 
113
            "view-calendar-list",
 
114
            AlbumSettings::instance()->getTreeViewIconSize()),
 
115
        SmallIcon(
 
116
            "view-calendar-month",
 
117
            AlbumSettings::instance()->getTreeViewIconSize()));
118
118
}
119
119
 
120
120
}