← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty

« back to all changes in this revision

Viewing changes to kdeui/widgets/keditlistbox.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning, Jonathan Thomas, Andreas Wenning
  • Date: 2009-04-01 05:55:52 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090401055552-uel5di5f3xiftax3
Tags: 4:4.2.2-0ubuntu1
https://launchpad.net/bugs/344709
https://launchpad.net/bugs/348823
[ Jonathan Thomas ]
* New upstream release (LP: #344709, #348823):
  - Bump upstreamversion and runtimedeps in debian/rules
  - Remove kubuntu_65_kcmdlineargs_decoding_svn934640.diff, applied upstream

[ Andreas Wenning ]
* Remove patch kubuntu_69_do_not_show_plasma_popups_over_screensaver.diff,
  applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdeui/widgets/keditlistbox.cpp
56
56
    bool checkAtEntering;
57
57
    KEditListBox::Buttons buttons;
58
58
 
59
 
    void init( bool checkAtEntering = false, KEditListBox::Buttons buttons = KEditListBox::All,
 
59
    void init( bool check = false, KEditListBox::Buttons buttons = KEditListBox::All,
60
60
               QWidget *representationWidget = 0 );
61
61
    void setEditor( KLineEdit* lineEdit, QWidget* representationWidget = 0 );
62
62
    void updateButtonState();
67
67
};
68
68
 
69
69
 
70
 
void KEditListBoxPrivate::init( bool checkAtEntering, KEditListBox::Buttons newButtons,
 
70
void KEditListBoxPrivate::init( bool check, KEditListBox::Buttons newButtons,
71
71
                                QWidget *representationWidget )
72
72
{
73
 
    checkAtEntering = checkAtEntering;
 
73
    checkAtEntering = check;
74
74
 
75
75
    servNewButton = servRemoveButton = servUpButton = servDownButton = 0L;
76
76
    q->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,
604
604
void KEditListBox::insertStringList(const QStringList& list, int index)
605
605
{
606
606
    QStringList content = d->model->stringList();
607
 
    if ( index > content.count() )
 
607
    if ( index < 0 )
608
608
      content += list;
609
609
    else
610
610
      for ( int i = 0, j = index; i < list.count(); ++i, ++j )
617
617
{
618
618
  QStringList list = d->model->stringList();
619
619
 
620
 
  if ( index == -1 )
 
620
  if ( index < 0 )
621
621
    list.append( text );
622
622
  else
623
623
    list.insert( index, text );