← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kde4libs/oneiric-proposed

« back to all changes in this revision

Viewing changes to kdecore/services/kmimetyperepository.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2011-07-08 00:08:34 UTC
  • mto: This revision was merged to the branch mainline in revision 247.
  • Revision ID: package-import@ubuntu.com-20110708000834-dr9a8my4iml90qe5
Tags: upstream-4.6.90
Import upstream version 4.6.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdecore/services/kmimetyperepository.cpp
661
661
        } else {
662
662
            const QString defaultMimeType = KMimeType::defaultMimeType();
663
663
            errorMissingMimeTypes(QStringList(defaultMimeType));
664
 
            const QString pathDefaultMimeType = KGlobal::dirs()->resourceDirs("xdgdata-mime").first()+defaultMimeType+QLatin1String(".xml");
 
664
            const QString pathDefaultMimeType = KGlobal::dirs()->locateLocal("xdgdata-mime", defaultMimeType+QLatin1String(".xml"));
665
665
            m_defaultMimeType = new KMimeType(pathDefaultMimeType, defaultMimeType, QLatin1String("mime"));
666
666
        }
667
667
    }
722
722
 
723
723
        while (!file.atEnd()) {
724
724
            const QByteArray line = file.readLine().simplified();
725
 
            if (!line.startsWith("Version")) {
 
725
            if (!line.startsWith("Version")) { // krazy:exclude=strings
726
726
                continue;
727
727
            }
728
728
            QRegExp versionRe(QString::fromLatin1("Version: (\\d+)\\.(\\d+)(\\.(\\d+))?"));