mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Clean up libaegisub includes

Browse source 
Consistently use the C++ names for headers rather than a combination of the
C and C++ names.

Remove empty LAGI_PRE blocks.

Remove checks for both AGI_PRE and LAGI_PRE and change a check for only
AGI_PRE to LAGI_PRE.

Originally committed to SVN as r5516.
This commit is contained in:
Thomas Goyne 2011-07-26 22:25:21 +00:00
parent ead31761db
commit 3c18ed542c
17 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/libaegisub/common/hotkey.cpp
View file

@ -21,8 +21,7 @@
#include "../config.h" #include "../config.h"
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <math.h> #include <cmath>
#include <memory> #include <memory>
#endif #endif

7
aegisub/libaegisub/common/log.cpp
View file

@ -18,11 +18,10 @@
/// @brief Logging /// @brief Logging
/// @ingroup libaegisub /// @ingroup libaegisub
#ifndef AGI_PRE #ifndef LAGI_PRE
#include <stdio.h>
#include <string.h>
#include <algorithm> #include <algorithm>
#include <cstdio>
#include <cstring>
#include <functional> #include <functional>
#include <memory> #include <memory>
#endif #endif

3
aegisub/libaegisub/common/option_visit.cpp
View file

@ -20,8 +20,7 @@
/// @ingroup libaegisub /// @ingroup libaegisub
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <math.h> #include <cmath>
#include <memory> #include <memory>
#endif #endif

2
aegisub/libaegisub/common/util.cpp
View file

@ -20,9 +20,9 @@
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <climits> #include <climits>
#include <cstdio>
#include <locale> #include <locale>
#endif #endif

3
aegisub/libaegisub/common/validator.cpp
View file

@ -18,9 +18,6 @@
/// @brief Input validation. /// @brief Input validation.
/// @ingroup libaegisub /// @ingroup libaegisub
#ifndef LAGI_PRE
#endif
#include <libaegisub/validator.h> #include <libaegisub/validator.h>
namespace agi { namespace agi {

2
aegisub/libaegisub/config.h
View file

@ -1,4 +1,4 @@
#if !defined(AGI_PRE) && !defined(LAGI_PRE) #ifndef LAGI_PRE
#ifdef _WIN32 // Windows specific settings #ifdef _WIN32 // Windows specific settings
#define HAVE_PTHREAD 1 #define HAVE_PTHREAD 1

3
aegisub/libaegisub/include/libaegisub/access.h
View file

@ -18,9 +18,6 @@
/// @brief Public interface for access methods. /// @brief Public interface for access methods.
/// @ingroup libaegisub /// @ingroup libaegisub
#ifndef LAGI_PRE
#endif
#include <libaegisub/exception.h> #include <libaegisub/exception.h>
namespace agi { namespace agi {

2
aegisub/libaegisub/include/libaegisub/charset_conv.h
View file

@ -21,7 +21,7 @@
#pragma once #pragma once
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <string.h> #include <cstring>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>

3
aegisub/libaegisub/include/libaegisub/hotkey.h
View file

@ -19,8 +19,7 @@
/// @ingroup hotkey menu event window /// @ingroup hotkey menu event window
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <math.h> #include <cmath>
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>

2
aegisub/libaegisub/include/libaegisub/keyframe.h
View file

@ -19,7 +19,7 @@
/// @ingroup libaegisub /// @ingroup libaegisub
/// ///
#if !defined(AGI_PRE) && !defined(LAGI_PRE) #ifndef LAGI_PRE
#include <vector> #include <vector>
#endif #endif

2
aegisub/libaegisub/include/libaegisub/line_iterator.h
View file

@ -20,7 +20,7 @@
#pragma once #pragma once
#if !defined(AGI_PRE) && !defined(LAGI_PRE) #ifndef LAGI_PRE
#include <iterator> #include <iterator>
#ifdef _WIN32 #ifdef _WIN32
#include <memory> #include <memory>

5
aegisub/libaegisub/include/libaegisub/log.h
View file

@ -19,10 +19,10 @@
/// @ingroup libaegisub /// @ingroup libaegisub
#ifndef LAGI_PRE #ifndef LAGI_PRE
#include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <time.h>
#include <cstdio>
#include <ctime>
#include <deque> #include <deque>
#include <memory> #include <memory>
#ifdef __DEPRECATED // Dodge GCC warnings #ifdef __DEPRECATED // Dodge GCC warnings
@ -34,7 +34,6 @@
#endif #endif
#include <vector> #include <vector>
#endif #endif
//#include <libaegisub/exception.h>
#include <libaegisub/types.h> #include <libaegisub/types.h>
// These macros below aren't a perm solution, it will depend on how annoying they are through // These macros below aren't a perm solution, it will depend on how annoying they are through

2
aegisub/libaegisub/include/libaegisub/option_value.h
View file

@ -18,7 +18,7 @@
/// @brief Container for holding an actual option value. /// @brief Container for holding an actual option value.
/// @ingroup libaegisub /// @ingroup libaegisub
#if !defined(AGI_PRE) && !defined(LAGI_PRE) #ifndef LAGI_PRE
#include <stdint.h> #include <stdint.h>
#include <fstream> #include <fstream>

3
aegisub/libaegisub/include/libaegisub/path.h
View file

@ -18,9 +18,6 @@
/// @brief Common paths. /// @brief Common paths.
/// @ingroup libaegisub /// @ingroup libaegisub
#ifndef AGI_PRE
#endif
#include <libaegisub/exception.h> #include <libaegisub/exception.h>
#include <libaegisub/scoped_ptr.h> #include <libaegisub/scoped_ptr.h>

2
aegisub/libaegisub/include/libaegisub/signal.h
View file

@ -20,7 +20,7 @@
#pragma once #pragma once
#if !defined(AGI_PRE) && !defined(LAGI_PRE) #ifndef LAGI_PRE
#ifdef _WIN32 #ifdef _WIN32
#include <functional> #include <functional>
#include <map> #include <map>

4
aegisub/libaegisub/include/libaegisub/validator.h
View file

@ -18,14 +18,10 @@
/// @brief Input validation. /// @brief Input validation.
/// @ingroup libaegisub /// @ingroup libaegisub
#ifndef LAGI_PRE
#endif
#include <libaegisub/colour.h> #include <libaegisub/colour.h>
namespace agi { namespace agi {
class Validator { class Validator {
public: public:
/// Types supported. /// Types supported.

2
aegisub/libaegisub/include/libaegisub/vfr.h
View file

@ -20,7 +20,7 @@
#pragma once #pragma once
#if !defined(AGI_PRE) && !defined(LAGI_PRE) #ifndef LAGI_PRE
#include <string> #include <string>
#include <vector> #include <vector>
#endif #endif