Clean up libaegisub includes

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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