Fixes two compiler warnings:

- call of GeneralPage() with null pointer rather than the boolean false
- decomposition of a suspicious line into safe expressions (problem related to
  sequence points)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3273 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
leander-256 2010-07-09 01:10:27 +00:00
parent 7dd79e650f
commit 36a9159884
2 changed files with 3 additions and 2 deletions

View File

@ -170,7 +170,8 @@ MessagesDialog::LockUpdate::LockUpdate (MessagesDialog *pDialog, bool bUpdate)
MessagesDialog::LockUpdate::~LockUpdate ()
{
m_pDialog->m_nLockUpdate = qMax (--m_pDialog->m_nLockUpdate, 0);
if(--m_pDialog->m_nLockUpdate < 0)
m_pDialog->m_nLockUpdate = 0;
if (m_bUpdate && m_pDialog->m_nLockUpdate == 0) {
m_pDialog->insertMessages();

View File

@ -100,7 +100,7 @@ RSettingsWin::initStackedWidget()
stackedWidget->setCurrentIndex(-1);
stackedWidget->removeWidget(stackedWidget->widget(0));
stackedWidget->addWidget(new GeneralPage(false));
stackedWidget->addWidget(new GeneralPage(0));
stackedWidget->addWidget(new ServerPage());
stackedWidget->addWidget(new TransferPage());
stackedWidget->addWidget(new DirectoriesPage());