osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix a variable name. 

svn path=/trunk/; revision=45939
This commit is contained in:
Gerald Combs 2012-11-05 22:25:06 +00:00
parent 6285d3f8c2
commit 4244e4480e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/qt/splash_overlay.cpp
View File

@ -46,11 +46,11 @@ void splash_update(register_action_e action, const char *message, void *dummy) {
SplashOverlay::SplashOverlay(QWidget *parent) :
QWidget(parent),
bo_ui_(new Ui::SplashOverlay),
so_ui_(new Ui::SplashOverlay),
last_action_(RA_NONE),
register_cur_(0)
{
bo_ui_->setupUi(this);
so_ui_->setupUi(this);
/* additional 6 for:
* dissectors, listeners,
@ -64,7 +64,7 @@ SplashOverlay::SplashOverlay(QWidget *parent) :
#ifdef HAVE_PYTHON
register_add += 2; /* additional 2 for python register and handoff */
#endif
bo_ui_->progressBar->setMaximum((int)register_count() + register_add);
so_ui_->progressBar->setMaximum((int)register_count() + register_add);
time_.start();
setPalette(Qt::transparent);
@ -93,7 +93,7 @@ SplashOverlay::SplashOverlay(QWidget *parent) :
SplashOverlay::~SplashOverlay()
{
delete bo_ui_;
delete so_ui_;
}
// Useful for debugging on fast machines.
@ -118,7 +118,7 @@ void SplashOverlay::splashUpdate(register_action_e action, const char *message)
#endif
register_cur_++;
if (last_action_ == action && time_.elapsed() < info_update_freq_ && register_cur_ < bo_ui_->progressBar->maximum()) {
if (last_action_ == action && time_.elapsed() < info_update_freq_ && register_cur_ < so_ui_->progressBar->maximum()) {
/* Only update every splash_register_freq milliseconds */
return;
}
@ -171,10 +171,10 @@ void SplashOverlay::splashUpdate(register_action_e action, const char *message)
message += 18;
action_msg.append(" ").append(message);
}
bo_ui_->actionLabel->setText(action_msg);
so_ui_->actionLabel->setText(action_msg);
register_cur_++;
bo_ui_->progressBar->setValue(register_cur_);
so_ui_->progressBar->setValue(register_cur_);
wsApp->processEvents();
}

2
ui/qt/splash_overlay.h
View File

@ -51,7 +51,7 @@ protected:
void paintEvent(QPaintEvent *event);
private:
Ui::SplashOverlay *bo_ui_;
Ui::SplashOverlay *so_ui_;
bool blurred_;
register_action_e last_action_;
int register_cur_;