← Back to branch summary

~njpatel/unity/fix-741652

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/unityshell.cpp

  • Committer: Tim Penhey
  • Date: 2011-08-03 04:40:05 UTC
  • mfrom: (1342.1.1 shortcut-tweaks)
  • Revision ID: tim.penhey@canonical.com-20110803044005-y8fj68dzmhuut0kr
Whitespace fixes, and remove the unused iterator.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/unityshell.cpp
230
230
void UnityScreen::EnsureKeybindings ()
231
231
{
232
232
  for (auto action : _shortcut_actions)
233
 
    screen->removeAction (action.get ());
 
233
    screen->removeAction(action.get());
234
234
 
235
235
  _shortcut_actions.clear ();
236
236
 
237
 
  LauncherModel::iterator it;
238
 
  for (auto icon : *(launcher->GetModel ()))
 
237
  for (auto icon : *(launcher->GetModel()))
239
238
  {
240
 
    char shortcut = icon->GetShortcut ();
 
239
    guint64 shortcut = icon->GetShortcut();
241
240
    if (shortcut == 0)
242
241
      continue;
243
 
    
244
 
    CompActionPtr action (new CompAction());
245
 
    
 
242
 
 
243
    CompActionPtr action(new CompAction());
 
244
 
246
245
    CompAction::KeyBinding binding;
247
246
    std::ostringstream sout;
248
247
    sout << "<Super>" << static_cast<char>(shortcut);
249
248
    binding.fromString(sout.str());
250
 
    
251
 
    action->setKey (binding);
252
 
 
253
 
    screen->addAction (action.get ());
254
 
    _shortcut_actions.push_back (action);
 
249
 
 
250
    action->setKey(binding);
 
251
 
 
252
    screen->addAction(action.get());
 
253
    _shortcut_actions.push_back(action);
255
254
  }
256
255
}
257
256