summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/base/AudioDevice.cpp7
-rw-r--r--src/base/AudioPluginInstance.cpp6
-rw-r--r--src/base/BaseProperties.cpp6
-rw-r--r--src/base/Colour.cpp6
-rw-r--r--src/base/ColourMap.cpp6
-rw-r--r--src/base/Composition.cpp6
-rw-r--r--src/base/Configuration.cpp8
-rw-r--r--src/base/ControlParameter.cpp5
-rw-r--r--src/base/Event.cpp9
-rw-r--r--src/base/Instrument.cpp8
-rw-r--r--src/base/Marker.cpp8
-rw-r--r--src/base/MidiDevice.cpp6
-rw-r--r--src/base/NotationTypes.cpp5
-rw-r--r--src/base/RealTime.cpp6
-rw-r--r--src/base/SoftSynthDevice.cpp7
-rw-r--r--src/base/Studio.cpp7
-rw-r--r--src/base/Track.cpp6
-rw-r--r--src/misc/stableheaders.h1
-rw-r--r--src/sound/AudioFileManager.cpp7
-rw-r--r--src/sound/Audit.h7
-rw-r--r--src/sound/BWFAudioFile.cpp8
-rw-r--r--src/sound/MidiFile.cpp8
-rw-r--r--src/sound/WAVAudioFile.cpp9
23 files changed, 12 insertions, 140 deletions
diff --git a/src/base/AudioDevice.cpp b/src/base/AudioDevice.cpp
index d9ff1f2..5a7783b 100644
--- a/src/base/AudioDevice.cpp
+++ b/src/base/AudioDevice.cpp
@@ -23,14 +23,7 @@
#include "Instrument.h"
#include <cstdio>
-
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
namespace Rosegarden
diff --git a/src/base/AudioPluginInstance.cpp b/src/base/AudioPluginInstance.cpp
index 112687b..aaac7ba 100644
--- a/src/base/AudioPluginInstance.cpp
+++ b/src/base/AudioPluginInstance.cpp
@@ -23,13 +23,7 @@
#include <iostream>
#include <cstring>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
namespace Rosegarden
{
diff --git a/src/base/BaseProperties.cpp b/src/base/BaseProperties.cpp
index adff519..b0f6f3c 100644
--- a/src/base/BaseProperties.cpp
+++ b/src/base/BaseProperties.cpp
@@ -19,13 +19,7 @@
#include "BaseProperties.h"
#include <vector>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
namespace Rosegarden
{
diff --git a/src/base/Colour.cpp b/src/base/Colour.cpp
index ea1f5a2..210210f 100644
--- a/src/base/Colour.cpp
+++ b/src/base/Colour.cpp
@@ -24,13 +24,7 @@
*/
#include "Colour.h"
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
namespace Rosegarden
{
diff --git a/src/base/ColourMap.cpp b/src/base/ColourMap.cpp
index 322a4a7..ea5d613 100644
--- a/src/base/ColourMap.cpp
+++ b/src/base/ColourMap.cpp
@@ -24,13 +24,7 @@
*/
#include <string>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
#include "ColourMap.h"
#include "XmlExportable.h"
diff --git a/src/base/Composition.cpp b/src/base/Composition.cpp
index cde3a8b..f77d0fb 100644
--- a/src/base/Composition.cpp
+++ b/src/base/Composition.cpp
@@ -32,13 +32,7 @@
#include <algorithm>
#include <cmath>
#include <typeinfo>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
using std::cerr;
using std::endl;
diff --git a/src/base/Configuration.cpp b/src/base/Configuration.cpp
index a3d836f..069c4f5 100644
--- a/src/base/Configuration.cpp
+++ b/src/base/Configuration.cpp
@@ -28,16 +28,10 @@
#include <string>
#include <algorithm>
+#include <sstream>
#include "Configuration.h"
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
namespace Rosegarden
{
diff --git a/src/base/ControlParameter.cpp b/src/base/ControlParameter.cpp
index 8606cf3..98942f9 100644
--- a/src/base/ControlParameter.cpp
+++ b/src/base/ControlParameter.cpp
@@ -19,12 +19,7 @@
COPYING included with this distribution for more information.
*/
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
#include "ControlParameter.h"
#include "MidiTypes.h"
diff --git a/src/base/Event.cpp b/src/base/Event.cpp
index e63e51b..82cd174 100644
--- a/src/base/Event.cpp
+++ b/src/base/Event.cpp
@@ -22,16 +22,11 @@
#include <cstdio>
#include <cctype>
#include <iostream>
+#include <sstream>
+
#include "Event.h"
#include "XmlExportable.h"
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
namespace Rosegarden
{
using std::string;
diff --git a/src/base/Instrument.cpp b/src/base/Instrument.cpp
index add1767..7583ac9 100644
--- a/src/base/Instrument.cpp
+++ b/src/base/Instrument.cpp
@@ -20,19 +20,13 @@
*/
#include <stdio.h>
+#include <sstream>
#include "Instrument.h"
#include "MidiDevice.h"
#include "AudioPluginInstance.h"
#include "AudioLevel.h"
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
namespace Rosegarden
{
diff --git a/src/base/Marker.cpp b/src/base/Marker.cpp
index beab5f6..c5f3d78 100644
--- a/src/base/Marker.cpp
+++ b/src/base/Marker.cpp
@@ -19,17 +19,11 @@
COPYING included with this distribution for more information.
*/
+#include <sstream>
#include "Marker.h"
#include "misc/Debug.h"
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
namespace Rosegarden
{
diff --git a/src/base/MidiDevice.cpp b/src/base/MidiDevice.cpp
index cceeb0e..01de0fb 100644
--- a/src/base/MidiDevice.cpp
+++ b/src/base/MidiDevice.cpp
@@ -28,13 +28,7 @@
#include <cstdlib>
#include <iostream>
#include <set>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
namespace Rosegarden
diff --git a/src/base/NotationTypes.cpp b/src/base/NotationTypes.cpp
index c0ccc91..689936b 100644
--- a/src/base/NotationTypes.cpp
+++ b/src/base/NotationTypes.cpp
@@ -28,12 +28,7 @@
#include <cstdlib> // for atoi
#include <limits.h> // for SHRT_MIN
#include <cassert>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#else
#include <sstream>
-#endif
//dmm This will make everything excruciatingly slow if defined:
//#define DEBUG_PITCH
diff --git a/src/base/RealTime.cpp b/src/base/RealTime.cpp
index 8f8125f..e1766ca 100644
--- a/src/base/RealTime.cpp
+++ b/src/base/RealTime.cpp
@@ -20,13 +20,7 @@
*/
#include <iostream>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
#include "RealTime.h"
#include "sys/time.h"
diff --git a/src/base/SoftSynthDevice.cpp b/src/base/SoftSynthDevice.cpp
index 9a736b7..8ad00f4 100644
--- a/src/base/SoftSynthDevice.cpp
+++ b/src/base/SoftSynthDevice.cpp
@@ -25,14 +25,7 @@
#include <cstdio>
#include <cstdlib>
-
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
namespace Rosegarden
diff --git a/src/base/Studio.cpp b/src/base/Studio.cpp
index 89e7cc1..257aa64 100644
--- a/src/base/Studio.cpp
+++ b/src/base/Studio.cpp
@@ -20,6 +20,7 @@
*/
#include <iostream>
+#include <sstream>
#include "Studio.h"
#include "MidiDevice.h"
@@ -30,12 +31,6 @@
#include "Track.h"
#include "Composition.h"
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
using std::cerr;
using std::endl;
diff --git a/src/base/Track.cpp b/src/base/Track.cpp
index 903e500..a17c8b2 100644
--- a/src/base/Track.cpp
+++ b/src/base/Track.cpp
@@ -22,13 +22,7 @@
#include "Track.h"
#include <iostream>
#include <cstdio>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
#include "Composition.h"
#include "StaffExportTypes.h"
diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h
index 9068e14..79e5740 100644
--- a/src/misc/stableheaders.h
+++ b/src/misc/stableheaders.h
@@ -23,7 +23,6 @@
#include <sstream>
#include <stack>
#include <string>
-#include <strstream>
#include <utility>
#include <vector>
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index a5aa89c..1525a89 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -27,13 +27,8 @@
#include <cstdio> // sprintf
#include <cstdlib>
#include <pthread.h>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
+
#include <kapp.h>
#include <tdelocale.h>
diff --git a/src/sound/Audit.h b/src/sound/Audit.h
index 4e0a20e..388829a 100644
--- a/src/sound/Audit.h
+++ b/src/sound/Audit.h
@@ -24,13 +24,8 @@
#include <string>
#include <iostream>
-
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
#include <sstream>
-#endif
+
// A staggeringly simple-minded audit trail implementation.
diff --git a/src/sound/BWFAudioFile.cpp b/src/sound/BWFAudioFile.cpp
index c38820f..b5ec798 100644
--- a/src/sound/BWFAudioFile.cpp
+++ b/src/sound/BWFAudioFile.cpp
@@ -18,17 +18,11 @@
License, or (at your option) any later version. See the file
COPYING included with this distribution for more information.
*/
+#include <sstream>
#include "BWFAudioFile.h"
#include "RealTime.h"
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
using std::cout;
using std::cerr;
using std::endl;
diff --git a/src/sound/MidiFile.cpp b/src/sound/MidiFile.cpp
index c59efa7..2fb032d 100644
--- a/src/sound/MidiFile.cpp
+++ b/src/sound/MidiFile.cpp
@@ -27,6 +27,7 @@
#include <string>
#include <cstdio>
#include <algorithm>
+#include <sstream>
#include "Midi.h"
#include "MidiFile.h"
@@ -46,13 +47,6 @@
//#define MIDI_DEBUG 1
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
#include <kapp.h>
namespace Rosegarden
diff --git a/src/sound/WAVAudioFile.cpp b/src/sound/WAVAudioFile.cpp
index 4e3b3bd..1874e19 100644
--- a/src/sound/WAVAudioFile.cpp
+++ b/src/sound/WAVAudioFile.cpp
@@ -19,16 +19,11 @@
COPYING included with this distribution for more information.
*/
+#include <sstream>
+
#include "WAVAudioFile.h"
#include "RealTime.h"
-#if (__GNUC__ < 3)
-#include <strstream>
-#define stringstream strstream
-#else
-#include <sstream>
-#endif
-
using std::cout;
using std::cerr;
using std::endl;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 06:23:11 +0000