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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 28093ac9a0bdb7619a3d771aad43bbfd3cd0c978
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Mar 1 12:19:41 2009 +0200

    Use shorter variable name for KaboomSettings::instance().
    
    KaboomSettings is/will be needed frequently here.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/choicepage.cpp b/choicepage.cpp
index ebe5685..cd6791f 100644
--- a/choicepage.cpp
+++ b/choicepage.cpp
@@ -41,24 +41,26 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
 {
   d = new ChoicePagePrivate;
   QVBoxLayout *lay = new QVBoxLayout(this);
+  KaboomSettings& s = KaboomSettings::instance();
+
   setTitle(tr("Setting migration options"));
   d->buttons = new QButtonGroup(this);
   d->text = new QLabel(tr("Please choose one of the following migration scenarios:"),this);
   d->text->setWordWrap(true);
   lay->addWidget(d->text);
-  if(KaboomSettings::instance().kdehomeDir().exists())
+  if(s.kdehomeDir().exists())
   {
     d->migrate = new RichRadioButton(tr("Migrate settings from KDE3 to KDE4 (standard)"),this);
     d->buttons->addButton(d->migrate,MigrationTool::Migrate);
     lay->addWidget(d->migrate);
     d->migrate->setChecked(true);
   }
-  if(KaboomSettings::instance().kde4homeDir().exists())
+  if(s.kde4homeDir().exists())
   {
     d->move = new RichRadioButton(tr("Use existing KDE 4 settings and <b>replace</b> KDE 3 settings"));
     d->buttons->addButton(d->move,MigrationTool::Move);
     lay->addWidget(d->move);
-    if(KaboomSettings::instance().kdehomeDir().exists())
+    if(s.kdehomeDir().exists())
     {
       d->merge = new RichRadioButton(tr("Merge settings from KDE3 and KDE4 (experimental)"));
       d->buttons->addButton(d->merge,MigrationTool::Merge);
@@ -80,7 +82,7 @@ ChoicePage::ChoicePage(QWidget *parent) : QWizardPage(parent)
   lay->addWidget(d->backup);
   d->backup->hide();
   d->backup->setChecked(false);
-  if(KaboomSettings::instance().kdehomeDir().exists()) //if no kdedir, nothing to backup.
+  if(s.kdehomeDir().exists()) //if no kdedir, nothing to backup.
   {
     d->backupinformation = new QWidget(this);
     QVBoxLayout *blay = new QVBoxLayout(d->backupinformation);

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