From ca44b40222f68bfb965a8605f647a0c4226a620a Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 24 Jul 2019 22:49:18 +0800 Subject: [PATCH 1/8] Move variables to the proper scope --- src/base/rss/private/rss_parser.cpp | 644 ++++++++++++++-------------- 1 file changed, 320 insertions(+), 324 deletions(-) diff --git a/src/base/rss/private/rss_parser.cpp b/src/base/rss/private/rss_parser.cpp index 315440fbd..2b2bb7da8 100644 --- a/src/base/rss/private/rss_parser.cpp +++ b/src/base/rss/private/rss_parser.cpp @@ -44,341 +44,337 @@ namespace { - // (X)HTML entities declared in: - // http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent - // http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent - // http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent - using StringHash = QHash; - Q_GLOBAL_STATIC_WITH_ARGS(StringHash, HTML_ENTITIES, ({ - {"nbsp", " "}, // no-break space = non-breaking space, U+00A0 ISOnum - {"iexcl", "¡"}, // inverted exclamation mark, U+00A1 ISOnum - {"cent", "¢"}, // cent sign, U+00A2 ISOnum - {"pound", "£"}, // pound sign, U+00A3 ISOnum - {"curren", "¤"}, // currency sign, U+00A4 ISOnum - {"yen", "¥"}, // yen sign = yuan sign, U+00A5 ISOnum - {"brvbar", "¦"}, // broken bar = broken vertical bar, U+00A6 ISOnum - {"sect", "§"}, // section sign, U+00A7 ISOnum - {"uml", "¨"}, // diaeresis = spacing diaeresis, U+00A8 ISOdia - {"copy", "©"}, // copyright sign, U+00A9 ISOnum - {"ordf", "ª"}, // feminine ordinal indicator, U+00AA ISOnum - {"laquo", "«"}, // left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum - {"not", "¬"}, // not sign = angled dash, U+00AC ISOnum - {"shy", "­"}, // soft hyphen = discretionary hyphen, U+00AD ISOnum - {"reg", "®"}, // registered sign = registered trade mark sign, U+00AE ISOnum - {"macr", "¯"}, // macron = spacing macron = overline = APL overbar, U+00AF ISOdia - {"deg", "°"}, // degree sign, U+00B0 ISOnum - {"plusmn", "±"}, // plus-minus sign = plus-or-minus sign, U+00B1 ISOnum - {"sup2", "²"}, // superscript two = superscript digit two = squared, U+00B2 ISOnum - {"sup3", "³"}, // superscript three = superscript digit three = cubed, U+00B3 ISOnum - {"acute", "´"}, // acute accent = spacing acute, U+00B4 ISOdia - {"micro", "µ"}, // micro sign, U+00B5 ISOnum - {"para", "¶"}, // pilcrow sign = paragraph sign, U+00B6 ISOnum - {"middot", "·"}, // middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum - {"cedil", "¸"}, // cedilla = spacing cedilla, U+00B8 ISOdia - {"sup1", "¹"}, // superscript one = superscript digit one, U+00B9 ISOnum - {"ordm", "º"}, // masculine ordinal indicator, U+00BA ISOnum - {"raquo", "»"}, // right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum - {"frac14", "¼"}, // vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum - {"frac12", "½"}, // vulgar fraction one half = fraction one half, U+00BD ISOnum - {"frac34", "¾"}, // vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum - {"iquest", "¿"}, // inverted question mark = turned question mark, U+00BF ISOnum - {"Agrave", "À"}, // latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1 - {"Aacute", "Á"}, // latin capital letter A with acute, U+00C1 ISOlat1 - {"Acirc", "Â"}, // latin capital letter A with circumflex, U+00C2 ISOlat1 - {"Atilde", "Ã"}, // latin capital letter A with tilde, U+00C3 ISOlat1 - {"Auml", "Ä"}, // latin capital letter A with diaeresis, U+00C4 ISOlat1 - {"Aring", "Å"}, // latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1 - {"AElig", "Æ"}, // latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1 - {"Ccedil", "Ç"}, // latin capital letter C with cedilla, U+00C7 ISOlat1 - {"Egrave", "È"}, // latin capital letter E with grave, U+00C8 ISOlat1 - {"Eacute", "É"}, // latin capital letter E with acute, U+00C9 ISOlat1 - {"Ecirc", "Ê"}, // latin capital letter E with circumflex, U+00CA ISOlat1 - {"Euml", "Ë"}, // latin capital letter E with diaeresis, U+00CB ISOlat1 - {"Igrave", "Ì"}, // latin capital letter I with grave, U+00CC ISOlat1 - {"Iacute", "Í"}, // latin capital letter I with acute, U+00CD ISOlat1 - {"Icirc", "Î"}, // latin capital letter I with circumflex, U+00CE ISOlat1 - {"Iuml", "Ï"}, // latin capital letter I with diaeresis, U+00CF ISOlat1 - {"ETH", "Ð"}, // latin capital letter ETH, U+00D0 ISOlat1 - {"Ntilde", "Ñ"}, // latin capital letter N with tilde, U+00D1 ISOlat1 - {"Ograve", "Ò"}, // latin capital letter O with grave, U+00D2 ISOlat1 - {"Oacute", "Ó"}, // latin capital letter O with acute, U+00D3 ISOlat1 - {"Ocirc", "Ô"}, // latin capital letter O with circumflex, U+00D4 ISOlat1 - {"Otilde", "Õ"}, // latin capital letter O with tilde, U+00D5 ISOlat1 - {"Ouml", "Ö"}, // latin capital letter O with diaeresis, U+00D6 ISOlat1 - {"times", "×"}, // multiplication sign, U+00D7 ISOnum - {"Oslash", "Ø"}, // latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1 - {"Ugrave", "Ù"}, // latin capital letter U with grave, U+00D9 ISOlat1 - {"Uacute", "Ú"}, // latin capital letter U with acute, U+00DA ISOlat1 - {"Ucirc", "Û"}, // latin capital letter U with circumflex, U+00DB ISOlat1 - {"Uuml", "Ü"}, // latin capital letter U with diaeresis, U+00DC ISOlat1 - {"Yacute", "Ý"}, // latin capital letter Y with acute, U+00DD ISOlat1 - {"THORN", "Þ"}, // latin capital letter THORN, U+00DE ISOlat1 - {"szlig", "ß"}, // latin small letter sharp s = ess-zed, U+00DF ISOlat1 - {"agrave", "à"}, // latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1 - {"aacute", "á"}, // latin small letter a with acute, U+00E1 ISOlat1 - {"acirc", "â"}, // latin small letter a with circumflex, U+00E2 ISOlat1 - {"atilde", "ã"}, // latin small letter a with tilde, U+00E3 ISOlat1 - {"auml", "ä"}, // latin small letter a with diaeresis, U+00E4 ISOlat1 - {"aring", "å"}, // latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1 - {"aelig", "æ"}, // latin small letter ae = latin small ligature ae, U+00E6 ISOlat1 - {"ccedil", "ç"}, // latin small letter c with cedilla, U+00E7 ISOlat1 - {"egrave", "è"}, // latin small letter e with grave, U+00E8 ISOlat1 - {"eacute", "é"}, // latin small letter e with acute, U+00E9 ISOlat1 - {"ecirc", "ê"}, // latin small letter e with circumflex, U+00EA ISOlat1 - {"euml", "ë"}, // latin small letter e with diaeresis, U+00EB ISOlat1 - {"igrave", "ì"}, // latin small letter i with grave, U+00EC ISOlat1 - {"iacute", "í"}, // latin small letter i with acute, U+00ED ISOlat1 - {"icirc", "î"}, // latin small letter i with circumflex, U+00EE ISOlat1 - {"iuml", "ï"}, // latin small letter i with diaeresis, U+00EF ISOlat1 - {"eth", "ð"}, // latin small letter eth, U+00F0 ISOlat1 - {"ntilde", "ñ"}, // latin small letter n with tilde, U+00F1 ISOlat1 - {"ograve", "ò"}, // latin small letter o with grave, U+00F2 ISOlat1 - {"oacute", "ó"}, // latin small letter o with acute, U+00F3 ISOlat1 - {"ocirc", "ô"}, // latin small letter o with circumflex, U+00F4 ISOlat1 - {"otilde", "õ"}, // latin small letter o with tilde, U+00F5 ISOlat1 - {"ouml", "ö"}, // latin small letter o with diaeresis, U+00F6 ISOlat1 - {"divide", "÷"}, // division sign, U+00F7 ISOnum - {"oslash", "ø"}, // latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1 - {"ugrave", "ù"}, // latin small letter u with grave, U+00F9 ISOlat1 - {"uacute", "ú"}, // latin small letter u with acute, U+00FA ISOlat1 - {"ucirc", "û"}, // latin small letter u with circumflex, U+00FB ISOlat1 - {"uuml", "ü"}, // latin small letter u with diaeresis, U+00FC ISOlat1 - {"yacute", "ý"}, // latin small letter y with acute, U+00FD ISOlat1 - {"thorn", "þ"}, // latin small letter thorn, U+00FE ISOlat1 - {"yuml", "ÿ"}, // latin small letter y with diaeresis, U+00FF ISOlat1 - - // Latin Extended-A - {"OElig", "Œ"}, // latin capital ligature OE, U+0152 ISOlat2 - {"oelig", "œ"}, // latin small ligature oe, U+0153 ISOlat2 - // ligature is a misnomer, this is a separate character in some languages - {"Scaron", "Š"}, // latin capital letter S with caron, U+0160 ISOlat2 - {"scaron", "š"}, // latin small letter s with caron, U+0161 ISOlat2 - {"Yuml", "Ÿ"}, // latin capital letter Y with diaeresis, U+0178 ISOlat2 - - // Spacing Modifier Letters - {"circ", "ˆ"}, // modifier letter circumflex accent, U+02C6 ISOpub - {"tilde", "˜"}, // small tilde, U+02DC ISOdia - - // General Punctuation - {"ensp", " "}, // en space, U+2002 ISOpub - {"emsp", " "}, // em space, U+2003 ISOpub - {"thinsp", " "}, // thin space, U+2009 ISOpub - {"zwnj", "‌"}, // zero width non-joiner, U+200C NEW RFC 2070 - {"zwj", "‍"}, // zero width joiner, U+200D NEW RFC 2070 - {"lrm", "‎"}, // left-to-right mark, U+200E NEW RFC 2070 - {"rlm", "‏"}, // right-to-left mark, U+200F NEW RFC 2070 - {"ndash", "–"}, // en dash, U+2013 ISOpub - {"mdash", "—"}, // em dash, U+2014 ISOpub - {"lsquo", "‘"}, // left single quotation mark, U+2018 ISOnum - {"rsquo", "’"}, // right single quotation mark, U+2019 ISOnum - {"sbquo", "‚"}, // single low-9 quotation mark, U+201A NEW - {"ldquo", "“"}, // left double quotation mark, U+201C ISOnum - {"rdquo", "”"}, // right double quotation mark, U+201D ISOnum - {"bdquo", "„"}, // double low-9 quotation mark, U+201E NEW - {"dagger", "†"}, // dagger, U+2020 ISOpub - {"Dagger", "‡"}, // double dagger, U+2021 ISOpub - {"permil", "‰"}, // per mille sign, U+2030 ISOtech - {"lsaquo", "‹"}, // single left-pointing angle quotation mark, U+2039 ISO proposed - // lsaquo is proposed but not yet ISO standardized - {"rsaquo", "›"}, // single right-pointing angle quotation mark, U+203A ISO proposed - // rsaquo is proposed but not yet ISO standardized - - // Currency Symbols - {"euro", "€"}, // euro sign, U+20AC NEW - - // Latin Extended-B - {"fnof", "ƒ"}, // latin small letter f with hook = function = florin, U+0192 ISOtech - - // Greek - {"Alpha", "Α"}, // greek capital letter alpha, U+0391 - {"Beta", "Β"}, // greek capital letter beta, U+0392 - {"Gamma", "Γ"}, // greek capital letter gamma, U+0393 ISOgrk3 - {"Delta", "Δ"}, // greek capital letter delta, U+0394 ISOgrk3 - {"Epsilon", "Ε"}, // greek capital letter epsilon, U+0395 - {"Zeta", "Ζ"}, // greek capital letter zeta, U+0396 - {"Eta", "Η"}, // greek capital letter eta, U+0397 - {"Theta", "Θ"}, // greek capital letter theta, U+0398 ISOgrk3 - {"Iota", "Ι"}, // greek capital letter iota, U+0399 - {"Kappa", "Κ"}, // greek capital letter kappa, U+039A - {"Lambda", "Λ"}, // greek capital letter lamda, U+039B ISOgrk3 - {"Mu", "Μ"}, // greek capital letter mu, U+039C - {"Nu", "Ν"}, // greek capital letter nu, U+039D - {"Xi", "Ξ"}, // greek capital letter xi, U+039E ISOgrk3 - {"Omicron", "Ο"}, // greek capital letter omicron, U+039F - {"Pi", "Π"}, // greek capital letter pi, U+03A0 ISOgrk3 - {"Rho", "Ρ"}, // greek capital letter rho, U+03A1 - {"Sigma", "Σ"}, // greek capital letter sigma, U+03A3 ISOgrk3 - {"Tau", "Τ"}, // greek capital letter tau, U+03A4 - {"Upsilon", "Υ"}, // greek capital letter upsilon, U+03A5 ISOgrk3 - {"Phi", "Φ"}, // greek capital letter phi, U+03A6 ISOgrk3 - {"Chi", "Χ"}, // greek capital letter chi, U+03A7 - {"Psi", "Ψ"}, // greek capital letter psi, U+03A8 ISOgrk3 - {"Omega", "Ω"}, // greek capital letter omega, U+03A9 ISOgrk3 - {"alpha", "α"}, // greek small letter alpha, U+03B1 ISOgrk3 - {"beta", "β"}, // greek small letter beta, U+03B2 ISOgrk3 - {"gamma", "γ"}, // greek small letter gamma, U+03B3 ISOgrk3 - {"delta", "δ"}, // greek small letter delta, U+03B4 ISOgrk3 - {"epsilon", "ε"}, // greek small letter epsilon, U+03B5 ISOgrk3 - {"zeta", "ζ"}, // greek small letter zeta, U+03B6 ISOgrk3 - {"eta", "η"}, // greek small letter eta, U+03B7 ISOgrk3 - {"theta", "θ"}, // greek small letter theta, U+03B8 ISOgrk3 - {"iota", "ι"}, // greek small letter iota, U+03B9 ISOgrk3 - {"kappa", "κ"}, // greek small letter kappa, U+03BA ISOgrk3 - {"lambda", "λ"}, // greek small letter lamda, U+03BB ISOgrk3 - {"mu", "μ"}, // greek small letter mu, U+03BC ISOgrk3 - {"nu", "ν"}, // greek small letter nu, U+03BD ISOgrk3 - {"xi", "ξ"}, // greek small letter xi, U+03BE ISOgrk3 - {"omicron", "ο"}, // greek small letter omicron, U+03BF NEW - {"pi", "π"}, // greek small letter pi, U+03C0 ISOgrk3 - {"rho", "ρ"}, // greek small letter rho, U+03C1 ISOgrk3 - {"sigmaf", "ς"}, // greek small letter final sigma, U+03C2 ISOgrk3 - {"sigma", "σ"}, // greek small letter sigma, U+03C3 ISOgrk3 - {"tau", "τ"}, // greek small letter tau, U+03C4 ISOgrk3 - {"upsilon", "υ"}, // greek small letter upsilon, U+03C5 ISOgrk3 - {"phi", "φ"}, // greek small letter phi, U+03C6 ISOgrk3 - {"chi", "χ"}, // greek small letter chi, U+03C7 ISOgrk3 - {"psi", "ψ"}, // greek small letter psi, U+03C8 ISOgrk3 - {"omega", "ω"}, // greek small letter omega, U+03C9 ISOgrk3 - {"thetasym", "ϑ"}, // greek theta symbol, U+03D1 NEW - {"upsih", "ϒ"}, // greek upsilon with hook symbol, U+03D2 NEW - {"piv", "ϖ"}, // greek pi symbol, U+03D6 ISOgrk3 - - // General Punctuation - {"bull", "•"}, // bullet = black small circle, U+2022 ISOpub - // bullet is NOT the same as bullet operator, U+2219 - {"hellip", "…"}, // horizontal ellipsis = three dot leader, U+2026 ISOpub - {"prime", "′"}, // prime = minutes = feet, U+2032 ISOtech - {"Prime", "″"}, // double prime = seconds = inches, U+2033 ISOtech - {"oline", "‾"}, // overline = spacing overscore, U+203E NEW - {"frasl", "⁄"}, // fraction slash, U+2044 NEW - - // Letterlike Symbols - {"weierp", "℘"}, // script capital P = power set = Weierstrass p, U+2118 ISOamso - {"image", "ℑ"}, // black-letter capital I = imaginary part, U+2111 ISOamso - {"real", "ℜ"}, // black-letter capital R = real part symbol, U+211C ISOamso - {"trade", "™"}, // trade mark sign, U+2122 ISOnum - {"alefsym", "ℵ"}, // alef symbol = first transfinite cardinal, U+2135 NEW - // alef symbol is NOT the same as hebrew letter alef, - // U+05D0 although the same glyph could be used to depict both characters - - // Arrows - {"larr", "←"}, // leftwards arrow, U+2190 ISOnum - {"uarr", "↑"}, // upwards arrow, U+2191 ISOnum - {"rarr", "→"}, // rightwards arrow, U+2192 ISOnum - {"darr", "↓"}, // downwards arrow, U+2193 ISOnum - {"harr", "↔"}, // left right arrow, U+2194 ISOamsa - {"crarr", "↵"}, // downwards arrow with corner leftwards = carriage return, U+21B5 NEW - {"lArr", "⇐"}, // leftwards double arrow, U+21D0 ISOtech - // Unicode does not say that lArr is the same as the 'is implied by' arrow - // but also does not have any other character for that function. So lArr can - // be used for 'is implied by' as ISOtech suggests - {"uArr", "⇑"}, // upwards double arrow, U+21D1 ISOamsa - {"rArr", "⇒"}, // rightwards double arrow, U+21D2 ISOtech - // Unicode does not say this is the 'implies' character but does not have - // another character with this function so rArr can be used for 'implies' - // as ISOtech suggests - {"dArr", "⇓"}, // downwards double arrow, U+21D3 ISOamsa - {"hArr", "⇔"}, // left right double arrow, U+21D4 ISOamsa - - // Mathematical Operators - {"forall", "∀"}, // for all, U+2200 ISOtech - {"part", "∂"}, // partial differential, U+2202 ISOtech - {"exist", "∃"}, // there exists, U+2203 ISOtech - {"empty", "∅"}, // empty set = null set, U+2205 ISOamso - {"nabla", "∇"}, // nabla = backward difference, U+2207 ISOtech - {"isin", "∈"}, // element of, U+2208 ISOtech - {"notin", "∉"}, // not an element of, U+2209 ISOtech - {"ni", "∋"}, // contains as member, U+220B ISOtech - {"prod", "∏"}, // n-ary product = product sign, U+220F ISOamsb - // prod is NOT the same character as U+03A0 'greek capital letter pi' though - // the same glyph might be used for both - {"sum", "∑"}, // n-ary summation, U+2211 ISOamsb - // sum is NOT the same character as U+03A3 'greek capital letter sigma' - // though the same glyph might be used for both - {"minus", "−"}, // minus sign, U+2212 ISOtech - {"lowast", "∗"}, // asterisk operator, U+2217 ISOtech - {"radic", "√"}, // square root = radical sign, U+221A ISOtech - {"prop", "∝"}, // proportional to, U+221D ISOtech - {"infin", "∞"}, // infinity, U+221E ISOtech - {"ang", "∠"}, // angle, U+2220 ISOamso - {"and", "∧"}, // logical and = wedge, U+2227 ISOtech - {"or", "∨"}, // logical or = vee, U+2228 ISOtech - {"cap", "∩"}, // intersection = cap, U+2229 ISOtech - {"cup", "∪"}, // union = cup, U+222A ISOtech - {"int", "∫"}, // integral, U+222B ISOtech - {"there4", "∴"}, // therefore, U+2234 ISOtech - {"sim", "∼"}, // tilde operator = varies with = similar to, U+223C ISOtech - // tilde operator is NOT the same character as the tilde, U+007E, - // although the same glyph might be used to represent both - {"cong", "≅"}, // approximately equal to, U+2245 ISOtech - {"asymp", "≈"}, // almost equal to = asymptotic to, U+2248 ISOamsr - {"ne", "≠"}, // not equal to, U+2260 ISOtech - {"equiv", "≡"}, // identical to, U+2261 ISOtech - {"le", "≤"}, // less-than or equal to, U+2264 ISOtech - {"ge", "≥"}, // greater-than or equal to, U+2265 ISOtech - {"sub", "⊂"}, // subset of, U+2282 ISOtech - {"sup", "⊃"}, // superset of, U+2283 ISOtech - {"nsub", "⊄"}, // not a subset of, U+2284 ISOamsn - {"sube", "⊆"}, // subset of or equal to, U+2286 ISOtech - {"supe", "⊇"}, // superset of or equal to, U+2287 ISOtech - {"oplus", "⊕"}, // circled plus = direct sum, U+2295 ISOamsb - {"otimes", "⊗"}, // circled times = vector product, U+2297 ISOamsb - {"perp", "⊥"}, // up tack = orthogonal to = perpendicular, U+22A5 ISOtech - {"sdot", "⋅"}, // dot operator, U+22C5 ISOamsb - // dot operator is NOT the same character as U+00B7 middle dot - - // Miscellaneous Technical - {"lceil", "⌈"}, // left ceiling = APL upstile, U+2308 ISOamsc - {"rceil", "⌉"}, // right ceiling, U+2309 ISOamsc - {"lfloor", "⌊"}, // left floor = APL downstile, U+230A ISOamsc - {"rfloor", "⌋"}, // right floor, U+230B ISOamsc - {"lang", "〈"}, // left-pointing angle bracket = bra, U+2329 ISOtech - // lang is NOT the same character as U+003C 'less than sign' - // or U+2039 'single left-pointing angle quotation mark' - {"rang", "〉"}, // right-pointing angle bracket = ket, U+232A ISOtech - // rang is NOT the same character as U+003E 'greater than sign' - // or U+203A 'single right-pointing angle quotation mark' - - // Geometric Shapes - {"loz", "◊"}, // lozenge, U+25CA ISOpub - - // Miscellaneous Symbols - {"spades", "♠"}, // black spade suit, U+2660 ISOpub - {"clubs", "♣"}, // black club suit = shamrock, U+2663 ISOpub - {"hearts", "♥"}, // black heart suit = valentine, U+2665 ISOpub - {"diams", "♦"} // black diamond suit, U+2666 ISOpub - })) - class XmlStreamEntityResolver : public QXmlStreamEntityResolver { public: QString resolveUndeclaredEntity(const QString &name) override { - return HTML_ENTITIES->value(name); + // (X)HTML entities declared in: + // http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent + // http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent + // http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent + static const QHash HTMLEntities { + {"nbsp", " "}, // no-break space = non-breaking space, U+00A0 ISOnum + {"iexcl", "¡"}, // inverted exclamation mark, U+00A1 ISOnum + {"cent", "¢"}, // cent sign, U+00A2 ISOnum + {"pound", "£"}, // pound sign, U+00A3 ISOnum + {"curren", "¤"}, // currency sign, U+00A4 ISOnum + {"yen", "¥"}, // yen sign = yuan sign, U+00A5 ISOnum + {"brvbar", "¦"}, // broken bar = broken vertical bar, U+00A6 ISOnum + {"sect", "§"}, // section sign, U+00A7 ISOnum + {"uml", "¨"}, // diaeresis = spacing diaeresis, U+00A8 ISOdia + {"copy", "©"}, // copyright sign, U+00A9 ISOnum + {"ordf", "ª"}, // feminine ordinal indicator, U+00AA ISOnum + {"laquo", "«"}, // left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum + {"not", "¬"}, // not sign = angled dash, U+00AC ISOnum + {"shy", "­"}, // soft hyphen = discretionary hyphen, U+00AD ISOnum + {"reg", "®"}, // registered sign = registered trade mark sign, U+00AE ISOnum + {"macr", "¯"}, // macron = spacing macron = overline = APL overbar, U+00AF ISOdia + {"deg", "°"}, // degree sign, U+00B0 ISOnum + {"plusmn", "±"}, // plus-minus sign = plus-or-minus sign, U+00B1 ISOnum + {"sup2", "²"}, // superscript two = superscript digit two = squared, U+00B2 ISOnum + {"sup3", "³"}, // superscript three = superscript digit three = cubed, U+00B3 ISOnum + {"acute", "´"}, // acute accent = spacing acute, U+00B4 ISOdia + {"micro", "µ"}, // micro sign, U+00B5 ISOnum + {"para", "¶"}, // pilcrow sign = paragraph sign, U+00B6 ISOnum + {"middot", "·"}, // middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum + {"cedil", "¸"}, // cedilla = spacing cedilla, U+00B8 ISOdia + {"sup1", "¹"}, // superscript one = superscript digit one, U+00B9 ISOnum + {"ordm", "º"}, // masculine ordinal indicator, U+00BA ISOnum + {"raquo", "»"}, // right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum + {"frac14", "¼"}, // vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum + {"frac12", "½"}, // vulgar fraction one half = fraction one half, U+00BD ISOnum + {"frac34", "¾"}, // vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum + {"iquest", "¿"}, // inverted question mark = turned question mark, U+00BF ISOnum + {"Agrave", "À"}, // latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1 + {"Aacute", "Á"}, // latin capital letter A with acute, U+00C1 ISOlat1 + {"Acirc", "Â"}, // latin capital letter A with circumflex, U+00C2 ISOlat1 + {"Atilde", "Ã"}, // latin capital letter A with tilde, U+00C3 ISOlat1 + {"Auml", "Ä"}, // latin capital letter A with diaeresis, U+00C4 ISOlat1 + {"Aring", "Å"}, // latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1 + {"AElig", "Æ"}, // latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1 + {"Ccedil", "Ç"}, // latin capital letter C with cedilla, U+00C7 ISOlat1 + {"Egrave", "È"}, // latin capital letter E with grave, U+00C8 ISOlat1 + {"Eacute", "É"}, // latin capital letter E with acute, U+00C9 ISOlat1 + {"Ecirc", "Ê"}, // latin capital letter E with circumflex, U+00CA ISOlat1 + {"Euml", "Ë"}, // latin capital letter E with diaeresis, U+00CB ISOlat1 + {"Igrave", "Ì"}, // latin capital letter I with grave, U+00CC ISOlat1 + {"Iacute", "Í"}, // latin capital letter I with acute, U+00CD ISOlat1 + {"Icirc", "Î"}, // latin capital letter I with circumflex, U+00CE ISOlat1 + {"Iuml", "Ï"}, // latin capital letter I with diaeresis, U+00CF ISOlat1 + {"ETH", "Ð"}, // latin capital letter ETH, U+00D0 ISOlat1 + {"Ntilde", "Ñ"}, // latin capital letter N with tilde, U+00D1 ISOlat1 + {"Ograve", "Ò"}, // latin capital letter O with grave, U+00D2 ISOlat1 + {"Oacute", "Ó"}, // latin capital letter O with acute, U+00D3 ISOlat1 + {"Ocirc", "Ô"}, // latin capital letter O with circumflex, U+00D4 ISOlat1 + {"Otilde", "Õ"}, // latin capital letter O with tilde, U+00D5 ISOlat1 + {"Ouml", "Ö"}, // latin capital letter O with diaeresis, U+00D6 ISOlat1 + {"times", "×"}, // multiplication sign, U+00D7 ISOnum + {"Oslash", "Ø"}, // latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1 + {"Ugrave", "Ù"}, // latin capital letter U with grave, U+00D9 ISOlat1 + {"Uacute", "Ú"}, // latin capital letter U with acute, U+00DA ISOlat1 + {"Ucirc", "Û"}, // latin capital letter U with circumflex, U+00DB ISOlat1 + {"Uuml", "Ü"}, // latin capital letter U with diaeresis, U+00DC ISOlat1 + {"Yacute", "Ý"}, // latin capital letter Y with acute, U+00DD ISOlat1 + {"THORN", "Þ"}, // latin capital letter THORN, U+00DE ISOlat1 + {"szlig", "ß"}, // latin small letter sharp s = ess-zed, U+00DF ISOlat1 + {"agrave", "à"}, // latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1 + {"aacute", "á"}, // latin small letter a with acute, U+00E1 ISOlat1 + {"acirc", "â"}, // latin small letter a with circumflex, U+00E2 ISOlat1 + {"atilde", "ã"}, // latin small letter a with tilde, U+00E3 ISOlat1 + {"auml", "ä"}, // latin small letter a with diaeresis, U+00E4 ISOlat1 + {"aring", "å"}, // latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1 + {"aelig", "æ"}, // latin small letter ae = latin small ligature ae, U+00E6 ISOlat1 + {"ccedil", "ç"}, // latin small letter c with cedilla, U+00E7 ISOlat1 + {"egrave", "è"}, // latin small letter e with grave, U+00E8 ISOlat1 + {"eacute", "é"}, // latin small letter e with acute, U+00E9 ISOlat1 + {"ecirc", "ê"}, // latin small letter e with circumflex, U+00EA ISOlat1 + {"euml", "ë"}, // latin small letter e with diaeresis, U+00EB ISOlat1 + {"igrave", "ì"}, // latin small letter i with grave, U+00EC ISOlat1 + {"iacute", "í"}, // latin small letter i with acute, U+00ED ISOlat1 + {"icirc", "î"}, // latin small letter i with circumflex, U+00EE ISOlat1 + {"iuml", "ï"}, // latin small letter i with diaeresis, U+00EF ISOlat1 + {"eth", "ð"}, // latin small letter eth, U+00F0 ISOlat1 + {"ntilde", "ñ"}, // latin small letter n with tilde, U+00F1 ISOlat1 + {"ograve", "ò"}, // latin small letter o with grave, U+00F2 ISOlat1 + {"oacute", "ó"}, // latin small letter o with acute, U+00F3 ISOlat1 + {"ocirc", "ô"}, // latin small letter o with circumflex, U+00F4 ISOlat1 + {"otilde", "õ"}, // latin small letter o with tilde, U+00F5 ISOlat1 + {"ouml", "ö"}, // latin small letter o with diaeresis, U+00F6 ISOlat1 + {"divide", "÷"}, // division sign, U+00F7 ISOnum + {"oslash", "ø"}, // latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1 + {"ugrave", "ù"}, // latin small letter u with grave, U+00F9 ISOlat1 + {"uacute", "ú"}, // latin small letter u with acute, U+00FA ISOlat1 + {"ucirc", "û"}, // latin small letter u with circumflex, U+00FB ISOlat1 + {"uuml", "ü"}, // latin small letter u with diaeresis, U+00FC ISOlat1 + {"yacute", "ý"}, // latin small letter y with acute, U+00FD ISOlat1 + {"thorn", "þ"}, // latin small letter thorn, U+00FE ISOlat1 + {"yuml", "ÿ"}, // latin small letter y with diaeresis, U+00FF ISOlat1 + + // Latin Extended-A + {"OElig", "Œ"}, // latin capital ligature OE, U+0152 ISOlat2 + {"oelig", "œ"}, // latin small ligature oe, U+0153 ISOlat2 + // ligature is a misnomer, this is a separate character in some languages + {"Scaron", "Š"}, // latin capital letter S with caron, U+0160 ISOlat2 + {"scaron", "š"}, // latin small letter s with caron, U+0161 ISOlat2 + {"Yuml", "Ÿ"}, // latin capital letter Y with diaeresis, U+0178 ISOlat2 + + // Spacing Modifier Letters + {"circ", "ˆ"}, // modifier letter circumflex accent, U+02C6 ISOpub + {"tilde", "˜"}, // small tilde, U+02DC ISOdia + + // General Punctuation + {"ensp", " "}, // en space, U+2002 ISOpub + {"emsp", " "}, // em space, U+2003 ISOpub + {"thinsp", " "}, // thin space, U+2009 ISOpub + {"zwnj", "‌"}, // zero width non-joiner, U+200C NEW RFC 2070 + {"zwj", "‍"}, // zero width joiner, U+200D NEW RFC 2070 + {"lrm", "‎"}, // left-to-right mark, U+200E NEW RFC 2070 + {"rlm", "‏"}, // right-to-left mark, U+200F NEW RFC 2070 + {"ndash", "–"}, // en dash, U+2013 ISOpub + {"mdash", "—"}, // em dash, U+2014 ISOpub + {"lsquo", "‘"}, // left single quotation mark, U+2018 ISOnum + {"rsquo", "’"}, // right single quotation mark, U+2019 ISOnum + {"sbquo", "‚"}, // single low-9 quotation mark, U+201A NEW + {"ldquo", "“"}, // left double quotation mark, U+201C ISOnum + {"rdquo", "”"}, // right double quotation mark, U+201D ISOnum + {"bdquo", "„"}, // double low-9 quotation mark, U+201E NEW + {"dagger", "†"}, // dagger, U+2020 ISOpub + {"Dagger", "‡"}, // double dagger, U+2021 ISOpub + {"permil", "‰"}, // per mille sign, U+2030 ISOtech + {"lsaquo", "‹"}, // single left-pointing angle quotation mark, U+2039 ISO proposed + // lsaquo is proposed but not yet ISO standardized + {"rsaquo", "›"}, // single right-pointing angle quotation mark, U+203A ISO proposed + // rsaquo is proposed but not yet ISO standardized + + // Currency Symbols + {"euro", "€"}, // euro sign, U+20AC NEW + + // Latin Extended-B + {"fnof", "ƒ"}, // latin small letter f with hook = function = florin, U+0192 ISOtech + + // Greek + {"Alpha", "Α"}, // greek capital letter alpha, U+0391 + {"Beta", "Β"}, // greek capital letter beta, U+0392 + {"Gamma", "Γ"}, // greek capital letter gamma, U+0393 ISOgrk3 + {"Delta", "Δ"}, // greek capital letter delta, U+0394 ISOgrk3 + {"Epsilon", "Ε"}, // greek capital letter epsilon, U+0395 + {"Zeta", "Ζ"}, // greek capital letter zeta, U+0396 + {"Eta", "Η"}, // greek capital letter eta, U+0397 + {"Theta", "Θ"}, // greek capital letter theta, U+0398 ISOgrk3 + {"Iota", "Ι"}, // greek capital letter iota, U+0399 + {"Kappa", "Κ"}, // greek capital letter kappa, U+039A + {"Lambda", "Λ"}, // greek capital letter lamda, U+039B ISOgrk3 + {"Mu", "Μ"}, // greek capital letter mu, U+039C + {"Nu", "Ν"}, // greek capital letter nu, U+039D + {"Xi", "Ξ"}, // greek capital letter xi, U+039E ISOgrk3 + {"Omicron", "Ο"}, // greek capital letter omicron, U+039F + {"Pi", "Π"}, // greek capital letter pi, U+03A0 ISOgrk3 + {"Rho", "Ρ"}, // greek capital letter rho, U+03A1 + {"Sigma", "Σ"}, // greek capital letter sigma, U+03A3 ISOgrk3 + {"Tau", "Τ"}, // greek capital letter tau, U+03A4 + {"Upsilon", "Υ"}, // greek capital letter upsilon, U+03A5 ISOgrk3 + {"Phi", "Φ"}, // greek capital letter phi, U+03A6 ISOgrk3 + {"Chi", "Χ"}, // greek capital letter chi, U+03A7 + {"Psi", "Ψ"}, // greek capital letter psi, U+03A8 ISOgrk3 + {"Omega", "Ω"}, // greek capital letter omega, U+03A9 ISOgrk3 + {"alpha", "α"}, // greek small letter alpha, U+03B1 ISOgrk3 + {"beta", "β"}, // greek small letter beta, U+03B2 ISOgrk3 + {"gamma", "γ"}, // greek small letter gamma, U+03B3 ISOgrk3 + {"delta", "δ"}, // greek small letter delta, U+03B4 ISOgrk3 + {"epsilon", "ε"}, // greek small letter epsilon, U+03B5 ISOgrk3 + {"zeta", "ζ"}, // greek small letter zeta, U+03B6 ISOgrk3 + {"eta", "η"}, // greek small letter eta, U+03B7 ISOgrk3 + {"theta", "θ"}, // greek small letter theta, U+03B8 ISOgrk3 + {"iota", "ι"}, // greek small letter iota, U+03B9 ISOgrk3 + {"kappa", "κ"}, // greek small letter kappa, U+03BA ISOgrk3 + {"lambda", "λ"}, // greek small letter lamda, U+03BB ISOgrk3 + {"mu", "μ"}, // greek small letter mu, U+03BC ISOgrk3 + {"nu", "ν"}, // greek small letter nu, U+03BD ISOgrk3 + {"xi", "ξ"}, // greek small letter xi, U+03BE ISOgrk3 + {"omicron", "ο"}, // greek small letter omicron, U+03BF NEW + {"pi", "π"}, // greek small letter pi, U+03C0 ISOgrk3 + {"rho", "ρ"}, // greek small letter rho, U+03C1 ISOgrk3 + {"sigmaf", "ς"}, // greek small letter final sigma, U+03C2 ISOgrk3 + {"sigma", "σ"}, // greek small letter sigma, U+03C3 ISOgrk3 + {"tau", "τ"}, // greek small letter tau, U+03C4 ISOgrk3 + {"upsilon", "υ"}, // greek small letter upsilon, U+03C5 ISOgrk3 + {"phi", "φ"}, // greek small letter phi, U+03C6 ISOgrk3 + {"chi", "χ"}, // greek small letter chi, U+03C7 ISOgrk3 + {"psi", "ψ"}, // greek small letter psi, U+03C8 ISOgrk3 + {"omega", "ω"}, // greek small letter omega, U+03C9 ISOgrk3 + {"thetasym", "ϑ"}, // greek theta symbol, U+03D1 NEW + {"upsih", "ϒ"}, // greek upsilon with hook symbol, U+03D2 NEW + {"piv", "ϖ"}, // greek pi symbol, U+03D6 ISOgrk3 + + // General Punctuation + {"bull", "•"}, // bullet = black small circle, U+2022 ISOpub + // bullet is NOT the same as bullet operator, U+2219 + {"hellip", "…"}, // horizontal ellipsis = three dot leader, U+2026 ISOpub + {"prime", "′"}, // prime = minutes = feet, U+2032 ISOtech + {"Prime", "″"}, // double prime = seconds = inches, U+2033 ISOtech + {"oline", "‾"}, // overline = spacing overscore, U+203E NEW + {"frasl", "⁄"}, // fraction slash, U+2044 NEW + + // Letterlike Symbols + {"weierp", "℘"}, // script capital P = power set = Weierstrass p, U+2118 ISOamso + {"image", "ℑ"}, // black-letter capital I = imaginary part, U+2111 ISOamso + {"real", "ℜ"}, // black-letter capital R = real part symbol, U+211C ISOamso + {"trade", "™"}, // trade mark sign, U+2122 ISOnum + {"alefsym", "ℵ"}, // alef symbol = first transfinite cardinal, U+2135 NEW + // alef symbol is NOT the same as hebrew letter alef, + // U+05D0 although the same glyph could be used to depict both characters + + // Arrows + {"larr", "←"}, // leftwards arrow, U+2190 ISOnum + {"uarr", "↑"}, // upwards arrow, U+2191 ISOnum + {"rarr", "→"}, // rightwards arrow, U+2192 ISOnum + {"darr", "↓"}, // downwards arrow, U+2193 ISOnum + {"harr", "↔"}, // left right arrow, U+2194 ISOamsa + {"crarr", "↵"}, // downwards arrow with corner leftwards = carriage return, U+21B5 NEW + {"lArr", "⇐"}, // leftwards double arrow, U+21D0 ISOtech + // Unicode does not say that lArr is the same as the 'is implied by' arrow + // but also does not have any other character for that function. So lArr can + // be used for 'is implied by' as ISOtech suggests + {"uArr", "⇑"}, // upwards double arrow, U+21D1 ISOamsa + {"rArr", "⇒"}, // rightwards double arrow, U+21D2 ISOtech + // Unicode does not say this is the 'implies' character but does not have + // another character with this function so rArr can be used for 'implies' + // as ISOtech suggests + {"dArr", "⇓"}, // downwards double arrow, U+21D3 ISOamsa + {"hArr", "⇔"}, // left right double arrow, U+21D4 ISOamsa + + // Mathematical Operators + {"forall", "∀"}, // for all, U+2200 ISOtech + {"part", "∂"}, // partial differential, U+2202 ISOtech + {"exist", "∃"}, // there exists, U+2203 ISOtech + {"empty", "∅"}, // empty set = null set, U+2205 ISOamso + {"nabla", "∇"}, // nabla = backward difference, U+2207 ISOtech + {"isin", "∈"}, // element of, U+2208 ISOtech + {"notin", "∉"}, // not an element of, U+2209 ISOtech + {"ni", "∋"}, // contains as member, U+220B ISOtech + {"prod", "∏"}, // n-ary product = product sign, U+220F ISOamsb + // prod is NOT the same character as U+03A0 'greek capital letter pi' though + // the same glyph might be used for both + {"sum", "∑"}, // n-ary summation, U+2211 ISOamsb + // sum is NOT the same character as U+03A3 'greek capital letter sigma' + // though the same glyph might be used for both + {"minus", "−"}, // minus sign, U+2212 ISOtech + {"lowast", "∗"}, // asterisk operator, U+2217 ISOtech + {"radic", "√"}, // square root = radical sign, U+221A ISOtech + {"prop", "∝"}, // proportional to, U+221D ISOtech + {"infin", "∞"}, // infinity, U+221E ISOtech + {"ang", "∠"}, // angle, U+2220 ISOamso + {"and", "∧"}, // logical and = wedge, U+2227 ISOtech + {"or", "∨"}, // logical or = vee, U+2228 ISOtech + {"cap", "∩"}, // intersection = cap, U+2229 ISOtech + {"cup", "∪"}, // union = cup, U+222A ISOtech + {"int", "∫"}, // integral, U+222B ISOtech + {"there4", "∴"}, // therefore, U+2234 ISOtech + {"sim", "∼"}, // tilde operator = varies with = similar to, U+223C ISOtech + // tilde operator is NOT the same character as the tilde, U+007E, + // although the same glyph might be used to represent both + {"cong", "≅"}, // approximately equal to, U+2245 ISOtech + {"asymp", "≈"}, // almost equal to = asymptotic to, U+2248 ISOamsr + {"ne", "≠"}, // not equal to, U+2260 ISOtech + {"equiv", "≡"}, // identical to, U+2261 ISOtech + {"le", "≤"}, // less-than or equal to, U+2264 ISOtech + {"ge", "≥"}, // greater-than or equal to, U+2265 ISOtech + {"sub", "⊂"}, // subset of, U+2282 ISOtech + {"sup", "⊃"}, // superset of, U+2283 ISOtech + {"nsub", "⊄"}, // not a subset of, U+2284 ISOamsn + {"sube", "⊆"}, // subset of or equal to, U+2286 ISOtech + {"supe", "⊇"}, // superset of or equal to, U+2287 ISOtech + {"oplus", "⊕"}, // circled plus = direct sum, U+2295 ISOamsb + {"otimes", "⊗"}, // circled times = vector product, U+2297 ISOamsb + {"perp", "⊥"}, // up tack = orthogonal to = perpendicular, U+22A5 ISOtech + {"sdot", "⋅"}, // dot operator, U+22C5 ISOamsb + // dot operator is NOT the same character as U+00B7 middle dot + + // Miscellaneous Technical + {"lceil", "⌈"}, // left ceiling = APL upstile, U+2308 ISOamsc + {"rceil", "⌉"}, // right ceiling, U+2309 ISOamsc + {"lfloor", "⌊"}, // left floor = APL downstile, U+230A ISOamsc + {"rfloor", "⌋"}, // right floor, U+230B ISOamsc + {"lang", "〈"}, // left-pointing angle bracket = bra, U+2329 ISOtech + // lang is NOT the same character as U+003C 'less than sign' + // or U+2039 'single left-pointing angle quotation mark' + {"rang", "〉"}, // right-pointing angle bracket = ket, U+232A ISOtech + // rang is NOT the same character as U+003E 'greater than sign' + // or U+203A 'single right-pointing angle quotation mark' + + // Geometric Shapes + {"loz", "◊"}, // lozenge, U+25CA ISOpub + + // Miscellaneous Symbols + {"spades", "♠"}, // black spade suit, U+2660 ISOpub + {"clubs", "♣"}, // black club suit = shamrock, U+2663 ISOpub + {"hearts", "♥"}, // black heart suit = valentine, U+2665 ISOpub + {"diams", "♦"} // black diamond suit, U+2666 ISOpub + }; + return HTMLEntities.value(name); } }; - const char shortDay[][4] = { - "Mon", "Tue", "Wed", - "Thu", "Fri", "Sat", - "Sun" - }; - - const char longDay[][10] = { - "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday", - "Sunday" - }; - - const char shortMonth[][4] = { - "Jan", "Feb", "Mar", "Apr", - "May", "Jun", "Jul", "Aug", - "Sep", "Oct", "Nov", "Dec" - }; - // Ported to Qt from KDElibs4 QDateTime parseDate(const QString &string) { + const char shortDay[][4] = { + "Mon", "Tue", "Wed", + "Thu", "Fri", "Sat", + "Sun" + }; + const char longDay[][10] = { + "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday", + "Sunday" + }; + const char shortMonth[][4] = { + "Jan", "Feb", "Mar", "Apr", + "May", "Jun", "Jul", "Aug", + "Sep", "Oct", "Nov", "Dec" + }; + const QString str = string.trimmed(); if (str.isEmpty()) return QDateTime::currentDateTime(); From ee0d2d2220f02c6a759723ace7331c09dea5bd7f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 24 Jul 2019 23:01:26 +0800 Subject: [PATCH 2/8] Move fspathedit_p to private folder --- src/gui/CMakeLists.txt | 4 ++-- src/gui/fspathedit.cpp | 2 +- src/gui/gui.pri | 4 ++-- src/gui/{ => private}/fspathedit_p.cpp | 0 src/gui/{ => private}/fspathedit_p.h | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename src/gui/{ => private}/fspathedit_p.cpp (100%) rename src/gui/{ => private}/fspathedit_p.h (100%) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index cea242ac6..dc67cad88 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -25,7 +25,6 @@ deletionconfirmationdialog.h downloadfromurldialog.h executionlogwidget.h fspathedit.h -fspathedit_p.h hidabletabwidget.h ipsubnetwhitelistoptionsdialog.h lineedit.h @@ -34,6 +33,7 @@ mainwindow.h optionsdialog.h previewlistdelegate.h previewselectdialog.h +private/fspathedit_p.h private/tristatewidget.h raisedmessagebox.h scanfoldersdelegate.h @@ -77,7 +77,6 @@ cookiesmodel.cpp downloadfromurldialog.cpp executionlogwidget.cpp fspathedit.cpp -fspathedit_p.cpp hidabletabwidget.cpp ipsubnetwhitelistoptionsdialog.cpp lineedit.cpp @@ -86,6 +85,7 @@ mainwindow.cpp optionsdialog.cpp previewlistdelegate.cpp previewselectdialog.cpp +private/fspathedit_p.cpp private/tristatewidget.cpp raisedmessagebox.cpp scanfoldersdelegate.cpp diff --git a/src/gui/fspathedit.cpp b/src/gui/fspathedit.cpp index fd4467183..9d6dfcce4 100644 --- a/src/gui/fspathedit.cpp +++ b/src/gui/fspathedit.cpp @@ -39,7 +39,7 @@ #include #include "base/utils/fs.h" -#include "fspathedit_p.h" +#include "private/fspathedit_p.h" namespace { diff --git a/src/gui/gui.pri b/src/gui/gui.pri index ea1d09ea3..78b0d838a 100644 --- a/src/gui/gui.pri +++ b/src/gui/gui.pri @@ -19,7 +19,6 @@ HEADERS += \ $$PWD/downloadfromurldialog.h \ $$PWD/executionlogwidget.h \ $$PWD/fspathedit.h \ - $$PWD/fspathedit_p.h \ $$PWD/hidabletabwidget.h \ $$PWD/ipsubnetwhitelistoptionsdialog.h \ $$PWD/lineedit.h \ @@ -28,6 +27,7 @@ HEADERS += \ $$PWD/optionsdialog.h \ $$PWD/previewlistdelegate.h \ $$PWD/previewselectdialog.h \ + $$PWD/private/fspathedit_p.h \ $$PWD/private/tristatewidget.h \ $$PWD/raisedmessagebox.h \ $$PWD/rss/articlelistwidget.h \ @@ -82,7 +82,6 @@ SOURCES += \ $$PWD/downloadfromurldialog.cpp \ $$PWD/executionlogwidget.cpp \ $$PWD/fspathedit.cpp \ - $$PWD/fspathedit_p.cpp \ $$PWD/hidabletabwidget.cpp \ $$PWD/ipsubnetwhitelistoptionsdialog.cpp \ $$PWD/lineedit.cpp \ @@ -91,6 +90,7 @@ SOURCES += \ $$PWD/optionsdialog.cpp \ $$PWD/previewlistdelegate.cpp \ $$PWD/previewselectdialog.cpp \ + $$PWD/private/fspathedit_p.cpp \ $$PWD/private/tristatewidget.cpp \ $$PWD/raisedmessagebox.cpp \ $$PWD/rss/articlelistwidget.cpp \ diff --git a/src/gui/fspathedit_p.cpp b/src/gui/private/fspathedit_p.cpp similarity index 100% rename from src/gui/fspathedit_p.cpp rename to src/gui/private/fspathedit_p.cpp diff --git a/src/gui/fspathedit_p.h b/src/gui/private/fspathedit_p.h similarity index 100% rename from src/gui/fspathedit_p.h rename to src/gui/private/fspathedit_p.h From 7ab3479a343067c991c380d8a7d943d28714181d Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 25 Jul 2019 01:41:09 +0800 Subject: [PATCH 3/8] Replace static_cast by qOverload --- src/base/bittorrent/session.cpp | 2 +- src/base/net/smtp.cpp | 2 +- src/gui/addnewtorrentdialog.cpp | 2 +- src/gui/advancedsettings.cpp | 6 +++--- src/gui/mainwindow.cpp | 26 ++++++++++++------------- src/gui/optionsdialog.cpp | 2 +- src/gui/properties/propertieswidget.cpp | 2 +- src/gui/properties/proptabbar.cpp | 2 +- src/gui/properties/speedwidget.cpp | 2 +- src/gui/rss/automatedrssdownloader.cpp | 2 +- src/gui/scanfoldersdelegate.cpp | 2 +- src/gui/search/searchjobwidget.cpp | 14 ++++++------- src/gui/search/searchwidget.cpp | 4 ++-- src/gui/speedlimitdialog.cpp | 2 +- src/gui/transferlistfilterswidget.cpp | 7 +++---- src/gui/updownratiodialog.cpp | 2 +- 16 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index 1e32ac752..b23ea3d57 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -3570,7 +3570,7 @@ void Session::configureDeferred() if (!m_deferredConfigureScheduled) { #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) QMetaObject::invokeMethod(this - , static_cast(&Session::configure) + , qOverload<>(&Session::configure) , Qt::QueuedConnection); #else QMetaObject::invokeMethod(this, "configure", Qt::QueuedConnection); diff --git a/src/base/net/smtp.cpp b/src/base/net/smtp.cpp index 1e009069a..444f12f53 100644 --- a/src/base/net/smtp.cpp +++ b/src/base/net/smtp.cpp @@ -113,7 +113,7 @@ Smtp::Smtp(QObject *parent) connect(m_socket, &QIODevice::readyRead, this, &Smtp::readyRead); connect(m_socket, &QAbstractSocket::disconnected, this, &QObject::deleteLater); - connect(m_socket, static_cast(&QAbstractSocket::error) + connect(m_socket, qOverload(&QAbstractSocket::error) , this, &Smtp::error); // Test hmacMD5 function (http://www.faqs.org/rfcs/rfc2202.html) diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp index eb5a02a3b..00a0d1ffc 100644 --- a/src/gui/addnewtorrentdialog.cpp +++ b/src/gui/addnewtorrentdialog.cpp @@ -612,7 +612,7 @@ void AddNewTorrentDialog::setupTreeview() m_contentDelegate = new PropListDelegate(nullptr); m_ui->contentTreeView->setItemDelegate(m_contentDelegate); connect(m_ui->contentTreeView, &QAbstractItemView::clicked, m_ui->contentTreeView - , static_cast(&QAbstractItemView::edit)); + , qOverload(&QAbstractItemView::edit)); connect(m_ui->contentTreeView, &QWidget::customContextMenuRequested, this, &AddNewTorrentDialog::displayContentTreeMenu); // List files in torrent diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp index c2d78fd46..58e2ccb4c 100644 --- a/src/gui/advancedsettings.cpp +++ b/src/gui/advancedsettings.cpp @@ -137,11 +137,11 @@ AdvancedSettings::AdvancedSettings(QWidget *parent) setSelectionMode(QAbstractItemView::NoSelection); setEditTriggers(QAbstractItemView::NoEditTriggers); // Signals - connect(&m_spinBoxCache, static_cast(&QSpinBox::valueChanged) + connect(&m_spinBoxCache, qOverload(&QSpinBox::valueChanged) , this, &AdvancedSettings::updateCacheSpinSuffix); - connect(&m_comboBoxInterface, static_cast(&QComboBox::currentIndexChanged) + connect(&m_comboBoxInterface, qOverload(&QComboBox::currentIndexChanged) , this, &AdvancedSettings::updateInterfaceAddressCombo); - connect(&m_spinBoxSaveResumeDataInterval, static_cast(&QSpinBox::valueChanged) + connect(&m_spinBoxSaveResumeDataInterval, qOverload(&QSpinBox::valueChanged) , this, &AdvancedSettings::updateSaveResumeDataIntervalSuffix); // Load settings loadAdvancedSettings(); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 1fe353c81..1275c6116 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -253,10 +253,12 @@ MainWindow::MainWindow(QWidget *parent) connect(BitTorrent::Session::instance(), &BitTorrent::Session::trackersRemoved, m_transferListFiltersWidget, &TransferListFiltersWidget::removeTrackers); connect(BitTorrent::Session::instance(), &BitTorrent::Session::trackerlessStateChanged, m_transferListFiltersWidget, &TransferListFiltersWidget::changeTrackerless); - using Func = void (TransferListFiltersWidget::*)(BitTorrent::TorrentHandle *const, const QString &); - connect(BitTorrent::Session::instance(), &BitTorrent::Session::trackerSuccess, m_transferListFiltersWidget, static_cast(&TransferListFiltersWidget::trackerSuccess)); - connect(BitTorrent::Session::instance(), &BitTorrent::Session::trackerError, m_transferListFiltersWidget, static_cast(&TransferListFiltersWidget::trackerError)); - connect(BitTorrent::Session::instance(), &BitTorrent::Session::trackerWarning, m_transferListFiltersWidget, static_cast(&TransferListFiltersWidget::trackerWarning)); + connect(BitTorrent::Session::instance(), &BitTorrent::Session::trackerSuccess + , m_transferListFiltersWidget, qOverload(&TransferListFiltersWidget::trackerSuccess)); + connect(BitTorrent::Session::instance(), &BitTorrent::Session::trackerError + , m_transferListFiltersWidget, qOverload(&TransferListFiltersWidget::trackerError)); + connect(BitTorrent::Session::instance(), &BitTorrent::Session::trackerWarning + , m_transferListFiltersWidget, qOverload(&TransferListFiltersWidget::trackerWarning)); #ifdef Q_OS_MAC // Increase top spacing to avoid tab overlapping @@ -856,17 +858,15 @@ void MainWindow::createKeyboardShortcuts() m_ui->actionCloseWindow->setVisible(false); #endif - QShortcut *switchTransferShortcut = new QShortcut(Qt::ALT + Qt::Key_1, this); + const auto *switchTransferShortcut = new QShortcut(Qt::ALT + Qt::Key_1, this); connect(switchTransferShortcut, &QShortcut::activated, this, &MainWindow::displayTransferTab); - - using Func = void (MainWindow::*)(); - QShortcut *switchSearchShortcut = new QShortcut(Qt::ALT + Qt::Key_2, this); - connect(switchSearchShortcut, &QShortcut::activated, this, static_cast(&MainWindow::displaySearchTab)); - QShortcut *switchRSSShortcut = new QShortcut(Qt::ALT + Qt::Key_3, this); - connect(switchRSSShortcut, &QShortcut::activated, this, static_cast(&MainWindow::displayRSSTab)); - QShortcut *switchExecutionLogShortcut = new QShortcut(Qt::ALT + Qt::Key_4, this); + const auto *switchSearchShortcut = new QShortcut(Qt::ALT + Qt::Key_2, this); + connect(switchSearchShortcut, &QShortcut::activated, this, qOverload<>(&MainWindow::displaySearchTab)); + const auto *switchRSSShortcut = new QShortcut(Qt::ALT + Qt::Key_3, this); + connect(switchRSSShortcut, &QShortcut::activated, this, qOverload<>(&MainWindow::displayRSSTab)); + const auto *switchExecutionLogShortcut = new QShortcut(Qt::ALT + Qt::Key_4, this); connect(switchExecutionLogShortcut, &QShortcut::activated, this, &MainWindow::displayExecutionLogTab); - QShortcut *switchSearchFilterShortcut = new QShortcut(QKeySequence::Find, m_transferListWidget); + const auto *switchSearchFilterShortcut = new QShortcut(QKeySequence::Find, m_transferListWidget); connect(switchSearchFilterShortcut, &QShortcut::activated, this, &MainWindow::focusSearchFilter); m_ui->actionDocumentation->setShortcut(QKeySequence::HelpContents); diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 232d102c6..aaaf01e16 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -341,7 +341,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) connect(m_ui->comboEncryption, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton); connect(m_ui->checkMaxRatio, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->checkMaxRatio, &QAbstractButton::toggled, this, &ThisType::toggleComboRatioLimitAct); - connect(m_ui->spinMaxRatio, static_cast(&QDoubleSpinBox::valueChanged), + connect(m_ui->spinMaxRatio, qOverload(&QDoubleSpinBox::valueChanged), this, &ThisType::enableApplyButton); connect(m_ui->comboRatioLimitAct, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton); connect(m_ui->checkMaxSeedingMinutes, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 87c28d93f..0757c429e 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -97,7 +97,7 @@ PropertiesWidget::PropertiesWidget(QWidget *parent) // SIGNAL/SLOTS connect(m_ui->filesList, &QAbstractItemView::clicked - , m_ui->filesList, static_cast(&QAbstractItemView::edit)); + , m_ui->filesList, qOverload(&QAbstractItemView::edit)); connect(m_ui->selectAllButton, &QPushButton::clicked, m_propListModel, &TorrentContentFilterModel::selectAll); connect(m_ui->selectNoneButton, &QPushButton::clicked, m_propListModel, &TorrentContentFilterModel::selectNone); connect(m_ui->filesList, &QWidget::customContextMenuRequested, this, &PropertiesWidget::displayFilesListMenu); diff --git a/src/gui/properties/proptabbar.cpp b/src/gui/properties/proptabbar.cpp index 150799425..67bbf9137 100644 --- a/src/gui/properties/proptabbar.cpp +++ b/src/gui/properties/proptabbar.cpp @@ -100,7 +100,7 @@ PropTabBar::PropTabBar(QWidget *parent) addWidget(speedButton); m_btnGroup->addButton(speedButton, SpeedTab); // SIGNAL/SLOT - connect(m_btnGroup, static_cast(&QButtonGroup::buttonClicked) + connect(m_btnGroup, qOverload(&QButtonGroup::buttonClicked) , this, &PropTabBar::setCurrentIndex); // Disable buttons focus for (QAbstractButton *btn : asConst(m_btnGroup->buttons())) diff --git a/src/gui/properties/speedwidget.cpp b/src/gui/properties/speedwidget.cpp index 761cb17ee..804a35bc4 100644 --- a/src/gui/properties/speedwidget.cpp +++ b/src/gui/properties/speedwidget.cpp @@ -75,7 +75,7 @@ SpeedWidget::SpeedWidget(PropertiesWidget *parent) m_periodCombobox->addItem(tr("12 Hours")); m_periodCombobox->addItem(tr("24 Hours")); - connect(m_periodCombobox, static_cast(&QComboBox::currentIndexChanged) + connect(m_periodCombobox, qOverload(&QComboBox::currentIndexChanged) , this, &SpeedWidget::onPeriodChange); m_graphsMenu = new QMenu(this); diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp index 5e173f757..8bd505e8f 100644 --- a/src/gui/rss/automatedrssdownloader.cpp +++ b/src/gui/rss/automatedrssdownloader.cpp @@ -113,7 +113,7 @@ AutomatedRssDownloader::AutomatedRssDownloader(QWidget *parent) connect(m_ui->checkRegex, &QCheckBox::stateChanged, this, &AutomatedRssDownloader::updateMustLineValidity); connect(m_ui->checkRegex, &QCheckBox::stateChanged, this, &AutomatedRssDownloader::updateMustNotLineValidity); connect(m_ui->checkSmart, &QCheckBox::stateChanged, this, &AutomatedRssDownloader::handleRuleDefinitionChanged); - connect(m_ui->spinIgnorePeriod, static_cast(&QSpinBox::valueChanged) + connect(m_ui->spinIgnorePeriod, qOverload(&QSpinBox::valueChanged) , this, &AutomatedRssDownloader::handleRuleDefinitionChanged); connect(m_ui->listFeeds, &QListWidget::itemChanged, this, &AutomatedRssDownloader::handleFeedCheckStateChange); diff --git a/src/gui/scanfoldersdelegate.cpp b/src/gui/scanfoldersdelegate.cpp index 344a6e675..136df25c2 100644 --- a/src/gui/scanfoldersdelegate.cpp +++ b/src/gui/scanfoldersdelegate.cpp @@ -67,7 +67,7 @@ QWidget *ScanFoldersDelegate::createEditor(QWidget *parent, const QStyleOptionVi editor->addItem(index.data().toString()); } - connect(editor, static_cast(&QComboBox::currentIndexChanged) + connect(editor, qOverload(&QComboBox::currentIndexChanged) , this, &ScanFoldersDelegate::comboboxIndexChanged); return editor; } diff --git a/src/gui/search/searchjobwidget.cpp b/src/gui/search/searchjobwidget.cpp index 9378751f5..fdc1f566b 100644 --- a/src/gui/search/searchjobwidget.cpp +++ b/src/gui/search/searchjobwidget.cpp @@ -135,23 +135,23 @@ SearchJobWidget::SearchJobWidget(SearchHandler *searchHandler, QWidget *parent) m_ui->horizontalLayout->insertWidget(0, m_lineEditSearchResultsFilter); connect(m_lineEditSearchResultsFilter, &LineEdit::textChanged, this, &SearchJobWidget::filterSearchResults); - connect(m_ui->filterMode, static_cast(&QComboBox::currentIndexChanged) + connect(m_ui->filterMode, qOverload(&QComboBox::currentIndexChanged) , this, &SearchJobWidget::updateFilter); connect(m_ui->minSeeds, &QAbstractSpinBox::editingFinished, this, &SearchJobWidget::updateFilter); - connect(m_ui->minSeeds, static_cast(&QSpinBox::valueChanged) + connect(m_ui->minSeeds, qOverload(&QSpinBox::valueChanged) , this, &SearchJobWidget::updateFilter); connect(m_ui->maxSeeds, &QAbstractSpinBox::editingFinished, this, &SearchJobWidget::updateFilter); - connect(m_ui->maxSeeds, static_cast(&QSpinBox::valueChanged) + connect(m_ui->maxSeeds, qOverload(&QSpinBox::valueChanged) , this, &SearchJobWidget::updateFilter); connect(m_ui->minSize, &QAbstractSpinBox::editingFinished, this, &SearchJobWidget::updateFilter); - connect(m_ui->minSize, static_cast(&QDoubleSpinBox::valueChanged) + connect(m_ui->minSize, qOverload(&QDoubleSpinBox::valueChanged) , this, &SearchJobWidget::updateFilter); connect(m_ui->maxSize, &QAbstractSpinBox::editingFinished, this, &SearchJobWidget::updateFilter); - connect(m_ui->maxSize, static_cast(&QDoubleSpinBox::valueChanged) + connect(m_ui->maxSize, qOverload(&QDoubleSpinBox::valueChanged) , this, &SearchJobWidget::updateFilter); - connect(m_ui->minSizeUnit, static_cast(&QComboBox::currentIndexChanged) + connect(m_ui->minSizeUnit, qOverload(&QComboBox::currentIndexChanged) , this, &SearchJobWidget::updateFilter); - connect(m_ui->maxSizeUnit, static_cast(&QComboBox::currentIndexChanged) + connect(m_ui->maxSizeUnit, qOverload(&QComboBox::currentIndexChanged) , this, &SearchJobWidget::updateFilter); connect(m_ui->resultsBrowser, &QAbstractItemView::doubleClicked, this, &SearchJobWidget::onItemDoubleClicked); diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp index b0345a436..c731f997e 100644 --- a/src/gui/search/searchwidget.cpp +++ b/src/gui/search/searchwidget.cpp @@ -132,9 +132,9 @@ SearchWidget::SearchWidget(MainWindow *mainWindow) connect(m_ui->lineEditSearchPattern, &LineEdit::returnPressed, m_ui->searchButton, &QPushButton::click); connect(m_ui->lineEditSearchPattern, &LineEdit::textEdited, this, &SearchWidget::searchTextEdited); - connect(m_ui->selectPlugin, static_cast(&QComboBox::currentIndexChanged) + connect(m_ui->selectPlugin, qOverload(&QComboBox::currentIndexChanged) , this, &SearchWidget::selectMultipleBox); - connect(m_ui->selectPlugin, static_cast(&QComboBox::currentIndexChanged) + connect(m_ui->selectPlugin, qOverload(&QComboBox::currentIndexChanged) , this, &SearchWidget::fillCatCombobox); const auto focusSearchHotkey = new QShortcut(QKeySequence::Find, this); diff --git a/src/gui/speedlimitdialog.cpp b/src/gui/speedlimitdialog.cpp index 29c9b2cee..6ca1cf5b8 100644 --- a/src/gui/speedlimitdialog.cpp +++ b/src/gui/speedlimitdialog.cpp @@ -39,7 +39,7 @@ SpeedLimitDialog::SpeedLimitDialog(QWidget *parent) // Connect to slots connect(m_ui->bandwidthSlider, &QSlider::valueChanged, this, &SpeedLimitDialog::updateSpinValue); - connect(m_ui->spinBandwidth, static_cast(&QSpinBox::valueChanged) + connect(m_ui->spinBandwidth, qOverload(&QSpinBox::valueChanged) , this, &SpeedLimitDialog::updateSliderValue); Utils::Gui::resize(this); diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 051a664f1..5e17ba8f6 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -652,12 +652,11 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi connect(trackerLabel, &QCheckBox::toggled, m_trackerFilters, &TrackerFiltersList::toggleFilter); connect(trackerLabel, &QCheckBox::toggled, pref, &Preferences::setTrackerFilterState); - using Func = void (TransferListFiltersWidget::*)(const QString&, const QString&); - connect(this, static_cast(&TransferListFiltersWidget::trackerSuccess) + connect(this, qOverload(&TransferListFiltersWidget::trackerSuccess) , m_trackerFilters, &TrackerFiltersList::trackerSuccess); - connect(this, static_cast(&TransferListFiltersWidget::trackerError) + connect(this, qOverload(&TransferListFiltersWidget::trackerError) , m_trackerFilters, &TrackerFiltersList::trackerError); - connect(this, static_cast(&TransferListFiltersWidget::trackerWarning) + connect(this, qOverload(&TransferListFiltersWidget::trackerWarning) , m_trackerFilters, &TrackerFiltersList::trackerWarning); } diff --git a/src/gui/updownratiodialog.cpp b/src/gui/updownratiodialog.cpp index 4bd27bda4..39f288c34 100644 --- a/src/gui/updownratiodialog.cpp +++ b/src/gui/updownratiodialog.cpp @@ -69,7 +69,7 @@ UpDownRatioDialog::UpDownRatioDialog(bool useDefault, qreal initialRatioValue, m_ui->timeSpinBox->setMaximum(maxTimeValue); m_ui->timeSpinBox->setValue(initialTimeValue); - connect(m_ui->buttonGroup, static_cast(&QButtonGroup::buttonClicked) + connect(m_ui->buttonGroup, qOverload(&QButtonGroup::buttonClicked) , this, &UpDownRatioDialog::handleRatioTypeChanged); connect(m_ui->checkMaxRatio, &QCheckBox::toggled, this, &UpDownRatioDialog::enableRatioSpin); connect(m_ui->checkMaxTime, &QCheckBox::toggled, this, &UpDownRatioDialog::enableTimeSpin); From 5c015d573bee9352faa9bf95b67cdff5eeed6ff4 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 25 Jul 2019 21:31:59 +0800 Subject: [PATCH 4/8] Forward declare types as much as possible --- src/app/qtlocalpeer/qtlocalpeer.cpp | 73 ++++++++++++++----- src/app/qtlocalpeer/qtlocalpeer.h | 50 +++++++++---- src/app/qtlocalpeer/qtlockedfile.cpp | 34 ++++++++- src/app/qtlocalpeer/qtlockedfile.h | 85 ++++++++++++++++------- src/app/qtlocalpeer/qtlockedfile_unix.cpp | 55 +++++++++++---- src/app/qtlocalpeer/qtlockedfile_win.cpp | 38 ++++++++-- 6 files changed, 254 insertions(+), 81 deletions(-) diff --git a/src/app/qtlocalpeer/qtlocalpeer.cpp b/src/app/qtlocalpeer/qtlocalpeer.cpp index d8a1bce31..701e9fa79 100644 --- a/src/app/qtlocalpeer/qtlocalpeer.cpp +++ b/src/app/qtlocalpeer/qtlocalpeer.cpp @@ -1,4 +1,31 @@ -/**************************************************************************** +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2019 Mike Tzou (Chocobo1) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * +**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal @@ -36,28 +63,34 @@ ** ** $QT_END_LICENSE$ ** -****************************************************************************/ - +**************************************************************************** +*/ #include "qtlocalpeer.h" -#include -#include -#include -#if defined(Q_OS_WIN) -#include -#include -typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); -static PProcessIdToSessionId pProcessIdToSessionId = 0; -#endif #if defined(Q_OS_UNIX) #include #include #include #endif -namespace QtLP_Private { +#include +#include +#include +#include +#include + +#if defined(Q_OS_WIN) +#include + +typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); +static PProcessIdToSessionId pProcessIdToSessionId = 0; +#endif + +namespace QtLP_Private +{ #include "qtlockedfile.cpp" + #if defined(Q_OS_WIN) #include "qtlockedfile_win.cpp" #else @@ -68,7 +101,8 @@ namespace QtLP_Private { const char* QtLocalPeer::ack = "ack"; QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId) - : QObject(parent), id(appId) + : QObject(parent) + , id(appId) { QString prefix = id; if (id.isEmpty()) { @@ -109,8 +143,6 @@ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId) lockFile.open(QIODevice::ReadWrite); } - - bool QtLocalPeer::isClient() { if (lockFile.isLocked()) @@ -120,7 +152,7 @@ bool QtLocalPeer::isClient() return true; bool res = server->listen(socketName); -#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) +#if defined(Q_OS_UNIX) // ### Workaround if (!res && server->serverError() == QAbstractSocket::AddressInUseError) { QFile::remove(QDir::cleanPath(QDir::tempPath())+QLatin1Char('/')+socketName); @@ -133,8 +165,7 @@ bool QtLocalPeer::isClient() return false; } - -bool QtLocalPeer::sendMessage(const QString &message, int timeout) +bool QtLocalPeer::sendMessage(const QString &message, const int timeout) { if (!isClient()) return false; @@ -170,6 +201,10 @@ bool QtLocalPeer::sendMessage(const QString &message, int timeout) return res; } +QString QtLocalPeer::applicationId() const +{ + return id; +} void QtLocalPeer::receiveConnection() { diff --git a/src/app/qtlocalpeer/qtlocalpeer.h b/src/app/qtlocalpeer/qtlocalpeer.h index 1b533b1ab..ac8b1ff27 100644 --- a/src/app/qtlocalpeer/qtlocalpeer.h +++ b/src/app/qtlocalpeer/qtlocalpeer.h @@ -1,4 +1,31 @@ -/**************************************************************************** +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2019 Mike Tzou (Chocobo1) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * +**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal @@ -36,38 +63,37 @@ ** ** $QT_END_LICENSE$ ** -****************************************************************************/ +**************************************************************************** +*/ #ifndef QTLOCALPEER_H #define QTLOCALPEER_H -#include -#include -#include - #include "qtlockedfile.h" +class QLocalServer; + class QtLocalPeer : public QObject { Q_OBJECT public: - QtLocalPeer(QObject *parent = 0, const QString &appId = QString()); + QtLocalPeer(QObject *parent = nullptr, const QString &appId = QString()); + bool isClient(); bool sendMessage(const QString &message, int timeout); - QString applicationId() const - { return id; } + QString applicationId() const; -Q_SIGNALS: +signals: void messageReceived(const QString &message); -protected Q_SLOTS: +protected slots: void receiveConnection(); protected: QString id; QString socketName; - QLocalServer* server; + QLocalServer *server = nullptr; QtLP_Private::QtLockedFile lockFile; private: diff --git a/src/app/qtlocalpeer/qtlockedfile.cpp b/src/app/qtlocalpeer/qtlockedfile.cpp index c142a863a..9b6b2acb1 100644 --- a/src/app/qtlocalpeer/qtlockedfile.cpp +++ b/src/app/qtlocalpeer/qtlockedfile.cpp @@ -1,4 +1,31 @@ -/**************************************************************************** +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2019 Mike Tzou (Chocobo1) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * +**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal @@ -36,7 +63,8 @@ ** ** $QT_END_LICENSE$ ** -****************************************************************************/ +**************************************************************************** +*/ #include "qtlockedfile.h" @@ -120,7 +148,7 @@ QtLockedFile::QtLockedFile(const QString &name) \sa QFile::open(), QFile::resize() */ -bool QtLockedFile::open(OpenMode mode) +bool QtLockedFile::open(const OpenMode mode) { if (mode & QIODevice::Truncate) { qWarning("QtLockedFile::open(): Truncate mode not allowed."); diff --git a/src/app/qtlocalpeer/qtlockedfile.h b/src/app/qtlocalpeer/qtlockedfile.h index ad3c5ab39..11f0b3b95 100644 --- a/src/app/qtlocalpeer/qtlockedfile.h +++ b/src/app/qtlocalpeer/qtlockedfile.h @@ -1,4 +1,31 @@ -/**************************************************************************** +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2019 Mike Tzou (Chocobo1) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * +**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal @@ -36,46 +63,54 @@ ** ** $QT_END_LICENSE$ ** -****************************************************************************/ +**************************************************************************** +*/ #ifndef QTLOCKEDFILE_H #define QTLOCKEDFILE_H #include + #ifdef Q_OS_WIN #include #endif -namespace QtLP_Private { - -class QtLockedFile : public QFile +namespace QtLP_Private { -public: - enum LockMode { NoLock = 0, ReadLock, WriteLock }; + class QtLockedFile : public QFile + { + public: + enum LockMode + { + NoLock = 0, + ReadLock, + WriteLock + }; - QtLockedFile(); - QtLockedFile(const QString &name); - ~QtLockedFile(); + QtLockedFile(); + QtLockedFile(const QString &name); + ~QtLockedFile(); - bool open(OpenMode mode) override; + bool open(OpenMode mode) override; - bool lock(LockMode mode, bool block = true); - bool unlock(); - bool isLocked() const; - LockMode lockMode() const; + bool lock(LockMode mode, bool block = true); + bool unlock(); + bool isLocked() const; + LockMode lockMode() const; -private: + private: #ifdef Q_OS_WIN - Qt::HANDLE wmutex; - Qt::HANDLE rmutex; - QVector rmutexes; - QString mutexname; - - Qt::HANDLE getMutexHandle(int idx, bool doCreate); - bool waitMutex(Qt::HANDLE mutex, bool doBlock); + Qt::HANDLE getMutexHandle(int idx, bool doCreate); + bool waitMutex(Qt::HANDLE mutex, bool doBlock); + Qt::HANDLE wmutex; + Qt::HANDLE rmutex; + QVector rmutexes; + QString mutexname; #endif - LockMode m_lock_mode; -}; + + LockMode m_lock_mode; + }; } + #endif diff --git a/src/app/qtlocalpeer/qtlockedfile_unix.cpp b/src/app/qtlocalpeer/qtlockedfile_unix.cpp index 976c1b9ee..c1145ab73 100644 --- a/src/app/qtlocalpeer/qtlockedfile_unix.cpp +++ b/src/app/qtlocalpeer/qtlockedfile_unix.cpp @@ -1,4 +1,31 @@ -/**************************************************************************** +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2019 Mike Tzou (Chocobo1) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * +**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal @@ -36,25 +63,26 @@ ** ** $QT_END_LICENSE$ ** -****************************************************************************/ - -#include -#include -#include -#include +**************************************************************************** +*/ #include "qtlockedfile.h" +#include +#include +#include +#include + bool QtLockedFile::lock(LockMode mode, bool block) { if (!isOpen()) { qWarning("QtLockedFile::lock(): file is not opened"); return false; } - + if (mode == NoLock) return unlock(); - + if (mode == m_lock_mode) return true; @@ -68,19 +96,17 @@ bool QtLockedFile::lock(LockMode mode, bool block) fl.l_type = (mode == ReadLock) ? F_RDLCK : F_WRLCK; int cmd = block ? F_SETLKW : F_SETLK; int ret = fcntl(handle(), cmd, &fl); - + if (ret == -1) { if (errno != EINTR && errno != EAGAIN) qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); return false; } - m_lock_mode = mode; return true; } - bool QtLockedFile::unlock() { if (!isOpen()) { @@ -97,12 +123,12 @@ bool QtLockedFile::unlock() fl.l_len = 0; fl.l_type = F_UNLCK; int ret = fcntl(handle(), F_SETLKW, &fl); - + if (ret == -1) { qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno)); return false; } - + m_lock_mode = NoLock; return true; } @@ -112,4 +138,3 @@ QtLockedFile::~QtLockedFile() if (isOpen()) unlock(); } - diff --git a/src/app/qtlocalpeer/qtlockedfile_win.cpp b/src/app/qtlocalpeer/qtlockedfile_win.cpp index 5e2126204..004194aaf 100644 --- a/src/app/qtlocalpeer/qtlockedfile_win.cpp +++ b/src/app/qtlocalpeer/qtlockedfile_win.cpp @@ -1,4 +1,31 @@ -/**************************************************************************** +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2019 Mike Tzou (Chocobo1) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + * +**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal @@ -36,19 +63,18 @@ ** ** $QT_END_LICENSE$ ** -****************************************************************************/ +**************************************************************************** +*/ #include "qtlockedfile.h" -#include + #include #define MUTEX_PREFIX "QtLockedFile mutex " // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS #define MAX_READERS MAXIMUM_WAIT_OBJECTS -#if QT_VERSION >= 0x050000 #define QT_WA(unicode, ansi) unicode -#endif Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate) { @@ -99,8 +125,6 @@ bool QtLockedFile::waitMutex(Qt::HANDLE mutex, bool doBlock) return false; } - - bool QtLockedFile::lock(LockMode mode, bool block) { if (!isOpen()) { From 25c56d3b661defa3c85a33a6dab07e71482b4745 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 25 Jul 2019 21:55:12 +0800 Subject: [PATCH 5/8] Make use of Utils::Misc::loadWinAPI --- src/app/qtlocalpeer/qtlocalpeer.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/app/qtlocalpeer/qtlocalpeer.cpp b/src/app/qtlocalpeer/qtlocalpeer.cpp index 701e9fa79..a8517a77a 100644 --- a/src/app/qtlocalpeer/qtlocalpeer.cpp +++ b/src/app/qtlocalpeer/qtlocalpeer.cpp @@ -80,12 +80,7 @@ #include #include -#if defined(Q_OS_WIN) -#include - -typedef BOOL(WINAPI*PProcessIdToSessionId)(DWORD,DWORD*); -static PProcessIdToSessionId pProcessIdToSessionId = 0; -#endif +#include "base/utils/misc.h" namespace QtLP_Private { @@ -121,17 +116,16 @@ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId) + QLatin1Char('-') + QString::number(idNum, 16); #if defined(Q_OS_WIN) - if (!pProcessIdToSessionId) { - QLibrary lib("kernel32"); - pProcessIdToSessionId = (PProcessIdToSessionId)lib.resolve("ProcessIdToSessionId"); - } - if (pProcessIdToSessionId) { + using PPROCESSIDTOSESSIONID = BOOL (WINAPI *)(DWORD, DWORD *); + const auto processIdToSessionId = Utils::Misc::loadWinAPI("kernel32.dll", "ProcessIdToSessionId"); + + if (processIdToSessionId) { DWORD sessionId = 0; - pProcessIdToSessionId(GetCurrentProcessId(), &sessionId); - socketName += QLatin1Char('-') + QString::number(sessionId, 16); + processIdToSessionId(GetCurrentProcessId(), &sessionId); + socketName += (QLatin1Char('-') + QString::number(sessionId, 16)); } #else - socketName += QLatin1Char('-') + QString::number(::getuid(), 16); + socketName += (QLatin1Char('-') + QString::number(::getuid(), 16)); #endif server = new QLocalServer(this); From cdb0db02f9d90fb94a71d7fcc7d87a72f02c6653 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 26 Jul 2019 01:21:53 +0800 Subject: [PATCH 6/8] Replace obsoleted QSysInfo functions --- src/gui/mainwindow.cpp | 12 ++++++++---- src/gui/programupdater.cpp | 12 ++++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 1275c6116..5840e2149 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -28,6 +28,11 @@ #include "mainwindow.h" +#if defined(Q_OS_WIN) +#include +#include // must follow after Windows.h +#endif + #include #include #include @@ -40,7 +45,6 @@ #include #include #include -#include #include #include @@ -2003,7 +2007,7 @@ void MainWindow::installPython() { setCursor(QCursor(Qt::WaitCursor)); // Download python - const QString installerURL = ((QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) + const QString installerURL = (::IsWindowsVistaOrGreater() ? "https://www.python.org/ftp/python/3.6.6/python-3.6.6.exe" : "https://www.python.org/ftp/python/3.4.4/python-3.4.4.msi"); Net::DownloadManager::instance()->download( @@ -2026,7 +2030,7 @@ void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result) QProcess installer; qDebug("Launching Python installer in passive mode..."); - if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) { + if (::IsWindowsVistaOrGreater()) { QFile::rename(result.filePath, result.filePath + ".exe"); installer.start('"' + Utils::Fs::toNativePath(result.filePath) + ".exe\" /passive"); } @@ -2042,7 +2046,7 @@ void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result) qDebug("Installer stderr: %s", installer.readAllStandardError().data()); qDebug("Setup should be complete!"); // Delete temp file - if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) + if (::IsWindowsVistaOrGreater()) Utils::Fs::forceRemove(result.filePath + ".exe"); else Utils::Fs::forceRemove(result.filePath + ".msi"); diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp index 0611e1717..95c8e5ee2 100644 --- a/src/gui/programupdater.cpp +++ b/src/gui/programupdater.cpp @@ -28,13 +28,21 @@ #include "programupdater.h" +#if defined(Q_OS_WIN) +#include +#include // must follow after Windows.h +#endif + #include #include #include #include -#include #include +#if defined(Q_OS_WIN) +#include +#endif + #include "base/net/downloadmanager.h" namespace @@ -73,7 +81,7 @@ void ProgramUpdater::rssDownloadFinished(const Net::DownloadResult &result) #ifdef Q_OS_MAC const QString OS_TYPE {"Mac OS X"}; #elif defined(Q_OS_WIN) - const QString OS_TYPE {((QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) + const QString OS_TYPE {(::IsWindows7OrGreater() && QSysInfo::currentCpuArchitecture().endsWith("64")) ? "Windows x64" : "Windows"}; #endif From 3ab2fe907f9519a9a90e072576ba6cfbbd52857d Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 26 Jul 2019 23:16:35 +0800 Subject: [PATCH 7/8] Remove Windows XP remnants --- src/base/private/profile_p.cpp | 5 ----- src/gui/mainwindow.cpp | 26 ++++++-------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/base/private/profile_p.cpp b/src/base/private/profile_p.cpp index e5a211cc8..ef5c79824 100644 --- a/src/base/private/profile_p.cpp +++ b/src/base/private/profile_p.cpp @@ -84,11 +84,6 @@ QString Private::DefaultProfile::dataLocation() const QString Private::DefaultProfile::downloadLocation() const { -#if defined(Q_OS_WIN) - if (QSysInfo::windowsVersion() <= QSysInfo::WV_XP) // Windows XP - return QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)).absoluteFilePath( - QCoreApplication::translate("fsutils", "Downloads")); -#endif return QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 5840e2149..44652c1c7 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -28,11 +28,6 @@ #include "mainwindow.h" -#if defined(Q_OS_WIN) -#include -#include // must follow after Windows.h -#endif - #include #include #include @@ -2007,9 +2002,7 @@ void MainWindow::installPython() { setCursor(QCursor(Qt::WaitCursor)); // Download python - const QString installerURL = (::IsWindowsVistaOrGreater() - ? "https://www.python.org/ftp/python/3.6.6/python-3.6.6.exe" - : "https://www.python.org/ftp/python/3.4.4/python-3.4.4.msi"); + const QString installerURL = "https://www.python.org/ftp/python/3.6.6/python-3.6.6.exe"; Net::DownloadManager::instance()->download( Net::DownloadRequest(installerURL).saveToFile(true) , this, &MainWindow::pythonDownloadFinished); @@ -2030,14 +2023,8 @@ void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result) QProcess installer; qDebug("Launching Python installer in passive mode..."); - if (::IsWindowsVistaOrGreater()) { - QFile::rename(result.filePath, result.filePath + ".exe"); - installer.start('"' + Utils::Fs::toNativePath(result.filePath) + ".exe\" /passive"); - } - else { - QFile::rename(result.filePath, result.filePath + ".msi"); - installer.start(Utils::Misc::windowsSystemPath() + "\\msiexec.exe /passive /i \"" + Utils::Fs::toNativePath(result.filePath) + ".msi\""); - } + QFile::rename(result.filePath, result.filePath + ".exe"); + installer.start('"' + Utils::Fs::toNativePath(result.filePath) + ".exe\" /passive"); // Wait for setup to complete installer.waitForFinished(10 * 60 * 1000); @@ -2045,11 +2032,10 @@ void MainWindow::pythonDownloadFinished(const Net::DownloadResult &result) qDebug("Installer stdout: %s", installer.readAllStandardOutput().data()); qDebug("Installer stderr: %s", installer.readAllStandardError().data()); qDebug("Setup should be complete!"); + // Delete temp file - if (::IsWindowsVistaOrGreater()) - Utils::Fs::forceRemove(result.filePath + ".exe"); - else - Utils::Fs::forceRemove(result.filePath + ".msi"); + Utils::Fs::forceRemove(result.filePath + ".exe"); + // Reload search engine if (Utils::ForeignApps::pythonInfo().isSupportedVersion()) { m_ui->actionSearchWidget->setChecked(true); From c1659a189be363928f3da1fc2f3b653c5b5a97ef Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 27 Jul 2019 00:24:36 +0800 Subject: [PATCH 8/8] Fix messed up symbols in log --- src/base/bittorrent/session.cpp | 2 +- src/base/bittorrent/torrenthandle.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index b23ea3d57..7ba283063 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -4032,7 +4032,7 @@ void Session::handleTorrentDeleteFailedAlert(const lt::torrent_delete_failed_ale if (p->error) { LogMsg(tr("'%1' was removed from the transfer list but the files couldn't be deleted. Error: %2", "'xxx.avi' was removed...") - .arg(tmpRemovingTorrentData.name, QString::fromStdString(p->error.message())) + .arg(tmpRemovingTorrentData.name, QString::fromLocal8Bit(p->error.message().c_str())) , Log::WARNING); } else { diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp index 53baf9e52..4fc4cf735 100644 --- a/src/base/bittorrent/torrenthandle.cpp +++ b/src/base/bittorrent/torrenthandle.cpp @@ -1803,7 +1803,7 @@ void TorrentHandle::handleSaveResumeDataFailedAlert(const lt::save_resume_data_f } else { LogMsg(tr("Save resume data failed. Torrent: \"%1\", error: \"%2\"") - .arg(name(), QString::fromStdString(p->error.message())), Log::CRITICAL); + .arg(name(), QString::fromLocal8Bit(p->error.message().c_str())), Log::CRITICAL); m_session->handleTorrentResumeDataFailed(this); } } @@ -1873,7 +1873,7 @@ void TorrentHandle::handleFileRenameFailedAlert(const lt::file_rename_failed_ale { LogMsg(tr("File rename failed. Torrent: \"%1\", file: \"%2\", reason: \"%3\"") .arg(name(), filePath(LTUnderlyingType {p->index}) - , QString::fromStdString(p->error.message())), Log::WARNING); + , QString::fromLocal8Bit(p->error.message().c_str())), Log::WARNING); m_oldPath[p->index].removeFirst(); if (m_oldPath[p->index].isEmpty())