diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-08-16 21:56:43 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-08-16 21:57:18 +0900 |
commit | 26afcbf0f90d77adde8d3f0948ffc2b707413315 (patch) | |
tree | 9124566bda7ff924012853629fdbf40bfab0857a /src/sound | |
parent | 2022a170faedb70b4bb5b9361aace6ec1686280f (diff) | |
download | rosegarden-26afcbf0f90d77adde8d3f0948ffc2b707413315.tar.gz rosegarden-26afcbf0f90d77adde8d3f0948ffc2b707413315.zip |
Switched from strstream to sstream.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8c0cfbf6610b1a3a70ee1d6098a9c7dacfba5445)
Diffstat (limited to 'src/sound')
-rw-r--r-- | src/sound/AudioFileManager.cpp | 7 | ||||
-rw-r--r-- | src/sound/Audit.h | 7 | ||||
-rw-r--r-- | src/sound/BWFAudioFile.cpp | 8 | ||||
-rw-r--r-- | src/sound/MidiFile.cpp | 8 | ||||
-rw-r--r-- | src/sound/WAVAudioFile.cpp | 9 |
5 files changed, 6 insertions, 33 deletions
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; |