aboutsummaryrefslogtreecommitdiffstats
path: root/src/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/base')
-rw-r--r--src/base/bpm.cpp2
-rw-r--r--src/base/bpm.hpp2
-rw-r--r--src/base/config.cpp2
-rw-r--r--src/base/config.hpp3
-rw-r--r--src/base/lyric_line.cpp2
-rw-r--r--src/base/lyric_line.hpp2
-rw-r--r--src/base/lyric_word.cpp2
-rw-r--r--src/base/lyric_word.hpp2
-rw-r--r--src/base/ringbuffer.cpp2
-rw-r--r--src/base/ringbuffer.hpp2
-rw-r--r--src/base/song.cpp2
-rw-r--r--src/base/song.hpp2
-rw-r--r--src/base/songloading/songloader.cpp2
-rw-r--r--src/base/songloading/songloader.hpp2
-rw-r--r--src/base/songloading/songloading_strategy.hpp2
-rw-r--r--src/base/songloading/songloading_strategy_base_factory.cpp2
-rw-r--r--src/base/songloading/songloading_strategy_base_factory.hpp2
-rw-r--r--src/base/songloading/songloading_strategy_factory.hpp2
-rw-r--r--src/base/songloading/songloading_strategy_txt.cpp2
-rw-r--r--src/base/songloading/songloading_strategy_txt.hpp2
-rw-r--r--src/base/songloading/songloading_strategy_xml.cpp2
-rw-r--r--src/base/songloading/songloading_strategy_xml.hpp2
-rw-r--r--src/base/stats.hpp2
-rw-r--r--src/base/time.hpp2
-rw-r--r--src/base/timestamp.cpp2
-rw-r--r--src/base/timestamp.hpp2
26 files changed, 26 insertions, 27 deletions
diff --git a/src/base/bpm.cpp b/src/base/bpm.cpp
index 429608a1..76361511 100644
--- a/src/base/bpm.cpp
+++ b/src/base/bpm.cpp
@@ -43,4 +43,4 @@ namespace usdx
{
return second;
}
-};
+}
diff --git a/src/base/bpm.hpp b/src/base/bpm.hpp
index 71da5a82..c3aa68a3 100644
--- a/src/base/bpm.hpp
+++ b/src/base/bpm.hpp
@@ -38,6 +38,6 @@ namespace usdx
const int get_beat(void) const;
const float get_bpm(void) const;
};
-};
+}
#endif
diff --git a/src/base/config.cpp b/src/base/config.cpp
index 7a5807af..08a9ba65 100644
--- a/src/base/config.cpp
+++ b/src/base/config.cpp
@@ -95,4 +95,4 @@ namespace usdx
{
return debug_boxes;
}
-};
+}
diff --git a/src/base/config.hpp b/src/base/config.hpp
index 36ee5394..d2f9d8a5 100644
--- a/src/base/config.hpp
+++ b/src/base/config.hpp
@@ -69,7 +69,6 @@ namespace usdx
void set_debug_boxes(bool value);
bool get_debug_boxes(void) const;
};
-};
-
+}
#endif
diff --git a/src/base/lyric_line.cpp b/src/base/lyric_line.cpp
index 8e2494d4..4d454054 100644
--- a/src/base/lyric_line.cpp
+++ b/src/base/lyric_line.cpp
@@ -64,4 +64,4 @@ namespace usdx
words.push_back(word);
}
-};
+}
diff --git a/src/base/lyric_line.hpp b/src/base/lyric_line.hpp
index bf1ae696..92902b9a 100644
--- a/src/base/lyric_line.hpp
+++ b/src/base/lyric_line.hpp
@@ -48,6 +48,6 @@ namespace usdx
void add_word(LyricWord* word);
};
-};
+}
#endif
diff --git a/src/base/lyric_word.cpp b/src/base/lyric_word.cpp
index f53acfb7..f89ed830 100644
--- a/src/base/lyric_word.cpp
+++ b/src/base/lyric_word.cpp
@@ -47,4 +47,4 @@ namespace usdx
LyricWord::~LyricWord(void)
{
}
-};
+}
diff --git a/src/base/lyric_word.hpp b/src/base/lyric_word.hpp
index c58a0b33..95c9473a 100644
--- a/src/base/lyric_word.hpp
+++ b/src/base/lyric_word.hpp
@@ -48,6 +48,6 @@ namespace usdx
LyricWord(const char type, const int beat, const int length, const int height, const std::string& lyric);
virtual ~LyricWord(void);
};
-};
+}
#endif
diff --git a/src/base/ringbuffer.cpp b/src/base/ringbuffer.cpp
index 72b09666..20fb9533 100644
--- a/src/base/ringbuffer.cpp
+++ b/src/base/ringbuffer.cpp
@@ -134,4 +134,4 @@ namespace usdx
write_pos = 0;
buffer_count = 0;
}
-};
+}
diff --git a/src/base/ringbuffer.hpp b/src/base/ringbuffer.hpp
index 44ecc961..4c49011a 100644
--- a/src/base/ringbuffer.hpp
+++ b/src/base/ringbuffer.hpp
@@ -45,6 +45,6 @@ namespace usdx
int get_available();
void flush(void);
};
-};
+}
#endif
diff --git a/src/base/song.cpp b/src/base/song.cpp
index 163694f6..c2ade58f 100644
--- a/src/base/song.cpp
+++ b/src/base/song.cpp
@@ -324,4 +324,4 @@ namespace usdx
get_last_lyric_line()->add_word(new LyricWord(type, beat + get_relative_beat(), length, height, lyric));
}
-};
+}
diff --git a/src/base/song.hpp b/src/base/song.hpp
index a071a558..4fb7e2ae 100644
--- a/src/base/song.hpp
+++ b/src/base/song.hpp
@@ -148,6 +148,6 @@ namespace usdx
void new_line(const int line_out, const int line_in);
void new_note(const char type, const int beat, const int length, const int height, const std::string& lyric);
};
-};
+}
#endif
diff --git a/src/base/songloading/songloader.cpp b/src/base/songloading/songloader.cpp
index a27ba652..fa972cf3 100644
--- a/src/base/songloading/songloader.cpp
+++ b/src/base/songloading/songloader.cpp
@@ -90,4 +90,4 @@ namespace usdx
strategies[factory->get_fileextension()] = factory;
}
}
-};
+}
diff --git a/src/base/songloading/songloader.hpp b/src/base/songloading/songloader.hpp
index 58fd8602..a9ba6802 100644
--- a/src/base/songloading/songloader.hpp
+++ b/src/base/songloading/songloader.hpp
@@ -65,6 +65,6 @@ namespace usdx
void add_strategy(SongloadingStrategyBaseFactory* strategie);
};
-};
+}
#endif
diff --git a/src/base/songloading/songloading_strategy.hpp b/src/base/songloading/songloading_strategy.hpp
index 32ccb690..e7db5b9d 100644
--- a/src/base/songloading/songloading_strategy.hpp
+++ b/src/base/songloading/songloading_strategy.hpp
@@ -51,6 +51,6 @@ namespace usdx
virtual Song* load_song(Song* song) = 0;
virtual Song* load_header(const boost::filesystem::wpath& filename) = 0;
};
-};
+}
#endif
diff --git a/src/base/songloading/songloading_strategy_base_factory.cpp b/src/base/songloading/songloading_strategy_base_factory.cpp
index cf515baa..6b12179c 100644
--- a/src/base/songloading/songloading_strategy_base_factory.cpp
+++ b/src/base/songloading/songloading_strategy_base_factory.cpp
@@ -36,4 +36,4 @@ namespace usdx
{
return fileextension;
}
-};
+}
diff --git a/src/base/songloading/songloading_strategy_base_factory.hpp b/src/base/songloading/songloading_strategy_base_factory.hpp
index 961f50b5..00671b26 100644
--- a/src/base/songloading/songloading_strategy_base_factory.hpp
+++ b/src/base/songloading/songloading_strategy_base_factory.hpp
@@ -48,6 +48,6 @@ namespace usdx
virtual SongloadingStrategy *get_songloader(void) = 0;
std::string get_fileextension(void);
};
-};
+}
#endif
diff --git a/src/base/songloading/songloading_strategy_factory.hpp b/src/base/songloading/songloading_strategy_factory.hpp
index 3d038ead..fe23ea42 100644
--- a/src/base/songloading/songloading_strategy_factory.hpp
+++ b/src/base/songloading/songloading_strategy_factory.hpp
@@ -61,6 +61,6 @@ namespace usdx
return songloader;
}
};
-};
+}
#endif
diff --git a/src/base/songloading/songloading_strategy_txt.cpp b/src/base/songloading/songloading_strategy_txt.cpp
index d7326245..d4966419 100644
--- a/src/base/songloading/songloading_strategy_txt.cpp
+++ b/src/base/songloading/songloading_strategy_txt.cpp
@@ -233,4 +233,4 @@ namespace usdx
// fill song
return new Song(filename, header_fields);
}
-};
+}
diff --git a/src/base/songloading/songloading_strategy_txt.hpp b/src/base/songloading/songloading_strategy_txt.hpp
index 23c21a7a..75c02cc3 100644
--- a/src/base/songloading/songloading_strategy_txt.hpp
+++ b/src/base/songloading/songloading_strategy_txt.hpp
@@ -60,6 +60,6 @@ namespace usdx
};
REGISTER_SONGLOADING_STRATEGY(SongloadingStrategyTxt);
-};
+}
#endif
diff --git a/src/base/songloading/songloading_strategy_xml.cpp b/src/base/songloading/songloading_strategy_xml.cpp
index 64715960..22b18039 100644
--- a/src/base/songloading/songloading_strategy_xml.cpp
+++ b/src/base/songloading/songloading_strategy_xml.cpp
@@ -46,4 +46,4 @@ namespace usdx
{
return NULL;
}
-};
+}
diff --git a/src/base/songloading/songloading_strategy_xml.hpp b/src/base/songloading/songloading_strategy_xml.hpp
index 32ca255b..5540756f 100644
--- a/src/base/songloading/songloading_strategy_xml.hpp
+++ b/src/base/songloading/songloading_strategy_xml.hpp
@@ -44,6 +44,6 @@ namespace usdx
};
REGISTER_SONGLOADING_STRATEGY(SongloadingStrategyXml);
-};
+}
#endif
diff --git a/src/base/stats.hpp b/src/base/stats.hpp
index e8155a2b..942bb51a 100644
--- a/src/base/stats.hpp
+++ b/src/base/stats.hpp
@@ -196,6 +196,6 @@ namespace usdx
StatResultMostSungBand *get_next();
};
-};
+}
#endif
diff --git a/src/base/time.hpp b/src/base/time.hpp
index 9e9eac20..a10449f6 100644
--- a/src/base/time.hpp
+++ b/src/base/time.hpp
@@ -49,6 +49,6 @@ namespace usdx
*/
static float get_time();
};
-};
+}
#endif
diff --git a/src/base/timestamp.cpp b/src/base/timestamp.cpp
index 668abbf9..1e86a8d4 100644
--- a/src/base/timestamp.cpp
+++ b/src/base/timestamp.cpp
@@ -41,4 +41,4 @@ namespace usdx
{
time = Time::get_time();
}
-};
+}
diff --git a/src/base/timestamp.hpp b/src/base/timestamp.hpp
index 18153e9f..e6fc5247 100644
--- a/src/base/timestamp.hpp
+++ b/src/base/timestamp.hpp
@@ -59,6 +59,6 @@ namespace usdx
*/
void update(void);
};
-};
+}
#endif