new opie-reader sources with support for ArriereGo, Reb input and flite output plugins

1 files changed, 85 insertions, 85 deletions

diff --git a/noncore/apps/opie-reader/CRegExp.cpp b/noncore/apps/opie-reader/CRegExp.cpp
index 77dc2dc..6318d28 100644
--- a/noncore/apps/opie-reader/CRegExp.cpp
+++ b/noncore/apps/opie-reader/CRegExp.cpp
@@ -61,11 +61,11 @@ void CRegExpFilt::prepreprocessing(const QString& pat, bool insens)
 {
   for (unsigned int p = 0; p < pat.length(); p++)
     {
-#ifdef _WINDOWS

-      switch (pat.at(p).unicode())

-#else

-      switch (pat[p].unicode())

-#endif

+#ifdef _WINDOWS
+      switch (pat.at(p).unicode())
+#else
+      switch (pat[p].unicode())
+#endif
 	  {
 	case '{':
 	  {
@@ -85,24 +85,24 @@ void CRegExpFilt::prepreprocessing(const QString& pat, bool insens)
 	  }
 	case '#':
 	  {
-	    p++;

+	    p++;
 #ifdef _WINDOWS
-	    while ('0' <= pat.at(p).unicode() && pat.at(p).unicode() <= '9')

-#else

-		while ('0' <= pat[p].unicode() && pat[p].unicode() <= '9')

-#endif

+	    while ('0' <= pat.at(p).unicode() && pat.at(p).unicode() <= '9')
+#else
+		while ('0' <= pat[p].unicode() && pat[p].unicode() <= '9')
+#endif
 	      {
 	      }
 	    p--;
 	    break;
 	  }
 	case '\\' :
-	  {

+	  {
 #ifdef _WINDOWS
-	    tchar c = escapedchar(pat.at(++p).unicode());

-#else

-	    tchar c = escapedchar(pat[++p].unicode());

-#endif

+	    tchar c = escapedchar(pat.at(++p).unicode());
+#else
+	    tchar c = escapedchar(pat[++p].unicode());
+#endif
 		regchar(c, insens);
 	    break;
 	  }
@@ -111,38 +111,38 @@ void CRegExpFilt::prepreprocessing(const QString& pat, bool insens)
 	  {
 	    tchar clast;
 	    bool invert = false;
-	    tchar c;

+	    tchar c;
 #ifdef _WINDOWS
-	    if (pat.at(p+1).unicode() == '^')

-#else

-	    if (pat[p+1].unicode() == '^')

-#endif

+	    if (pat.at(p+1).unicode() == '^')
+#else
+	    if (pat[p+1].unicode() == '^')
+#endif
 		{
 		p++;
 		invert = true;
-	      }

+	      }
 #ifdef _WINDOWS
-	    while ((c = pat.at(++p).unicode()) != ']')

-#else

-	    while ((c = pat[++p].unicode()) != ']')

-#endif

+	    while ((c = pat.at(++p).unicode()) != ']')
+#else
+	    while ((c = pat[++p].unicode()) != ']')
+#endif
 		{
 		if (c == '\\')
-		  {

+		  {
 #ifdef _WINDOWS
-		    c = escapedchar(pat.at(++p).unicode());

-#else

-		    c = escapedchar(pat[++p].unicode());

-#endif

+		    c = escapedchar(pat.at(++p).unicode());
+#else
+		    c = escapedchar(pat[++p].unicode());
+#endif
 			if (c == ']') break;
 		  }
 		if (c == '-')
-		  {

+		  {
 #ifdef _WINDOWS
-		    c = pat.at(++p).unicode();

-#else

-		    c = pat[++p].unicode();

-#endif

+		    c = pat.at(++p).unicode();
+#else
+		    c = pat[++p].unicode();
+#endif
 			for (tchar j = clast; j <= c; j++)
 		      {
 			regchar(j, insens);
@@ -157,12 +157,12 @@ void CRegExpFilt::prepreprocessing(const QString& pat, bool insens)
 	    break;
 	  }
 	default :
-	  {

+	  {
 #ifdef _WINDOWS
-	    regchar(pat.at(p).unicode(), insens);

-#else

-	    regchar(pat[p].unicode(), insens);

-#endif

+	    regchar(pat.at(p).unicode(), insens);
+#else
+	    regchar(pat[p].unicode(), insens);
+#endif
 		break;
 	  }
 	}
@@ -193,12 +193,12 @@ unsigned int CRegExpFilt::preprocessing(const QString& pat, bool insens)
   for (p = 0, m = 0; p < pat.length(); p++)
     {
       qDebug("m is %u", m);
-      if (inkeep) keep |= bit[m];

+      if (inkeep) keep |= bit[m];
 #ifdef _WINDOWS
-      switch (pat.at(p).unicode())

-#else

-      switch (pat[p].unicode())

-#endif

+      switch (pat.at(p).unicode())
+#else
+      switch (pat[p].unicode())
+#endif
 	  {
 	case '{':
 	  {
@@ -228,18 +228,18 @@ unsigned int CRegExpFilt::preprocessing(const QString& pat, bool insens)
 	    if (m > 0)
 	      {
 		p++;
-		int count = 0;

+		int count = 0;
 #ifdef _WINDOWS
-		while ('0' <= pat.at(p).unicode() && pat.at(p).unicode() <= '9')

-#else

-		while ('0' <= pat[p].unicode() && pat[p].unicode() <= '9')

-#endif

-		{

+		while ('0' <= pat.at(p).unicode() && pat.at(p).unicode() <= '9')
+#else
+		while ('0' <= pat[p].unicode() && pat[p].unicode() <= '9')
+#endif
+		{
 #ifdef _WINDOWS
-		    count = 10*count + pat.at(p++).unicode() - '0';

-#else

-		    count = 10*count + pat[p++].unicode() - '0';

-#endif

+		    count = 10*count + pat.at(p++).unicode() - '0';
+#else
+		    count = 10*count + pat[p++].unicode() - '0';
+#endif
 		  }
 		p--;
 		count = count-1;
@@ -266,12 +266,12 @@ unsigned int CRegExpFilt::preprocessing(const QString& pat, bool insens)
 	    break;
 	  }
 	case '\\' :
-	  {

+	  {
 #ifdef _WINDOWS
-	    tchar c = escapedchar(pat.at(++p).unicode());

-#else

-	    tchar c = escapedchar(pat[++p].unicode());

-#endif

+	    tchar c = escapedchar(pat.at(++p).unicode());
+#else
+	    tchar c = escapedchar(pat[++p].unicode());
+#endif
 		if (insens)
 	      {
 		CV[upper(c)] |= bit[m];
@@ -288,38 +288,38 @@ unsigned int CRegExpFilt::preprocessing(const QString& pat, bool insens)
 	case '[' :
 	  {
 	    tchar c, clast;
-	    bool invert = false;

+	    bool invert = false;
 #ifdef _WINDOWS
-	    if (pat.at(p+1).unicode() == '^')

-#else

-	    if (pat[p+1].unicode() == '^')

-#endif

+	    if (pat.at(p+1).unicode() == '^')
+#else
+	    if (pat[p+1].unicode() == '^')
+#endif
 		{
 		p++;
 		invert = true;
-	      }

+	      }
 #ifdef _WINDOWS
-	    while ((c = pat.at(++p).unicode()) != ']')

-#else

-	    while ((c = pat[++p].unicode()) != ']')

-#endif

+	    while ((c = pat.at(++p).unicode()) != ']')
+#else
+	    while ((c = pat[++p].unicode()) != ']')
+#endif
 		{
 		if (c == '\\')
-		  {

+		  {
 #ifdef _WINDOWS
-		    c = escapedchar(pat.at(++p).unicode());

-#else

-		    c = escapedchar(pat[++p].unicode());

-#endif

+		    c = escapedchar(pat.at(++p).unicode());
+#else
+		    c = escapedchar(pat[++p].unicode());
+#endif
 			if (c == ']') break;
 		  }
 		if (c == '-')
-		  {

+		  {
 #ifdef _WINDOWS
-		    c = pat.at(++p).unicode();

-#else

-		    c = pat[++p].unicode();

-#endif

+		    c = pat.at(++p).unicode();
+#else
+		    c = pat[++p].unicode();
+#endif
 			for (tchar j = clast; j <= c; j++)
 		      {
 			if (insens)
@@ -382,12 +382,12 @@ unsigned int CRegExpFilt::preprocessing(const QString& pat, bool insens)
 	    break;
 	  }
 	default :
-	  {

+	  {
 #ifdef _WINDOWS
-	    tchar c = pat.at(p).unicode();

-#else

-	    tchar c = pat[p].unicode();

-#endif

+	    tchar c = pat.at(p).unicode();
+#else
+	    tchar c = pat[p].unicode();
+#endif
 		if (insens)
 	      {
 		CV[upper(c)] |= bit[m];