diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | src/GUIFileList.txt | 4 | ||||
| -rw-r--r-- | src/SequencerFileList.txt | 2 | ||||
| -rw-r--r-- | src/sequencer/RosegardenSequencerApp.cpp | 2 | ||||
| -rw-r--r-- | src/sequencer/SequencerMmapper.cpp | 4 | ||||
| -rw-r--r-- | src/sound/AlsaDriver.cpp | 12 |
6 files changed, 12 insertions, 12 deletions
diff --git a/admin b/admin -Subproject 26d642b2620397b76d5fbb64a9ef5ca8f2334f7 +Subproject 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b diff --git a/src/GUIFileList.txt b/src/GUIFileList.txt index 75403e0..37838f6 100644 --- a/src/GUIFileList.txt +++ b/src/GUIFileList.txt @@ -2,8 +2,8 @@ # find commands/ document/ gui/ -iname '*.cpp' -or -iname '*.h' > list.txt SET(gui_dcop_SRCS - gui/application/RosegardenIface.h - gui/editors/segment/TrackEditorIface.h + gui/application/RosegardenIface.skel + gui/editors/segment/TrackEditorIface.skel ) SET(ui_SRCS diff --git a/src/SequencerFileList.txt b/src/SequencerFileList.txt index bd85f75..99874c7 100644 --- a/src/SequencerFileList.txt +++ b/src/SequencerFileList.txt @@ -13,5 +13,5 @@ SET(sequencer_SRCS ) SET(seq_dcop_SRCS - sequencer/RosegardenSequencerIface.h + sequencer/RosegardenSequencerIface.skel ) diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp index 6e20e69..9e9b301 100644 --- a/src/sequencer/RosegardenSequencerApp.cpp +++ b/src/sequencer/RosegardenSequencerApp.cpp @@ -1104,7 +1104,7 @@ RosegardenSequencerApp::getSoundDrivertqStatus(const TQString &guiVersion) drivertqStatus |= VERSION_OK; else { std::cerr << "WARNING: RosegardenSequencerApp::getSoundDriverStatus: " - << "GUI version \"" << guiVersion + << "GUI version \"" << guiVersion.ascii() << "\" does not match sequencer version \"" << VERSION << "\"" << std::endl; } diff --git a/src/sequencer/SequencerMmapper.cpp b/src/sequencer/SequencerMmapper.cpp index bc34642..f3808a1 100644 --- a/src/sequencer/SequencerMmapper.cpp +++ b/src/sequencer/SequencerMmapper.cpp @@ -123,14 +123,14 @@ SequencerMmapper::setFileSize(size_t size) // (seek() to wanted size, then write a byte) // if (::lseek(m_fd, size - 1, SEEK_SET) == -1) { - std::cerr << "WARNING: SequencerMmapper : Couldn't lseek in " << m_fileName + std::cerr << "WARNING: SequencerMmapper : Couldn't lseek in " << m_fileName.ascii() << " to " << size << std::endl; throw Exception("lseek failed"); } if (::write(m_fd, "\0", 1) != 1) { std::cerr << "WARNING: SequencerMmapper : Couldn't write byte in " - << m_fileName << std::endl; + << m_fileName.ascii() << std::endl; throw Exception("write failed"); } } diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp index a0ac79c..921b17f 100644 --- a/src/sound/AlsaDriver.cpp +++ b/src/sound/AlsaDriver.cpp @@ -982,7 +982,7 @@ AlsaDriver::createMidiDevice(AlsaPortDescription *port, int outputPort = checkAlsaError(snd_seq_create_simple_port (m_midiHandle, - portName, + portName.ascii(), SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ, SND_SEQ_PORT_TYPE_APPLICATION), @@ -990,7 +990,7 @@ AlsaDriver::createMidiDevice(AlsaPortDescription *port, if (outputPort >= 0) { - std::cerr << "CREATED OUTPUT PORT " << outputPort << ":" << portName << " for device " << deviceId << std::endl; + std::cerr << "CREATED OUTPUT PORT " << outputPort << ":" << portName.ascii() << " for device " << deviceId << std::endl; m_outputPorts[deviceId] = outputPort; @@ -1179,7 +1179,7 @@ AlsaDriver::renameDevice(DeviceId id, TQString name) } } - std::cerr << "Renamed " << m_client << ":" << i->second << " to " << name << std::endl; + std::cerr << "Renamed " << m_client << ":" << i->second << " to " << name.ascii() << std::endl; } ClientPortPair @@ -1252,7 +1252,7 @@ void AlsaDriver::setConnectionToDevice(MappedDevice &device, TQString connection) { ClientPortPair pair( -1, -1); - if (connection && connection != "") { + if (!connection.isNull() && connection != "") { pair = getPortByName(connection.ascii()); } setConnectionToDevice(device, connection, pair); @@ -1352,7 +1352,7 @@ AlsaDriver::setPlausibleConnection(DeviceId id, TQString idealConnection) ClientPortPair port(getPortByName(idealConnection.ascii())); audit << "AlsaDriver::setPlausibleConnection: connection like " - << idealConnection << " requested for device " << id << std::endl; + << idealConnection.ascii() << " requested for device " << id << std::endl; if (port.first != -1 && port.second != -1) { @@ -1610,7 +1610,7 @@ AlsaDriver::setCurrentTimer(TQString timer) if (timer == getCurrentTimer()) return ; - std::cerr << "AlsaDriver::setCurrentTimer(" << timer << ")" << std::endl; + std::cerr << "AlsaDriver::setCurrentTimer(" << timer.ascii() << ")" << std::endl; std::string name(timer.ascii()); |