← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libkcddb/categories.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:
libkcddb/categories.cpp
16
16
    //
17
17
    // http://www.freedb.org/modules.php?name=Sections&sop=viewarticle&artid=26
18
18
    //
19
 
    m_cddb << "blues" << "classical" << "country" <<
20
 
            "data" << "folk" << "jazz" << "misc" <<
21
 
            "newage" << "reggae" << "rock" << "soundtrack";
 
19
    m_cddb << QLatin1String( "blues" ) << QLatin1String( "classical" ) << QLatin1String( "country" ) <<
 
20
        QLatin1String( "data" ) << QLatin1String( "folk" ) << QLatin1String( "jazz" ) << QLatin1String( "misc" ) <<
 
21
        QLatin1String( "newage" ) << QLatin1String( "reggae" ) << QLatin1String( "rock" ) << QLatin1String( "soundtrack" );
22
22
    m_i18n << i18n("Blues") << i18n("Classical") << i18nc("music genre", "Country") <<
23
23
            i18n("Data") << i18n("Folk") << i18n("Jazz") << i18n("Miscellaneous") <<
24
24
            i18n("New Age") << i18n("Reggae") << i18n("Rock") << i18n("Soundtrack");
33
33
    }
34
34
    else
35
35
    {
36
 
        return cddb2i18n("misc");
 
36
        return cddb2i18n(QLatin1String( "misc" ));
37
37
    }
38
38
}
39
39
 
46
46
    }
47
47
    else
48
48
    {
49
 
        return "misc";
 
49
        return QLatin1String( "misc" );
50
50
    }
51
51
}