[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 79e876de945f9a28aa08ec86f2b03c215ac8525f

Sune Vuorela pusling-guest at alioth.debian.org
Tue Mar 3 09:39:25 UTC 2009


The following commit has been merged in the master branch:
commit e2268697a9c008e328ac6987ef3c710207b93cf9
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Mar 3 10:38:55 2009 +0100

    make sure that pointers dereferenced actually exists

diff --git a/choicepage.cpp b/choicepage.cpp
index f75efb5..f973cc7 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -24,7 +24,7 @@
 class ChoicePagePrivate
 {
   public:
-    ChoicePagePrivate() : backup(NULL) {}
+    ChoicePagePrivate() : backup(NULL), backupinformation(NULL) {}
     QLabel *configInfoLabel, *configLabel, *onceDoneLabel;
     QLabel *scenariosLabel;
     RichRadioButton *clean;
@@ -80,6 +80,10 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
   lay->addWidget(d->onceDoneLabel);
   lay->addSpacing(10);
   lay->addWidget(d->scenariosLabel);
+  
+  d->backupinformation = new QWidget(this);
+  d->backupinformation->hide();
+  lay->addWidget(d->backupinformation);
 
   if(s.kdehomeDir().exists())
   {
@@ -158,7 +162,6 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
   d->backup->setChecked(false);
   if(s.kdehomeDir().exists()) //if no kdedir, nothing to backup.
   {
-    d->backupinformation = new QWidget(this);
     QVBoxLayout *blay = new QVBoxLayout(d->backupinformation);
     QLabel *freewarning = new QLabel(tr("Insufficient free space to complete a backup, please consider freeing up some space. You can go to TTY1 to do this."),this);
     d->spacebar = new QProgressBar(this);
@@ -169,7 +172,7 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
     blay->addWidget(d->spacebar);
     blay->addWidget(d->freeinfo);
     blay->addWidget(recheck);
-    lay->addWidget(d->backupinformation);
+    d->backupinformation->show();
     connect(recheck,SIGNAL(clicked()),this,SLOT(checkSpaceForBackup()));
   }
 }
@@ -209,7 +212,7 @@ void ChoicePage::checkSpaceForBackup()
   }
   else
   {
-    d->backupinformation->setVisible(false);
+    d->backupinformation->hide();
     d->progresswidget->setVisible(false);
     d->backup->setChecked(true);
     d->backup->show();

-- 
Kaboom - Debian KDE 3->4 migration tool



More information about the pkg-kde-commits mailing list