From f6c4a4ca02c0ab3871abd2abce740c1030700587 Mon Sep 17 00:00:00 2001 From: Daniel Kristjansson Date: Sun, 24 Feb 2013 14:00:32 -0500 Subject: [PATCH] Convert {to,from}Ascii to {to,from}Latin1. The ascii functions are depreciated in Qt5 and don't actually do what they are supposed to do in Qt4. --- mythtv/external/qjson/src/qobjecthelper.cpp | 2 +- mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 8 +- mythtv/libs/libmyth/audio/audiooutputjack.cpp | 6 +- mythtv/libs/libmyth/audio/audiooutputoss.cpp | 6 +- .../libs/libmyth/audio/audiooutputpulse.cpp | 2 +- mythtv/libs/libmyth/audio/spdifencoder.cpp | 2 +- mythtv/libs/libmyth/mediamonitor-darwin.cpp | 6 +- mythtv/libs/libmyth/mediamonitor-unix.cpp | 16 ++-- mythtv/libs/libmyth/mythdialogs.cpp | 6 +- mythtv/libs/libmyth/mythmediamonitor.cpp | 2 +- mythtv/libs/libmyth/remoteutil.cpp | 2 +- mythtv/libs/libmyth/settings.cpp | 8 +- mythtv/libs/libmyth/storagegroupeditor.cpp | 2 +- mythtv/libs/libmythbase/filesysteminfo.cpp | 2 +- mythtv/libs/libmythbase/iso639.cpp | 2 +- mythtv/libs/libmythbase/iso639.h | 8 +- mythtv/libs/libmythbase/mythcdrom-linux.cpp | 2 +- .../libmythbase/mythcommandlineparser.cpp | 4 +- .../libs/libmythbase/mythdownloadmanager.cpp | 2 +- mythtv/libs/libmythbase/mythmiscutil.cpp | 8 +- mythtv/libs/libmythbase/mythplugin.cpp | 2 +- mythtv/libs/libmythbase/plist.cpp | 2 +- mythtv/libs/libmythbase/storagegroup.cpp | 8 +- mythtv/libs/libmythbase/unzip.cpp | 8 +- mythtv/libs/libmythfreemheg/BaseClasses.h | 2 +- mythtv/libs/libmythfreemheg/Engine.cpp | 2 +- mythtv/libs/libmythfreemheg/Groups.cpp | 2 +- .../libs/libmythmetadata/bluraymetadata.cpp | 2 +- .../libs/libmythservicecontracts/service.cpp | 4 +- .../libmythtv/AirPlay/mythairplayserver.cpp | 18 ++--- .../libmythtv/AirPlay/mythraopconnection.cpp | 6 +- .../libs/libmythtv/AirPlay/mythraopdevice.cpp | 2 +- mythtv/libs/libmythtv/Bluray/bdringbuffer.cpp | 2 +- mythtv/libs/libmythtv/HLS/httplivestream.cpp | 12 +-- .../libmythtv/HLS/httplivestreambuffer.cpp | 8 +- mythtv/libs/libmythtv/avformatdecoder.cpp | 4 +- mythtv/libs/libmythtv/avformatwriter.cpp | 10 +-- mythtv/libs/libmythtv/cardutil.cpp | 14 ++-- mythtv/libs/libmythtv/cc608decoder.cpp | 2 +- mythtv/libs/libmythtv/cc708window.cpp | 8 +- .../libmythtv/channelscan/channelimporter.cpp | 76 +++++++++---------- .../channelscan/channelscanner_cli.cpp | 10 +-- .../channelscan/iptvchannelfetcher.cpp | 2 +- mythtv/libs/libmythtv/channelutil.cpp | 16 ++-- mythtv/libs/libmythtv/datadirect.cpp | 14 ++-- mythtv/libs/libmythtv/dtvconfparser.cpp | 2 +- mythtv/libs/libmythtv/fifowriter.cpp | 4 +- mythtv/libs/libmythtv/filtermanager.cpp | 4 +- mythtv/libs/libmythtv/mhi.cpp | 8 +- mythtv/libs/libmythtv/mpeg/dvbdescriptors.h | 6 +- mythtv/libs/libmythtv/netstream.cpp | 2 +- mythtv/libs/libmythtv/previewgenerator.cpp | 2 +- .../recorders/NuppelVideoRecorder.cpp | 8 +- .../libs/libmythtv/recorders/audioinput.cpp | 2 +- .../libmythtv/recorders/audioinputalsa.cpp | 2 +- .../libmythtv/recorders/audioinputoss.cpp | 2 +- mythtv/libs/libmythtv/recorders/cetonrtsp.cpp | 2 +- mythtv/libs/libmythtv/recorders/dvbcam.cpp | 4 +- .../libs/libmythtv/recorders/dvbchannel.cpp | 2 +- .../libmythtv/recorders/dvbstreamhandler.cpp | 8 +- .../libmythtv/recorders/iptvstreamhandler.cpp | 2 +- .../libs/libmythtv/recorders/mpegrecorder.cpp | 10 +-- .../libs/libmythtv/recorders/v4lchannel.cpp | 2 +- .../libs/libmythtv/recorders/v4lrecorder.cpp | 2 +- mythtv/libs/libmythtv/streamingringbuffer.cpp | 2 +- mythtv/libs/libmythtv/util-xv.cpp | 2 +- mythtv/libs/libmythtv/videoout_xv.cpp | 6 +- mythtv/libs/libmythtv/videosource.cpp | 8 +- mythtv/libs/libmythui/mythmainwindow.cpp | 2 +- mythtv/libs/libmythui/mythrender_opengl1.cpp | 2 +- mythtv/libs/libmythui/mythrender_opengl2.cpp | 2 +- mythtv/libs/libmythui/mythuifilebrowser.cpp | 2 +- mythtv/libs/libmythui/mythuitype.cpp | 2 +- mythtv/libs/libmythui/mythxdisplay.cpp | 2 +- .../libmythupnp/mmulticastsocketdevice.cpp | 2 +- .../libmythupnp/serializers/xmlSerializer.cpp | 2 +- mythtv/libs/libmythupnp/servicehost.cpp | 2 +- mythtv/libs/libmythupnp/soapclient.cpp | 2 +- mythtv/programs/mythbackend/main_helpers.cpp | 2 +- mythtv/programs/mythbackend/mainserver.cpp | 6 +- .../programs/mythbackend/services/content.cpp | 4 +- .../mythcommflag/ClassicCommDetector.cpp | 6 +- .../mythcommflag/ClassicLogoDetector.cpp | 2 +- .../mythcommflag/PrePostRollFlagger.cpp | 4 +- .../programs/mythcommflag/TemplateFinder.cpp | 4 +- mythtv/programs/mythcommflag/main.cpp | 6 +- mythtv/programs/mythfrontend/mythcontrols.cpp | 2 +- mythtv/programs/mythfrontend/videofilter.cpp | 2 +- mythtv/programs/mythjobqueue/main.cpp | 2 +- mythtv/programs/mythmediaserver/main.cpp | 2 +- mythtv/programs/mythtv-setup/importicons.cpp | 2 +- mythtv/programs/mythtv-setup/main.cpp | 8 +- 92 files changed, 248 insertions(+), 248 deletions(-) diff --git a/mythtv/external/qjson/src/qobjecthelper.cpp b/mythtv/external/qjson/src/qobjecthelper.cpp index b756488f077..812bdb6021e 100644 --- a/mythtv/external/qjson/src/qobjecthelper.cpp +++ b/mythtv/external/qjson/src/qobjecthelper.cpp @@ -66,7 +66,7 @@ void QObjectHelper::qvariant2qobject(const QVariantMap& variant, QObject* object QVariantMap::const_iterator iter; for (iter = variant.constBegin(); iter != variant.constEnd(); ++iter) { - int pIdx = metaobject->indexOfProperty( iter.key().toAscii() ); + int pIdx = metaobject->indexOfProperty( iter.key().toLatin1() ); if ( pIdx < 0 ) { continue; diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp index 40ae6d0820b..8f74751ecb3 100644 --- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp @@ -117,7 +117,7 @@ int AudioOutputALSA::TryOpenDevice(int open_mode, int try_ac3) if (try_ac3) { - dev_ba = passthru_device.toAscii(); + dev_ba = passthru_device.toLatin1(); VBAUDIO(QString("OpenDevice %1 for passthrough").arg(passthru_device)); err = snd_pcm_open(&pcm_handle, dev_ba.constData(), SND_PCM_STREAM_PLAYBACK, open_mode); @@ -137,7 +137,7 @@ int AudioOutputALSA::TryOpenDevice(int open_mode, int try_ac3) { // passthru open failed, retry default device VBAUDIO(QString("OpenDevice %1").arg(main_device)); - dev_ba = main_device.toAscii(); + dev_ba = main_device.toLatin1(); err = snd_pcm_open(&pcm_handle, dev_ba.constData(), SND_PCM_STREAM_PLAYBACK, open_mode); m_lastdevice = main_device; @@ -261,7 +261,7 @@ QByteArray *AudioOutputALSA::GetELD(int card, int device, int subdevice) snd_ctl_elem_id_set_name(id, "ELD"); snd_ctl_elem_id_set_device(id, device); if ((err = snd_hctl_open(&hctl, - QString("hw:%1").arg(card).toAscii().constData(), + QString("hw:%1").arg(card).toLatin1().constData(), 0)) < 0) { VBAUDIO(QString("Control %1 open error: %2") @@ -911,7 +911,7 @@ bool AudioOutputALSA::OpenMixer(void) return false; } - QByteArray dev_ba = m_mixer.device.toAscii(); + QByteArray dev_ba = m_mixer.device.toLatin1(); struct snd_mixer_selem_regopt regopts = {1, SND_MIXER_SABSTRACT_NONE, dev_ba.constData(), NULL, NULL}; diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp index 533fceb7072..038f685fbb9 100644 --- a/mythtv/libs/libmyth/audio/audiooutputjack.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputjack.cpp @@ -154,7 +154,7 @@ bool AudioOutputJACK::OpenDevice() for (i = 0; i < channels; i++) { QString port_name = QString("out_%1").arg(i); - ports[i] = jack_port_register(client, port_name.toAscii().constData(), + ports[i] = jack_port_register(client, port_name.toLatin1().constData(), JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0); if (!ports[i]) @@ -559,7 +559,7 @@ jack_client_t* AudioOutputJACK::_jack_client_open(void) (jack_options_t)(JackUseExactName | JackNoStartServer); jack_status_t open_status; - client = jack_client_open(client_name.toAscii().constData(), + client = jack_client_open(client_name.toLatin1().constData(), open_options, &open_status); return client; @@ -574,7 +574,7 @@ const char** AudioOutputJACK::_jack_get_ports(void) // Have we been given a target port to connect to if (!main_device.isEmpty()) { - port_name = main_device.toAscii().constData(); + port_name = main_device.toLatin1().constData(); } else { diff --git a/mythtv/libs/libmyth/audio/audiooutputoss.cpp b/mythtv/libs/libmyth/audio/audiooutputoss.cpp index 4e85f371560..e1398355090 100644 --- a/mythtv/libs/libmyth/audio/audiooutputoss.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputoss.cpp @@ -47,7 +47,7 @@ AudioOutputSettings* AudioOutputOSS::GetOutputSettings(bool /*digital*/) { AudioOutputSettings *settings = new AudioOutputSettings(); - QByteArray device = main_device.toAscii(); + QByteArray device = main_device.toLatin1(); audiofd = open(device.constData(), O_WRONLY | O_NONBLOCK); AudioFormat fmt; @@ -121,7 +121,7 @@ bool AudioOutputOSS::OpenDevice() while (timer.elapsed() < 2000 && audiofd == -1) { - QByteArray device = main_device.toAscii(); + QByteArray device = main_device.toLatin1(); audiofd = open(device.constData(), O_WRONLY); if (audiofd < 0 && errno != EAGAIN && errno != EINTR) { @@ -282,7 +282,7 @@ void AudioOutputOSS::VolumeInit() if (device.toLower() == "software") return; - QByteArray dev = device.toAscii(); + QByteArray dev = device.toLatin1(); mixerfd = open(dev.constData(), O_RDONLY); QString controlLabel = gCoreContext->GetSetting("MixerControl", "PCM"); diff --git a/mythtv/libs/libmyth/audio/audiooutputpulse.cpp b/mythtv/libs/libmyth/audio/audiooutputpulse.cpp index 26023fd9b27..ebfb93e041c 100644 --- a/mythtv/libs/libmyth/audio/audiooutputpulse.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputpulse.cpp @@ -470,7 +470,7 @@ char *AudioOutputPulseAudio::ChooseHost(void) { QString fn_log_tag = "ChooseHost, "; char *pulse_host = NULL; - char *device = strdup(main_device.toAscii().constData()); + char *device = strdup(main_device.toLatin1().constData()); const char *host; for (host=device; host && *host != ':' && *host != 0; host++); diff --git a/mythtv/libs/libmyth/audio/spdifencoder.cpp b/mythtv/libs/libmyth/audio/spdifencoder.cpp index 57363b86b14..d7511ed05ba 100644 --- a/mythtv/libs/libmyth/audio/spdifencoder.cpp +++ b/mythtv/libs/libmyth/audio/spdifencoder.cpp @@ -24,7 +24,7 @@ extern "C" { SPDIFEncoder::SPDIFEncoder(QString muxer, int codec_id) : m_complete(false), m_oc(NULL), m_stream(NULL), m_size(0) { - QByteArray dev_ba = muxer.toAscii(); + QByteArray dev_ba = muxer.toLatin1(); AVOutputFormat *fmt; avcodeclock->lock(); diff --git a/mythtv/libs/libmyth/mediamonitor-darwin.cpp b/mythtv/libs/libmyth/mediamonitor-darwin.cpp index 7aafafaf9cf..2a57472b559 100644 --- a/mythtv/libs/libmyth/mediamonitor-darwin.cpp +++ b/mythtv/libs/libmyth/mediamonitor-darwin.cpp @@ -418,11 +418,11 @@ void MonitorThreadDarwin::diskInsert(const char *devName, // We store the volume name for user activities like ChooseAndEjectMedia(). media->setVolumeID(volName); - media->setDeviceModel(model.toAscii()); // Same for the Manufacturer and model + media->setDeviceModel(model.toLatin1()); // Same for the Manufacturer and model // Mac OS X devices are pre-mounted here: QString mnt = "/Volumes/"; mnt += volName; - media->setMountPath(mnt.toAscii()); + media->setMountPath(mnt.toLatin1()); int attempts = 0; QDir d(mnt); @@ -496,7 +496,7 @@ void MonitorThreadDarwin::diskRename(const char *devName, const char *volName) pDevice->setStatus(MEDIASTAT_NODISK); pDevice->setVolumeID(volName); - pDevice->setMountPath((QString("/Volumes/") + volName).toAscii()); + pDevice->setMountPath((QString("/Volumes/") + volName).toLatin1()); // Plugins can now use it again: if (m_Monitor->m_SendEvent) diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmyth/mediamonitor-unix.cpp index ba19383c316..7cb480c2eec 100644 --- a/mythtv/libs/libmyth/mediamonitor-unix.cpp +++ b/mythtv/libs/libmyth/mediamonitor-unix.cpp @@ -234,9 +234,9 @@ bool MediaMonitorUnix::CheckMountable(void) MythMediaDevice* pDevice; if (DeviceProperty(*it, "DeviceIsRemovable").toBool()) - pDevice = MythCDROM::get(this, dev.toAscii(), false, m_AllowEject); + pDevice = MythCDROM::get(this, dev.toLatin1(), false, m_AllowEject); else - pDevice = MythHDD::Get(this, dev.toAscii(), false, false); + pDevice = MythHDD::Get(this, dev.toLatin1(), false, false); if (pDevice && !AddDevice(pDevice)) pDevice->deleteLater(); @@ -332,7 +332,7 @@ QString MediaMonitorUnix::GetDeviceFile(const QString &sysfs) if (udev != NULL) { struct udev_device *device = - udev_device_new_from_syspath(udev, sysfs.toAscii().constData()); + udev_device_new_from_syspath(udev, sysfs.toLatin1().constData()); if (device != NULL) { const char *name = udev_device_get_devnode(device); @@ -533,7 +533,7 @@ static void LookupModel(MythMediaDevice* device) LOG(VB_MEDIA, LOG_DEBUG, QString("LookupModel '%1' -> '%2'") .arg(device->getRealDevice()).arg(desc) ); - device->setDeviceModel(desc.toAscii().constData()); + device->setDeviceModel(desc.toLatin1().constData()); } /** @@ -714,9 +714,9 @@ void MediaMonitorUnix::deviceAdded( QDBusObjectPath o) MythMediaDevice* pDevice; if (DeviceProperty(o, "DeviceIsRemovable").toBool()) - pDevice = MythCDROM::get(this, dev.toAscii(), false, m_AllowEject); + pDevice = MythCDROM::get(this, dev.toLatin1(), false, m_AllowEject); else - pDevice = MythHDD::Get(this, dev.toAscii(), false, false); + pDevice = MythHDD::Get(this, dev.toLatin1(), false, false); if (pDevice && !AddDevice(pDevice)) pDevice->deleteLater(); @@ -804,13 +804,13 @@ bool MediaMonitorUnix::FindPartitions(const QString &dev, bool checkPartitions) { // found cdrom device pDevice = MythCDROM::get( - this, device_file.toAscii().constData(), false, m_AllowEject); + this, device_file.toLatin1().constData(), false, m_AllowEject); } else { // found block or partition device pDevice = MythHDD::Get( - this, device_file.toAscii().constData(), false, false); + this, device_file.toLatin1().constData(), false, false); } if (AddDevice(pDevice)) diff --git a/mythtv/libs/libmyth/mythdialogs.cpp b/mythtv/libs/libmyth/mythdialogs.cpp index df009f642bc..0811352e393 100644 --- a/mythtv/libs/libmyth/mythdialogs.cpp +++ b/mythtv/libs/libmyth/mythdialogs.cpp @@ -700,7 +700,7 @@ bool MythPopupBox::showOkPopup( if (button_msg.isEmpty()) button_msg = QObject::tr("OK"); - MythPopupBox *popup = new MythPopupBox(parent, title.toAscii().constData()); + MythPopupBox *popup = new MythPopupBox(parent, title.toLatin1().constData()); popup->addLabel(message, MythPopupBox::Medium, true); QAbstractButton *okButton = popup->addButton(button_msg, popup, SLOT(accept())); @@ -716,7 +716,7 @@ bool MythPopupBox::showOkPopup( bool MythPopupBox::showGetTextPopup(MythMainWindow *parent, QString title, QString message, QString& text) { - MythPopupBox *popup = new MythPopupBox(parent, title.toAscii().constData()); + MythPopupBox *popup = new MythPopupBox(parent, title.toLatin1().constData()); popup->addLabel(message, Medium, true); @@ -763,7 +763,7 @@ DialogCode MythPopupBox::ShowButtonPopup( const QStringList &buttonmsgs, DialogCode default_button) { - MythPopupBox *popup = new MythPopupBox(parent, title.toAscii().constData()); + MythPopupBox *popup = new MythPopupBox(parent, title.toLatin1().constData()); popup->addLabel(message, Medium, true); popup->addLabel(""); diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmyth/mythmediamonitor.cpp index 518681a8688..f2a7afc418e 100644 --- a/mythtv/libs/libmyth/mythmediamonitor.cpp +++ b/mythtv/libs/libmyth/mythmediamonitor.cpp @@ -545,7 +545,7 @@ QString MediaMonitor::GetMountPath(const QString& devPath) // Create a fake media device just to lookup mount map: else { - pMedia = MythCDROM::get(NULL, devPath.toAscii(), true, false); + pMedia = MythCDROM::get(NULL, devPath.toLatin1(), true, false); if (pMedia && pMedia->findMountPath()) mountPath = pMedia->getMountPath(); else diff --git a/mythtv/libs/libmyth/remoteutil.cpp b/mythtv/libs/libmyth/remoteutil.cpp index b669cadccb4..1312fb44e44 100644 --- a/mythtv/libs/libmyth/remoteutil.cpp +++ b/mythtv/libs/libmyth/remoteutil.cpp @@ -271,7 +271,7 @@ QDateTime RemoteGetPreviewIfModified( size_t length = strlist[1].toULongLong(); quint16 checksum16 = strlist[2].toUInt(); - QByteArray data = QByteArray::fromBase64(strlist[3].toAscii()); + QByteArray data = QByteArray::fromBase64(strlist[3].toLatin1()); if ((size_t) data.size() < length) { // (note data.size() may be up to 3 bytes longer after decoding LOG(VB_GENERAL, LOG_ERR, loc + diff --git a/mythtv/libs/libmyth/settings.cpp b/mythtv/libs/libmyth/settings.cpp index 6a1a539ae03..e3e8f69a156 100644 --- a/mythtv/libs/libmyth/settings.cpp +++ b/mythtv/libs/libmyth/settings.cpp @@ -308,7 +308,7 @@ QWidget* LineEditSetting::configWidget(ConfigurationGroup *cg, QWidget* parent, edit = new MythLineEdit( settingValue, NULL, - QString(QString(widgetName) + "-edit").toAscii().constData()); + QString(QString(widgetName) + "-edit").toLatin1().constData()); edit->setHelpText(getHelpText()); edit->setText( getValue() ); edit->setMinimumHeight(25); @@ -408,7 +408,7 @@ QWidget* SliderSetting::configWidget(ConfigurationGroup *cg, QWidget* parent, } MythSlider *slider = new MythSlider( - NULL, QString(QString(widgetName) + "-slider").toAscii().constData()); + NULL, QString(QString(widgetName) + "-slider").toLatin1().constData()); slider->setHelpText(getHelpText()); slider->setMinimum(min); slider->setMaximum(max); @@ -419,7 +419,7 @@ QWidget* SliderSetting::configWidget(ConfigurationGroup *cg, QWidget* parent, QLCDNumber *lcd = new QLCDNumber(); lcd->setObjectName(QString(QString(widgetName) + "-lcd") - .toAscii().constData()); + .toLatin1().constData()); lcd->setMode(QLCDNumber::Dec); lcd->setSegmentStyle(QLCDNumber::Flat); lcd->display(intValue()); @@ -484,7 +484,7 @@ QWidget* SpinBoxSetting::configWidget(ConfigurationGroup *cg, QWidget* parent, this, SLOT(widgetDeleted(QObject*))); QString sbname = QString(widgetName) + "MythSpinBox"; - spinbox = new MythSpinBox(NULL, sbname.toAscii().constData(), sstep); + spinbox = new MythSpinBox(NULL, sbname.toLatin1().constData(), sstep); spinbox->setHelpText(getHelpText()); spinbox->setMinimum(min); spinbox->setMaximum(max); diff --git a/mythtv/libs/libmyth/storagegroupeditor.cpp b/mythtv/libs/libmyth/storagegroupeditor.cpp index 0a8b48c2803..fd5afc334fc 100644 --- a/mythtv/libs/libmyth/storagegroupeditor.cpp +++ b/mythtv/libs/libmyth/storagegroupeditor.cpp @@ -28,7 +28,7 @@ class StorageGroupPopup SGPopupResult StorageGroupPopup::showPopup(MythMainWindow *parent, QString title, QString message, QString& text) { - MythPopupBox *popup = new MythPopupBox(parent, title.toAscii().constData()); + MythPopupBox *popup = new MythPopupBox(parent, title.toLatin1().constData()); popup->addLabel(message); MythLineEdit *textEdit = new MythLineEdit(popup, "chooseEdit"); diff --git a/mythtv/libs/libmythbase/filesysteminfo.cpp b/mythtv/libs/libmythbase/filesysteminfo.cpp index 7c7786922d2..c16a0f4d510 100644 --- a/mythtv/libs/libmythbase/filesysteminfo.cpp +++ b/mythtv/libs/libmythbase/filesysteminfo.cpp @@ -230,7 +230,7 @@ void FileSystemInfo::Consolidate(QList &disks, void FileSystemInfo::PopulateDiskSpace(void) { int64_t total = -1, used = -1; - getDiskSpace(getPath().toAscii().constData(), total, used); + getDiskSpace(getPath().toLatin1().constData(), total, used); setTotalSpace(total); setUsedSpace(used); } diff --git a/mythtv/libs/libmythbase/iso639.cpp b/mythtv/libs/libmythbase/iso639.cpp index 5f0eb192e4d..432fad2e19b 100644 --- a/mythtv/libs/libmythbase/iso639.cpp +++ b/mythtv/libs/libmythbase/iso639.cpp @@ -64,7 +64,7 @@ vector iso639_get_language_key_list(void) QString iso639_str2_to_str3(const QString &str2) { - int key2 = iso639_str2_to_key2(str2.toAscii().constData()); + int key2 = iso639_str2_to_key2(str2.toLatin1().constData()); int key3 = 0; if (_iso639_key2_to_key3.contains(key2)) key3 = _iso639_key2_to_key3[key2]; diff --git a/mythtv/libs/libmythbase/iso639.h b/mythtv/libs/libmythbase/iso639.h index 447c417aecb..cd382eada5c 100644 --- a/mythtv/libs/libmythbase/iso639.h +++ b/mythtv/libs/libmythbase/iso639.h @@ -78,9 +78,9 @@ static inline int iso639_str3_to_key(const QString &iso639_2) } else { - return ((iso639_2.at(0).toAscii()<<16) | - (iso639_2.at(1).toAscii()<<8) | - (iso639_2.at(2).toAscii())); + return ((iso639_2.at(0).toLatin1()<<16) | + (iso639_2.at(1).toLatin1()<<8) | + (iso639_2.at(2).toLatin1())); } } @@ -97,7 +97,7 @@ static inline int iso639_str2_to_key2(const char *iso639_1) static inline QString iso639_str_to_canonoical_str(const QString &str3) { - int key = iso639_str3_to_key(str3.toAscii().constData()); + int key = iso639_str3_to_key(str3.toLatin1().constData()); int can = iso639_key_to_canonical_key(key); return iso639_key_to_str3(can); } diff --git a/mythtv/libs/libmythbase/mythcdrom-linux.cpp b/mythtv/libs/libmythbase/mythcdrom-linux.cpp index acec7eca8ce..820881f9c3c 100644 --- a/mythtv/libs/libmythbase/mythcdrom-linux.cpp +++ b/mythtv/libs/libmythbase/mythcdrom-linux.cpp @@ -503,7 +503,7 @@ MythMediaStatus MythCDROMLinux::checkMedia() // Check for a DVD/BD disk by reading the UDF root dir. // This allows DVD's to play immediately upon insertion without // calling mount, which either needs pmount or changes to fstab. - udf_t *pUdf = udf_open(m_DevicePath.toAscii()); + udf_t *pUdf = udf_open(m_DevicePath.toLatin1()); if (NULL != pUdf) { udf_dirent_t *pUdfRoot = udf_get_root(pUdf, true, 0); diff --git a/mythtv/libs/libmythbase/mythcommandlineparser.cpp b/mythtv/libs/libmythbase/mythcommandlineparser.cpp index a7c1e268c3f..d3752f60621 100644 --- a/mythtv/libs/libmythbase/mythcommandlineparser.cpp +++ b/mythtv/libs/libmythbase/mythcommandlineparser.cpp @@ -1875,7 +1875,7 @@ QMap MythCommandLineParser::GetSettingsOverride(void) } else { - QByteArray tmp = filename.toAscii(); + QByteArray tmp = filename.toLatin1(); cerr << "Failed to open the override settings file: '" << tmp.constData() << "'" << endl; } @@ -2613,7 +2613,7 @@ bool openPidfile(ofstream &pidfs, const QString &pidfile) { if (!pidfile.isEmpty()) { - pidfs.open(pidfile.toAscii().constData()); + pidfs.open(pidfile.toLatin1().constData()); if (!pidfs) { cerr << "Could not open pid file: " << ENO_STR << endl; diff --git a/mythtv/libs/libmythbase/mythdownloadmanager.cpp b/mythtv/libs/libmythbase/mythdownloadmanager.cpp index 18b2c9b057a..da86a3387db 100644 --- a/mythtv/libs/libmythbase/mythdownloadmanager.cpp +++ b/mythtv/libs/libmythbase/mythdownloadmanager.cpp @@ -1089,7 +1089,7 @@ void MythDownloadManager::downloadFinished(MythDownloadInfo *dlInfo) QNetworkCacheMetaData::RawHeader newheader; QDateTime now = MythDate::current(); newheader = QNetworkCacheMetaData::RawHeader("Date", - now.toString(dateFormat).toAscii()); + now.toString(dateFormat).toLatin1()); headers.append(newheader); urlData.setRawHeaders(headers); m_infoLock->lock(); diff --git a/mythtv/libs/libmythbase/mythmiscutil.cpp b/mythtv/libs/libmythbase/mythmiscutil.cpp index e2f569f3d04..7477afb1619 100644 --- a/mythtv/libs/libmythbase/mythmiscutil.cpp +++ b/mythtv/libs/libmythbase/mythmiscutil.cpp @@ -371,7 +371,7 @@ QString createTempFile(QString name_template, bool dir) } QString tmpFileName(tempfilename); #else - QByteArray safe_name_template = name_template.toAscii(); + QByteArray safe_name_template = name_template.toLatin1(); const char *tmp = safe_name_template.constData(); char *ctemplate = strdup(tmp); @@ -423,7 +423,7 @@ QString createTempFile(QString name_template, bool dir) */ void makeFileAccessible(QString filename) { - QByteArray fname = filename.toAscii(); + QByteArray fname = filename.toLatin1(); chmod(fname.constData(), 0666); } @@ -936,8 +936,8 @@ void setHttpProxy(void) url = "http://%1:%2"; url = url.arg(p.hostName()).arg(p.port()); - setenv("HTTP_PROXY", url.toAscii(), 1); - setenv("http_proxy", url.toAscii(), 0); + setenv("HTTP_PROXY", url.toLatin1(), 1); + setenv("http_proxy", url.toLatin1(), 0); return; } diff --git a/mythtv/libs/libmythbase/mythplugin.cpp b/mythtv/libs/libmythbase/mythplugin.cpp index 0e21878296b..697b73042b4 100644 --- a/mythtv/libs/libmythbase/mythplugin.cpp +++ b/mythtv/libs/libmythbase/mythplugin.cpp @@ -45,7 +45,7 @@ int MythPlugin::init(const char *libversion) QString error_msg(dlerror()); if (error_msg.isEmpty()) { - QByteArray libname = QLibrary::fileName().toAscii(); + QByteArray libname = QLibrary::fileName().toLatin1(); (void)dlopen(libname.constData(), RTLD_LAZY); error_msg = dlerror(); } diff --git a/mythtv/libs/libmythbase/plist.cpp b/mythtv/libs/libmythbase/plist.cpp index 1cddae69c16..5cc2c7d74f0 100644 --- a/mythtv/libs/libmythbase/plist.cpp +++ b/mythtv/libs/libmythbase/plist.cpp @@ -419,7 +419,7 @@ QVariant PList::ParseBinaryString(quint8 *data) if (!count) return result; - result = QString::fromAscii((const char*)data, count); + result = QString::fromLatin1((const char*)data, count); LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("ASCII String: %1").arg(result)); return QVariant(result); } diff --git a/mythtv/libs/libmythbase/storagegroup.cpp b/mythtv/libs/libmythbase/storagegroup.cpp index 26522f7f6a3..66821363d29 100644 --- a/mythtv/libs/libmythbase/storagegroup.cpp +++ b/mythtv/libs/libmythbase/storagegroup.cpp @@ -426,7 +426,7 @@ QString StorageGroup::GetRelativePathname(const QString &filename) while (query.next()) { /* The storagegroup.dirname column uses utf8_bin collation, so Qt - * uses QString::fromAscii() for toString(). Explicitly convert the + * uses QString::fromLatin1() for toString(). Explicitly convert the * value using QString::fromUtf8() to prevent corruption. */ dirname = QString::fromUtf8(query.value(0) .toByteArray().constData()); @@ -543,7 +543,7 @@ bool StorageGroup::FindDirs(const QString group, const QString hostname, do { /* The storagegroup.dirname column uses utf8_bin collation, so Qt - * uses QString::fromAscii() for toString(). Explicitly convert the + * uses QString::fromLatin1() for toString(). Explicitly convert the * value using QString::fromUtf8() to prevent corruption. */ dirname = QString::fromUtf8(query.value(0) .toByteArray().constData()); @@ -730,7 +730,7 @@ void StorageGroup::CheckAllStorageGroupDirs(void) { m_groupname = query.value(0).toString(); /* The storagegroup.dirname column uses utf8_bin collation, so Qt - * uses QString::fromAscii() for toString(). Explicitly convert the + * uses QString::fromLatin1() for toString(). Explicitly convert the * value using QString::fromUtf8() to prevent corruption. */ dirname = QString::fromUtf8(query.value(1) .toByteArray().constData()); @@ -819,7 +819,7 @@ QStringList StorageGroup::getGroupDirs(QString groupname, QString host) while (query.next()) { /* The storagegroup.dirname column uses utf8_bin collation, so Qt - * uses QString::fromAscii() for toString(). Explicitly convert the + * uses QString::fromLatin1() for toString(). Explicitly convert the * value using QString::fromUtf8() to prevent corruption. */ dirname = QString::fromUtf8(query.value(0) .toByteArray().constData()); diff --git a/mythtv/libs/libmythbase/unzip.cpp b/mythtv/libs/libmythbase/unzip.cpp index b774daad85a..c994f77ae75 100644 --- a/mythtv/libs/libmythbase/unzip.cpp +++ b/mythtv/libs/libmythbase/unzip.cpp @@ -633,7 +633,7 @@ UnZip::ErrorCode UnzipPrivate::parseLocalHeaderRecord(const QString& path, ZipEn if (device->read(buffer2, szName) != szName) return UnZip::ReadFailed; - QString filename = QString::fromAscii(buffer2, szName); + QString filename = QString::fromLatin1(buffer2, szName); if (filename != path) { qDebug() << "Filename in local header mismatches."; @@ -893,7 +893,7 @@ UnZip::ErrorCode UnzipPrivate::parseCentralDirectoryRecord() return ec; } - QString filename = QString::fromAscii(buffer2, szName); + QString filename = QString::fromLatin1(buffer2, szName); ZipEntryP* h = new ZipEntryP; h->compMethod = compMethod; @@ -930,7 +930,7 @@ UnZip::ErrorCode UnzipPrivate::parseCentralDirectoryRecord() return UnZip::ReadFailed; } - h->comment = QString::fromAscii(buffer2, szComment); + h->comment = QString::fromLatin1(buffer2, szComment); } h->lhOffset = getULong(uBuffer, UNZIP_CD_OFF_LHOFFSET); @@ -1279,7 +1279,7 @@ void UnzipPrivate::initKeys(const QString& pwd, quint32* keys) const keys[1] = 591751049L; keys[2] = 878082192L; - QByteArray pwdBytes = pwd.toAscii(); + QByteArray pwdBytes = pwd.toLatin1(); int sz = pwdBytes.size(); const char* ascii = pwdBytes.data(); diff --git a/mythtv/libs/libmythfreemheg/BaseClasses.h b/mythtv/libs/libmythfreemheg/BaseClasses.h index 7f7670f9c43..725224eb857 100644 --- a/mythtv/libs/libmythfreemheg/BaseClasses.h +++ b/mythtv/libs/libmythfreemheg/BaseClasses.h @@ -120,7 +120,7 @@ class MHOctetString const unsigned char *Bytes() const { return m_pChars; } // Read-only pointer to the buffer. void Append(const MHOctetString &str); // Add text to the end of the string. - QString Printable() const { return QString::fromAscii((const char*)m_pChars, m_nLength); } + QString Printable() const { return QString::fromLatin1((const char*)m_pChars, m_nLength); } void PrintMe(FILE *fd, int nTabs) const; diff --git a/mythtv/libs/libmythfreemheg/Engine.cpp b/mythtv/libs/libmythfreemheg/Engine.cpp index 8bba4b9f349..5079286d78c 100644 --- a/mythtv/libs/libmythfreemheg/Engine.cpp +++ b/mythtv/libs/libmythfreemheg/Engine.cpp @@ -1521,7 +1521,7 @@ FILE *__mhlogStream = NULL; // The MHEG engine calls this when it needs to log something. void __mhlog(QString logtext) { - QByteArray tmp = logtext.toAscii(); + QByteArray tmp = logtext.toLatin1(); fprintf(__mhlogStream, "[freemheg] %s\n", tmp.constData()); } diff --git a/mythtv/libs/libmythfreemheg/Groups.cpp b/mythtv/libs/libmythfreemheg/Groups.cpp index df1fbfb58ab..bb779c5d5b7 100644 --- a/mythtv/libs/libmythfreemheg/Groups.cpp +++ b/mythtv/libs/libmythfreemheg/Groups.cpp @@ -850,7 +850,7 @@ void MHSendEvent::Initialise(MHParseNode *p, MHEngine *engine) void MHSendEvent::PrintArgs(FILE *fd, int) const { m_EventSource.PrintMe(fd, 0); - QByteArray tmp = MHLink::EventTypeToString(m_EventType).toAscii(); + QByteArray tmp = MHLink::EventTypeToString(m_EventType).toLatin1(); fprintf(fd, "%s", tmp.constData()); fprintf(fd, " "); diff --git a/mythtv/libs/libmythmetadata/bluraymetadata.cpp b/mythtv/libs/libmythmetadata/bluraymetadata.cpp index c68f668165a..f8470147c8d 100644 --- a/mythtv/libs/libmythmetadata/bluraymetadata.cpp +++ b/mythtv/libs/libmythmetadata/bluraymetadata.cpp @@ -30,7 +30,7 @@ bool BlurayMetadata::OpenDisc(void) return true; QString keyfile = QString("%1/KEYDB.cfg").arg(GetConfDir()); - QByteArray keyarray = keyfile.toAscii(); + QByteArray keyarray = keyfile.toLatin1(); const char *keyfilepath = keyarray.data(); m_bdnav = bd_open(m_path.toLatin1().data(), keyfilepath); diff --git a/mythtv/libs/libmythservicecontracts/service.cpp b/mythtv/libs/libmythservicecontracts/service.cpp index 6703af2b0f4..1e1fe3d9681 100644 --- a/mythtv/libs/libmythservicecontracts/service.cpp +++ b/mythtv/libs/libmythservicecontracts/service.cpp @@ -51,8 +51,8 @@ void* Service::ConvertToParameterPtr( int nTypeId, { case QMetaType::Bool : *(( bool *)pParam) = ToBool( sValue ); break; - case QMetaType::Char : *(( char *)pParam) = ( sValue.length() > 0) ? sValue.at( 0 ).toAscii() : 0; break; - case QMetaType::UChar : *(( unsigned char *)pParam) = ( sValue.length() > 0) ? sValue.at( 0 ).toAscii() : 0; break; + case QMetaType::Char : *(( char *)pParam) = ( sValue.length() > 0) ? sValue.at( 0 ).toLatin1() : 0; break; + case QMetaType::UChar : *(( unsigned char *)pParam) = ( sValue.length() > 0) ? sValue.at( 0 ).toLatin1() : 0; break; case QMetaType::QChar : *(( QChar *)pParam) = ( sValue.length() > 0) ? sValue.at( 0 ) : 0; break; case QMetaType::Short : *(( short *)pParam) = sValue.toShort (); break; diff --git a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp index 367a2a95ec3..7cfd599b04c 100644 --- a/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp +++ b/mythtv/libs/libmythtv/AirPlay/mythairplayserver.cpp @@ -151,21 +151,21 @@ QByteArray DigestMd5Response(QString response, QString option, { int authStart = response.indexOf("response=\"") + 10; int authLength = response.indexOf("\"", authStart) - authStart; - auth = response.mid(authStart, authLength).toAscii(); + auth = response.mid(authStart, authLength).toLatin1(); int uriStart = response.indexOf("uri=\"") + 5; int uriLength = response.indexOf("\"", uriStart) - uriStart; - QByteArray uri = response.mid(uriStart, uriLength).toAscii(); + QByteArray uri = response.mid(uriStart, uriLength).toLatin1(); int userStart = response.indexOf("username=\"") + 10; int userLength = response.indexOf("\"", userStart) - userStart; - QByteArray user = response.mid(userStart, userLength).toAscii(); + QByteArray user = response.mid(userStart, userLength).toLatin1(); int realmStart = response.indexOf("realm=\"") + 7; int realmLength = response.indexOf("\"", realmStart) - realmStart; - QByteArray realm = response.mid(realmStart, realmLength).toAscii(); + QByteArray realm = response.mid(realmStart, realmLength).toLatin1(); - QByteArray passwd = password.toAscii(); + QByteArray passwd = password.toLatin1(); QCryptographicHash hash(QCryptographicHash::Md5); hash.addData(user); @@ -178,7 +178,7 @@ QByteArray DigestMd5Response(QString response, QString option, // calculate H(A2) hash.reset(); - hash.addData(option.toAscii()); + hash.addData(option.toLatin1()); hash.addData(":", 1); hash.addData(uri); QByteArray ha2 = hash.result().toHex(); @@ -187,7 +187,7 @@ QByteArray DigestMd5Response(QString response, QString option, hash.reset(); hash.addData(ha1); hash.addData(":", 1); - hash.addData(nonce.toAscii()); + hash.addData(nonce.toLatin1()); hash.addData(":", 1); hash.addData(ha2); return hash.result().toHex(); @@ -583,7 +583,7 @@ void MythAirplayServer::HandleResponse(APHTTPRequest *req, if (session.size() == 0) { // No session ID, use IP address instead - session = addr.toString().toAscii(); + session = addr.toString().toLatin1(); } if (!m_connections.contains(session)) { @@ -662,7 +662,7 @@ void MythAirplayServer::HandleResponse(APHTTPRequest *req, m_nonce = GenerateNonce(); } header = QString("WWW-Authenticate: Digest realm=\"AirPlay\", " - "nonce=\"%1\"\r\n").arg(m_nonce).toAscii(); + "nonce=\"%1\"\r\n").arg(m_nonce).toLatin1(); if (!req->GetHeaders().contains("Authorization")) { SendResponse(socket, HTTP_STATUS_UNAUTHORIZED, diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp index 4d7630bff80..07f6f144ed0 100644 --- a/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp +++ b/mythtv/libs/libmythtv/AirPlay/mythraopconnection.cpp @@ -938,7 +938,7 @@ void MythRAOPConnection::ProcessRequest(const QStringList &header, uint8_t *to = new uint8_t[tosize]; QByteArray challenge = - QByteArray::fromBase64(tags["Apple-Challenge"].toAscii()); + QByteArray::fromBase64(tags["Apple-Challenge"].toLatin1()); int challenge_size = challenge.size(); if (challenge_size != 16) { @@ -1023,7 +1023,7 @@ void MythRAOPConnection::ProcessRequest(const QStringList &header, if (line.startsWith("a=rsaaeskey:")) { QString key = line.mid(12).trimmed(); - QByteArray decodedkey = QByteArray::fromBase64(key.toAscii()); + QByteArray decodedkey = QByteArray::fromBase64(key.toLatin1()); LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("RSAAESKey: %1 (decoded size %2)") .arg(key).arg(decodedkey.size())); @@ -1053,7 +1053,7 @@ void MythRAOPConnection::ProcessRequest(const QStringList &header, else if (line.startsWith("a=aesiv:")) { QString aesiv = line.mid(8).trimmed(); - m_AESIV = QByteArray::fromBase64(aesiv.toAscii()); + m_AESIV = QByteArray::fromBase64(aesiv.toLatin1()); LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("AESIV: %1 (decoded size %2)") .arg(aesiv).arg(m_AESIV.size())); diff --git a/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp index 3b98e312c3f..225a97a4df0 100644 --- a/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp +++ b/mythtv/libs/libmythtv/AirPlay/mythraopdevice.cpp @@ -87,7 +87,7 @@ MythRAOPDevice::MythRAOPDevice() : ServerPool(), m_name(QString("MythTV")), m_bonjour(NULL), m_valid(false), m_lock(new QMutex(QMutex::Recursive)), m_setupPort(5000), m_basePort(0) { - m_hardwareId = QByteArray::fromHex(AirPlayHardwareId().toAscii()); + m_hardwareId = QByteArray::fromHex(AirPlayHardwareId().toLatin1()); } MythRAOPDevice::~MythRAOPDevice() diff --git a/mythtv/libs/libmythtv/Bluray/bdringbuffer.cpp b/mythtv/libs/libmythtv/Bluray/bdringbuffer.cpp index a63e3f39a29..4a07cd4fa2e 100644 --- a/mythtv/libs/libmythtv/Bluray/bdringbuffer.cpp +++ b/mythtv/libs/libmythtv/Bluray/bdringbuffer.cpp @@ -305,7 +305,7 @@ bool BDRingBuffer::OpenFile(const QString &lfilename, uint retry_ms) close(); QString keyfile = QString("%1/KEYDB.cfg").arg(GetConfDir()); - QByteArray keyarray = keyfile.toAscii(); + QByteArray keyarray = keyfile.toLatin1(); const char *keyfilepath = keyarray.data(); bdnav = bd_open(filename.toLocal8Bit().data(), keyfilepath); diff --git a/mythtv/libs/libmythtv/HLS/httplivestream.cpp b/mythtv/libs/libmythtv/HLS/httplivestream.cpp index 3d7b40727b8..61917b1d18a 100644 --- a/mythtv/libs/libmythtv/HLS/httplivestream.cpp +++ b/mythtv/libs/libmythtv/HLS/httplivestream.cpp @@ -347,7 +347,7 @@ bool HTTPLiveStream::WriteHTML(void) " \n" "\n" ).arg(m_sourceFile).arg(m_outBaseEncoded) - .toAscii()); + .toLatin1()); file.close(); @@ -382,7 +382,7 @@ bool HTTPLiveStream::WriteMetaPlaylist(void) "#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=%1\n" "%2.m3u8\n" ).arg((int)((m_bitrate + m_audioBitrate) * 1.1)) - .arg(m_outFileEncoded).toAscii()); + .arg(m_outFileEncoded).toLatin1()); if (m_audioOnlyBitrate) { @@ -390,7 +390,7 @@ bool HTTPLiveStream::WriteMetaPlaylist(void) "#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=%1\n" "%2.m3u8\n" ).arg((int)((m_audioOnlyBitrate) * 1.1)) - .arg(m_audioOutFileEncoded).toAscii()); + .arg(m_audioOutFileEncoded).toLatin1()); } file.close(); @@ -431,7 +431,7 @@ bool HTTPLiveStream::WritePlaylist(bool audioOnly, bool writeEndTag) "#EXTM3U\n" "#EXT-X-TARGETDURATION:%1\n" "#EXT-X-MEDIA-SEQUENCE:%2\n" - ).arg(m_segmentSize).arg(m_startSegment).toAscii()); + ).arg(m_segmentSize).arg(m_startSegment).toLatin1()); if (writeEndTag) file.write("#EXT-X-ENDLIST\n"); @@ -450,14 +450,14 @@ bool HTTPLiveStream::WritePlaylist(bool audioOnly, bool writeEndTag) "#EXTINF:%1,\n" "%2\n" ).arg(m_segmentSize) - .arg(GetFilename(segmentid + i, true, audioOnly, true)).toAscii()); + .arg(GetFilename(segmentid + i, true, audioOnly, true)).toLatin1()); ++i; } file.close(); - rename(tmpFile.toAscii().constData(), outFile.toAscii().constData()); + rename(tmpFile.toLatin1().constData(), outFile.toLatin1().constData()); return true; } diff --git a/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp index 9f1c3baca63..f9b739dbcd8 100644 --- a/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp +++ b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp @@ -58,7 +58,7 @@ enum static QString decoded_URI(const QString uri) { - QByteArray ba = uri.toAscii(); + QByteArray ba = uri.toLatin1(); QUrl url = QUrl::fromEncoded(ba); return url.toString(); } @@ -826,7 +826,7 @@ class HLSStream } int padding = max(0, AES_BLOCK_SIZE - (line.size() - 2)); QByteArray ba = QByteArray(padding, 0x0); - ba.append(QByteArray::fromHex(QByteArray(line.toAscii().constData() + 2))); + ba.append(QByteArray::fromHex(QByteArray(line.toLatin1().constData() + 2))); memcpy(m_AESIV, ba.constData(), ba.size()); m_ivloaded = true; return true; @@ -1727,7 +1727,7 @@ bool HLSRingBuffer::TestForHTTPLiveStreaming(const QString filename) // Do a peek on the URL to test the format RingBuffer::AVFormatInitNetwork(); - int ret = ffurl_open(&context, filename.toAscii(), + int ret = ffurl_open(&context, filename.toLatin1(), AVIO_FLAG_READ, NULL, NULL); if (ret >= 0) { @@ -2579,7 +2579,7 @@ bool HLSRingBuffer::OpenFile(const QString &lfilename, uint retry_ms) bool HLSRingBuffer::SaveToDisk(const QString filename, int segstart, int segend) { // download it all - FILE *fp = fopen(filename.toAscii().constData(), "w"); + FILE *fp = fopen(filename.toLatin1().constData(), "w"); if (fp == NULL) return false; int count = NumSegments(); diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp index 47a26a73504..a1551de4be9 100644 --- a/mythtv/libs/libmythtv/avformatdecoder.cpp +++ b/mythtv/libs/libmythtv/avformatdecoder.cpp @@ -817,7 +817,7 @@ bool AvFormatDecoder::CanHandle(char testbuf[kDecoderProbeBufferSize], AVProbeData probe; - QByteArray fname = filename.toAscii(); + QByteArray fname = filename.toLatin1(); probe.filename = fname.constData(); probe.buf = (unsigned char *)testbuf; probe.buf_size = testbufsize; @@ -950,7 +950,7 @@ int AvFormatDecoder::OpenFile(RingBuffer *rbuffer, bool novideo, AVInputFormat *fmt = NULL; QString fnames = ringBuffer->GetFilename(); - QByteArray fnamea = fnames.toAscii(); + QByteArray fnamea = fnames.toLatin1(); const char *filename = fnamea.constData(); AVProbeData probe; diff --git a/mythtv/libs/libmythtv/avformatwriter.cpp b/mythtv/libs/libmythtv/avformatwriter.cpp index e921c8adb37..c689672082c 100644 --- a/mythtv/libs/libmythtv/avformatwriter.cpp +++ b/mythtv/libs/libmythtv/avformatwriter.cpp @@ -98,7 +98,7 @@ AVFormatWriter::~AVFormatWriter() bool AVFormatWriter::Init(void) { - AVOutputFormat *fmt = av_guess_format(m_container.toAscii().constData(), + AVOutputFormat *fmt = av_guess_format(m_container.toLatin1().constData(), NULL, NULL); if (!fmt) { @@ -113,7 +113,7 @@ bool AVFormatWriter::Init(void) if (m_width && m_height) { m_avVideoCodec = avcodec_find_encoder_by_name( - m_videoCodec.toAscii().constData()); + m_videoCodec.toLatin1().constData()); if (!m_avVideoCodec) { LOG(VB_RECORD, LOG_ERR, LOC + @@ -127,7 +127,7 @@ bool AVFormatWriter::Init(void) m_fmt.video_codec = AV_CODEC_ID_NONE; m_avAudioCodec = avcodec_find_encoder_by_name( - m_audioCodec.toAscii().constData()); + m_audioCodec.toLatin1().constData()); if (!m_avAudioCodec) { LOG(VB_RECORD, LOG_ERR, LOC + @@ -151,7 +151,7 @@ bool AVFormatWriter::Init(void) m_ctx->packet_size = 2324; snprintf(m_ctx->filename, sizeof(m_ctx->filename), "%s", - m_filename.toAscii().constData()); + m_filename.toLatin1().constData()); if (m_fmt.video_codec != AV_CODEC_ID_NONE) m_videoStream = AddVideoStream(); @@ -193,7 +193,7 @@ bool AVFormatWriter::OpenFile(void) { if (!(m_fmt.flags & AVFMT_NOFILE)) { - if (avio_open(&m_ctx->pb, m_filename.toAscii().constData(), + if (avio_open(&m_ctx->pb, m_filename.toLatin1().constData(), AVIO_FLAG_WRITE) < 0) { LOG(VB_RECORD, LOG_ERR, LOC + "OpenFile(): avio_open() failed"); diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp index 77e16c89888..e8684ea1b25 100644 --- a/mythtv/libs/libmythtv/cardutil.cpp +++ b/mythtv/libs/libmythtv/cardutil.cpp @@ -101,7 +101,7 @@ bool CardUtil::IsCableCardPresent(uint cardid, hdhomerun_device_t *hdhr; hdhomerun_tuner_status_t status; QString device = GetVideoDevice(cardid); - hdhr = hdhomerun_device_create_from_str(device.toAscii(), NULL); + hdhr = hdhomerun_device_create_from_str(device.toLatin1(), NULL); if (!hdhr) return false; @@ -396,7 +396,7 @@ QString CardUtil::ProbeDVBType(const QString &device) #ifdef USING_DVB QString dvbdev = CardUtil::GetDeviceName(DVB_DEV_FRONTEND, device); - QByteArray dev = dvbdev.toAscii(); + QByteArray dev = dvbdev.toLatin1(); int fd_frontend = open(dev.constData(), O_RDONLY | O_NONBLOCK); if (fd_frontend < 0) { @@ -438,7 +438,7 @@ QString CardUtil::ProbeDVBFrontendName(const QString &device) #ifdef USING_DVB QString dvbdev = CardUtil::GetDeviceName(DVB_DEV_FRONTEND, device); - QByteArray dev = dvbdev.toAscii(); + QByteArray dev = dvbdev.toLatin1(); int fd_frontend = open(dev.constData(), O_RDWR | O_NONBLOCK); if (fd_frontend < 0) return "ERROR_OPEN"; @@ -1952,7 +1952,7 @@ QStringList CardUtil::ProbeV4LVideoInputs(QString device) { bool ok; QStringList ret; - QByteArray dev = device.toAscii(); + QByteArray dev = device.toLatin1(); int videofd = open(dev.constData(), O_RDWR); if (videofd < 0) { @@ -1985,7 +1985,7 @@ QStringList CardUtil::ProbeV4LAudioInputs(QString device) bool ok; QStringList ret; - int videofd = open(device.toAscii().constData(), O_RDWR); + int videofd = open(device.toLatin1().constData(), O_RDWR); if (videofd < 0) { LOG(VB_GENERAL, LOG_ERR, "ProbeAudioInputs() -> couldn't open device"); @@ -2346,7 +2346,7 @@ bool CardUtil::HDHRdoesDVB(const QString &device) #ifdef USING_HDHOMERUN hdhomerun_device_t *hdhr; - hdhr = hdhomerun_device_create_from_str(device.toAscii(), NULL); + hdhr = hdhomerun_device_create_from_str(device.toLatin1(), NULL); if (!hdhr) return false; @@ -2386,7 +2386,7 @@ QString CardUtil::GetHDHRdesc(const QString &device) ") - trying to locate device"); hdhomerun_device_t *hdhr; - hdhr = hdhomerun_device_create_from_str(device.toAscii(), NULL); + hdhr = hdhomerun_device_create_from_str(device.toLatin1(), NULL); if (!hdhr) return QObject::tr("Invalid Device ID or address."); diff --git a/mythtv/libs/libmythtv/cc608decoder.cpp b/mythtv/libs/libmythtv/cc608decoder.cpp index 618ce58d2f0..3e3b44965cd 100644 --- a/mythtv/libs/libmythtv/cc608decoder.cpp +++ b/mythtv/libs/libmythtv/cc608decoder.cpp @@ -1031,7 +1031,7 @@ static bool is_better(const QString &newStr, const QString &oldStr) // check if the string contains any bogus characters for (int i = 0; i < newStr.length(); i++) - if (newStr[i].toAscii() < 0x20) + if (newStr[i].toLatin1() < 0x20) return false; return true; diff --git a/mythtv/libs/libmythtv/cc708window.cpp b/mythtv/libs/libmythtv/cc708window.cpp index fe563d3c4f7..6ec6c4fb66b 100644 --- a/mythtv/libs/libmythtv/cc708window.cpp +++ b/mythtv/libs/libmythtv/cc708window.cpp @@ -352,8 +352,8 @@ void CC708Window::AddChar(QChar ch) return; QString dbg_char = ch; - if (ch.toAscii() < 32) - dbg_char = QString("0x%1").arg( (int)ch.toAscii(), 0,16); + if (ch.toLatin1() < 32) + dbg_char = QString("0x%1").arg( (int)ch.toLatin1(), 0,16); if (!IsPenValid()) { @@ -364,7 +364,7 @@ void CC708Window::AddChar(QChar ch) return; } - if (ch.toAscii() == 0x0D) + if (ch.toLatin1() == 0x0D) { Scroll(pen.row + 1, 0); changed = true; @@ -372,7 +372,7 @@ void CC708Window::AddChar(QChar ch) } QMutexLocker locker(&lock); - if (ch.toAscii() == 0x08) + if (ch.toLatin1() == 0x08) { DecrPenLocation(); CC708Character& chr = GetCCChar(); diff --git a/mythtv/libs/libmythtv/channelscan/channelimporter.cpp b/mythtv/libs/libmythtv/channelscan/channelimporter.cpp index 98fc899d264..84c113d5e7b 100644 --- a/mythtv/libs/libmythtv/channelscan/channelimporter.cpp +++ b/mythtv/libs/libmythtv/channelscan/channelimporter.cpp @@ -61,7 +61,7 @@ void ChannelImporter::Process(const ScanDTVTransportList &_transports) { cout << "Before processing: " << endl; ChannelImporterBasicStats infoA = CollectStats(transports); - cout << FormatChannels(transports, infoA).toAscii().constData() << endl; + cout << FormatChannels(transports, infoA).toLatin1().constData() << endl; cout << endl << endl; } @@ -100,11 +100,11 @@ void ChannelImporter::Process(const ScanDTVTransportList &_transports) CollectUniquenessStats(transports, info); // Print out each channel - cout << FormatChannels(transports, info).toAscii().constData() << endl; + cout << FormatChannels(transports, info).toLatin1().constData() << endl; // Create summary QString msg = GetSummary(transports.size(), info, stats); - cout << msg.toAscii().constData() << endl << endl; + cout << msg.toLatin1().constData() << endl << endl; if (do_insert) InsertChannels(transports, info); @@ -322,8 +322,8 @@ void ChannelImporter::InsertChannels( ChannelImporterBasicStats ninfo = CollectStats(list); ChannelImporterUniquenessStats nstats = CollectUniquenessStats(list, ninfo); cout << endl << endl << "Printing remaining channels" << endl; - cout << FormatChannels(list, ninfo).toAscii().constData() << endl; - cout << GetSummary(list.size(), ninfo, nstats).toAscii().constData() + cout << FormatChannels(list, ninfo).toLatin1().constData() << endl; + cout << GetSummary(list.size(), ninfo, nstats).toLatin1().constData() << endl << endl; // if any of the potential uniques is high and inserting @@ -403,7 +403,7 @@ ScanDTVTransportList ChannelImporter::InsertChannels( { cout<prognum_cnt[chan.service_id]) .arg(info->channum_cnt[map_str(chan.chan_num)]) - ).toAscii().constData(); + ).toLatin1().constData(); if (chan.si_standard == "atsc") { ssMsg << @@ -1052,7 +1052,7 @@ QString ChannelImporter::FormatChannel( (chan.atsc_minor_channel)]) .arg(info->atscmin_cnt[ chan.atsc_minor_channel]) - ).toAscii().constData(); + ).toLatin1().constData(); } } @@ -1075,24 +1075,24 @@ QString ChannelImporter::SimpleFormatChannel( if (si_standard == "atsc") ssMsg << (QString("%1-%2") .arg(chan.atsc_major_channel) - .arg(chan.atsc_minor_channel)).toAscii().constData(); + .arg(chan.atsc_minor_channel)).toLatin1().constData(); else ssMsg << (QString("%1-%2") .arg(chan.freqid) - .arg(chan.service_id)).toAscii().constData(); + .arg(chan.service_id)).toLatin1().constData(); if (!chan.callsign.isEmpty()) ssMsg << (QString(" (%1)") - .arg(chan.callsign)).toAscii().constData(); + .arg(chan.callsign)).toLatin1().constData(); } else if (si_standard == "dvb") ssMsg << (QString("%1 (%2 %3)") .arg(chan.service_name).arg(chan.service_id) - .arg(chan.netid)).toAscii().constData(); + .arg(chan.netid)).toLatin1().constData(); else ssMsg << (QString("%1-%2") .arg(chan.freqid).arg(chan.service_id)) - .toAscii().constData(); + .toLatin1().constData(); return msg; } @@ -1291,7 +1291,7 @@ ChannelImporter::QueryUserDelete(const QString &msg) } else if (is_interactive) { - cout << msg.toAscii().constData() << endl; + cout << msg.toLatin1().constData() << endl; cout << "Do you want to:" << endl; cout << "1. Delete all" << endl; cout << "2. Set all invisible" << endl; @@ -1351,7 +1351,7 @@ ChannelImporter::QueryUserInsert(const QString &msg) } else if (is_interactive) { - cout << msg.toAscii().constData() << endl; + cout << msg.toLatin1().constData() << endl; cout << "Do you want to:" << endl; cout << "1. Insert all" << endl; cout << "2. Insert manually" << endl; @@ -1408,15 +1408,15 @@ ChannelImporter::QueryUserUpdate(const QString &msg) } else if (is_interactive) { - cout << msg.toAscii().constData() + cout << msg.toLatin1().constData() << endl - << QObject::tr("Do you want to:").toAscii().constData() + << QObject::tr("Do you want to:").toLatin1().constData() << endl - << "1. " << QObject::tr("Update all").toAscii().constData() + << "1. " << QObject::tr("Update all").toLatin1().constData() << endl - << "2. " << QObject::tr("Update manually").toAscii().constData() + << "2. " << QObject::tr("Update manually").toLatin1().constData() << endl - << "3. " << QObject::tr("Ignore all").toAscii().constData() + << "3. " << QObject::tr("Ignore all").toLatin1().constData() << endl; while (true) { @@ -1435,7 +1435,7 @@ ChannelImporter::QueryUserUpdate(const QString &msg) { cout << QObject::tr( "Please enter either 1, 2, or 3:") - .toAscii().constData() << endl; + .toLatin1().constData() << endl; } } } @@ -1447,7 +1447,7 @@ OkCancelType ChannelImporter::ShowManualChannelPopup( MythMainWindow *parent, QString title, QString message, QString &text) { - MythPopupBox *popup = new MythPopupBox(parent, title.toAscii().constData()); + MythPopupBox *popup = new MythPopupBox(parent, title.toLatin1().constData()); popup->addLabel(message, MythPopupBox::Medium, true); @@ -1471,7 +1471,7 @@ OkCancelType ChannelImporter::ShowManualChannelPopup( popup->hide(); popup->deleteLater(); - popup = new MythPopupBox(parent, title.toAscii().constData()); + popup = new MythPopupBox(parent, title.toLatin1().constData()); popup->addLabel(message, MythPopupBox::Medium, true); textEdit = new MythLineEdit(popup); @@ -1536,7 +1536,7 @@ OkCancelType ChannelImporter::QueryUserResolve( } else if (is_interactive) { - cout << msg.toAscii().constData() << endl; + cout << msg.toLatin1().constData() << endl; QString cancelStr = QObject::tr("Cancel").toLower(); QString cancelAllStr = QObject::tr("Cancel All").toLower(); @@ -1547,7 +1547,7 @@ OkCancelType ChannelImporter::QueryUserResolve( while (true) { - cout << msg2.toAscii().constData() << endl; + cout << msg2.toLatin1().constData() << endl; string sret; cin >> sret; QString val = QString(sret.c_str()); @@ -1620,7 +1620,7 @@ OkCancelType ChannelImporter::QueryUserInsert( } else if (is_interactive) { - cout << msg.toAscii().constData() << endl; + cout << msg.toLatin1().constData() << endl; QString cancelStr = QObject::tr("Cancel").toLower(); QString cancelAllStr = QObject::tr("Cancel All").toLower(); @@ -1631,7 +1631,7 @@ OkCancelType ChannelImporter::QueryUserInsert( while (true) { - cout << msg2.toAscii().constData() << endl; + cout << msg2.toLatin1().constData() << endl; string sret; cin >> sret; QString val = QString(sret.c_str()); diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp index 614cbd4ae0a..c4210dc74d3 100644 --- a/mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp +++ b/mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp @@ -100,10 +100,10 @@ void ChannelScannerCLI::HandleEvent(const ScannerEvent *scanEvent) msg.sprintf("%3i%% S/N %3.1f %s : %s (%s) %20s", status_complete, status_snr, (status_lock) ? "l" : "L", - status_text.toAscii().constData(), - status_last_log.toAscii().constData(), ""); + status_text.toLatin1().constData(), + status_last_log.toLatin1().constData(), ""); } - //cout< 80) msg = msg.left(77) + "..."; - cout<<"\r"< &muxes, freq, QString(), // DVB specific (int)tsid, (int)netid, - -1, cd.BandwidthString()[0].toAscii(), + -1, cd.BandwidthString()[0].toLatin1(), -1, 'a', - cd.TransmissionModeString()[0].toAscii(), + cd.TransmissionModeString()[0].toLatin1(), QString(), cd.ConstellationString(), - cd.HierarchyString()[0].toAscii(), cd.CodeRateHPString(), + cd.HierarchyString()[0].toLatin1(), cd.CodeRateHPString(), cd.CodeRateLPString(), cd.GuardIntervalString(), QString(), QString()); @@ -332,7 +332,7 @@ static void handle_transport_desc(vector &muxes, // DVB specific tsid, netid, cd.SymbolRateHz(), -1, - cd.PolarizationString()[0].toAscii(), 'a', + cd.PolarizationString()[0].toLatin1(), 'a', -1, cd.FECInnerString(), QString(), -1, QString(), @@ -420,11 +420,11 @@ uint ChannelUtil::CreateMultiplex(uint sourceid, const DTVMultiplex &mux, mux.frequency, mux.modulation.toString(), // DVB specific transport_id, network_id, - mux.symbolrate, mux.bandwidth.toChar().toAscii(), - mux.polarity.toChar().toAscii(), mux.inversion.toChar().toAscii(), - mux.trans_mode.toChar().toAscii(), + mux.symbolrate, mux.bandwidth.toChar().toLatin1(), + mux.polarity.toChar().toLatin1(), mux.inversion.toChar().toLatin1(), + mux.trans_mode.toChar().toLatin1(), mux.fec.toString(), mux.modulation.toString(), - mux.hierarchy.toChar().toAscii(), mux.hp_code_rate.toString(), + mux.hierarchy.toChar().toLatin1(), mux.hp_code_rate.toString(), mux.lp_code_rate.toString(), mux.guard_interval.toString(), mux.mod_sys.toString(), mux.rolloff.toString()); } diff --git a/mythtv/libs/libmythtv/datadirect.cpp b/mythtv/libs/libmythtv/datadirect.cpp index 1870ff012b4..707300844e6 100644 --- a/mythtv/libs/libmythtv/datadirect.cpp +++ b/mythtv/libs/libmythtv/datadirect.cpp @@ -569,19 +569,19 @@ DataDirectProcessor::~DataDirectProcessor() if (!m_tmpPostFile.isEmpty()) { - QByteArray tmp = m_tmpPostFile.toAscii(); + QByteArray tmp = m_tmpPostFile.toLatin1(); unlink(tmp.constData()); } if (!m_tmpResultFile.isEmpty()) { - QByteArray tmp = m_tmpResultFile.toAscii(); + QByteArray tmp = m_tmpResultFile.toLatin1(); unlink(tmp.constData()); } if (!m_cookieFile.isEmpty()) { - QByteArray tmp = m_cookieFile.toAscii(); + QByteArray tmp = m_cookieFile.toLatin1(); unlink(tmp.constData()); } @@ -591,13 +591,13 @@ DataDirectProcessor::~DataDirectProcessor() for (uint i = 0; i < d.count(); i++) { QString tmps = QString(m_tmpDir + "/" + d[i]); - QByteArray tmpa = tmps.toAscii(); + QByteArray tmpa = tmps.toLatin1(); unlink(tmpa.constData()); } if (m_tmpDir != "/tmp") { - QByteArray tmp = m_tmpDir.toAscii(); + QByteArray tmp = m_tmpDir.toLatin1(); rmdir(tmp.constData()); } } @@ -1161,7 +1161,7 @@ bool DataDirectProcessor::GrabData(const QDateTime &pstartDate, if (m_cacheData) { - QByteArray userid = GetUserID().toAscii(); + QByteArray userid = GetUserID().toLatin1(); cache_dd_data = m_tmpDir + QString("/mythtv_dd_cache_%1_%2_UTC_%3_to_%4") .arg(GetListingsProvider()) @@ -1530,7 +1530,7 @@ bool DataDirectProcessor::GrabLineupsFromCache(const QString &lineupid) bool DataDirectProcessor::SaveLineupToCache(const QString &lineupid) const { QString fn = get_cache_filename(lineupid); - QByteArray fna = fn.toAscii(); + QByteArray fna = fn.toLatin1(); QFile lfile(fna.constData()); if (!lfile.open(QIODevice::WriteOnly)) { diff --git a/mythtv/libs/libmythtv/dtvconfparser.cpp b/mythtv/libs/libmythtv/dtvconfparser.cpp index e4bc8623a66..d60be885b5c 100644 --- a/mythtv/libs/libmythtv/dtvconfparser.cpp +++ b/mythtv/libs/libmythtv/dtvconfparser.cpp @@ -241,7 +241,7 @@ bool DTVConfParser::ParseVDR(const QStringList &tokens, int channelNo) while (!params.isEmpty()) { QString ori = params; - int s = (int) (params.toAscii().constData()[0]); + int s = (int) (params.toLatin1().constData()[0]); params = params.mid(1); switch (s) { diff --git a/mythtv/libs/libmythtv/fifowriter.cpp b/mythtv/libs/libmythtv/fifowriter.cpp index 0565f0c10a8..dd033bdd757 100644 --- a/mythtv/libs/libmythtv/fifowriter.cpp +++ b/mythtv/libs/libmythtv/fifowriter.cpp @@ -94,7 +94,7 @@ int FIFOWriter::FIFOInit(int id, QString desc, QString name, long size, if (id < 0 || id >= num_fifos) return false; - QByteArray fname = name.toAscii(); + QByteArray fname = name.toLatin1(); const char *aname = fname.constData(); if (mkfifo(aname, S_IREAD | S_IWRITE | S_IRGRP | S_IROTH) == -1) { @@ -155,7 +155,7 @@ void FIFOWriter::FIFOWriteThread(int id) break; if (fd < 0) { - QByteArray fname = filename[id].toAscii(); + QByteArray fname = filename[id].toLatin1(); fd = open(fname.constData(), O_WRONLY| O_SYNC); } if (fd >= 0) diff --git a/mythtv/libs/libmythtv/filtermanager.cpp b/mythtv/libs/libmythtv/filtermanager.cpp index 0a2e8510515..8bb819daebd 100644 --- a/mythtv/libs/libmythtv/filtermanager.cpp +++ b/mythtv/libs/libmythtv/filtermanager.cpp @@ -168,7 +168,7 @@ bool FilterManager::LoadFilterLib(const QString &path) if (!dlhandle) { - QByteArray apath = path.toAscii(); + QByteArray apath = path.toLatin1(); dlhandle = dlopen(apath.constData(), RTLD_LAZY); if (!dlhandle) { @@ -208,7 +208,7 @@ bool FilterManager::LoadFilterLib(const QString &path) memcpy(newFilter->formats, filtInfo->formats, sizeof(FmtConv) * (i + 1)); - QByteArray libname = path.toAscii(); + QByteArray libname = path.toLatin1(); newFilter->libname = strdup(libname.constData()); filters[newFilter->name] = newFilter; LOG(VB_PLAYBACK, LOG_DEBUG, LOC + QString("filters[%1] = 0x%2") diff --git a/mythtv/libs/libmythtv/mhi.cpp b/mythtv/libs/libmythtv/mhi.cpp index 2afde8e8950..e1a5871e8bd 100644 --- a/mythtv/libs/libmythtv/mhi.cpp +++ b/mythtv/libs/libmythtv/mhi.cpp @@ -79,25 +79,25 @@ MHIContext::MHIContext(InteractiveTV *parent) bool MHIContext::LoadFont(QString name) { QString fullnameA = GetConfDir() + "/" + name; - QByteArray fnameA = fullnameA.toAscii(); + QByteArray fnameA = fullnameA.toLatin1(); FT_Error errorA = FT_New_Face(ft_library, fnameA.constData(), 0, &m_face); if (!errorA) return true; QString fullnameB = GetFontsDir() + name; - QByteArray fnameB = fullnameB.toAscii(); + QByteArray fnameB = fullnameB.toLatin1(); FT_Error errorB = FT_New_Face(ft_library, fnameB.constData(), 0, &m_face); if (!errorB) return true; QString fullnameC = GetShareDir() + "themes/" + name; - QByteArray fnameC = fullnameC.toAscii(); + QByteArray fnameC = fullnameC.toLatin1(); FT_Error errorC = FT_New_Face(ft_library, fnameC.constData(), 0, &m_face); if (!errorC) return true; QString fullnameD = name; - QByteArray fnameD = fullnameD.toAscii(); + QByteArray fnameD = fullnameD.toLatin1(); FT_Error errorD = FT_New_Face(ft_library, fnameD.constData(), 0, &m_face); if (!errorD) return true; diff --git a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h index a960bf4e1ac..bd8bfa8b224 100644 --- a/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h +++ b/mythtv/libs/libmythtv/mpeg/dvbdescriptors.h @@ -635,7 +635,7 @@ class CountryAvailabilityDescriptor : public MPEGDescriptor for (uint i=0; i 0 || m_size >= 0) - m_request.setRawHeader("Range", QString("bytes=%1-").arg(m_pos).toAscii()); + m_request.setRawHeader("Range", QString("bytes=%1-").arg(m_pos).toLatin1()); #ifndef QT_NO_OPENSSL #if 1 // The BBC use a self certified cert so don't verify it diff --git a/mythtv/libs/libmythtv/previewgenerator.cpp b/mythtv/libs/libmythtv/previewgenerator.cpp index 2d8b3c9d0c9..b000da48d34 100644 --- a/mythtv/libs/libmythtv/previewgenerator.cpp +++ b/mythtv/libs/libmythtv/previewgenerator.cpp @@ -451,7 +451,7 @@ bool PreviewGenerator::event(QEvent *e) size_t length = me->ExtraData(4).toULongLong(); quint16 checksum16 = me->ExtraData(5).toUInt(); - QByteArray data = QByteArray::fromBase64(me->ExtraData(6).toAscii()); + QByteArray data = QByteArray::fromBase64(me->ExtraData(6).toLatin1()); if ((size_t) data.size() < length) { // (note data.size() may be up to 3 // bytes longer after decoding diff --git a/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp index 9d2f9f028d0..c5d13e0ae23 100644 --- a/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp +++ b/mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp @@ -510,7 +510,7 @@ bool NuppelVideoRecorder::SetupAVCodecVideo(void) av_free(mpa_vidctx); mpa_vidctx = NULL; - QByteArray vcodec = videocodec.toAscii(); + QByteArray vcodec = videocodec.toLatin1(); mpa_vidcodec = avcodec_find_encoder_by_name(vcodec.constData()); if (!mpa_vidcodec) @@ -756,7 +756,7 @@ int NuppelVideoRecorder::AudioInit(bool skipdevice) if (!skipdevice) { - audio_device = AudioInput::CreateDevice(audiodevice.toAscii()); + audio_device = AudioInput::CreateDevice(audiodevice.toLatin1()); if (!audio_device) { LOG(VB_GENERAL, LOG_ERR, LOC + @@ -833,7 +833,7 @@ bool NuppelVideoRecorder::MJPEGInit(void) int init_fd = fd; if (init_fd < 0) { - QByteArray vdevice = videodevice.toAscii(); + QByteArray vdevice = videodevice.toLatin1(); init_fd = open(vdevice.constData(), O_RDWR); we_opened_fd = true; @@ -990,7 +990,7 @@ bool NuppelVideoRecorder::Open(void) return true; int retries = 0; - QByteArray vdevice = videodevice.toAscii(); + QByteArray vdevice = videodevice.toLatin1(); fd = open(vdevice.constData(), O_RDWR); while (fd < 0) { diff --git a/mythtv/libs/libmythtv/recorders/audioinput.cpp b/mythtv/libs/libmythtv/recorders/audioinput.cpp index 4be71977b29..3c8e4effdd1 100644 --- a/mythtv/libs/libmythtv/recorders/audioinput.cpp +++ b/mythtv/libs/libmythtv/recorders/audioinput.cpp @@ -28,7 +28,7 @@ AudioInput::AudioInput(const QString &device) { - m_audio_device = QByteArray(device.toAscii()); + m_audio_device = QByteArray(device.toLatin1()); m_audio_channels = 0; m_audio_sample_bits = 0; m_audio_sample_rate = 0; diff --git a/mythtv/libs/libmythtv/recorders/audioinputalsa.cpp b/mythtv/libs/libmythtv/recorders/audioinputalsa.cpp index f300eb17f82..5c0e6501991 100644 --- a/mythtv/libs/libmythtv/recorders/audioinputalsa.cpp +++ b/mythtv/libs/libmythtv/recorders/audioinputalsa.cpp @@ -31,7 +31,7 @@ AudioInputALSA::AudioInputALSA(const QString &device): period_size(0), myth_block_bytes(0) { - alsa_device = device.right(device.size()-5).toAscii(); + alsa_device = device.right(device.size()-5).toLatin1(); } bool AudioInputALSA::Open(uint sample_bits, uint sample_rate, uint channels) diff --git a/mythtv/libs/libmythtv/recorders/audioinputoss.cpp b/mythtv/libs/libmythtv/recorders/audioinputoss.cpp index 3286d8763ce..759e5a1e6e8 100644 --- a/mythtv/libs/libmythtv/recorders/audioinputoss.cpp +++ b/mythtv/libs/libmythtv/recorders/audioinputoss.cpp @@ -38,7 +38,7 @@ AudioInputOSS::AudioInputOSS(const QString &device) : AudioInput(device) { if (!device.isEmpty()) - m_device_name = QByteArray(device.toAscii()); + m_device_name = QByteArray(device.toLatin1()); else m_device_name = QByteArray(); dsp_fd = -1; diff --git a/mythtv/libs/libmythtv/recorders/cetonrtsp.cpp b/mythtv/libs/libmythtv/recorders/cetonrtsp.cpp index 283c030584b..9040787b99d 100644 --- a/mythtv/libs/libmythtv/recorders/cetonrtsp.cpp +++ b/mythtv/libs/libmythtv/recorders/cetonrtsp.cpp @@ -64,7 +64,7 @@ bool CetonRTSP::ProcessRequest( LOG(VB_RECORD, LOG_DEBUG, LOC + QString("write: %1").arg(request)); - socket.write(request.toAscii()); + socket.write(request.toLatin1()); _responseHeaders.clear(); _responseContent.clear(); diff --git a/mythtv/libs/libmythtv/recorders/dvbcam.cpp b/mythtv/libs/libmythtv/recorders/dvbcam.cpp index 74a2e96be59..4d0dd26b2fd 100644 --- a/mythtv/libs/libmythtv/recorders/dvbcam.cpp +++ b/mythtv/libs/libmythtv/recorders/dvbcam.cpp @@ -67,7 +67,7 @@ DVBCam::DVBCam(const QString &aDevice) pmt_updated(false), pmt_added(false) { QString dvbdev = CardUtil::GetDeviceName(DVB_DEV_CA, device); - QByteArray dev = dvbdev.toAscii(); + QByteArray dev = dvbdev.toLatin1(); int cafd = open(dev.constData(), O_RDWR); if (cafd >= 0) { @@ -94,7 +94,7 @@ bool DVBCam::Start(void) pmt_added = false; QString dvbdev = CardUtil::GetDeviceName(DVB_DEV_CA, device); - QByteArray dev = dvbdev.toAscii(); + QByteArray dev = dvbdev.toLatin1(); ciHandler = cCiHandler::CreateCiHandler(dev.constData()); if (!ciHandler) { diff --git a/mythtv/libs/libmythtv/recorders/dvbchannel.cpp b/mythtv/libs/libmythtv/recorders/dvbchannel.cpp index 74f78f16351..0e2bea0bb86 100644 --- a/mythtv/libs/libmythtv/recorders/dvbchannel.cpp +++ b/mythtv/libs/libmythtv/recorders/dvbchannel.cpp @@ -216,7 +216,7 @@ bool DVBChannel::Open(DVBChannel *who) ReturnMasterLock(master); // if we're the master we don't need this lock.. QString devname = CardUtil::GetDeviceName(DVB_DEV_FRONTEND, device); - QByteArray devn = devname.toAscii(); + QByteArray devn = devname.toLatin1(); for (int tries = 1; ; ++tries) { diff --git a/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp index 8831c3c2f2d..01a38252837 100644 --- a/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp +++ b/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp @@ -133,7 +133,7 @@ void DVBStreamHandler::run(void) */ void DVBStreamHandler::RunTS(void) { - QByteArray dvr_dev_path = _dvr_dev_path.toAscii(); + QByteArray dvr_dev_path = _dvr_dev_path.toLatin1(); int dvr_fd; for (int tries = 1; ; ++tries) { @@ -566,7 +566,7 @@ bool DVBStreamHandler::SupportsTSMonitoring(void) return *it; } - QByteArray dvr_dev_path = _dvr_dev_path.toAscii(); + QByteArray dvr_dev_path = _dvr_dev_path.toLatin1(); int dvr_fd = open(dvr_dev_path.constData(), O_RDONLY | O_NONBLOCK); if (dvr_fd < 0) { @@ -603,7 +603,7 @@ bool DVBPIDInfo::Open(const QString &dvb_dev, bool use_section_reader) } QString demux_fn = CardUtil::GetDeviceName(DVB_DEV_DEMUX, dvb_dev); - QByteArray demux_ba = demux_fn.toAscii(); + QByteArray demux_ba = demux_fn.toLatin1(); LOG(VB_RECORD, LOG_INFO, LOC + QString("Opening filter for pid 0x%1") .arg(_pid, 0, 16)); @@ -745,7 +745,7 @@ int DVBRecorder::OpenFilterFd(uint pid, int pes_type, uint stream_type) // Open the demux device QString dvbdev = CardUtil::GetDeviceName( DVB_DEV_DEMUX, _card_number_option); - QByteArray dev = dvbdev.toAscii(); + QByteArray dev = dvbdev.toLatin1(); int fd_tmp = open(dev.constData(), O_RDWR); if (fd_tmp < 0) diff --git a/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp index 52b782390d2..254b06b9296 100644 --- a/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp +++ b/mythtv/libs/libmythtv/recorders/iptvstreamhandler.cpp @@ -216,7 +216,7 @@ void IPTVStreamHandler::run(void) struct ip_mreq imr; memset(&imr, 0, sizeof(struct ip_mreq)); imr.imr_multiaddr.s_addr = inet_addr( - dest_addr.toString().toAscii().constData()); + dest_addr.toString().toLatin1().constData()); imr.imr_interface.s_addr = htonl(INADDR_ANY); if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &imr, sizeof(imr)) < 0) diff --git a/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp b/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp index 3b11d9c345c..8a5ff1474fa 100644 --- a/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp +++ b/mythtv/libs/libmythtv/recorders/mpegrecorder.cpp @@ -359,7 +359,7 @@ void MpegRecorder::SetStrOption(RecordingProfile *profile, const QString &name) bool MpegRecorder::OpenMpegFileAsInput(void) { - QByteArray vdevice = videodevice.toAscii(); + QByteArray vdevice = videodevice.toLatin1(); chanfd = readfd = open(vdevice.constData(), O_RDONLY); if (readfd < 0) @@ -377,7 +377,7 @@ bool MpegRecorder::OpenV4L2DeviceAsInput(void) // open implicitly starts encoding, so we need the lock.. QMutexLocker locker(&start_stop_encoding_lock); - QByteArray vdevice = videodevice.toAscii(); + QByteArray vdevice = videodevice.toLatin1(); chanfd = open(vdevice.constData(), O_RDWR); if (chanfd < 0) { @@ -973,7 +973,7 @@ void MpegRecorder::run(void) StartEncoding(); } - QByteArray vdevice = videodevice.toAscii(); + QByteArray vdevice = videodevice.toLatin1(); while (IsRecordingRequested() && !IsErrored()) { if (PauseAndWait(100)) @@ -1277,7 +1277,7 @@ bool MpegRecorder::StartEncoding(void) if (readfd < 0) { - readfd = open(videodevice.toAscii().constData(), O_RDWR | O_NONBLOCK); + readfd = open(videodevice.toLatin1().constData(), O_RDWR | O_NONBLOCK); if (readfd < 0) { LOG(VB_GENERAL, LOG_ERR, LOC + @@ -1313,7 +1313,7 @@ bool MpegRecorder::StartEncoding(void) if (_device_read_buffer) { - _device_read_buffer->Reset(videodevice.toAscii().constData(), readfd); + _device_read_buffer->Reset(videodevice.toLatin1().constData(), readfd); _device_read_buffer->SetRequestPause(false); _device_read_buffer->Start(); } diff --git a/mythtv/libs/libmythtv/recorders/v4lchannel.cpp b/mythtv/libs/libmythtv/recorders/v4lchannel.cpp index a8f62eea7e0..c325e231901 100644 --- a/mythtv/libs/libmythtv/recorders/v4lchannel.cpp +++ b/mythtv/libs/libmythtv/recorders/v4lchannel.cpp @@ -71,7 +71,7 @@ bool V4LChannel::Open(void) if (videofd >= 0) return true; - QByteArray ascii_device = device.toAscii(); + QByteArray ascii_device = device.toLatin1(); videofd = open(ascii_device.constData(), O_RDWR); if (videofd < 0) { diff --git a/mythtv/libs/libmythtv/recorders/v4lrecorder.cpp b/mythtv/libs/libmythtv/recorders/v4lrecorder.cpp index 882ab63ac4f..6fc005a5283 100644 --- a/mythtv/libs/libmythtv/recorders/v4lrecorder.cpp +++ b/mythtv/libs/libmythtv/recorders/v4lrecorder.cpp @@ -114,7 +114,7 @@ int V4LRecorder::OpenVBIDevice(void) struct vbi *pal_tt = NULL; uint width = 0, start_line = 0, line_count = 0; - QByteArray vbidev = vbidevice.toAscii(); + QByteArray vbidev = vbidevice.toLatin1(); if (VBIMode::PAL_TT == vbimode) { pal_tt = vbi_open(vbidev.constData(), NULL, 99, -1); diff --git a/mythtv/libs/libmythtv/streamingringbuffer.cpp b/mythtv/libs/libmythtv/streamingringbuffer.cpp index 7b4a731f236..f77cf6a2689 100644 --- a/mythtv/libs/libmythtv/streamingringbuffer.cpp +++ b/mythtv/libs/libmythtv/streamingringbuffer.cpp @@ -58,7 +58,7 @@ bool StreamingRingBuffer::OpenFile(const QString &lfilename, uint retry_ms) url.setScheme("hls+http"); } - int res = ffurl_open(&m_context, url.toString().toAscii(), AVIO_FLAG_READ, + int res = ffurl_open(&m_context, url.toString().toLatin1(), AVIO_FLAG_READ, NULL, NULL); if (res >=0 && m_context && !m_context->is_streamed && ffurl_seek(m_context, 0, SEEK_SET) >= 0) diff --git a/mythtv/libs/libmythtv/util-xv.cpp b/mythtv/libs/libmythtv/util-xv.cpp index c1b73ca8f57..fa2bef92988 100644 --- a/mythtv/libs/libmythtv/util-xv.cpp +++ b/mythtv/libs/libmythtv/util-xv.cpp @@ -84,7 +84,7 @@ void restore_port_attributes(int port, bool clear) for (it = open_xv_ports[port].attribs.begin(); it != open_xv_ports[port].attribs.end(); ++it) { - QByteArray ascii_name = it.key().toAscii(); + QByteArray ascii_name = it.key().toLatin1(); const char *cname = ascii_name.constData(); xv_set_attrib(disp, port, cname, it.value()); } diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp index 935be2b6311..b4c6edc3a09 100644 --- a/mythtv/libs/libmythtv/videoout_xv.cpp +++ b/mythtv/libs/libmythtv/videoout_xv.cpp @@ -892,7 +892,7 @@ bool VideoOutputXv::Init(int width, int height, float aspect, Colormap cmap = XDefaultColormap(disp->GetDisplay(), disp->GetScreen()); XColor colour, colour_exact; QString name = toXString(db_letterbox_colour); - QByteArray ascii_name = name.toAscii(); + QByteArray ascii_name = name.toLatin1(); const char *cname = ascii_name.constData(); if (XAllocNamedColor(disp->GetDisplay(), cmap, cname, &colour, &colour_exact)) XJ_letterbox_colour = colour.pixel; @@ -1847,7 +1847,7 @@ int VideoOutputXv::SetPictureAttribute( int VideoOutputXv::SetXVPictureAttribute(PictureAttribute attribute, int newValue) { QString attrName = toXVString(attribute); - QByteArray ascii_attr_name = attrName.toAscii(); + QByteArray ascii_attr_name = attrName.toLatin1(); const char *cname = ascii_attr_name.constData(); if (attrName.isEmpty()) @@ -1895,7 +1895,7 @@ void VideoOutputXv::InitPictureAttributes(void) for (uint i = 0; i < kPictureAttribute_MAX; i++) { QString attrName = toXVString((PictureAttribute)i); - QByteArray ascii_attr_name = attrName.toAscii(); + QByteArray ascii_attr_name = attrName.toLatin1(); const char *cname = ascii_attr_name.constData(); if (attrName.isEmpty()) diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp index c53c15da4fc..2311456ad9f 100644 --- a/mythtv/libs/libmythtv/videosource.cpp +++ b/mythtv/libs/libmythtv/videosource.cpp @@ -790,7 +790,7 @@ class VideoDevice : public PathSetting, public CaptureCardDBStorage continue; // if the driver returns any info add this device to our list - QByteArray tmp = filepath.toAscii(); + QByteArray tmp = filepath.toLatin1(); int videofd = open(tmp.constData(), O_RDWR); if (videofd >= 0) { @@ -860,7 +860,7 @@ class VBIDevice : public PathSetting, public CaptureCardDBStorage QFileInfo &fi = *it; QString device = fi.absoluteFilePath(); - QByteArray adevice = device.toAscii(); + QByteArray adevice = device.toLatin1(); int vbifd = open(adevice.constData(), O_RDWR); if (vbifd < 0) continue; @@ -2084,7 +2084,7 @@ void V4LConfigurationGroup::probeCard(const QString &device) { QString cn = tr("Failed to open"), ci = cn, dn = QString::null; - QByteArray adevice = device.toAscii(); + QByteArray adevice = device.toLatin1(); int videofd = open(adevice.constData(), O_RDWR); if (videofd >= 0) { @@ -2128,7 +2128,7 @@ void MPEGConfigurationGroup::probeCard(const QString &device) { QString cn = tr("Failed to open"), ci = cn, dn = QString::null; - QByteArray adevice = device.toAscii(); + QByteArray adevice = device.toLatin1(); int videofd = open(adevice.constData(), O_RDWR); if (videofd >= 0) { diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp index 14307f24967..b8753c04897 100644 --- a/mythtv/libs/libmythui/mythmainwindow.cpp +++ b/mythtv/libs/libmythui/mythmainwindow.cpp @@ -878,7 +878,7 @@ bool MythMainWindow::SaveScreenShot(const QImage &image, QString filename) LOG(VB_GENERAL, LOG_INFO, QString("Saving screenshot to %1 (%2x%3)") .arg(filename).arg(image.width()).arg(image.height())); - if (image.save(filename, extension.toAscii(), 100)) + if (image.save(filename, extension.toLatin1(), 100)) { LOG(VB_GENERAL, LOG_INFO, "MythMainWindow::screenShot succeeded"); return true; diff --git a/mythtv/libs/libmythui/mythrender_opengl1.cpp b/mythtv/libs/libmythui/mythrender_opengl1.cpp index 52df5dbb21e..1f6c6ca2c77 100644 --- a/mythtv/libs/libmythui/mythrender_opengl1.cpp +++ b/mythtv/libs/libmythui/mythrender_opengl1.cpp @@ -121,7 +121,7 @@ uint MythRenderOpenGL1::CreateShaderObject(const QString &vert, const QString &f makeCurrent(); - QByteArray tmp = frag.toAscii(); + QByteArray tmp = frag.toLatin1(); GLuint glfp; m_glGenProgramsARB(1, &glfp); diff --git a/mythtv/libs/libmythui/mythrender_opengl2.cpp b/mythtv/libs/libmythui/mythrender_opengl2.cpp index 9eac37f7afc..b92b733e06c 100644 --- a/mythtv/libs/libmythui/mythrender_opengl2.cpp +++ b/mythtv/libs/libmythui/mythrender_opengl2.cpp @@ -823,7 +823,7 @@ void MythRenderOpenGL2::DeleteDefaultShaders(void) uint MythRenderOpenGL2::CreateShader(int type, const QString &source) { uint result = m_glCreateShader(type); - QByteArray src = source.toAscii(); + QByteArray src = source.toLatin1(); const char* tmp[1] = { src.constData() }; m_glShaderSource(result, 1, tmp, NULL); m_glCompileShader(result); diff --git a/mythtv/libs/libmythui/mythuifilebrowser.cpp b/mythtv/libs/libmythui/mythuifilebrowser.cpp index 2de17869cfc..80b3124b4f2 100644 --- a/mythtv/libs/libmythui/mythuifilebrowser.cpp +++ b/mythtv/libs/libmythui/mythuifilebrowser.cpp @@ -353,7 +353,7 @@ bool MythUIFileBrowser::IsImage(QString extension) QList formats = QImageReader::supportedImageFormats(); - if (formats.contains(extension.toAscii())) + if (formats.contains(extension.toLatin1())) return true; return false; diff --git a/mythtv/libs/libmythui/mythuitype.cpp b/mythtv/libs/libmythui/mythuitype.cpp index 754af0dadd8..d72b031c4e1 100644 --- a/mythtv/libs/libmythui/mythuitype.cpp +++ b/mythtv/libs/libmythui/mythuitype.cpp @@ -144,7 +144,7 @@ static QObject *qChildHelper(const char *objName, const char *inheritsClass, */ MythUIType *MythUIType::GetChild(const QString &name) const { - QObject *ret = qChildHelper(name.toAscii().constData(), NULL, true, children()); + QObject *ret = qChildHelper(name.toLatin1().constData(), NULL, true, children()); if (ret) return dynamic_cast(ret); diff --git a/mythtv/libs/libmythui/mythxdisplay.cpp b/mythtv/libs/libmythui/mythxdisplay.cpp index 68ee900f1a8..eb54e13c1d0 100644 --- a/mythtv/libs/libmythui/mythxdisplay.cpp +++ b/mythtv/libs/libmythui/mythxdisplay.cpp @@ -96,7 +96,7 @@ bool MythXDisplay::Open(void) QString dispStr = GetMythUI()->GetX11Display(); const char *dispCStr = NULL; if (!dispStr.isEmpty()) - dispCStr = dispStr.toAscii().constData(); + dispCStr = dispStr.toLatin1().constData(); m_disp = XOpenDisplay(dispCStr); if (!m_disp) diff --git a/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp b/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp index 1abd449d42e..84f6f21c976 100644 --- a/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp +++ b/mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp @@ -53,7 +53,7 @@ MMulticastSocketDevice::MMulticastSocketDevice( setProtocol(IPv4); setSocket(createNewSocket(), MSocketDevice::Datagram); - m_imr.imr_multiaddr.s_addr = inet_addr(sAddress.toAscii().constData()); + m_imr.imr_multiaddr.s_addr = inet_addr(sAddress.toLatin1().constData()); m_imr.imr_interface.s_addr = htonl(INADDR_ANY); if (setsockopt(socket(), IPPROTO_IP, IP_ADD_MEMBERSHIP, diff --git a/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp b/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp index f7176762e19..ddc58da1aed 100644 --- a/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp +++ b/mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp @@ -291,7 +291,7 @@ QString XmlSerializer::GetContentName( const QString &sName, { // Try to read Name or TypeName from classinfo metadata. - int nClassIdx = pMetaObject->indexOfClassInfo( sName.toAscii() ); + int nClassIdx = pMetaObject->indexOfClassInfo( sName.toLatin1() ); if (nClassIdx >=0) { diff --git a/mythtv/libs/libmythupnp/servicehost.cpp b/mythtv/libs/libmythupnp/servicehost.cpp index 3eaf9045d99..5250aede291 100644 --- a/mythtv/libs/libmythupnp/servicehost.cpp +++ b/mythtv/libs/libmythupnp/servicehost.cpp @@ -236,7 +236,7 @@ ServiceHost::ServiceHost(const QMetaObject &metaObject, QString sMethodClassInfo = oInfo.m_sName + "_Method"; int nClassIdx = - m_oMetaObject.indexOfClassInfo(sMethodClassInfo.toAscii()); + m_oMetaObject.indexOfClassInfo(sMethodClassInfo.toLatin1()); if (nClassIdx >=0) { diff --git a/mythtv/libs/libmythupnp/soapclient.cpp b/mythtv/libs/libmythupnp/soapclient.cpp index 309dd6c6d7d..d3e4bcf7dc0 100644 --- a/mythtv/libs/libmythupnp/soapclient.cpp +++ b/mythtv/libs/libmythupnp/soapclient.cpp @@ -124,7 +124,7 @@ bool SOAPClient::GetNodeValue( if (sValue.isEmpty()) return bDefault; - char ret = sValue[0].toAscii(); + char ret = sValue[0].toLatin1(); switch (ret) { case 't': case 'T': case 'y': case 'Y': case '1': diff --git a/mythtv/programs/mythbackend/main_helpers.cpp b/mythtv/programs/mythbackend/main_helpers.cpp index d2c40ece40c..fd4c4dc854d 100644 --- a/mythtv/programs/mythbackend/main_helpers.cpp +++ b/mythtv/programs/mythbackend/main_helpers.cpp @@ -265,7 +265,7 @@ void cleanup(void) if (pidfile.size()) { - unlink(pidfile.toAscii().constData()); + unlink(pidfile.toLatin1().constData()); pidfile.clear(); } diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp index 9af493950d3..e9cae9bb3e5 100644 --- a/mythtv/programs/mythbackend/mainserver.cpp +++ b/mythtv/programs/mythbackend/mainserver.cpp @@ -2629,10 +2629,10 @@ void MainServer::DoHandleDeleteRecording( bool fileExists = checkFile.exists(); if (!fileExists) { - QFile checkFileUTF8(QString::fromUtf8(filename.toAscii().constData())); + QFile checkFileUTF8(QString::fromUtf8(filename.toLatin1().constData())); fileExists = checkFileUTF8.exists(); if (fileExists) - filename = QString::fromUtf8(filename.toAscii().constData()); + filename = QString::fromUtf8(filename.toLatin1().constData()); } // Allow deleting of files where the recording failed meaning size == 0 @@ -4491,7 +4491,7 @@ void MainServer::BackendQueryDiskSpace(QStringList &strlist, bool consolidated, { if (checkDir.exists()) { - QByteArray cdir = currentDir.toAscii(); + QByteArray cdir = currentDir.toLatin1(); getDiskSpace(cdir.constData(), totalKB, usedKB); memset(&statbuf, 0, sizeof(statbuf)); localStr = "1"; // Assume local diff --git a/mythtv/programs/mythbackend/services/content.cpp b/mythtv/programs/mythbackend/services/content.cpp index 97758bed4bf..97fabe0bc04 100644 --- a/mythtv/programs/mythbackend/services/content.cpp +++ b/mythtv/programs/mythbackend/services/content.cpp @@ -194,7 +194,7 @@ QFileInfo Content::GetImageFile( const QString &sStorageGroup, QImage img = pImage->scaled( nWidth, nHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - QByteArray fname = sNewFileName.toAscii(); + QByteArray fname = sNewFileName.toLatin1(); img.save( fname.constData(), "JPG", 60 ); delete pImage; @@ -414,7 +414,7 @@ QFileInfo Content::GetAlbumArt( int nId, int nWidth, int nHeight ) QImage img = pImage->scaled( nWidth, nHeight, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); - QByteArray fname = sNewFileName.toAscii(); + QByteArray fname = sNewFileName.toLatin1(); img.save( fname.constData(), "PNG" ); delete pImage; diff --git a/mythtv/programs/mythcommflag/ClassicCommDetector.cpp b/mythtv/programs/mythcommflag/ClassicCommDetector.cpp index b1b2e0b6b29..d88fa67495d 100644 --- a/mythtv/programs/mythcommflag/ClassicCommDetector.cpp +++ b/mythtv/programs/mythcommflag/ClassicCommDetector.cpp @@ -2508,7 +2508,7 @@ void ClassicCommDetector::PrintFullMap( { if (verbose) { - QByteArray tmp = FrameInfoEntry::GetHeader().toAscii(); + QByteArray tmp = FrameInfoEntry::GetHeader().toLatin1(); out << tmp.constData() << " mark" << endl; } @@ -2518,7 +2518,7 @@ void ClassicCommDetector::PrintFullMap( if (it == frameInfo.end()) continue; - QByteArray atmp = (*it).toString(i, verbose).toAscii(); + QByteArray atmp = (*it).toString(i, verbose).toLatin1(); out << atmp.constData() << " "; if (comm_breaks) { @@ -2527,7 +2527,7 @@ void ClassicCommDetector::PrintFullMap( { QString tmp = (verbose) ? toString((MarkTypes)*mit) : QString::number(*mit); - atmp = tmp.toAscii(); + atmp = tmp.toLatin1(); out << atmp.constData(); } diff --git a/mythtv/programs/mythcommflag/ClassicLogoDetector.cpp b/mythtv/programs/mythcommflag/ClassicLogoDetector.cpp index ba214bdd9bd..818ee3c232e 100644 --- a/mythtv/programs/mythcommflag/ClassicLogoDetector.cpp +++ b/mythtv/programs/mythcommflag/ClassicLogoDetector.cpp @@ -409,7 +409,7 @@ void ClassicLogoDetector::DumpLogo(bool fromCurrentFrame, for(unsigned int y = logoMinY - 2; y <= (logoMaxY + 2); y++) { QString tmp = QString("%1: ").arg(y, 3); - QString ba = tmp.toAscii(); + QString ba = tmp.toLatin1(); cerr << ba.constData(); for(unsigned int x = logoMinX - 2; x <= (logoMaxX + 2); x++) { diff --git a/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp index 67c1db9e7c3..c39652b6db5 100644 --- a/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp +++ b/mythtv/programs/mythcommflag/PrePostRollFlagger.cpp @@ -316,14 +316,14 @@ long long PrePostRollFlagger::findBreakInrange(long long startFrame, { QString tmp = QString("\b\b\b\b\b\b\b\b\b\b\b%1%/%2fps") .arg(percentage, 3).arg((int)flagFPS, 3); - QByteArray ba = tmp.toAscii(); + QByteArray ba = tmp.toLatin1(); cerr << ba.constData() << flush; } else { QString tmp = QString("\b\b\b\b\b\b\b\b\b\b\b\b\b%1/%2fps") .arg(currentFrameNumber, 6).arg((int)flagFPS, 3); - QByteArray ba = tmp.toAscii(); + QByteArray ba = tmp.toLatin1(); cerr << ba.constData() << flush; } cerr.flush(); diff --git a/mythtv/programs/mythcommflag/TemplateFinder.cpp b/mythtv/programs/mythcommflag/TemplateFinder.cpp index a1ab6c5bca6..fa9566cc6ee 100644 --- a/mythtv/programs/mythcommflag/TemplateFinder.cpp +++ b/mythtv/programs/mythcommflag/TemplateFinder.cpp @@ -646,7 +646,7 @@ readTemplate(QString datafile, int *prow, int *pcol, int *pwidth, int *pheight, return false; } - QByteArray tmfile = tmplfile.toAscii(); + QByteArray tmfile = tmplfile.toLatin1(); if (pgm_read(tmpl->data[0], *pwidth, *pheight, tmfile.constData())) { avpicture_free(tmpl); @@ -674,7 +674,7 @@ writeTemplate(QString tmplfile, const AVPicture *tmpl, QString datafile, { QFile tfile(tmplfile); - QByteArray tmfile = tmplfile.toAscii(); + QByteArray tmfile = tmplfile.toLatin1(); if (pgm_write(tmpl->data[0], width, height, tmfile.constData())) return false; diff --git a/mythtv/programs/mythcommflag/main.cpp b/mythtv/programs/mythcommflag/main.cpp index 44eb7098b62..5d50beb5726 100644 --- a/mythtv/programs/mythcommflag/main.cpp +++ b/mythtv/programs/mythcommflag/main.cpp @@ -769,7 +769,7 @@ static int FlagCommercials(ProgramInfo *program_info, int jobid, if (!skipTypes->contains(val)) { cerr << "Failed to decode --method option '" - << val.toAscii().constData() + << val.toLatin1().constData() << "'" << endl; return GENERIC_EXIT_INVALID_CMDLINE; } @@ -997,7 +997,7 @@ static int FlagCommercials(QString filename, int jobid, if (progress) { cerr << "MythTV Commercial Flagger, flagging commercials for:" << endl - << " " << filename.toAscii().constData() << endl; + << " " << filename.toLatin1().constData() << endl; } ProgramInfo pginfo(filename); @@ -1069,7 +1069,7 @@ static int RebuildSeekTable(QString filename, int jobid) if (progress) { cerr << "MythTV Commercial Flagger, building seek table for:" << endl - << " " << filename.toAscii().constData() << endl; + << " " << filename.toLatin1().constData() << endl; } ProgramInfo pginfo(filename); return RebuildSeekTable(&pginfo, jobid); diff --git a/mythtv/programs/mythfrontend/mythcontrols.cpp b/mythtv/programs/mythfrontend/mythcontrols.cpp index 7b212469a5e..01a3eff8ee8 100644 --- a/mythtv/programs/mythfrontend/mythcontrols.cpp +++ b/mythtv/programs/mythfrontend/mythcontrols.cpp @@ -367,7 +367,7 @@ void MythControls::RefreshKeyInformation(void) const QString action = GetCurrentAction(); QString desc = m_bindings->GetActionDescription(context, action); - m_description->SetText(tr(desc.toAscii().constData())); + m_description->SetText(tr(desc.toLatin1().constData())); QStringList keys = m_bindings->GetActionKeys(context, action); for (int i = 0; (i < keys.count()) && diff --git a/mythtv/programs/mythfrontend/videofilter.cpp b/mythtv/programs/mythfrontend/videofilter.cpp index 05528003dd4..fa5bbd86ed3 100644 --- a/mythtv/programs/mythfrontend/videofilter.cpp +++ b/mythtv/programs/mythfrontend/videofilter.cpp @@ -523,7 +523,7 @@ void VideoFilterSettings::setTextFilter(QString val) QStringList list = re_date.capturedTexts(); int modnr = list[1].toInt(); QDate testdate = MythDate::current().date(); - switch(list[2].at(0).toAscii()) + switch(list[2].at(0).toLatin1()) { case 'm': testdate = testdate.addMonths(-modnr);break; case 'd': testdate = testdate.addDays(-modnr);break; diff --git a/mythtv/programs/mythjobqueue/main.cpp b/mythtv/programs/mythjobqueue/main.cpp index 42a5c76f45e..486cde6002a 100644 --- a/mythtv/programs/mythjobqueue/main.cpp +++ b/mythtv/programs/mythjobqueue/main.cpp @@ -47,7 +47,7 @@ static void cleanup(void) if (pidfile.size()) { - unlink(pidfile.toAscii().constData()); + unlink(pidfile.toLatin1().constData()); pidfile.clear(); } diff --git a/mythtv/programs/mythmediaserver/main.cpp b/mythtv/programs/mythmediaserver/main.cpp index 302d7b7cd0a..6f5a0093656 100644 --- a/mythtv/programs/mythmediaserver/main.cpp +++ b/mythtv/programs/mythmediaserver/main.cpp @@ -45,7 +45,7 @@ static void cleanup(void) if (pidfile.size()) { - unlink(pidfile.toAscii().constData()); + unlink(pidfile.toLatin1().constData()); pidfile.clear(); } diff --git a/mythtv/programs/mythtv-setup/importicons.cpp b/mythtv/programs/mythtv-setup/importicons.cpp index 4fe041ba695..e6a6fdb1010 100644 --- a/mythtv/programs/mythtv-setup/importicons.cpp +++ b/mythtv/programs/mythtv-setup/importicons.cpp @@ -519,7 +519,7 @@ QStringList ImportIconsWizard::extract_csv(const QString &line) QString ImportIconsWizard::wget(QUrl& url,const QString& strParam ) { - QByteArray raw(strParam.toAscii()); + QByteArray raw(strParam.toLatin1()); QBuffer data(&raw); QHttpRequestHeader header; diff --git a/mythtv/programs/mythtv-setup/main.cpp b/mythtv/programs/mythtv-setup/main.cpp index 52c27549685..4208068ff76 100644 --- a/mythtv/programs/mythtv-setup/main.cpp +++ b/mythtv/programs/mythtv-setup/main.cpp @@ -409,9 +409,9 @@ int main(int argc, char *argv[]) fprintf(stderr, "%5i: %s %s\n", cardids[i], CardUtil::GetRawCardType(cardids[i]) - .toAscii().constData(), + .toLatin1().constData(), CardUtil::GetVideoDevice(cardids[i]) - .toAscii().constData()); + .toLatin1().constData()); } return GENERIC_EXIT_INVALID_CMDLINE; } @@ -423,7 +423,7 @@ int main(int argc, char *argv[]) cerr << "Valid inputs: " << endl; for (int i = 0; i < inputnames.size(); i++) { - cerr << inputnames[i].toAscii().constData() << endl; + cerr << inputnames[i].toLatin1().constData() << endl; } return GENERIC_EXIT_INVALID_CMDLINE; } @@ -484,7 +484,7 @@ int main(int argc, char *argv[]) scans[i].scanid, scans[i].cardid, scans[i].sourceid, (scans[i].processed) ? "yes" : "no", scans[i].scandate.toString(Qt::ISODate) - .toAscii().constData()); + .toLatin1().constData()); } cout<