Renamed all .h to .hpp for consistency

korslund · Jun 3, 2010 · 6b0b7c9 · 6b0b7c9
1 parent 52e7570
commit 6b0b7c9
Show file tree

Hide file tree

Showing 53 changed files with 80 additions and 79 deletions.
diff --git a/sound/filters/input_filter.h → sound/filters/input_filter.hpp b/sound/filters/input_filter.h → sound/filters/input_filter.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_INPUT_FILTER_H
 #define MANGLE_INPUT_FILTER_H
 
-#include "../output.h"
+#include "../output.hpp"
 
 #include <assert.h>
 

diff --git a/sound/filters/openal_audiere.h → sound/filters/openal_audiere.hpp b/sound/filters/openal_audiere.h → sound/filters/openal_audiere.hpp
@@ -1,9 +1,9 @@
 #ifndef MANGLE_FFMPEG_OPENAL_H
 #define MANGLE_FFMPEG_OPENAL_H
 
-#include "input_filter.h"
-#include "../sources/audiere_source.h"
-#include "../outputs/openal_out.h"
+#include "input_filter.hpp"
+#include "../sources/audiere_source.hpp"
+#include "../outputs/openal_out.hpp"
 
 namespace Mangle {
 namespace Sound {

diff --git a/sound/output.h → sound/output.hpp b/sound/output.h → sound/output.hpp
@@ -2,9 +2,9 @@
 #define MANGLE_SOUND_OUTPUT_H
 
 #include <string>
-#include "source.h"
+#include "source.hpp"
 
-#include "../stream/stream.h"
+#include "../stream/stream.hpp"
 
 namespace Mangle {
 namespace Sound {

diff --git a/sound/outputs/openal_out.cpp b/sound/outputs/openal_out.cpp
@@ -1,8 +1,8 @@
-#include "openal_out.h"
+#include "openal_out.hpp"
 #include <assert.h>
 
-#include "../../stream/filters/buffer_stream.h"
-#include "../../tools/str_exception.h"
+#include "../../stream/filters/buffer_stream.hpp"
+#include "../../tools/str_exception.hpp"
 
 using namespace Mangle::Sound;
 

diff --git a/sound/outputs/openal_out.h → sound/outputs/openal_out.hpp b/sound/outputs/openal_out.h → sound/outputs/openal_out.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_SOUND_OPENAL_OUT_H
 #define MANGLE_SOUND_OPENAL_OUT_H
 
-#include "../output.h"
+#include "../output.hpp"
 
 #include <AL/al.h>
 #include <AL/alc.h>

diff --git a/sound/source.h → sound/source.hpp b/sound/source.h → sound/source.hpp
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "../stream/stream.h"
+#include "../stream/stream.hpp"
 
 namespace Mangle {
 namespace Sound {

diff --git a/sound/sources/audiere_source.cpp b/sound/sources/audiere_source.cpp
@@ -1,7 +1,7 @@
-#include "audiere_source.h"
+#include "audiere_source.hpp"
 
-#include "../../stream/clients/audiere_file.h"
-#include "../../tools/str_exception.h"
+#include "../../stream/clients/audiere_file.hpp"
+#include "../../tools/str_exception.hpp"
 
 using namespace Mangle::Stream;
 

diff --git a/sound/sources/audiere_source.h → sound/sources/audiere_source.hpp b/sound/sources/audiere_source.h → sound/sources/audiere_source.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_SOUND_AUDIERE_SOURCE_H
 #define MANGLE_SOUND_AUDIERE_SOURCE_H
 
-#include "../source.h"
+#include "../source.hpp"
 
 #include <audiere.h>
 
@@ -46,7 +46,7 @@ class AudiereSource : public SampleSource
   size_t size() const { return sample->getLength()*frameSize; }
 };
 
-#include "loadertemplate.h"
+#include "loadertemplate.hpp"
 
 /// A factory that loads AudiereSources from file and stream
 typedef SSL_Template<AudiereSource,true,true> AudiereLoader;

diff --git a/sound/sources/ffmpeg_source.cpp b/sound/sources/ffmpeg_source.cpp
@@ -1,6 +1,6 @@
-#include "ffmpeg_source.h"
+#include "ffmpeg_source.hpp"
 
-#include "../../tools/str_exception.h"
+#include "../../tools/str_exception.hpp"
 
 using namespace Mangle::Sound;
 

diff --git a/sound/sources/ffmpeg_source.h → sound/sources/ffmpeg_source.hpp b/sound/sources/ffmpeg_source.h → sound/sources/ffmpeg_source.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_SOUND_FFMPEG_H
 #define MANGLE_SOUND_FFMPEG_H
 
-#include "../source.h"
+#include "../source.hpp"
 #include <vector>
 #include <assert.h>
 
@@ -36,7 +36,7 @@ class FFMpegSource : public SampleSource
   size_t read(void *data, size_t length);
 };
 
-#include "loadertemplate.h"
+#include "loadertemplate.hpp"
 
 /// A factory that loads FFMpegSources from file
 class FFMpegLoader : public SSL_Template<FFMpegSource,false,true>

diff --git a/sound/sources/loadertemplate.h → sound/sources/loadertemplate.hpp b/sound/sources/loadertemplate.h → sound/sources/loadertemplate.hpp
diff --git a/sound/sources/stream_source.h → sound/sources/stream_source.hpp b/sound/sources/stream_source.h → sound/sources/stream_source.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_SOUND_STREAMSOURCE_H
 #define MANGLE_SOUND_STREAMSOURCE_H
 
-#include "../source.h"
+#include "../source.hpp"
 
 namespace Mangle {
 namespace Sound {

diff --git a/sound/tests/audiere_source_test.cpp b/sound/tests/audiere_source_test.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "../../stream/servers/file_stream.h"
-#include "../sources/audiere_source.h"
+#include "../../stream/servers/file_stream.hpp"
+#include "../sources/audiere_source.hpp"
 
 #include <assert.h>
 #include <string.h>

diff --git a/sound/tests/ffmpeg_source_test.cpp b/sound/tests/ffmpeg_source_test.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "../../stream/servers/file_stream.h"
-#include "../sources/ffmpeg_source.h"
+#include "../../stream/servers/file_stream.hpp"
+#include "../sources/ffmpeg_source.hpp"
 
 #include <assert.h>
 #include <string.h>

diff --git a/sound/tests/openal_audiere_test.cpp b/sound/tests/openal_audiere_test.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <exception>
 
-#include "../../stream/servers/file_stream.h"
-#include "../filters/openal_audiere.h"
+#include "../../stream/servers/file_stream.hpp"
+#include "../filters/openal_audiere.hpp"
 
 using namespace std;
 using namespace Mangle::Stream;

diff --git a/sound/tests/openal_output_test.cpp b/sound/tests/openal_output_test.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
 #include <exception>
 
-#include "../../stream/servers/file_stream.h"
-#include "../sources/stream_source.h"
-#include "../outputs/openal_out.h"
+#include "../../stream/servers/file_stream.hpp"
+#include "../sources/stream_source.hpp"
+#include "../outputs/openal_out.hpp"
 
 using namespace std;
 using namespace Mangle::Stream;

diff --git a/stream/clients/audiere_file.cpp b/stream/clients/audiere_file.cpp
@@ -1,4 +1,4 @@
-#include "audiere_file.h"
+#include "audiere_file.hpp"
 
 using namespace audiere;
 using namespace Mangle::Stream;

diff --git a/stream/clients/audiere_file.h → stream/clients/audiere_file.hpp b/stream/clients/audiere_file.h → stream/clients/audiere_file.hpp
@@ -4,7 +4,7 @@
 #include <audiere.h>
 #include <assert.h>
 
-#include "../stream.h"
+#include "../stream.hpp"
 
 namespace Mangle {
 namespace Stream {

diff --git a/stream/clients/ogre_datastream.h → stream/clients/ogre_datastream.hpp b/stream/clients/ogre_datastream.h → stream/clients/ogre_datastream.hpp
@@ -3,7 +3,7 @@
 
 #include <OgreDataStream.h>
 #include <assert.h>
-#include "../stream.h"
+#include "../stream.hpp"
 
 namespace Mangle {
 namespace Stream {

diff --git a/stream/filters/buffer_stream.h → stream/filters/buffer_stream.hpp b/stream/filters/buffer_stream.h → stream/filters/buffer_stream.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_STREAM_BUFFER_H
 #define MANGLE_STREAM_BUFFER_H
 
-#include "../servers/memory_stream.h"
+#include "../servers/memory_stream.hpp"
 #include <vector>
 
 namespace Mangle {

diff --git a/stream/filters/pure_filter.h → stream/filters/pure_filter.hpp b/stream/filters/pure_filter.h → stream/filters/pure_filter.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_STREAM_FILTER_H
 #define MANGLE_STREAM_FILTER_H
 
-#include "../stream.h"
+#include "../stream.hpp"
 
 namespace Mangle {
 namespace Stream {

diff --git a/stream/filters/slice_stream.h → stream/filters/slice_stream.hpp b/stream/filters/slice_stream.h → stream/filters/slice_stream.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_STREAM_SLICE_H
 #define MANGLE_STREAM_SLICE_H
 
-#include "../stream.h"
+#include "../stream.hpp"
 
 namespace Mangle {
 namespace Stream {

diff --git a/stream/servers/file_stream.h → stream/servers/file_stream.hpp b/stream/servers/file_stream.h → stream/servers/file_stream.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_STREAM_FILESERVER_H
 #define MANGLE_STREAM_FILESERVER_H
 
-#include "std_stream.h"
+#include "std_stream.hpp"
 #include <fstream>
 
 namespace Mangle {

diff --git a/stream/servers/memory_stream.h → stream/servers/memory_stream.hpp b/stream/servers/memory_stream.h → stream/servers/memory_stream.hpp
@@ -2,7 +2,7 @@
 #define MANGLE_STREAM_MEMSERVER_H
 
 #include <assert.h>
-#include "../stream.h"
+#include "../stream.hpp"
 #include <string.h>
 
 namespace Mangle {

diff --git a/stream/servers/ogre_datastream.h → stream/servers/ogre_datastream.hpp b/stream/servers/ogre_datastream.h → stream/servers/ogre_datastream.hpp
diff --git a/stream/servers/phys_stream.h → stream/servers/phys_stream.hpp b/stream/servers/phys_stream.h → stream/servers/phys_stream.hpp
diff --git a/stream/servers/std_stream.h → stream/servers/std_stream.hpp b/stream/servers/std_stream.h → stream/servers/std_stream.hpp
@@ -1,9 +1,9 @@
 #ifndef MANGLE_STREAM_STDIOSERVER_H
 #define MANGLE_STREAM_STDIOSERVER_H
 
-#include "../stream.h"
+#include "../stream.hpp"
 #include <iostream>
-#include "../../tools/str_exception.h"
+#include "../../tools/str_exception.hpp"
 
 namespace Mangle {
 namespace Stream {

diff --git a/stream/stream.h → stream/stream.hpp b/stream/stream.h → stream/stream.hpp
@@ -2,7 +2,7 @@
 #define MANGLE_STREAM_INPUT_H
 
 #include <stdlib.h>
-#include "../tools/shared_ptr.h"
+#include "../tools/shared_ptr.hpp"
 #include <assert.h>
 
 namespace Mangle {

diff --git a/stream/tests/Makefile b/stream/tests/Makefile
@@ -6,22 +6,22 @@ I_OGRE=$(shell pkg-config --cflags OGRE)
 L_OGRE=$(shell pkg-config --libs OGRE)
 L_AUDIERE=-laudiere
 
-ogre_client_test: ogre_client_test.cpp ../stream.h ../clients/ogre_datastream.h
+ogre_client_test: ogre_client_test.cpp ../stream.hpp ../clients/ogre_datastream.hpp
 	$(GCC) $< -o $@ $(I_OGRE) $(L_OGRE)
 
-audiere_client_test: audiere_client_test.cpp ../stream.h ../clients/audiere_file.h ../clients/audiere_file.cpp
+audiere_client_test: audiere_client_test.cpp ../stream.hpp ../clients/audiere_file.hpp ../clients/audiere_file.cpp
 	$(GCC) $< -o $@ ../clients/audiere_file.cpp $(L_AUDIERE)
 
-file_server_test: file_server_test.cpp ../stream.h ../servers/file_stream.h ../servers/std_stream.h
+file_server_test: file_server_test.cpp ../stream.hpp ../servers/file_stream.hpp ../servers/std_stream.hpp
 	$(GCC) $< -o $@
 
-memory_server_test: memory_server_test.cpp ../stream.h ../servers/memory_stream.h
+memory_server_test: memory_server_test.cpp ../stream.hpp ../servers/memory_stream.hpp
 	$(GCC) $< -o $@
 
-buffer_filter_test: buffer_filter_test.cpp ../stream.h ../servers/memory_stream.h ../filters/buffer_stream.h
+buffer_filter_test: buffer_filter_test.cpp ../stream.hpp ../servers/memory_stream.hpp ../filters/buffer_stream.hpp
 	$(GCC) $< -o $@
 
-slice_filter_test: slice_filter_test.cpp ../stream.h ../servers/memory_stream.h ../filters/slice_stream.h
+slice_filter_test: slice_filter_test.cpp ../stream.hpp ../servers/memory_stream.hpp ../filters/slice_stream.hpp
 	$(GCC) $< -o $@
 
 clean:

diff --git a/stream/tests/audiere_client_test.cpp b/stream/tests/audiere_client_test.cpp
@@ -1,5 +1,5 @@
-#include "../servers/memory_stream.h"
-#include "../clients/audiere_file.h"
+#include "../servers/memory_stream.hpp"
+#include "../clients/audiere_file.hpp"
 #include <audiere.h>
 #include <iostream>
 

diff --git a/stream/tests/buffer_filter_test.cpp b/stream/tests/buffer_filter_test.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <string.h>
 
-#include "../filters/buffer_stream.h"
+#include "../filters/buffer_stream.hpp"
 
 using namespace Mangle::Stream;
 using namespace std;

diff --git a/stream/tests/file_server_test.cpp b/stream/tests/file_server_test.cpp
@@ -1,4 +1,4 @@
-#include "../servers/file_stream.h"
+#include "../servers/file_stream.hpp"
 #include <iostream>
 
 using namespace Mangle::Stream;

diff --git a/stream/tests/memory_server_test.cpp b/stream/tests/memory_server_test.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <string.h>
 
-#include "../servers/memory_stream.h"
+#include "../servers/memory_stream.hpp"
 
 using namespace Mangle::Stream;
 using namespace std;

diff --git a/stream/tests/ogre_client_test.cpp b/stream/tests/ogre_client_test.cpp
@@ -1,5 +1,5 @@
-#include "../servers/memory_stream.h"
-#include "../clients/ogre_datastream.h"
+#include "../servers/memory_stream.hpp"
+#include "../clients/ogre_datastream.hpp"
 #include <iostream>
 
 using namespace Mangle::Stream;

diff --git a/stream/tests/slice_filter_test.cpp b/stream/tests/slice_filter_test.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <string.h>
 
-#include "../filters/slice_stream.h"
-#include "../servers/memory_stream.h"
+#include "../filters/slice_stream.hpp"
+#include "../servers/memory_stream.hpp"
 
 using namespace Mangle::Stream;
 using namespace std;

diff --git a/testall.sh b/testall.sh
@@ -2,6 +2,7 @@
 
 function run()
 {
+  echo "TESTING $1"
   cd "$1/tests/"
   ./test.sh
   cd ../../

diff --git a/tests/ogrevfs_audiere_openal_test.cpp b/tests/ogrevfs_audiere_openal_test.cpp
@@ -7,8 +7,8 @@
 
  */
 
-#include "sound/filters/openal_audiere.h"
-#include "vfs/servers/ogre_vfs.h"
+#include "sound/filters/openal_audiere.hpp"
+#include "vfs/servers/ogre_vfs.hpp"
 #include <Ogre.h>
 #include <iostream>
 

diff --git a/tools/shared_ptr.h → tools/shared_ptr.hpp b/tools/shared_ptr.h → tools/shared_ptr.hpp
diff --git a/tools/str_exception.h → tools/str_exception.hpp b/tools/str_exception.h → tools/str_exception.hpp
diff --git a/vfs/clients/ogre_archive.cpp b/vfs/clients/ogre_archive.cpp
@@ -1,6 +1,6 @@
-#include "ogre_archive.h"
+#include "ogre_archive.hpp"
 
-#include "../../stream/clients/ogre_datastream.h"
+#include "../../stream/clients/ogre_datastream.hpp"
 
 using namespace Mangle::VFS;
 using namespace Mangle::Stream;

diff --git a/vfs/clients/ogre_archive.h → vfs/clients/ogre_archive.hpp b/vfs/clients/ogre_archive.h → vfs/clients/ogre_archive.hpp
@@ -3,7 +3,7 @@
 
 #include <OgreArchive.h>
 #include <assert.h>
-#include "../vfs.h"
+#include "../vfs.hpp"
 
 namespace Mangle {
 namespace VFS {

diff --git a/vfs/servers/ogre_vfs.cpp b/vfs/servers/ogre_vfs.cpp
@@ -1,5 +1,5 @@
-#include "ogre_vfs.h"
-#include "../../stream/servers/ogre_datastream.h"
+#include "ogre_vfs.hpp"
+#include "../../stream/servers/ogre_datastream.hpp"
 
 using namespace Mangle::VFS;
 using namespace Mangle::Stream;

diff --git a/vfs/servers/ogre_vfs.h → vfs/servers/ogre_vfs.hpp b/vfs/servers/ogre_vfs.h → vfs/servers/ogre_vfs.hpp
@@ -1,7 +1,7 @@
 #ifndef MANGLE_VFS_OGRESERVER_H
 #define MANGLE_VFS_OGRESERVER_H
 
-#include "../vfs.h"
+#include "../vfs.hpp"
 #include <OgreResourceGroupManager.h>
 
 namespace Mangle {