Merge branch 'master' of https://github.com/gammasoft71/Examples.Qt

Author: gammasoft71

Qt.Core/StringUnicode/src/StringUnicode.cpp

@@ -2,17 +2,17 @@
 #include <QTextStream>
 
 int main() {
-  QString arabic = "\u0627\u0644\u0643\u0644\u0645\u0629 \u0627\u0644\u0639\u0631\u0628\u064A\u0629";
-  QString tradChinese = "\u4E2D\u570B\u7684\u6F22\u5B57";
-  QString simplChinese = "\u6C49\u8BED";
-  QString french = "Langue fran\u00E7aise";
-  QString greek = "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE \u03B3\u03BB\u03CE\u03C3\u03C3\u03B1";
-  QString hebrew = "\u05DB\u05EA\u05D1 \u05E2\u05D1\u05E8\u05D9\u05EA";
-  QString hindi = "\u0939\u093f\u0928\u094d\u0926\u0940 \u092d\u093e\u0937\u093e";
-  QString icelandic = "\u00CDslenska";
-  QString japanese = "\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, \u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA";
-  QString korean = "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00";
-  QString russian = "\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A";
+  QString arabic = u8"\u0627\u0644\u0643\u0644\u0645\u0629 \u0627\u0644\u0639\u0631\u0628\u064A\u0629";
+  QString tradChinese = u8"\u4E2D\u570B\u7684\u6F22\u5B57";
+  QString simplChinese = u8"\u6C49\u8BED";
+  QString french = u8"Langue fran\u00E7aise";
+  QString greek = u8"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE \u03B3\u03BB\u03CE\u03C3\u03C3\u03B1";
+  QString hebrew = u8"\u05DB\u05EA\u05D1 \u05E2\u05D1\u05E8\u05D9\u05EA";
+  QString hindi = u8"\u0939\u093f\u0928\u094d\u0926\u0940 \u092d\u093e\u0937\u093e";
+  QString icelandic = u8"\u00CDslenska";
+  QString japanese = u8"\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, \u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA";
+  QString korean = u8"\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00";
+  QString russian = u8"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A";
 
   QTextStream out(stdout);
   out << QString("Arabic:         %1").arg(arabic) << endl;

Qt.Core/StringUnicode2/src/StringUnicode2.cpp

@@ -3,7 +3,7 @@
 
 int main() {
   QTextStream out(stdout);
-  QString str = "\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A\u002c\u0020\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA\U0001F428\u0021";
+  QString str = u8"\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A\u002c\u0020\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA\U0001F428\u0021";
 
   // Remarks : the koala character (\U0001F428) is splitted into two utf16...
   QString result = "";

Qt.Widgets/FontDialog/src/FontDialog.cpp

@@ -14,21 +14,21 @@ class Form : public QMainWindow {
     this->connect(&this->button, &QPushButton::clicked, [&]() {
       QFontDialog fontDialog;
       fontDialog.setFont(this->label.font());
-      QDialog::DialogCode dialogCode = (QDialog::DialogCode)fontDialog.exec();
+      QDialog::DialogCode dialogCode = static_cast<QDialog::DialogCode>(fontDialog.exec());
       if (dialogCode == QDialog::Accepted) {
         this->label.setFont(fontDialog.currentFont());
       }
     });
 
-    this->label.setText("The quick brown fox jumps over the lazy dog.\n"
-                        "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG.\n"
-                        "0123456789+-*/%~^&|=<>≤≥±÷≠{{[()]}},;:.?¿!¡\n"
-                        "àçéèêëïî@@°_#§$ù£€æœø𵩮∞\\\"'\n"
-                        "\u0400{u0401\u0402\u0403\u0404\u0405\u0406\u0407\u0408\u0409\u040a\u040b\u040c\u040d\u040e\u040f\n"
-                        "\u0410\u0411\u0412\u0413\u0414\u0415\u0416\u0417\u0418\u0419\u041a\u041b\u041c\u041d\u041e\u041f\n"
-                        "\u4ea0\u4ea1\u4ea2\u4ea3\u4ea4\u4ea5\u4ea6\u4ea7\u4ea8\u4ea9\u4eaa\u4eab\u4eac\u4ead\u4eae\u4eaf\n"
-                        "\u4eb0\u4eb1\u4eb2\u4eb3\u4eb4\u4eb5\u4eb6\u4eb7\u4eb8\u4eb9\u4eba\u4ebb\u4ebc\u4ebd\u4ebe\u4ebf\n"
-                        "\U0001F428");
+    this->label.setText(u8"The quick brown fox jumps over the lazy dog.\n"
+                        u8"THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG.\n"
+                        u8"0123456789+-*/%~^&|=<>≤≥±÷≠{{[()]}},;:.?¿!¡\n"
+                        u8"àçéèêëïî@@°_#§$ù£€æœø𵩮∞\\\"'\n"
+                        u8"\u0400{u0401\u0402\u0403\u0404\u0405\u0406\u0407\u0408\u0409\u040a\u040b\u040c\u040d\u040e\u040f\n"
+                        u8"\u0410\u0411\u0412\u0413\u0414\u0415\u0416\u0417\u0418\u0419\u041a\u041b\u041c\u041d\u041e\u041f\n"
+                        u8"\u4ea0\u4ea1\u4ea2\u4ea3\u4ea4\u4ea5\u4ea6\u4ea7\u4ea8\u4ea9\u4eaa\u4eab\u4eac\u4ead\u4eae\u4eaf\n"
+                        u8"\u4eb0\u4eb1\u4eb2\u4eb3\u4eb4\u4eb5\u4eb6\u4eb7\u4eb8\u4eb9\u4eba\u4ebb\u4ebc\u4ebd\u4ebe\u4ebf\n"
+                        u8"\U0001F428");
     this->label.move(10, 50);
     this->label.resize(380, 340);
     this->label.setAlignment(Qt::AlignTop);