← Back to branch summary

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

« back to all changes in this revision

Viewing changes to digikam/editablesearchtreeview.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/editablesearchtreeview.cpp
50
50
    {
51
51
    }
52
52
 
53
 
    SearchModificationHelper *searchModificationHelper;
 
53
    SearchModificationHelper* searchModificationHelper;
54
54
 
55
 
    QAction *renameSearchAction;
56
 
    QAction *deleteSearchAction;
 
55
    QAction* renameSearchAction;
 
56
    QAction* deleteSearchAction;
57
57
};
58
58
 
59
59
EditableSearchTreeView::EditableSearchTreeView(QWidget* parent,
60
 
                                             SearchModel* searchModel,
61
 
                                             SearchModificationHelper* searchModificationHelper)
62
 
                      : SearchTreeView(parent, searchModel), d(new EditableSearchTreeViewPriv)
 
60
        SearchModel* searchModel,
 
61
        SearchModificationHelper* searchModificationHelper)
 
62
    : SearchTreeView(parent, searchModel), d(new EditableSearchTreeViewPriv)
63
63
{
64
64
    d->searchModificationHelper = searchModificationHelper;
65
65
 
87
87
 
88
88
    // disable actions if there is no album or the album is a temporary search
89
89
    bool activate = false;
 
90
 
90
91
    if (searchAlbum)
91
92
    {
92
93
        activate = !searchAlbum->isTemporarySearch();