X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/673ae68a3c63f85da2f58f50c858efb9deeff79c..124a5e3e6ab203dcbed670d586dc53a28e4c97a7:/utils/ifacecheck/src/xmlparser.h diff --git a/utils/ifacecheck/src/xmlparser.h b/utils/ifacecheck/src/xmlparser.h index 8f2d2854fa..f491bf0b08 100644 --- a/utils/ifacecheck/src/xmlparser.h +++ b/utils/ifacecheck/src/xmlparser.h @@ -16,6 +16,7 @@ #include #include #include +#include /* @@ -27,27 +28,11 @@ ifacecheck sources with the string: // ADHOC-FIX: - + // ...fix description... */ - - -// helper macros -#define LogMessage(fmt, ...) { if (g_bLogEnabled) { wxPrintf(fmt "\n", __VA_ARGS__); fflush(stdout); }} -#define LogWarning(fmt, ...) { if (g_bLogEnabled) { wxPrintf(fmt "\n", __VA_ARGS__); fflush(stdout); }} -#define LogError(fmt, ...) { if (g_bLogEnabled) { wxPrintf("ERROR: " fmt "\n", __VA_ARGS__); fflush(stdout); }} -#define wxPrint(str) { wxPrintf(str); fflush(stdout); } - -// enable/disable logging -extern bool g_bLogEnabled; - -class LogNull -{ -public: - LogNull() { g_bLogEnabled = false; } - ~LogNull() { g_bLogEnabled = true; } -}; - +// NOTE: all messages in this way are printed on the stderr +//#define wxLogWarning wxLogMessage // ---------------------------------------------------------------------------- @@ -188,7 +173,9 @@ public: // getters { return m_retType; } wxString GetName() const { return m_strName; } - wxArgumentTypeArray GetArgumentTypes() const + const wxArgumentTypeArray& GetArgumentTypes() const + { return m_args; } + wxArgumentTypeArray& GetArgumentTypes() { return m_args; } int GetLocation() const { return m_nLine; } @@ -211,11 +198,14 @@ public: // getters { return m_retType==wxEmptyType && !m_strName.StartsWith("~"); } bool IsDtor() const { return m_retType==wxEmptyType && m_strName.StartsWith("~"); } + bool IsOperator() const + { return m_strName.StartsWith("operator"); } bool IsDeprecated() const { return m_bDeprecated; } + public: // setters void SetReturnType(const wxType& t) @@ -257,6 +247,11 @@ public: // misc // except for the method attributes (const,static,virtual,pureVirtual,deprecated) bool MatchesExceptForAttributes(const wxMethod& m) const; + // returns true if this is a ctor which has default values for all its + // argument, thus is able to act also as default ctor + bool ActsAsDefaultCtor() const; + + // dumps the contents of this class in the given stream void Dump(wxTextOutputStream& stream) const; protected: @@ -435,9 +430,10 @@ public: wxClassPtrArray FindClassesDefinedIn(const wxString& headerfile) const; void ShowProgress() - { /*wxPrint(".");*/ } + { /*wxFprintf(stderr, ".");*/ } - bool CheckParseResults() const; + // is this interface coherent? + bool CheckConsistency() const; protected: wxClassArray m_classes;