Show
Ignore:
Timestamp:
04/15/08 03:43:45 (8 months ago)
Author:
flynd
Message:

Added NameRole? in model to access name/title/alias for items. Changed edit function in delegate to use this role instead.

Location:
trunk/qt4-gui/src/contactlist
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • trunk/qt4-gui/src/contactlist/contactbar.cpp

    r5837 r6150  
    7272      break; 
    7373 
     74    case ContactListModel::NameRole: 
     75      return myText; 
     76 
    7477    case ContactListModel::ItemTypeRole: 
    7578      return ContactListModel::BarItem; 

  • trunk/qt4-gui/src/contactlist/contactgroup.cpp

    r6148 r6150  
    161161      break; 
    162162 
    163     case Qt::EditRole: 
     163    case ContactListModel::NameRole: 
    164164      return myName; 
    165165 
    … …  
    191191bool ContactGroup::setData(const QVariant& value, int role) 
    192192{ 
    193   if (role != Qt::EditRole || !value.isValid()) 
     193  if (role != ContactListModel::NameRole || !value.isValid()) 
    194194    return false; 
    195195 

  • trunk/qt4-gui/src/contactlist/contactgroup.h

    r6148 r6150  
    150150   * @return True if any data was changed 
    151151   */ 
    152   virtual bool setData(const QVariant& value, int role = Qt::EditRole); 
     152  virtual bool setData(const QVariant& value, int role = ContactListModel::NameRole); 
    153153 
    154154signals: 

  • trunk/qt4-gui/src/contactlist/contactitem.h

    r6148 r6150  
    7373   * @return True if any data was changed 
    7474   */ 
    75   virtual bool setData(const QVariant& value, int role = Qt::EditRole); 
     75  virtual bool setData(const QVariant& value, int role = ContactListModel::NameRole); 
    7676 
    7777private: 

  • trunk/qt4-gui/src/contactlist/contactlist.h

    r6148 r6150  
    7373  { 
    7474    ItemTypeRole = Qt::UserRole,        // Type of item (one of enum ItemType) 
     75    NameRole,                           // Item name (alias for UserItems) 
    7576    SortPrefixRole,                     // Primary sort index 
    7677    SortRole,                           // Secondary sort index 
    … …  
    297298   * @param role Role to update 
    298299   */ 
    299   virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); 
     300  virtual bool setData(const QModelIndex& index, const QVariant& value, int role = ContactListModel::NameRole); 
    300301 
    301302  /** 

  • trunk/qt4-gui/src/contactlist/contactuser.h

    r6148 r6150  
    106106   * @return True if any data was changed 
    107107   */ 
    108   virtual bool setData(const QVariant& value, int role = Qt::EditRole); 
     108  virtual bool setData(const QVariant& value, int role = ContactListModel::NameRole); 
    109109 
    110110private: 

  • trunk/qt4-gui/src/contactlist/contactuserdata.cpp

    r6148 r6150  
    471471bool ContactUserData::setData(const QVariant& value, int role) 
    472472{ 
    473   if (role != Qt::EditRole || !value.isValid()) 
     473  if (role != ContactListModel::NameRole || !value.isValid()) 
    474474    return false; 
    475475 
    … …  
    583583      break; 
    584584 
    585     case Qt::EditRole: 
     585    case ContactListModel::NameRole: 
    586586      return myAlias; 
    587587 

  • trunk/qt4-gui/src/contactlist/contactuserdata.h

    r6148 r6150  
    154154   * 
    155155   * @param value New value to set 
    156    * @param role Must be Qt::EditRole 
     156   * @param role Must be ContactListModel::NameRole 
    157157   * @return True if alias was changed 
    158158   */ 
    159   virtual bool setData(const QVariant& value, int role = Qt::EditRole); 
     159  virtual bool setData(const QVariant& value, int role = ContactListModel::NameRole); 
    160160 
    161161signals: