← Back to branch summary

~carlos-mazieri/ubuntu-filemanager-app/model

« back to all changes in this revision

Viewing changes to folderlistmodel/dirmodel.h

  • Committer: carlos-mazieri
  • Date: 2014-02-07 13:22:44 UTC
  • Revision ID: carlos.mazieri@gmail.com-20140207132244-nk0x11g7tl2hhvch
removed most of Qt4 code between QT_VERSION macros
changed IsSelecteRole role to IsSelectedRole
enclosed QBrush and QColor includes in macro REGRESSION_TEST_FOLDERLISTMODEL

Show diffs side-by-side

added added

removed removed

Lines of Context:
folderlistmodel/dirmodel.h
71
71
        IsReadableRole,
72
72
        IsWritableRole,
73
73
        IsExecutableRole,
74
 
        IsSelecteRole,
 
74
        IsSelectedRole,
75
75
        TrackTitleRole,
76
76
        TrackArtistRole,
77
77
        TrackAlbumRole,
163
163
    void error(const QString &errorTitle, const QString &errorMessage);
164
164
 
165
165
private:
166
 
    QHash<int, QByteArray> buildRoleNames() const;
167
 
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
168
 
    // In Qt5, the roleNames() is virtual and will work just fine. On qt4 setRoleNames must be used with buildRoleNames.
 
166
    QHash<int, QByteArray> buildRoleNames() const;   
169
167
    QHash<int, QByteArray> roleNames() const;
170
 
#endif
171
 
 
172
168
    QStringList mNameFilters;
173
169
    bool mFilterDirectories;
174
170
    bool mShowDirectories;