← Back to branch summary

~ubuntu-branches/ubuntu/edgy/psi/edgy

« back to all changes in this revision

Viewing changes to libpsi/psiwidgets/iconwidget.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2005-09-14 16:33:49 UTC
  • mfrom: (2.1.1 sarge)
  • Revision ID: james.westby@ubuntu.com-20050914163349-3zacov4afysz5cw5
Tags: 0.9.3-2ubuntu1
* Sync with debian
* Applied patch to psi.desktop to start psi without gpg-agent use (known
  issue)
* Updated README.Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpsi/psiwidgets/iconwidget.cpp
174
174
                        QRect r = it2.data();
175
175
                        it2.data() = QRect( r.x(), (h - r.height())/2, r.width(), r.height() );
176
176
                }
 
177
#else
 
178
                Q_UNUSED( _iconset );
177
179
#endif
178
180
        }
179
181
 
365
367
                        setText(str);
366
368
                else
367
369
                        setText(tr("Name: '%1'").arg(icon->name()));
 
370
#else
 
371
                Q_UNUSED( i );
 
372
                Q_UNUSED( iconW );
368
373
#endif
369
374
        }
370
375
 
509
514
                if ( i )
510
515
                        icon = new Icon(*i);
511
516
                iconStart();
 
517
#else
 
518
                Q_UNUSED(i);
512
519
#endif
513
520
        }
514
521
 
604
611
        d->iconName = name;
605
612
 
606
613
        if ( !name.isEmpty() ) {
607
 
                QPixmap pix((char **)cancel_xpm);
 
614
                QPixmap pix((const char **)cancel_xpm);
608
615
                d->iconUpdated(QPixmap( pix ));
609
616
        }
610
617
        else
683
690
                if ( i )
684
691
                        icon = new Icon(*i);
685
692
                iconStart();
 
693
#else
 
694
                Q_UNUSED(i);
686
695
#endif
687
696
        }
688
697