← Back to branch summary

~ubuntu-branches/ubuntu/trusty/bibletime/trusty

« back to all changes in this revision

Viewing changes to src/frontend/bookshelfmanager/instbackend.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Marsden
  • Date: 2010-01-10 22:21:36 UTC
  • mfrom: (1.3.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100110222136-905hza76230hperg
Tags: 2.5-1
http://bugs.debian.org/564551
New upstream version 2.5 (Closes: #564551).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/frontend/bookshelfmanager/instbackend.cpp
120
120
        sce = l.join("|").append("|");
121
121
        it = range.first;
122
122
        while (it != range.second) {
123
 
           qDebug() << it->second;
 
123
            qDebug() << it->second;
124
124
            if (it->second == sce) {
125
125
                config["Sources"].erase(it);
126
126
                break;
150
150
}
151
151
 
152
152
const QString configPath() {
153
 
        QString confPath = util::directory::getUserHomeSwordDir().absolutePath();
154
 
        confPath.append("/InstallMgr");
 
153
    QString confPath = util::directory::getUserHomeSwordDir().absolutePath();
 
154
    confPath.append("/InstallMgr");
155
155
    return confPath;
156
156
}
157
157
 
196
196
        return false;
197
197
    }
198
198
 
199
 
        filename = util::directory::convertDirSeparators(filename);
 
199
    filename = util::directory::convertDirSeparators(filename);
200
200
    SWConfig conf(filename.toLocal8Bit());
201
201
    conf.Sections.clear();
202
202
 
203
203
#ifdef Q_WS_WIN
204
 
        // On Windows, add the sword directory to the config file.
205
 
        QString swordPath = DU::convertDirSeparators( DU::getApplicationSwordDir().absolutePath());
206
 
        conf["Install"].insert( 
207
 
                std::make_pair( SWBuf("LocalePath"), swordPath.toLocal8Bit().data() )
208
 
        );
 
204
    // On Windows, add the sword directory to the config file.
 
205
    QString swordPath = DU::convertDirSeparators( DU::getApplicationSwordDir().absolutePath());
 
206
    conf["Install"].insert(
 
207
        std::make_pair( SWBuf("LocalePath"), swordPath.toLocal8Bit().data() )
 
208
    );
209
209
#endif
210
210
 
211
211
    bool setDataPath = false;
212
212
    for (QStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
213
 
                QString t = DU::convertDirSeparators(*it);
 
213
        QString t = DU::convertDirSeparators(*it);
214
214
#ifdef Q_WS_WIN
215
 
                if (t.contains(DU::convertDirSeparators(DU::getUserHomeDir().canonicalPath().append("\\Sword")))) {
 
215
        if (t.contains(DU::convertDirSeparators(DU::getUserHomeDir().canonicalPath().append("\\Sword")))) {
216
216
#else
217
217
        if (t.contains(DU::getUserHomeDir().canonicalPath().append("/.sword"))) {
218
218
#endif