← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to .pc/kubuntu_add_langpack_path.diff/kdecore/kernel/kstandarddirs.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-11-06 22:32:05 UTC
  • mfrom: (1.14.23)
  • Revision ID: package-import@ubuntu.com-20121106223205-gagst9s46g041mmo
Tags: 4:4.9.3-0ubuntu1
https://launchpad.net/bugs/1074747
* New upstream release (LP: #1074747)
  - drop fix_samba.diff, applied upstream
  - add new symbols to libkjsapi4.symbols and libkio5.symbols
  - refresh python3-support-bytecode.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/kubuntu_add_langpack_path.diff/kdecore/kernel/kstandarddirs.cpp
1110
1110
                restrictionActive = true;
1111
1111
        }
1112
1112
 
1113
 
        QStringList dirs;
1114
 
        dirs = m_relatives.value(type);
 
1113
        const QStringList dirs = m_relatives.value(type);
1115
1114
        const QString typeInstallPath = installPath(type); // could be empty
1116
1115
// better #ifdef incasesensitive_filesystem
1117
1116
#ifdef Q_WS_WIN
1209
1208
                candidates.append(installdir);
1210
1209
        }
1211
1210
 
1212
 
        dirs = m_absolutes.value(type);
1213
 
        if (!dirs.isEmpty())
1214
 
            for (QStringList::ConstIterator it = dirs.constBegin();
1215
 
                 it != dirs.constEnd(); ++it)
1216
 
            {
1217
 
                testdir.setPath(*it);
1218
 
                if (testdir.exists()) {
 
1211
        const QStringList absDirs = m_absolutes.value(type);
 
1212
        for (QStringList::ConstIterator it = absDirs.constBegin();
 
1213
             it != absDirs.constEnd(); ++it)
 
1214
        {
 
1215
            testdir.setPath(*it);
 
1216
            if (testdir.exists()) {
1219
1217
#ifdef Q_WS_WIN
1220
 
                    const QString filename = realPath( *it ).toLower();
 
1218
                const QString filename = realPath( *it ).toLower();
1221
1219
#else
1222
 
                    const QString filename = realPath( *it );
 
1220
                const QString filename = realPath( *it );
1223
1221
#endif
1224
 
                    if (!candidates.contains(filename)) {
1225
 
                        candidates.append(filename);
1226
 
                    }
 
1222
                if (!candidates.contains(filename)) {
 
1223
                    candidates.append(filename);
1227
1224
                }
1228
1225
            }
 
1226
        }
1229
1227
 
1230
1228
        // Insert result into the cache for next time.
1231
1229
        // Exception: data_subdir restrictions are per-subdir, so we can't store such results
1878
1876
 
1879
1877
    addResourceType("lib", 0, "lib" KDELIBSUFF "/");
1880
1878
 
 
1879
    addResourceType("qtplugins", "lib", "plugins");
 
1880
 
1881
1881
    uint index = 0;
1882
1882
    while (types_indices[index] != -1) {
1883
1883
        addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);