diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-09-03 16:14:38 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-09-03 16:14:38 +0000 |
| commit | 3331d6d4e94fbf48268657ec6986e5f66376fbdd (patch) | |
| tree | 888ba8ca4d2ef98f17623427fb90c00a4ac6c3a3 /ui/qt/progress_bar.cpp | |
| parent | 259ebc5269ddc8d9d7c221abd79509372078a17f (diff) | |
| download | wireshark-3331d6d4e94fbf48268657ec6986e5f66376fbdd.tar.gz | |
Use more consistent naming.
svn path=/trunk/; revision=51724
Diffstat (limited to 'ui/qt/progress_bar.cpp')
| -rw-r--r-- | ui/qt/progress_bar.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/qt/progress_bar.cpp b/ui/qt/progress_bar.cpp index f4886c5ca5..b9000ad228 100644 --- a/ui/qt/progress_bar.cpp +++ b/ui/qt/progress_bar.cpp @@ -88,7 +88,7 @@ update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status) { Q_UNUSED(status); - dlg->progressBar->setValue(percentage * 100); + dlg->progress_bar->setValue(percentage * 100); /* * Flush out the update and process any input events. @@ -102,17 +102,17 @@ update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status) void destroy_progress_dlg(progdlg_t *dlg) { - dlg->progressBar->hide(); + dlg->progress_bar->hide(); } // XXX - Add a "stop what you're doing this instant" button. // XXX - We need to show the task and item titles. Maybe as a tooltip or popped // into our sibling status message? ProgressBar::ProgressBar(QWidget *parent) : - QProgressBar(parent), m_terminate_is_stop(false), m_stop_flag(NULL) + QProgressBar(parent), terminate_is_stop_(false), stop_flag_(NULL) { - m_dlg.progressBar = this; - m_dlg.topLevelWindow = window(); + progress_dialog_.progress_bar = this; + progress_dialog_.top_level_window = window(); //#ifdef Q_OS_MAC // // https://bugreports.qt-project.org/browse/QTBUG-11569 @@ -133,8 +133,8 @@ ProgressBar::ProgressBar(QWidget *parent) : progdlg_t * ProgressBar::show(bool animate, bool terminate_is_stop, gboolean *stop_flag, int value) { - m_terminate_is_stop = terminate_is_stop; - m_stop_flag = stop_flag; + terminate_is_stop_ = terminate_is_stop; + stop_flag_ = stop_flag; setValue(value); @@ -155,7 +155,7 @@ progdlg_t * ProgressBar::show(bool animate, bool terminate_is_stop, gboolean *st #endif QProgressBar::show(); - return &m_dlg; + return &progress_dialog_; } /* |