← Back to branch summary

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

« back to all changes in this revision

Viewing changes to digikam/albumselectcombobox.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/albumselectcombobox.cpp
40
40
namespace Digikam
41
41
{
42
42
 
43
 
AlbumSelectComboBox::AlbumSelectComboBox(QWidget *parent)
44
 
            : TreeViewLineEditComboBox(parent)
 
43
AlbumSelectComboBox::AlbumSelectComboBox(QWidget* parent)
 
44
    : TreeViewLineEditComboBox(parent)
45
45
{
46
46
    m_noSelectionText = i18n("No Album Selected");
47
47
    m_model           = 0;
67
67
              new QSortFilterProxyModel(this));
68
68
}
69
69
 
70
 
void AlbumSelectComboBox::setModels(AbstractCheckableAlbumModel *model, QSortFilterProxyModel *filterModel)
 
70
void AlbumSelectComboBox::setModels(AbstractCheckableAlbumModel* model, QSortFilterProxyModel* filterModel)
71
71
{
72
72
    m_model = model;
73
73
    m_filterModel = filterModel;
94
94
    updateText();
95
95
}
96
96
 
97
 
AbstractCheckableAlbumModel *AlbumSelectComboBox::model() const
 
97
AbstractCheckableAlbumModel* AlbumSelectComboBox::model() const
98
98
{
99
99
    return m_model;
100
100
}
101
101
 
102
 
QSortFilterProxyModel *AlbumSelectComboBox::filterModel() const
 
102
QSortFilterProxyModel* AlbumSelectComboBox::filterModel() const
103
103
{
104
104
    return m_filterModel;
105
105
}
106
106
 
107
107
void AlbumSelectComboBox::updateText()
108
108
{
109
 
    QList<Album *> checkedAlbums = m_model->checkedAlbums();
110
 
    QList<Album *> partiallyCheckedAlbums = m_model->partiallyCheckedAlbums();
 
109
    QList<Album*> checkedAlbums = m_model->checkedAlbums();
 
110
    QList<Album*> partiallyCheckedAlbums = m_model->partiallyCheckedAlbums();
111
111
    QString newIncludeText;
112
112
    QString newExcludeText;
113
113