diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-07 23:40:10 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-07 23:40:10 +0000 |
commit | c856c3c44f488b137dd3b76f81b2d4b9c5444b73 (patch) | |
tree | 88a64ae28e48d4f71396d329b0d1c797b31accc3 /muse2/muse/mixer | |
parent | 1e2c10156202d4b50df409a1930adc3f151e44dc (diff) |
Converted all latin1() instances. Ported Qt3 methods to Qt4.
Diffstat (limited to 'muse2/muse/mixer')
-rw-r--r-- | muse2/muse/mixer/amixer.cpp | 4 | ||||
-rw-r--r-- | muse2/muse/mixer/astrip.cpp | 16 | ||||
-rw-r--r-- | muse2/muse/mixer/rack.cpp | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp index 1848b9fd..a9345b8a 100644 --- a/muse2/muse/mixer/amixer.cpp +++ b/muse2/muse/mixer/amixer.cpp @@ -677,7 +677,7 @@ void AudioMixerApp::write(int level, Xml& xml) //void AudioMixerApp::write(int level, Xml& xml, const char* name) { //xml.stag(QString(name)); - //xml.tag(level++, name.latin1()); + //xml.tag(level++, name.toLatin1()); xml.tag(level++, "Mixer"); xml.strTag(level, "name", cfg->name); @@ -695,7 +695,7 @@ void AudioMixerApp::write(int level, Xml& xml) xml.intTag(level, "showSyntiTracks", cfg->showSyntiTracks); //xml.etag(name); - //xml.etag(level, name.latin1()); + //xml.etag(level, name.toLatin1()); xml.etag(level, "Mixer"); } diff --git a/muse2/muse/mixer/astrip.cpp b/muse2/muse/mixer/astrip.cpp index 58cf870f..1c206712 100644 --- a/muse2/muse/mixer/astrip.cpp +++ b/muse2/muse/mixer/astrip.cpp @@ -1148,9 +1148,9 @@ static int addSyntiPorts(AudioTrack* t, PopupMenu* lb, int id, { char buffer[128]; if(tchans == 2) - snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").latin1(), ch+1, ch+2); + snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").toLatin1().constData(), ch+1, ch+2); else - snprintf(buffer, 128, "%s %d", chpup->tr("Channel").latin1(), ch+1); + snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1); act = chpup->addAction(QString(buffer)); act->setData(id); act->setCheckable(true); @@ -1281,7 +1281,7 @@ static int addMultiChannelPorts(AudioTrack* t, PopupMenu* pup, int id, RouteMenu if(chans > 1) { char buffer[128]; - snprintf(buffer, 128, "%s %d", pup->tr("Channel").latin1(), ch+1); + snprintf(buffer, 128, "%s %d", pup->tr("Channel").toLatin1().constData(), ch+1); chpup->setTitle(QString(buffer)); pup->addMenu(chpup); } @@ -1362,7 +1362,7 @@ static int addMultiChannelPorts(AudioTrack* t, PopupMenu* pup, int id, RouteMenu if(chans > 2) { char buffer[128]; - snprintf(buffer, 128, "%s %d,%d", pup->tr("Channel").latin1(), ch+1, ch+2); + snprintf(buffer, 128, "%s %d,%d", pup->tr("Channel").toLatin1().constData(), ch+1, ch+2); chpup->setTitle(QString(buffer)); pup->addMenu(chpup); } @@ -1419,7 +1419,7 @@ static int nonSyntiTrackAddSyntis(AudioTrack* t, PopupMenu* lb, int id, RouteMen for(int ch = 0; ch < chans; ++ch) { char buffer[128]; - snprintf(buffer, 128, "%s %d", chpup->tr("Channel").latin1(), ch+1); + snprintf(buffer, 128, "%s %d", chpup->tr("Channel").toLatin1().constData(), ch+1); act = chpup->addAction(QString(buffer)); act->setData(id); act->setCheckable(true); @@ -1473,7 +1473,7 @@ static int nonSyntiTrackAddSyntis(AudioTrack* t, PopupMenu* lb, int id, RouteMen for(int ch = 0; ch < chans; ++ch) { char buffer[128]; - snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").latin1(), ch+1, ch+2); + snprintf(buffer, 128, "%s %d,%d", chpup->tr("Channel").toLatin1().constData(), ch+1, ch+2); act = chpup->addAction(QString(buffer)); act->setData(id); act->setCheckable(true); @@ -1558,7 +1558,7 @@ void AudioStrip::iRoutePressed() for(int i = 0; i < channel; ++i) { char buffer[128]; - snprintf(buffer, 128, "%s %d", tr("Channel").latin1(), i+1); + snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), i+1); MenuTitleItem* titel = new MenuTitleItem(QString(buffer), pup); pup->addAction(titel); @@ -1811,7 +1811,7 @@ void AudioStrip::oRoutePressed() for(int i = 0; i < channel; ++i) { char buffer[128]; - snprintf(buffer, 128, "%s %d", tr("Channel").latin1(), i+1); + snprintf(buffer, 128, "%s %d", tr("Channel").toLatin1().constData(), i+1); MenuTitleItem* titel = new MenuTitleItem(QString(buffer), pup); pup->addAction(titel); diff --git a/muse2/muse/mixer/rack.cpp b/muse2/muse/mixer/rack.cpp index 16e76258..b979b420 100644 --- a/muse2/muse/mixer/rack.cpp +++ b/muse2/muse/mixer/rack.cpp @@ -146,7 +146,7 @@ void EffectRack::choosePlugin(QListWidgetItem* it, bool replace) PluginI* plugi = new PluginI(); if (plugi->initPluginInstance(plugin, track->channels())) { printf("cannot instantiate plugin <%s>\n", - plugin->name().latin1()); + plugin->name().toLatin1().constData()); delete plugi; return; } @@ -396,7 +396,7 @@ void EffectRack::startDrag(int idx) QString xmlconf; xml.dump(xmlconf); - QByteArray data(xmlconf.toLatin1().data()); + QByteArray data(xmlconf.toLatin1().constData()); QMimeData* md = new QMimeData(); md->setData("text/x-muse-plugin", data); @@ -510,7 +510,7 @@ void EffectRack::mousePressEvent(QMouseEvent *event) void EffectRack::mouseMoveEvent(QMouseEvent *event) { - if (event->state() & Qt::LeftButton) { + if (event->buttons() & Qt::LeftButton) { Pipeline* pipe = track->efxPipe(); if(!pipe) return; |