Fixed accents codding - now is explicit utf8

diff --git a/trunk/src/includes/AccentsNormalizer.h b/trunk/src/includes/AccentsNormalizer.h
index e49ab31..d94a6b2 100644 (file)
--- a/trunk/src/includes/AccentsNormalizer.h
+++ b/trunk/src/includes/AccentsNormalizer.h
@@ -49,31 +49,26 @@ class AccentsNormalizer {
        return normalized;
     }
     void initAccents() {
-        letters['a'] = QRegExp("[ÀàÁáÂÂâÃãÄäÅåæÆĀāĂ㥹ǠȀǡȁǢȂǣȃȦȧǺȺǻǼǍǽǎǞǟⱥ]", Qt::CaseInsensitive);
-        letters['b'] = QRegExp("[ƀƁƂƃɃƄƅ]", Qt::CaseInsensitive);
-        letters['c'] = QRegExp("[ÇçÈçŒĆćĈĉĊċČčƇƈȻȼ]", Qt::CaseInsensitive);
-        letters['d'] = QRegExp("[ÐĐđĎďȡƉ]", Qt::CaseInsensitive);
-        letters['e'] = QRegExp("[ÈéèÉÊêËëĒēĔĕĖėĘęĚěēȄȅȆɆȇɇȨȩ]", Qt::CaseInsensitive);
-        letters['f'] = QRegExp("[ſƑƒꜰ]", Qt::CaseInsensitive);
-        letters['g'] = QRegExp("[ĠġĢģĜĝĞğƓǤǴǥǵǦǧ]", Qt::CaseInsensitive);
-        letters['h'] = QRegExp("[ħĤĥĦȞȟⱧⱨ]", Qt::CaseInsensitive);
-        letters['i'] = QRegExp("[ÌìÍíÎîÏïİijĨĩĪīĬĭĮįǐƗȈȉȊȋǏꟾ]", Qt::CaseInsensitive);
-        letters['j'] = QRegExp("[ĴĵǰȷɈɉⱼ]", Qt::CaseInsensitive);
-        letters['k'] = QRegExp("[ĶķĸƘǨƙǩⱩⱪ]", Qt::CaseInsensitive);
-        letters['l'] = QRegExp("[ŀŁłłĹĺĻļĽľĿȴȽⱠⱡⱢꝈ]", Qt::CaseInsensitive);
-        letters['m'] = QRegExp("[Ɱ]", Qt::CaseInsensitive);
-        letters['n'] = QRegExp("[ÑñŃńŅņŇňʼnŊŋȵǸǹƝ]", Qt::CaseInsensitive);
-        letters['o'] = QRegExp("[ÒòÓóÔÕõÖöØøŐőœŌōŎŏƠȰơǑȱǒǪȪǫȫǬȌȬǭȍȭǾȎȮǿȏȯⱺ]", Qt::CaseInsensitive);
-        letters['p'] = QRegExp("[ƤƥⱣ]", Qt::CaseInsensitive);
-        letters['q'] = QRegExp("[Ɋɋ]", Qt::CaseInsensitive);
-        letters['r'] = QRegExp("[ŕŖŖŗŘřȐȑȒȓɌɍⱤ]", Qt::CaseInsensitive);
-        letters['s'] = QRegExp("[ߊšŚśŜŝŞşȘșȿꜱ]", Qt::CaseInsensitive);
-        letters['t'] = QRegExp("[ŢţŤťŦŧȶȚƫțƬƮȾⱦ]", Qt::CaseInsensitive);
-        letters['u'] = QRegExp("[ÙùÚúÛûÜüŰűŲųŨũŪūŬŮůưǓǔȔɄǕȕǖȖǗȗǘǙǚǛǜƯ]", Qt::CaseInsensitive);
-        letters['v'] = QRegExp("[Ʋⱱⱴⱽ]", Qt::CaseInsensitive);
-        letters['w'] = QRegExp("[ŴŵⱲⱳ]", Qt::CaseInsensitive);
-        letters['y'] = QRegExp("[ÿÝýŶŷŸȲƳȳƴɎɏ]", Qt::CaseInsensitive);
-        letters['z'] = QRegExp("[ŹźŻżŽžɀȤƵȥƶⱫⱬ]", Qt::CaseInsensitive);
+        letters['a'] = QRegExp(QString::fromUtf8("[ÀàÁáÂÂâÃãÄäÅåæÆĀāĂ㥹]"), Qt::CaseInsensitive);
+        letters['c'] = QRegExp(QString::fromUtf8("[ÇçÈçŒĆćĈĉĊċČč]"), Qt::CaseInsensitive);
+        letters['d'] = QRegExp(QString::fromUtf8("[ÐĐđĎď]"), Qt::CaseInsensitive);
+        letters['e'] = QRegExp(QString::fromUtf8("[ÈéèÉÊêËëĒēĔĕĖėĘęĚěē]"), Qt::CaseInsensitive);
+        letters['f'] = QRegExp(QString::fromUtf8("[ſ]"), Qt::CaseInsensitive);
+        letters['g'] = QRegExp(QString::fromUtf8("[ĠġĢģĜĝĞğ]"), Qt::CaseInsensitive);
+        letters['h'] = QRegExp(QString::fromUtf8("[ħĤĥĦ]"), Qt::CaseInsensitive);
+        letters['i'] = QRegExp(QString::fromUtf8("[ÌìÍíÎîÏïİijĨĩĪīĬĭĮį]"), Qt::CaseInsensitive);
+        letters['j'] = QRegExp(QString::fromUtf8("[Ĵĵ]"), Qt::CaseInsensitive);
+        letters['k'] = QRegExp(QString::fromUtf8("[Ķķĸ]"), Qt::CaseInsensitive);
+        letters['l'] = QRegExp(QString::fromUtf8("[ŀŁłĹĺĻļĽľĿ]"), Qt::CaseInsensitive);
+        letters['n'] = QRegExp(QString::fromUtf8("[ÑñŃńŅņŇňʼnŊŋ]"), Qt::CaseInsensitive);
+        letters['o'] = QRegExp(QString::fromUtf8("[ÒòÓóÔÕõÖöØøŐőœŌōŎŏ]"), Qt::CaseInsensitive);
+        letters['r'] = QRegExp(QString::fromUtf8("[ŕŖŖŗŘř]"), Qt::CaseInsensitive);
+        letters['s'] = QRegExp(QString::fromUtf8("[ߊšŚśŜŝŞş]"), Qt::CaseInsensitive);
+        letters['t'] = QRegExp(QString::fromUtf8("[ŢţŤťŦŧ]"), Qt::CaseInsensitive);
+        letters['u'] = QRegExp(QString::fromUtf8("[ÙùÚúÛûÜüŰűŲųŨũŪūŬŮů]"), Qt::CaseInsensitive);
+        letters['w'] = QRegExp(QString::fromUtf8("[Ŵŵ]"), Qt::CaseInsensitive);
+        letters['y'] = QRegExp(QString::fromUtf8("[ÿÝýŶŷŸ]"), Qt::CaseInsensitive);
+        letters['z'] = QRegExp(QString::fromUtf8("[ŹźŻżŽž]"), Qt::CaseInsensitive);
         noLetter = QRegExp("[^a-z ]", Qt::CaseInsensitive);
     }
 };