Changeset 1187

Timestamp:

06/13/09 18:43:40 (4 years ago)

Author:

gabriel@…

Message:

Fix a bunch of errors introduced in rev 1183.

I assumed there would be a QString::QString(int) or something, but
there is not, and the results were.... bad. It assumed I meant
QString::QString(char) or something.

Files:

• branches/jack_zombies/libs/hydrogen/src/preferences.cpp (modified) (5 diffs)

branches/jack_zombies/libs/hydrogen/src/preferences.cpp

@@ -636 +636 @@
                 LocalFileMng::writeXmlString( &audioEngineNode, "use_metronome", m_bUseMetronome ? "true": "false" );
                 LocalFileMng::writeXmlString( &audioEngineNode, "metronome_volume", QString("%1").arg( m_fMetronomeVolume ) );
-                LocalFileMng::writeXmlString( &audioEngineNode, "maxNotes", QString( m_nMaxNotes ) );
-                LocalFileMng::writeXmlString( &audioEngineNode, "buffer_size", QString( m_nBufferSize ) );
-                LocalFileMng::writeXmlString( &audioEngineNode, "samplerate", QString( m_nSampleRate ) );
+                LocalFileMng::writeXmlString( &audioEngineNode, "maxNotes", QString("%1").arg( m_nMaxNotes ) );
+                LocalFileMng::writeXmlString( &audioEngineNode, "buffer_size", QString("%1").arg( m_nBufferSize ) );
+                LocalFileMng::writeXmlString( &audioEngineNode, "samplerate", QString("%1").arg( m_nSampleRate ) );
 
                 //// OSS DRIVER ////
@@ -680 +680 @@
 
                         //pre-fader or post-fader track outputs ?
-                        LocalFileMng::writeXmlString( &jackDriverNode, "jack_track_output_mode", QString( m_nJackTrackOutputMode ));
+                        LocalFileMng::writeXmlString( &jackDriverNode, "jack_track_output_mode", QString("%1").arg( m_nJackTrackOutputMode ));
 
                         // jack track outs
@@ -706 +706 @@
                         LocalFileMng::writeXmlString( &midiDriverNode, "driverName", m_sMidiDriver );
                         LocalFileMng::writeXmlString( &midiDriverNode, "port_name", m_sMidiPortName );
-                        LocalFileMng::writeXmlString( &midiDriverNode, "channel_filter", QString( m_nMidiChannelFilter ) );
+                        LocalFileMng::writeXmlString( &midiDriverNode, "channel_filter", QString("%1").arg( m_nMidiChannelFilter ) );
 
                         if ( m_bMidiNoteOffIgnore ) {
@@ -732 +732 @@
                 LocalFileMng::writeXmlString( &guiNode, "QTStyle", m_sQTStyle );
                 LocalFileMng::writeXmlString( &guiNode, "application_font_family", applicationFontFamily );
-                LocalFileMng::writeXmlString( &guiNode, "application_font_pointsize", QString( applicationFontPointSize ) );
+                LocalFileMng::writeXmlString( &guiNode, "application_font_pointsize", QString("%1").arg( applicationFontPointSize ) );
                 LocalFileMng::writeXmlString( &guiNode, "mixer_font_family", mixerFontFamily );
-                LocalFileMng::writeXmlString( &guiNode, "mixer_font_pointsize", QString( mixerFontPointSize ) );
+                LocalFileMng::writeXmlString( &guiNode, "mixer_font_pointsize", QString("%1").arg( mixerFontPointSize ) );
                 LocalFileMng::writeXmlString( &guiNode, "mixer_falloff_speed", QString("%1").arg( mixerFalloffSpeed ) );
-                LocalFileMng::writeXmlString( &guiNode, "patternEditorGridResolution", QString( m_nPatternEditorGridResolution ) );
-                LocalFileMng::writeXmlString( &guiNode, "patternEditorGridHeight", QString( m_nPatternEditorGridHeight ) );
-                LocalFileMng::writeXmlString( &guiNode, "patternEditorGridWidth", QString( m_nPatternEditorGridWidth ) );
+                LocalFileMng::writeXmlString( &guiNode, "patternEditorGridResolution", QString("%1").arg( m_nPatternEditorGridResolution ) );
+                LocalFileMng::writeXmlString( &guiNode, "patternEditorGridHeight", QString("%1").arg( m_nPatternEditorGridHeight ) );
+                LocalFileMng::writeXmlString( &guiNode, "patternEditorGridWidth", QString("%1").arg( m_nPatternEditorGridWidth ) );
                 LocalFileMng::writeXmlBool( &guiNode, "patternEditorUsingTriplets", m_bPatternEditorUsingTriplets );
                 LocalFileMng::writeXmlBool( &guiNode, "showInstrumentPeaks", m_bShowInstrumentPeaks );
@@ -980 +980 @@
         }
 
-        LocalFileMng::writeXmlString( &windowPropNode, "x", QString( prop.x ) );
-        LocalFileMng::writeXmlString( &windowPropNode, "y", QString( prop.y ) );
-        LocalFileMng::writeXmlString( &windowPropNode, "width", QString( prop.width ) );
-        LocalFileMng::writeXmlString( &windowPropNode, "height", QString( prop.height ) );
+        LocalFileMng::writeXmlString( &windowPropNode, "x", QString("%1").arg( prop.x ) );
+        LocalFileMng::writeXmlString( &windowPropNode, "y", QString("%1").arg( prop.y ) );
+        LocalFileMng::writeXmlString( &windowPropNode, "width", QString("%1").arg( prop.width ) );
+        LocalFileMng::writeXmlString( &windowPropNode, "height", QString("%1").arg( prop.height ) );
         parent.InsertEndChild( windowPropNode );
 }