← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/searchwindow/searchfolderview.h

  • 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:
utilities/searchwindow/searchfolderview.h
56
56
     *                                 perform operations on the displayed
57
57
     *                                 searches
58
58
     */
59
 
    NormalSearchTreeView(QWidget *parent, SearchModel *searchModel,
60
 
                         SearchModificationHelper *searchModificationHelper);
 
59
    NormalSearchTreeView(QWidget* parent, SearchModel* searchModel,
 
60
                         SearchModificationHelper* searchModificationHelper);
61
61
 
62
62
    /**
63
63
     * Destructor.
76
76
     *
77
77
     * @param album search to edit
78
78
     */
79
 
    void editSearch(SAlbum *album);
 
79
    void editSearch(SAlbum* album);
80
80
 
81
81
protected:
82
82
 
83
 
    virtual void addCustomContextMenuActions(ContextMenuHelper &cmh,
84
 
                                             Album *album);
85
 
    virtual void handleCustomContextMenuAction(QAction *action, AlbumPointer<Album> album);
 
83
    virtual void addCustomContextMenuActions(ContextMenuHelper& cmh,
 
84
            Album* album);
 
85
    virtual void handleCustomContextMenuAction(QAction* action, AlbumPointer<Album> album);
86
86
 
87
87
private:
88
 
    NormalSearchTreeViewPriv *d;
 
88
    NormalSearchTreeViewPriv* d;
89
89
 
90
90
};
91
91