Update description of PAGES and changes to TODO. Also removed spacers

[bacula/bacula] / bacula / src / qt-console / restore / prerestore.cpp

diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index b6cd0839a1d5352d8d0fa36df844aec4968cff83..a1a8423ecb051586f0d29921089180fe59561c9d 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -39,26 +39,19 @@
 #include "restore.h"
 
 
-prerestorePage::prerestorePage(Console *console)
+prerestorePage::prerestorePage()
 {
-   console->notify(false);
    m_name = "Pre-Restore";
    setupUi(this);
-   QTreeWidgetItem *parent = mainWin->getFromHash(console);
-   if (!parent) {
-      /* ***FIXME*** */
-      printf("Error retrieving tree widget.");
-      return;
-   }
-   pgInitialize(parent);
+   pgInitialize();
+   m_console->notify(false);
    m_closeable = true;
 
-   jobCombo->addItems(console->job_list);
-   filesetCombo->addItems(console->fileset_list);
-   clientCombo->addItems(console->client_list);
-   poolCombo->addItems(console->pool_list);
-   storageCombo->addItems(console->storage_list);
-   //beforeDateTime->setDate(QDateTime::currentDateTime().toUTC().date());
+   jobCombo->addItems(m_console->job_list);
+   filesetCombo->addItems(m_console->fileset_list);
+   clientCombo->addItems(m_console->client_list);
+   poolCombo->addItems(m_console->pool_list);
+   storageCombo->addItems(m_console->storage_list);
    beforeDateTime->setDateTime(QDateTime::currentDateTime());
    beforeDateTime->setEnabled(false);
    job_name_change(0);
@@ -86,11 +79,11 @@ void prerestorePage::okButtonPushed()
              .arg(storageCombo->currentText());
 
    /* ***FIXME*** */
-   printf("preRestore command \"%s\"\n", cmd.toUtf8().data());
+   //printf("preRestore command \"%s\"\n", cmd.toUtf8().data());
    m_console->write(cmd);
    m_console->display_text(cmd);
    /* Note, do not turn notifier back on here ... */
-   new restorePage(m_console);
+   new restorePage();
    closeStackPage();
 }