From: Jari Jarvi <t7jaja00@students.oamk.fi>
Date: Thu, 8 Jul 2010 10:57:24 +0000 (+0300)
Subject: Merge branch 'master' of ssh://mercury/var/git/irwi
X-Git-Url: http://vcs.maemo.org/git/?p=irwi;a=commitdiff_plain;h=b7ed6b2adabca3f775e65ba14893eef74f042560

Merge branch 'master' of ssh://mercury/var/git/irwi

Conflicts:
	src/selectremotedlg.cpp
---

b7ed6b2adabca3f775e65ba14893eef74f042560
diff --cc src/selectremotedlg.cpp
index e001110,b6fefb2..9c8b009
--- a/src/selectremotedlg.cpp
+++ b/src/selectremotedlg.cpp
@@@ -78,8 -79,9 +79,8 @@@ void SelectRemoteDlg::alphabetItemChang
                                        QListWidgetItem * /*previous*/)
  {
      mfgList->clear();
-     modelList->clear();
+     modelList->removeAllRows();
 -    if (current)
 -    {
 +    if (current) {
          mfgList->addItems((*remoteDB)[current->text()].keys());
      }
  }
@@@ -87,8 -89,9 +88,8 @@@
  void SelectRemoteDlg::mfgItemChanged(QListWidgetItem *current,
                                       QListWidgetItem * /*previous*/)
  {
-     modelList->clear();
+     modelList->removeAllRows();
 -    if (current)
 -    {
 +    if (current) {
          RemoteList remotes =
              (*remoteDB)[alphabetList->currentItem()->text()][current->text()];
          foreach(Remote *remote, remotes) {
@@@ -99,16 -102,15 +100,15 @@@
  
  void SelectRemoteDlg::downloadRemote()
  {
-     RemoteListWidgetItem *currentModel =
-         static_cast<RemoteListWidgetItem *>(modelList->currentItem());
+     Remote *currentModel = modelList->selected();
 -    if (currentModel)
 -    {
 +    if (currentModel) {
 +        setResult(QDialog::Accepted);
          setBusy();
-         connect(currentModel->remote(), SIGNAL(saveFinished()),
+         connect(currentModel, SIGNAL(saveFinished()),
                  this, SLOT(close()));
-         currentModel->remote()->saveToFile();
+         currentModel->saveToFile();
  
-         emit remoteChanged(*(currentModel->remote()));
+         emit remoteChanged(*currentModel);
      }
  }