aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Knall <roland.knall@br-automation.com>2017-11-21 10:46:26 +0100
committerRoland Knall <rknall@gmail.com>2017-11-21 09:50:39 +0000
commit1470aeef4cd4b1660d68c2907dc7b58f9d16df58 (patch)
tree8238f92490051811d206ea390e86ab2461f01df9
parent3cf73671d10a9c8f6505c57397dd833c7e3efc4f (diff)
Qt: Remove merge issue from Drag Drop
Remove a remissent merge artefact Change-Id: I4c53d4b2adef124712091c40efccc1cad3db3301 Reviewed-on: https://code.wireshark.org/review/24521 Reviewed-by: Roland Knall <rknall@gmail.com>
-rw-r--r--ui/qt/widgets/drag_drop_toolbar.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/qt/widgets/drag_drop_toolbar.cpp b/ui/qt/widgets/drag_drop_toolbar.cpp
index ba585f9..0e4d174 100644
--- a/ui/qt/widgets/drag_drop_toolbar.cpp
+++ b/ui/qt/widgets/drag_drop_toolbar.cpp
@@ -114,10 +114,6 @@ bool DragDropToolBar::eventFilter(QObject * obj, QEvent * event)
if ( ( ev->buttons() & Qt::LeftButton ) && (ev->pos() - dragStartPosition).manhattanLength()
> QApplication::startDragDistance())
{
- bool success = false;
- if ( ! success )
- return false;
-
ToolbarEntryMimeData * temd =
new ToolbarEntryMimeData(((QToolButton *)elem)->text(), elem->property(drag_drop_toolbar_action_).toInt());
DragLabel * lbl = new DragLabel(temd->labelText(), this);