← Back to branch summary

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

« back to all changes in this revision

Viewing changes to digikam/tagfolderview.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/tagfolderview.cpp
57
57
 
58
58
    bool showFindDuplicateAction;
59
59
 
60
 
    TagModel *model;
 
60
    TagModel* model;
61
61
 
62
 
    QAction *resetIconAction;
63
 
    QAction *findDuplAction;
 
62
    QAction* resetIconAction;
 
63
    QAction* findDuplAction;
64
64
 
65
65
};
66
66
 
67
 
TagFolderView::TagFolderView(QWidget *parent, TagModel *model) :
 
67
TagFolderView::TagFolderView(QWidget* parent, TagModel* model) :
68
68
    TagTreeView(model, parent), d(new TagFolderViewPriv)
69
69
{
70
70
 
94
94
    return i18n("My Tags");
95
95
}
96
96
 
97
 
void TagFolderView::addCustomContextMenuActions(ContextMenuHelper &cmh, Album *album)
 
97
void TagFolderView::addCustomContextMenuActions(ContextMenuHelper& cmh, Album* album)
98
98
{
99
99
 
100
 
    TAlbum *tag = dynamic_cast<TAlbum*> (album);
 
100
    TAlbum* tag = dynamic_cast<TAlbum*> (album);
 
101
 
101
102
    if (!tag)
102
103
    {
103
104
        return;
109
110
    cmh.addCreateTagFromAddressbookMenu();
110
111
    cmh.addAction(d->resetIconAction);
111
112
    cmh.addSeparator();
 
113
 
112
114
    if (d->showFindDuplicateAction)
113
115
    {
114
116
        cmh.addAction(d->findDuplAction);
115
117
    }
 
118
 
116
119
    cmh.addExportMenu();
117
120
    cmh.addBatchMenu();
118
121
    cmh.addSeparator();
127
130
 
128
131
}
129
132
 
130
 
void TagFolderView::slotTagNewFromABCMenu(const QString &personName)
 
133
void TagFolderView::slotTagNewFromABCMenu(const QString& personName)
131
134
{
132
135
 
133
 
    TAlbum *parent = currentAlbum();
 
136
    TAlbum* parent = currentAlbum();
 
137
 
134
138
    if (!parent)
135
139
    {
136
140
        return;
140
144
 
141
145
}
142
146
 
143
 
void TagFolderView::handleCustomContextMenuAction(QAction *action, AlbumPointer<Album> album)
 
147
void TagFolderView::handleCustomContextMenuAction(QAction* action, AlbumPointer<Album> album)
144
148
{
145
149
 
146
 
    Album *a = album;
147
 
    TAlbum *tag = dynamic_cast<TAlbum*> (a);
 
150
    Album* a = album;
 
151
    TAlbum* tag = dynamic_cast<TAlbum*> (a);
 
152
 
148
153
    if (!tag)
149
154
    {
150
155
        return;