← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/searchwindow/searchgroup.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/searchgroup.h
66
66
        ChainGroup
67
67
    };
68
68
 
69
 
    SearchGroup(SearchView *parent);
 
69
    SearchGroup(SearchView* parent);
70
70
 
71
71
    void setup(Type type = FirstGroup);
72
72
 
84
84
 
85
85
protected:
86
86
 
87
 
    virtual SearchGroup *createSearchGroup();
88
 
    virtual void addGroupToLayout(SearchGroup *group);
 
87
    virtual SearchGroup* createSearchGroup();
 
88
    virtual void addGroupToLayout(SearchGroup* group);
89
89
 
90
 
    SearchView                   *m_view;
 
90
    SearchView*                   m_view;
91
91
 
92
92
    QList<SearchFieldGroup*>      m_fieldGroups;
93
93
    QList<SearchFieldGroupLabel*> m_fieldLabels;
94
94
 
95
 
    QVBoxLayout                  *m_layout;
96
 
    SearchGroupLabel             *m_label;
97
 
    QVBoxLayout                  *m_subgroupLayout;
 
95
    QVBoxLayout*                  m_layout;
 
96
    SearchGroupLabel*             m_label;
 
97
    QVBoxLayout*                  m_subgroupLayout;
98
98
 
99
99
    Type                          m_groupType;
100
100
};
107
107
 
108
108
public:
109
109
 
110
 
    SearchGroupLabel(SearchViewThemedPartsCache *cache, SearchGroup::Type type, QWidget *parent = 0);
 
110
    SearchGroupLabel(SearchViewThemedPartsCache* cache, SearchGroup::Type type, QWidget* parent = 0);
111
111
 
112
112
    void setGroupOperator(SearchXml::Operator op);
113
113
    void setDefaultFieldOperator(SearchXml::Operator op);
138
138
    bool                        m_extended;
139
139
    SearchXml::Operator         m_groupOp;
140
140
    SearchXml::Operator         m_fieldOp;
141
 
    QGridLayout                *m_layout;
 
141
    QGridLayout*                m_layout;
142
142
    //QComboBox                  *m_groupOpBox;
143
 
    RClickLabel                *m_groupOpLabel;
144
 
    QRadioButton               *m_allBox;
145
 
    QRadioButton               *m_anyBox;
146
 
    QRadioButton               *m_noneBox;
147
 
    QRadioButton               *m_oneNotBox;
148
 
    RClickLabel                *m_optionsLabel;
149
 
    RClickLabel                *m_removeLabel;
150
 
    QStackedLayout             *m_stackedLayout;
151
 
    SearchViewThemedPartsCache *m_themeCache;
 
143
    RClickLabel*                m_groupOpLabel;
 
144
    QRadioButton*               m_allBox;
 
145
    QRadioButton*               m_anyBox;
 
146
    QRadioButton*               m_noneBox;
 
147
    QRadioButton*               m_oneNotBox;
 
148
    RClickLabel*                m_optionsLabel;
 
149
    RClickLabel*                m_removeLabel;
 
150
    QStackedLayout*             m_stackedLayout;
 
151
    SearchViewThemedPartsCache* m_themeCache;
152
152
};
153
153
 
154
154
} // namespace Digikam