← Back to branch summary

~ubuntu-branches/ubuntu/utopic/psi/utopic

« back to all changes in this revision

Viewing changes to src/options/opt_toolbars.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2009-09-25 17:49:51 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090925174951-lvm7kdap82o8xhn3
Tags: 0.13-1
* Updated to upstream version 0.13
* Set Standards-Version to 3.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/options/opt_toolbars.cpp
170
170
        if (!w)
171
171
                return;
172
172
 
173
 
        LookFeelToolbarsUI *d = (LookFeelToolbarsUI *)w;
174
 
 
175
173
        PsiOptions *o = PsiOptions::instance();
176
174
        o->removeOption("options.ui.contactlist.toolbars", true);
177
175
        QMap<QString, ToolbarPrefs>::Iterator it = p->toolbars.begin();
222
220
{
223
221
        LookFeelToolbarsUI *d = (LookFeelToolbarsUI *)w;
224
222
 
225
 
        int i = d->cb_toolbars->count();
226
 
 
227
223
        ToolbarPrefs tb;
228
224
        int j = 0;
229
225
        bool ok;
427
423
 
428
424
        if (d->tw_availActions->currentItem() && !d->tw_availActions->currentItem()->data(0, Qt::UserRole).toString().isEmpty())
429
425
                right = true;
430
 
        QListWidgetItem *i = d->lw_selectedActions->currentItem();
431
 
        if (i) {
 
426
        QListWidgetItem *item = d->lw_selectedActions->currentItem();
 
427
        if (item) {
432
428
                left = true;
433
429
 
434
430
                // get numeric index of item
435
 
                int n = d->lw_selectedActions->row(i);
 
431
                int n = d->lw_selectedActions->row(item);
436
432
 
437
433
                int i = n;
438
 
                while (--i > 0) {
 
434
                while (--i >= 0) {
439
435
                        if (!d->lw_selectedActions->item(i)->isHidden()) {
440
436
                                up = true;
441
437
                                break;