diff --git a/README-maintainer b/README-maintainer index db07a0a..10d6525 100644 --- a/README-maintainer +++ b/README-maintainer @@ -93,7 +93,7 @@ CODING RULES first at least once, thereby ensuring that it explicitly includes all the headers it needs, which in turn alleviates lots of header ordering problems. The blank line ensures that formatters don't - messt his up by resorting the headers. + mess this up by resorting the headers. * Avoid atoi. Use QUtil::string_to_int instead. It does overflow/underflow checking. diff --git a/TODO b/TODO index 327e53c..222e200 100644 --- a/TODO +++ b/TODO @@ -344,7 +344,7 @@ PointerHolder to std::shared_ptr ================================ Once all deprecation warnings are cleared up (changing getPointer() to -get() and getRefcout() to use_count()), the only real issues are that +get() and getRefcount() to use_count()), the only real issues are that implicit assignment of a pointer to a shared_ptr doesn't work while it does for PointerHolder and containers are different. Using auto takes care of containers. @@ -402,7 +402,7 @@ Strategy: * Replace each public API one at a time * Replace remaining internal uses; sometimes unique_ptr may be good, particularly for temporary strings that are deleted in the same - scope and Members for non-copiable classes + scope and Members for non-copyable classes * std::shared_ptr m can be replaced with std::shared_ptr m_ph and Members* m if performance is critical * Remove #include from all headers diff --git a/cSpell.json b/cSpell.json index 7332a2c..1d78754 100644 --- a/cSpell.json +++ b/cSpell.json @@ -63,7 +63,6 @@ "coldwind", "colorspace", "conftest", - "copiable", "cout", "cphe", "cppflags", @@ -129,7 +128,6 @@ "fuzzer", "fuzzers", "fvisibility", - "iostream", "gajic", "gajić", "gcurl", @@ -163,6 +161,7 @@ "infilename", "inheritsresources", "inpdf", + "iostream", "ioutfilename", "irdp", "ischeckbox", @@ -305,6 +304,7 @@ "pldh", "pluggable", "pngify", + "pointerholder", "poppler", "prebuild", "precheck", @@ -373,6 +373,7 @@ "rcon", "rdpp", "rdquo", + "refcount", "resave", "retargeted", "rfont", diff --git a/libtests/pointer_holder.cc b/libtests/pointer_holder.cc index cad299b..87c1fa0 100644 --- a/libtests/pointer_holder.cc +++ b/libtests/pointer_holder.cc @@ -106,7 +106,7 @@ int main(int argc, char* argv[]) callHelloWithGet(ol1.front()); ol1.pop_front(); std::cout << "array" << std::endl; - PointerHolder oarr1_ph(true, new Object[2]); + PointerHolder o_arr1_ph(true, new Object[2]); std::cout << "goodbye" << std::endl; return 0; }