mac paths updated

[wxWidgets.git] / src / stc / scintilla / include / PropSet.h

diff --git a/src/stc/scintilla/include/PropSet.h b/src/stc/scintilla/include/PropSet.h
index e38de7dc408f106970257fff1feafcf300655b12..91bc7072ba68d46b2847261e37724e4b72c015aa 100644 (file)
--- a/src/stc/scintilla/include/PropSet.h
+++ b/src/stc/scintilla/include/PropSet.h
@@ -13,6 +13,10 @@ bool EqualCaseInsensitive(const char *a, const char *b);
 
 bool isprefix(const char *target, const char *prefix);
 
 
 bool isprefix(const char *target, const char *prefix);
 

+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+

 struct Property {
        unsigned int hash;
        char *key;
 struct Property {
        unsigned int hash;
        char *key;


@@ -29,7 +33,6 @@ protected:
        Property *props[hashRoots];
        Property *enumnext;
        int enumhash;
        Property *props[hashRoots];
        Property *enumnext;
        int enumhash;

-       static bool caseSensitiveFilenames;

        static unsigned int HashString(const char *s, size_t len) {
                unsigned int ret = 0;
                while (len--) {
        static unsigned int HashString(const char *s, size_t len) {
                unsigned int ret = 0;
                while (len--) {


@@ -39,7 +42,6 @@ protected:
                }
                return ret;
        }
                }
                return ret;
        }

-       static bool IncludesVar(const char *value, const char *key);

 
 public:
        PropSet *superPS;
 
 public:
        PropSet *superPS;


@@ -49,19 +51,12 @@ public:
        void Set(const char *keyVal);
        void Unset(const char *key, int lenKey=-1);
        void SetMultiple(const char *s);
        void Set(const char *keyVal);
        void Unset(const char *key, int lenKey=-1);
        void SetMultiple(const char *s);

-       SString Get(const char *key);
-       SString GetExpanded(const char *key);
-       SString Expand(const char *withVars, int maxExpands=100);
-       int GetInt(const char *key, int defaultValue=0);
-       SString GetWild(const char *keybase, const char *filename);
-       SString GetNewExpand(const char *keybase, const char *filename="");
+       SString Get(const char *key) const;
+       SString GetExpanded(const char *key) const;
+       SString Expand(const char *withVars, int maxExpands=100) const;
+       int GetInt(const char *key, int defaultValue=0) const;

        void Clear();
        void Clear();

-       char *ToString();       // Caller must delete[] the return value
-       bool GetFirst(char **key, char **val);
-       bool GetNext(char **key, char **val);
-       static void SetCaseSensitiveFilenames(bool caseSensitiveFilenames_) {
-               caseSensitiveFilenames = caseSensitiveFilenames_;
-       }
+       char *ToString() const; // Caller must delete[] the return value

 
 private:
        // copy-value semantics not implemented
 
 private:
        // copy-value semantics not implemented


@@ -75,35 +70,30 @@ class WordList {
 public:
        // Each word contains at least one character - a empty word acts as sentinel at the end.
        char **words;
 public:
        // Each word contains at least one character - a empty word acts as sentinel at the end.
        char **words;

-       char **wordsNoCase;

        char *list;
        int len;
        bool onlyLineEnds;      ///< Delimited by any white space or only line ends
        bool sorted;
        char *list;
        int len;
        bool onlyLineEnds;      ///< Delimited by any white space or only line ends
        bool sorted;

-       bool sortedNoCase;

        int starts[256];
        WordList(bool onlyLineEnds_ = false) :
        int starts[256];
        WordList(bool onlyLineEnds_ = false) :

-               words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_),
-               sorted(false), sortedNoCase(false) {}
+               words(0), list(0), len(0), onlyLineEnds(onlyLineEnds_),
+               sorted(false)
+               {}

        ~WordList() { Clear(); }
        operator bool() { return len ? true : false; }
        ~WordList() { Clear(); }
        operator bool() { return len ? true : false; }

-       char *operator[](int ind) { return words[ind]; }

        void Clear();
        void Set(const char *s);
        void Clear();
        void Set(const char *s);

-       char *Allocate(int size);
-       void SetFromAllocated();

        bool InList(const char *s);
        bool InListAbbreviated(const char *s, const char marker);
        bool InList(const char *s);
        bool InListAbbreviated(const char *s, const char marker);

-       const char *GetNearestWord(const char *wordStart, int searchLen,
-               bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);
-       char *GetNearestWords(const char *wordStart, int searchLen,
-               bool ignoreCase=false, char otherSeparator='\0', bool exactLen=false);

 };
 
 inline bool IsAlphabetic(unsigned int ch) {
        return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z'));
 }
 
 };
 
 inline bool IsAlphabetic(unsigned int ch) {
        return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z'));
 }
 

+#ifdef SCI_NAMESPACE
+}
+#endif

 
 #ifdef _MSC_VER
 // Visual C++ doesn't like the private copy idiom for disabling
 
 #ifdef _MSC_VER
 // Visual C++ doesn't like the private copy idiom for disabling