summaryrefslogtreecommitdiff
path: root/ui/qt/capture_filter_edit.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-08-04 09:49:45 -0700
committerAnders Broman <a.broman58@gmail.com>2016-08-06 07:29:55 +0000
commit86bf0357feeb9049b82114b3ef13de7282d774f0 (patch)
treef85ed9e134b4a222e6a1fe07fae12ee2476e8fd3 /ui/qt/capture_filter_edit.cpp
parent0eee62affe9e6b935fdc37a0d72d5c27c5c7651a (diff)
downloadwireshark-86bf0357feeb9049b82114b3ef13de7282d774f0.tar.gz
Remove old Qt code.
Our minimum version has been 4.7 for a while. Remove dead QT_VERSION_CHECK code. Change-Id: Ia003c1aa4275eefdda707975774d886643ff1538 Reviewed-on: https://code.wireshark.org/review/16888 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/capture_filter_edit.cpp')
-rw-r--r--ui/qt/capture_filter_edit.cpp26
1 files changed, 0 insertions, 26 deletions
diff --git a/ui/qt/capture_filter_edit.cpp b/ui/qt/capture_filter_edit.cpp
index 0a033f43dc..20f48ac0bd 100644
--- a/ui/qt/capture_filter_edit.cpp
+++ b/ui/qt/capture_filter_edit.cpp
@@ -239,30 +239,6 @@ void CaptureFilterEdit::paintEvent(QPaintEvent *evt) {
QSize bksz = bookmark_button_->size();
painter.drawLine(bksz.width(), cr.top(), bksz.width(), cr.bottom());
}
-
-#if QT_VERSION < QT_VERSION_CHECK(4, 7, 0)
- // http://wiki.forum.nokia.com/index.php/Custom_QLineEdit
- if (text().isEmpty() && ! this->hasFocus()) {
- QPainter p(this);
- QFont f = font();
- f.setItalic(true);
- p.setFont(f);
-
- QColor color(palette().color(foregroundRole()));
- color.setAlphaF(0.5);
- p.setPen(color);
-
- QStyleOptionFrame opt;
- initStyleOption(&opt);
- QRect cr = style()->subElementRect(QStyle::SE_LineEditContents, &opt, this);
- cr.setLeft(cr.left() + 2);
- cr.setRight(cr.right() - 2);
-
- p.drawText(cr, Qt::AlignLeft|Qt::AlignVCenter, placeholder_text_);
- }
- // else check filter syntax and set the background accordingly
- // XXX - Should we add little warning/error icons as well?
-#endif // QT < 4.7
}
void CaptureFilterEdit::resizeEvent(QResizeEvent *)
@@ -303,9 +279,7 @@ void CaptureFilterEdit::setConflict(bool conflict)
placeholder_text_ = QString(tr("Enter a capture filter %1")).arg(UTF8_HORIZONTAL_ELLIPSIS);
setToolTip(QString());
}
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
setPlaceholderText(placeholder_text_);
-#endif
}
// XXX Make this private along with setConflict.