Qt: remove some more leftovers of Qt4
This commit is contained in:
@@ -522,7 +522,6 @@ void ModifierLineEdit::keyPressEvent (QKeyEvent * e)
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
|
||||
#if QT_VERSION >= 0x050200
|
||||
ClearLineEdit::ClearLineEdit (QWidget * parent)
|
||||
: QLineEdit(parent)
|
||||
{
|
||||
@@ -542,41 +541,6 @@ void ClearLineEdit::updateClearButton(const QString& text)
|
||||
{
|
||||
clearAction->setVisible(!text.isEmpty());
|
||||
}
|
||||
#else
|
||||
ClearLineEdit::ClearLineEdit (QWidget * parent)
|
||||
: QLineEdit(parent)
|
||||
{
|
||||
clearButton = new QToolButton(this);
|
||||
QPixmap pixmap(BitmapFactory().pixmapFromSvg(":/icons/edit-cleartext.svg", QSize(18, 18)));
|
||||
clearButton->setIcon(QIcon(pixmap));
|
||||
clearButton->setIconSize(pixmap.size());
|
||||
clearButton->setCursor(Qt::ArrowCursor);
|
||||
clearButton->setStyleSheet(QString::fromLatin1("QToolButton { border: none; padding: 0px; }"));
|
||||
clearButton->hide();
|
||||
connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
|
||||
connect(this, SIGNAL(textChanged(const QString&)),
|
||||
this, SLOT(updateClearButton(const QString&)));
|
||||
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
|
||||
setStyleSheet(QString::fromLatin1("QLineEdit { padding-right: %1px; } ")
|
||||
.arg(clearButton->sizeHint().width() + frameWidth + 1));
|
||||
QSize msz = minimumSizeHint();
|
||||
setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2 + 2),
|
||||
msz.height());
|
||||
}
|
||||
|
||||
void ClearLineEdit::resizeEvent(QResizeEvent *)
|
||||
{
|
||||
QSize sz = clearButton->sizeHint();
|
||||
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
|
||||
clearButton->move(rect().right() - frameWidth - sz.width(),
|
||||
(rect().bottom() + 1 - sz.height())/2);
|
||||
}
|
||||
|
||||
void ClearLineEdit::updateClearButton(const QString& text)
|
||||
{
|
||||
clearButton->setVisible(!text.isEmpty());
|
||||
}
|
||||
#endif
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user