aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-11-29 04:57:31 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:50 +0100
commit1ec8c29f8efc77f728c1f1b733966c6a4dfe9d6e (patch)
treed39cbce23ccf93a1a837a8ef35c1f8b9dbbd4c1e
parent3b9521f234fd2c301d00030e779252cc2e51db99 (diff)
downloadusdx-1ec8c29f8efc77f728c1f1b733966c6a4dfe9d6e.tar.gz
usdx-1ec8c29f8efc77f728c1f1b733966c6a4dfe9d6e.tar.xz
usdx-1ec8c29f8efc77f728c1f1b733966c6a4dfe9d6e.zip
code formatting
-rw-r--r--src/base/image.cpp3
-rw-r--r--src/base/song.cpp4
-rw-r--r--test/base/songloading.cpp2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/base/image.cpp b/src/base/image.cpp
index 753c8ec3..448f4852 100644
--- a/src/base/image.cpp
+++ b/src/base/image.cpp
@@ -64,7 +64,8 @@ namespace usdx
{
BinaryFile file(filename);
- SDL_RWops* source = SDL_RWFromConstMem(file.get_content(), file.get_filesize());
+ SDL_RWops* source = SDL_RWFromConstMem(file.get_content(),
+ file.get_filesize());
surface = IMG_Load_RW(source, 1);
if (surface == NULL) {
diff --git a/src/base/song.cpp b/src/base/song.cpp
index af7e90a5..51798115 100644
--- a/src/base/song.cpp
+++ b/src/base/song.cpp
@@ -39,7 +39,7 @@ namespace usdx
}
Song::Song(const boost::filesystem::wpath& filename,
- const std::map<std::string, std::string>& header) :
+ const std::map<std::string, std::string>& header) :
filename(filename), custom_header_tags(header)
{
std::map<std::string, std::string>::iterator it;
@@ -100,7 +100,7 @@ namespace usdx
std::string Song::get_header_tag(const std::string& tag, const bool required)
{
- std::map<std::string, std::string>::iterator it;
+ std::map<std::string, std::string>::iterator it;
std::string result = "";
if ((it = custom_header_tags.find(tag)) != custom_header_tags.end()) {
diff --git a/test/base/songloading.cpp b/test/base/songloading.cpp
index 94690cc3..03824669 100644
--- a/test/base/songloading.cpp
+++ b/test/base/songloading.cpp
@@ -63,7 +63,7 @@ namespace usdx
Song *song = Songloader::get_instance()->load_header("testdata/testsong_correct.txt");
CPPUNIT_ASSERT( "Test Ă„rtist" == song->get_artist() );
- // FIXIT: unicode length is not counted correctly
+ // FIXIT: unicode length is not counted correctly
// CPPUNIT_ASSERT( 11 == song->get_artist().length() );
CPPUNIT_ASSERT( "Test Title" == song->get_title() );
CPPUNIT_ASSERT( "Test.mp3" == song->get_mp3() );