← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/hack_in_etc_kde4_in_kstandarddirs.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/hack_in_etc_kde4_in_kstandarddirs.diff/kdecore/kernel/kstandarddirs.cpp
1106
1106
                restrictionActive = true;
1107
1107
        }
1108
1108
 
1109
 
        QStringList dirs;
1110
 
        dirs = m_relatives.value(type);
 
1109
        const QStringList dirs = m_relatives.value(type);
1111
1110
        const QString typeInstallPath = installPath(type); // could be empty
1112
1111
// better #ifdef incasesensitive_filesystem
1113
1112
#ifdef Q_WS_WIN
1201
1200
                candidates.append(installdir);
1202
1201
        }
1203
1202
 
1204
 
        dirs = m_absolutes.value(type);
1205
 
        if (!dirs.isEmpty())
1206
 
            for (QStringList::ConstIterator it = dirs.constBegin();
1207
 
                 it != dirs.constEnd(); ++it)
1208
 
            {
1209
 
                testdir.setPath(*it);
1210
 
                if (testdir.exists()) {
 
1203
        const QStringList absDirs = m_absolutes.value(type);
 
1204
        for (QStringList::ConstIterator it = absDirs.constBegin();
 
1205
             it != absDirs.constEnd(); ++it)
 
1206
        {
 
1207
            testdir.setPath(*it);
 
1208
            if (testdir.exists()) {
1211
1209
#ifdef Q_WS_WIN
1212
 
                    const QString filename = realPath( *it ).toLower();
 
1210
                const QString filename = realPath( *it ).toLower();
1213
1211
#else
1214
 
                    const QString filename = realPath( *it );
 
1212
                const QString filename = realPath( *it );
1215
1213
#endif
1216
 
                    if (!candidates.contains(filename)) {
1217
 
                        candidates.append(filename);
1218
 
                    }
 
1214
                if (!candidates.contains(filename)) {
 
1215
                    candidates.append(filename);
1219
1216
                }
1220
1217
            }
 
1218
        }
1221
1219
 
1222
1220
        // Insert result into the cache for next time.
1223
1221
        // Exception: data_subdir restrictions are per-subdir, so we can't store such results
1870
1868
 
1871
1869
    addResourceType("lib", 0, "lib" KDELIBSUFF "/");
1872
1870
 
 
1871
    addResourceType("qtplugins", "lib", "plugins");
 
1872
 
1873
1873
    uint index = 0;
1874
1874
    while (types_indices[index] != -1) {
1875
1875
        addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);