← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to utilities/setup/setupdatabase.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/setup/setupdatabase.cpp
66
66
{
67
67
public:
68
68
 
69
 
    SetupDatabasePriv()
 
69
    SetupDatabasePriv() :
 
70
        mainDialog(0),
 
71
        databaseWidget(0)
70
72
    {
71
 
        mainDialog     = 0;
72
 
        databaseWidget = 0;
73
73
    }
74
74
 
75
75
    KPageDialog*    mainDialog;
77
77
};
78
78
 
79
79
SetupDatabase::SetupDatabase(KPageDialog* dialog, QWidget* parent)
80
 
             : QScrollArea(parent), d(new SetupDatabasePriv)
 
80
    : QScrollArea(parent), d(new SetupDatabasePriv)
81
81
{
82
82
    d->mainDialog  = dialog;
83
83
    d->databaseWidget = new DatabaseWidget(viewport());
100
100
void SetupDatabase::applySettings()
101
101
{
102
102
    AlbumSettings* settings = AlbumSettings::instance();
103
 
    if (!settings) return;
 
103
 
 
104
    if (!settings)
 
105
    {
 
106
        return;
 
107
    }
104
108
 
105
109
    if (d->databaseWidget->currentDatabaseType() == QString(DatabaseParameters::SQLiteDatabaseType()))
106
110
    {
145
149
            settings->setDatabaseUserName(d->databaseWidget->userName->text());
146
150
            settings->setDatabasePassword(d->databaseWidget->password->text());
147
151
        }
 
152
 
148
153
        settings->saveSettings();
149
154
    }
150
155
}
152
157
void SetupDatabase::readSettings()
153
158
{
154
159
    AlbumSettings* settings = AlbumSettings::instance();
155
 
    if (!settings) return;
 
160
 
 
161
    if (!settings)
 
162
    {
 
163
        return;
 
164
    }
156
165
 
157
166
    d->databaseWidget->setParametersFromSettings(settings);
158
167
}