← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/widgets/dialpad.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/widgets/dialpad.cpp
48
48
      static QFontMetrics metric(m_pButtons[i]->font());
49
49
      m_pButtons[i]->setMinimumHeight((30 > metric.height()+6)?30:metric.height()+6);
50
50
      gridLayout->addWidget( m_pButtons[i],i/3,i%3              );
51
 
      number->setFont      ( QFont("", m_NumberSize)            );
 
51
      number->setFont      ( QFont(QString(), m_NumberSize)            );
52
52
      number->setAlignment ( Qt::AlignRight | Qt::AlignVCenter  );
53
 
      text->setFont        ( QFont("", m_TextSize)              );
 
53
      text->setFont        ( QFont(QString(), m_TextSize)              );
54
54
      layout->setSpacing        ( m_Spacing );
55
55
      layout->addWidget         ( number    );
56
56
      layout->addWidget         ( text      );