← Back to branch summary

~azzar1/unity/fix-1028810

« back to all changes in this revision

Viewing changes to launcher/MockLauncherIcon.h

  • Committer: Andrea Azzarone
  • Date: 2012-08-22 13:14:18 UTC
  • mfrom: (2516.1.92 unity)
  • Revision ID: azzaronea@gmail.com-20120822131418-mrfwx82k39xnvl9e
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/MockLauncherIcon.h
49
49
  {
50
50
    tooltip_text = "Mock Icon";
51
51
    sort_priority_ = 0;
52
 
    type_ = TYPE_APPLICATION;
 
52
    type_ = IconType::APPLICATION;
53
53
 
54
 
    for (int i = 0; i < QUIRK_LAST; ++i)
 
54
    for (unsigned i = 0; i < unsigned(Quirk::LAST); ++i)
55
55
    {
56
56
      quirks_[i] = false;
57
57
    }
206
206
 
207
207
  bool GetQuirk(Quirk quirk) const
208
208
  {
209
 
    return quirks_[quirk];
 
209
    return quirks_[unsigned(quirk)];
210
210
  }
211
211
 
212
212
  void SetQuirk(Quirk quirk, bool value)
213
213
  {
214
 
    quirks_[quirk] = value;
 
214
    quirks_[unsigned(quirk)] = value;
 
215
    clock_gettime(CLOCK_MONOTONIC, &(quirk_times_[unsigned(quirk)]));
215
216
  }
216
217
 
217
218
  void ResetQuirkTime(Quirk quirk) {};
218
219
 
219
220
  struct timespec GetQuirkTime(Quirk quirk)
220
221
  {
221
 
    timespec tv;
222
 
    return tv;
 
222
    return quirk_times_[unsigned(quirk)];
223
223
  }
224
224
 
225
 
  IconType GetIconType()
 
225
  IconType GetIconType() const
226
226
  {
227
227
    return type_;
228
228
  }
260
260
    return 0;
261
261
  }
262
262
 
263
 
  std::list<DbusmenuMenuitem*> Menus()
 
263
  MenuItemsVector Menus()
264
264
  {
265
 
    return std::list<DbusmenuMenuitem*> ();
 
265
    return MenuItemsVector ();
266
266
  }
267
267
 
268
268
  nux::DndAction QueryAcceptDrop(DndData const& dnd_data)
344
344
  nux::BaseTexture* icon_;
345
345
  int sort_priority_;
346
346
  IconType type_;
347
 
  bool quirks_[QUIRK_LAST];
 
347
  bool quirks_[unsigned(Quirk::LAST)];
 
348
  timespec quirk_times_[unsigned(Quirk::LAST)];
348
349
};
349
350
 
350
351
}