Commit 38c44901 authored by Christoph Pfister's avatar Christoph Pfister

make krazy happy

parent 6296d8e9
......@@ -177,16 +177,16 @@ void MPlayerMediaWidget::setCurrentAudioStream(int currentAudioStream)
{
if ((currentAudioStream >= 0) && (currentAudioStream < audioIds.size())) {
process.write("pausing_keep_force set_property switch_audio " +
QByteArray::number(audioIds.at(currentAudioStream)) + "\n"
"pausing_keep_force get_property switch_audio\n");
QByteArray::number(audioIds.at(currentAudioStream)) +
"\npausing_keep_force get_property switch_audio\n");
}
}
void MPlayerMediaWidget::setCurrentSubtitle(int currentSubtitle)
{
process.write("pausing_keep_force set_property sub " +
QByteArray::number(currentSubtitle) + "\n"
"pausing_keep_force get_property sub\n");
QByteArray::number(currentSubtitle) +
"\npausing_keep_force get_property sub\n");
}
void MPlayerMediaWidget::setExternalSubtitle(const KUrl &subtitleUrl)
......@@ -198,16 +198,16 @@ void MPlayerMediaWidget::setExternalSubtitle(const KUrl &subtitleUrl)
void MPlayerMediaWidget::setCurrentTitle(int currentTitle)
{
process.write("pausing_keep_force set_property switch_title " +
QByteArray::number(currentTitle) + "\n"
"pausing_keep_force get_property switch_title\n"
QByteArray::number(currentTitle) +
"\npausing_keep_force get_property switch_title\n"
"pausing_keep_force get_property chapter\n");
}
void MPlayerMediaWidget::setCurrentChapter(int currentChapter)
{
process.write("pausing_keep_force set_property chapter " +
QByteArray::number(currentChapter) + "\n"
"pausing_keep_force get_property switch_title\n"
QByteArray::number(currentChapter) +
"\npausing_keep_force get_property switch_title\n"
"pausing_keep_force get_property chapter\n");
}
......
......@@ -346,7 +346,7 @@ void VlcMediaWidget::play(const MediaSource &source)
switch (source.type) {
case MediaSource::Url:
if (url.endsWith(".iso")) {
if (url.endsWith(QLatin1String(".iso"))) {
playingDvd = true;
}
......
......@@ -458,7 +458,7 @@ void MediaWidget::playAudioCd(const QString &device)
KUrl devicePath;
if (!device.isEmpty()) {
devicePath = QUrl::fromLocalFile(device);
devicePath = KUrl::fromLocalFile(device);
} else {
QList<Solid::Device> devices =
Solid::Device::listFromQuery("OpticalDisc.availableContent & 'Audio'");
......@@ -467,7 +467,7 @@ void MediaWidget::playAudioCd(const QString &device)
Solid::Block *block = devices.first().as<Solid::Block>();
if (block != NULL) {
devicePath = QUrl::fromLocalFile(block->device());
devicePath = KUrl::fromLocalFile(block->device());
}
}
}
......@@ -481,7 +481,7 @@ void MediaWidget::playVideoCd(const QString &device)
KUrl devicePath;
if (!device.isEmpty()) {
devicePath = QUrl::fromLocalFile(device);
devicePath = KUrl::fromLocalFile(device);
} else {
QList<Solid::Device> devices = Solid::Device::listFromQuery(
"OpticalDisc.availableContent & 'VideoCd|SuperVideoCd'");
......@@ -490,7 +490,7 @@ void MediaWidget::playVideoCd(const QString &device)
Solid::Block *block = devices.first().as<Solid::Block>();
if (block != NULL) {
devicePath = QUrl::fromLocalFile(block->device());
devicePath = KUrl::fromLocalFile(block->device());
}
}
}
......@@ -504,7 +504,7 @@ void MediaWidget::playDvd(const QString &device)
KUrl devicePath;
if (!device.isEmpty()) {
devicePath = QUrl::fromLocalFile(device);
devicePath = KUrl::fromLocalFile(device);
} else {
QList<Solid::Device> devices =
Solid::Device::listFromQuery("OpticalDisc.availableContent & 'VideoDvd'");
......@@ -513,7 +513,7 @@ void MediaWidget::playDvd(const QString &device)
Solid::Block *block = devices.first().as<Solid::Block>();
if (block != NULL) {
devicePath = QUrl::fromLocalFile(block->device());
devicePath = KUrl::fromLocalFile(block->device());
}
}
}
......
......@@ -129,7 +129,7 @@ static QString parseLine(DvbTransponderBase::TransmissionType type, const QStrin
qWarning() << "Warning: bandwidth == AUTO in file" << fileName;
}
if ((transponder.modulation == DvbTTransponder::ModulationAuto) && !fileName.startsWith("auto-")) {
if ((transponder.modulation == DvbTTransponder::ModulationAuto) && !fileName.startsWith(QLatin1String("auto-"))) {
qWarning() << "Warning: modulation == AUTO in file" << fileName;
}
......@@ -143,11 +143,11 @@ static QString parseLine(DvbTransponderBase::TransmissionType type, const QStrin
qWarning() << "Warning: fec rate low != NONE in file" << fileName;
}
if ((transponder.transmissionMode == DvbTTransponder::TransmissionModeAuto) && !fileName.startsWith("auto-")) {
if ((transponder.transmissionMode == DvbTTransponder::TransmissionModeAuto) && !fileName.startsWith(QLatin1String("auto-"))) {
qWarning() << "Warning: transmission mode == AUTO in file" << fileName;
}
if ((transponder.guardInterval == DvbTTransponder::GuardIntervalAuto) && !fileName.startsWith("auto-")) {
if ((transponder.guardInterval == DvbTTransponder::GuardIntervalAuto) && !fileName.startsWith(QLatin1String("auto-"))) {
qWarning() << "Warning: guard interval == AUTO in file" << fileName;
}
......
......@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
}
}
if (path.startsWith("include/") || path.startsWith("tools/")) {
if (path.startsWith(QLatin1String("include/")) || path.startsWith(QLati1nString("tools/"))) {
continue;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment