← Back to branch summary

~ubuntu-branches/ubuntu/natty/kdemultimedia/natty-proposed

« back to all changes in this revision

Viewing changes to kioslave/audiocd/plugins/audiocdencoder.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Debian Qt/KDE Maintainers
  • Date: 2011-05-26 02:41:36 UTC
  • mfrom: (0.2.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 108.
  • Revision ID: james.westby@ubuntu.com-20110526024136-jjwsigfy402jhupm
Tags: upstream-4.6.3
Import upstream version 4.6.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
kioslave/audiocd/plugins/audiocdencoder.cpp
39
39
#ifdef DEBUG
40
40
    kDebug(7117) << "We have a loader. File:  \"" << libFileName.latin1() << "\".";
41
41
#endif
42
 
    KLibrary *lib = loader->library(libFileName.toLatin1());
 
42
    KLibrary *lib = loader->library(QLatin1String( libFileName.toLatin1() ));
43
43
    if (!lib)
44
44
        return NULL;
45
45
#ifdef DEBUG
64
64
    QString foundEncoders;
65
65
 
66
66
                KStandardDirs standardDirs;
67
 
    QStringList dirs = standardDirs.findDirs("module", "");
 
67
    QStringList dirs = standardDirs.findDirs("module", QLatin1String( "" ));
68
68
    for (QStringList::const_iterator it = dirs.constBegin(); it != dirs.constEnd(); ++it) {
69
69
        QDir dir(*it);
70
70
        if (!dir.exists()) {
76
76
        const QFileInfoList files = dir.entryInfoList();
77
77
        for (int i = 0; i < files.count(); ++i) {
78
78
            QFileInfo fi(files.at(i));
79
 
            if (0 < fi.fileName().count(QRegExp("^libaudiocd_encoder_.*.so$"))) {
80
 
                QString fileName = (fi.fileName().mid(0, fi.fileName().indexOf('.')));
 
79
            if (0 < fi.fileName().count(QRegExp( QLatin1String( "^libaudiocd_encoder_.*.so$" )))) {
 
80
                QString fileName = (fi.fileName().mid(0, fi.fileName().indexOf(QLatin1Char( '.' ))));
81
81
                if (foundEncoders.contains(fileName)) {
82
82
                    kDebug(7117) << "Warning, encoder has been found twice!";
83
83
                    continue;