From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 api/logic/pathmatcher/FSTreeMatcher.h | 18 +++++-----
 api/logic/pathmatcher/IPathMatcher.h  |  6 ++--
 api/logic/pathmatcher/MultiMatcher.h  | 42 +++++++++++-----------
 api/logic/pathmatcher/RegexpMatcher.h | 66 +++++++++++++++++------------------
 4 files changed, 66 insertions(+), 66 deletions(-)

(limited to 'api/logic/pathmatcher')

diff --git a/api/logic/pathmatcher/FSTreeMatcher.h b/api/logic/pathmatcher/FSTreeMatcher.h
index a5bed57c..361924af 100644
--- a/api/logic/pathmatcher/FSTreeMatcher.h
+++ b/api/logic/pathmatcher/FSTreeMatcher.h
@@ -7,15 +7,15 @@
 class FSTreeMatcher : public IPathMatcher
 {
 public:
-	virtual ~FSTreeMatcher() {};
-	FSTreeMatcher(SeparatorPrefixTree<'/'> & tree) : m_fsTree(tree)
-	{
-	}
+    virtual ~FSTreeMatcher() {};
+    FSTreeMatcher(SeparatorPrefixTree<'/'> & tree) : m_fsTree(tree)
+    {
+    }
 
-	virtual bool matches(const QString &string) const override
-	{
-		return m_fsTree.covers(string);
-	}
+    virtual bool matches(const QString &string) const override
+    {
+        return m_fsTree.covers(string);
+    }
 
-	SeparatorPrefixTree<'/'> & m_fsTree;
+    SeparatorPrefixTree<'/'> & m_fsTree;
 };
diff --git a/api/logic/pathmatcher/IPathMatcher.h b/api/logic/pathmatcher/IPathMatcher.h
index 1d410947..b60621c9 100644
--- a/api/logic/pathmatcher/IPathMatcher.h
+++ b/api/logic/pathmatcher/IPathMatcher.h
@@ -4,9 +4,9 @@
 class IPathMatcher
 {
 public:
-	typedef std::shared_ptr<IPathMatcher> Ptr;
+    typedef std::shared_ptr<IPathMatcher> Ptr;
 
 public:
-	virtual ~IPathMatcher(){};
-	virtual bool matches(const QString &string) const = 0;
+    virtual ~IPathMatcher(){};
+    virtual bool matches(const QString &string) const = 0;
 };
diff --git a/api/logic/pathmatcher/MultiMatcher.h b/api/logic/pathmatcher/MultiMatcher.h
index 91f70aa4..8bc1b6ee 100644
--- a/api/logic/pathmatcher/MultiMatcher.h
+++ b/api/logic/pathmatcher/MultiMatcher.h
@@ -5,27 +5,27 @@
 class MultiMatcher : public IPathMatcher
 {
 public:
-	virtual ~MultiMatcher() {};
-	MultiMatcher()
-	{
-	}
-	MultiMatcher &add(Ptr add)
-	{
-		m_matchers.append(add);
-		return *this;
-	}
+    virtual ~MultiMatcher() {};
+    MultiMatcher()
+    {
+    }
+    MultiMatcher &add(Ptr add)
+    {
+        m_matchers.append(add);
+        return *this;
+    }
 
-	virtual bool matches(const QString &string) const override
-	{
-		for(auto iter: m_matchers)
-		{
-			if(iter->matches(string))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
+    virtual bool matches(const QString &string) const override
+    {
+        for(auto iter: m_matchers)
+        {
+            if(iter->matches(string))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 
-	QList<Ptr> m_matchers;
+    QList<Ptr> m_matchers;
 };
diff --git a/api/logic/pathmatcher/RegexpMatcher.h b/api/logic/pathmatcher/RegexpMatcher.h
index da552123..825d488c 100644
--- a/api/logic/pathmatcher/RegexpMatcher.h
+++ b/api/logic/pathmatcher/RegexpMatcher.h
@@ -4,39 +4,39 @@
 class RegexpMatcher : public IPathMatcher
 {
 public:
-	virtual ~RegexpMatcher() {};
-	RegexpMatcher(const QString &regexp)
-	{
-		m_regexp.setPattern(regexp);
-		m_onlyFilenamePart = !regexp.contains('/');
-	}
+    virtual ~RegexpMatcher() {};
+    RegexpMatcher(const QString &regexp)
+    {
+        m_regexp.setPattern(regexp);
+        m_onlyFilenamePart = !regexp.contains('/');
+    }
 
-	RegexpMatcher &caseSensitive(bool cs = true)
-	{
-		if(cs)
-		{
-			m_regexp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
-		}
-		else
-		{
-			m_regexp.setPatternOptions(QRegularExpression::NoPatternOption);
-		}
-		return *this;
-	}
+    RegexpMatcher &caseSensitive(bool cs = true)
+    {
+        if(cs)
+        {
+            m_regexp.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
+        }
+        else
+        {
+            m_regexp.setPatternOptions(QRegularExpression::NoPatternOption);
+        }
+        return *this;
+    }
 
-	virtual bool matches(const QString &string) const override
-	{
-		if(m_onlyFilenamePart)
-		{
-			auto slash = string.lastIndexOf('/');
-			if(slash != -1)
-			{
-				auto part = string.mid(slash + 1);
-				return m_regexp.match(part).hasMatch();
-			}
-		}
-		return m_regexp.match(string).hasMatch();
-	}
-	QRegularExpression m_regexp;
-	bool m_onlyFilenamePart = false;
+    virtual bool matches(const QString &string) const override
+    {
+        if(m_onlyFilenamePart)
+        {
+            auto slash = string.lastIndexOf('/');
+            if(slash != -1)
+            {
+                auto part = string.mid(slash + 1);
+                return m_regexp.match(part).hasMatch();
+            }
+        }
+        return m_regexp.match(string).hasMatch();
+    }
+    QRegularExpression m_regexp;
+    bool m_onlyFilenamePart = false;
 };
-- 
cgit v1.2.3