aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/column_preferences_frame.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-02-06 18:22:54 +0000
committerGerald Combs <gerald@wireshark.org>2013-02-06 18:22:54 +0000
commit1c0deb0fc818252904878fe5419c75df3873a901 (patch)
treeb44a3986fa473e3c6872c21c1036abe9d573b225 /ui/qt/column_preferences_frame.h
parentae527cbf109a054ba10e3e313fb42e0b2ec0f342 (diff)
Add Filter Expressions^WButton^WShortcut^WBookmark preferences.
Add comments noting that - We might want to do something different when the bookmark button is pressed. - The display filters (dfilters file) and gui.filter_expressions preferences should be merged. - Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the main window really wide. Add a qstring_strdup convenience routine. Add "disabled" display filter edit icons. Fix up whitespace and descriptions in a couple of places. svn path=/trunk/; revision=47522
Diffstat (limited to 'ui/qt/column_preferences_frame.h')
-rw-r--r--ui/qt/column_preferences_frame.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/qt/column_preferences_frame.h b/ui/qt/column_preferences_frame.h
index 3eabae0cc4..24d1e4e16c 100644
--- a/ui/qt/column_preferences_frame.h
+++ b/ui/qt/column_preferences_frame.h
@@ -43,7 +43,6 @@ public:
void unstash();
protected:
- void showEvent(QShowEvent *evt);
void keyPressEvent(QKeyEvent *evt);
private: