TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-26 14:43:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

general: Get rid of some coerce constructors where they make no sense

Browse Source
This commit is contained in:
rdb 2022-10-17 16:53:00 +02:00
parent 61ff260ee3
commit cee1de7338
15 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dtool/src/dtoolutil/dSearchPath.h
View File

@ -53,8 +53,8 @@ PUBLISHED:
};
DSearchPath() = default;
DSearchPath(const std::string &path, const std::string &separator = std::string());
DSearchPath(const Filename &directory);
explicit DSearchPath(const std::string &path, const std::string &separator = std::string());
explicit DSearchPath(const Filename &directory);
DSearchPath(const DSearchPath &copy) = default;
DSearchPath(DSearchPath &&from) = default;
~DSearchPath() = default;

2
dtool/src/dtoolutil/filename.h
View File

@ -63,7 +63,7 @@ public:
PUBLISHED:
INLINE Filename();
Filename(const Filename &dirname, const Filename &basename);
explicit Filename(const Filename &dirname, const Filename &basename);
#ifdef HAVE_PYTHON
EXTENSION(Filename(PyObject *path));

2
dtool/src/prc/configVariableBool.h
View File

@ -22,7 +22,7 @@
*/
class EXPCL_DTOOL_PRC ConfigVariableBool : public ConfigVariable {
PUBLISHED:
INLINE ConfigVariableBool(const std::string &name);
INLINE explicit ConfigVariableBool(const std::string &name);
INLINE ConfigVariableBool(const std::string &name, bool default_value,
const std::string &description = std::string(), int flags = 0);
INLINE ConfigVariableBool(const std::string &name, const std::string &default_value,

2
dtool/src/prc/configVariableDouble.h
View File

@ -23,7 +23,7 @@
*/
class EXPCL_DTOOL_PRC ConfigVariableDouble : public ConfigVariable {
PUBLISHED:
INLINE ConfigVariableDouble(const std::string &name);
INLINE explicit ConfigVariableDouble(const std::string &name);
INLINE ConfigVariableDouble(const std::string &name, double default_value,
const std::string &description = std::string(),
int flags = 0);

2
dtool/src/prc/configVariableFilename.h
View File

@ -26,7 +26,7 @@
*/
class EXPCL_DTOOL_PRC ConfigVariableFilename : public ConfigVariable {
PUBLISHED:
INLINE ConfigVariableFilename(const std::string &name);
INLINE explicit ConfigVariableFilename(const std::string &name);
INLINE ConfigVariableFilename(const std::string &name, const Filename &default_value,
const std::string &description = std::string(), int flags = 0);

2
dtool/src/prc/configVariableInt.h
View File

@ -23,7 +23,7 @@
*/
class EXPCL_DTOOL_PRC ConfigVariableInt : public ConfigVariable {
PUBLISHED:
INLINE ConfigVariableInt(const std::string &name);
INLINE explicit ConfigVariableInt(const std::string &name);
INLINE ConfigVariableInt(const std::string &name, int default_value,
const std::string &description = std::string(),
int flags = 0);

2
dtool/src/prc/configVariableInt64.h
View File

@ -24,7 +24,7 @@
*/
class EXPCL_DTOOL_PRC ConfigVariableInt64 : public ConfigVariable {
PUBLISHED:
INLINE ConfigVariableInt64(const std::string &name);
INLINE explicit ConfigVariableInt64(const std::string &name);
INLINE ConfigVariableInt64(const std::string &name, int64_t default_value,
const std::string &description = std::string(),
int flags = 0);

2
panda/src/downloader/urlSpec.h
View File

@ -29,7 +29,7 @@ class EXPCL_PANDA_DOWNLOADER URLSpec {
PUBLISHED:
URLSpec();
INLINE URLSpec(const std::string &url, bool server_name_expected = false);
URLSpec(const URLSpec &url, const Filename &path);
explicit URLSpec(const URLSpec &url, const Filename &path);
INLINE void operator = (const std::string &url);
INLINE bool operator == (const URLSpec &other) const;

2
panda/src/express/datagram.h
View File

@ -38,7 +38,7 @@
class EXPCL_PANDA_EXPRESS Datagram : public TypedObject {
PUBLISHED:
INLINE Datagram() = default;
INLINE Datagram(const void *data, size_t size);
INLINE explicit Datagram(const void *data, size_t size);
INLINE explicit Datagram(vector_uchar data);
Datagram(const Datagram &copy) = default;
Datagram(Datagram &&from) noexcept = default;

4
panda/src/gobj/texture.cxx
View File

@ -10455,9 +10455,9 @@ make_this_from_bam(const FactoryParams &params) {
// If texture filename was given relative to the bam filename, expand
// it now.
Filename bam_dir = manager->get_filename().get_dirname();
vfs->resolve_filename(filename, bam_dir);
vfs->resolve_filename(filename, DSearchPath(bam_dir));
if (!alpha_filename.empty()) {
vfs->resolve_filename(alpha_filename, bam_dir);
vfs->resolve_filename(alpha_filename, DSearchPath(bam_dir));
}
}

2
panda/src/linmath/lvecBase3_src.h
View File

@ -33,7 +33,7 @@ PUBLISHED:
INLINE_LINMATH FLOATNAME(LVecBase3)() = default;
INLINE_LINMATH FLOATNAME(LVecBase3)(FLOATTYPE fill_value);
INLINE_LINMATH FLOATNAME(LVecBase3)(FLOATTYPE x, FLOATTYPE y, FLOATTYPE z);
INLINE_LINMATH FLOATNAME(LVecBase3)(const FLOATNAME(LVecBase2) &copy, FLOATTYPE z);
INLINE_LINMATH explicit FLOATNAME(LVecBase3)(const FLOATNAME(LVecBase2) &copy, FLOATTYPE z);
ALLOC_DELETED_CHAIN(FLOATNAME(LVecBase3));
#ifdef CPPPARSER

2
panda/src/linmath/lvecBase4_src.h
View File

@ -40,7 +40,7 @@ PUBLISHED:
INLINE_LINMATH FLOATNAME(LVecBase4)(FLOATTYPE fill_value);
INLINE_LINMATH FLOATNAME(LVecBase4)(FLOATTYPE x, FLOATTYPE y, FLOATTYPE z, FLOATTYPE w);
INLINE_LINMATH FLOATNAME(LVecBase4)(const FLOATNAME(UnalignedLVecBase4) &copy);
INLINE_LINMATH FLOATNAME(LVecBase4)(const FLOATNAME(LVecBase3) &copy, FLOATTYPE w);
INLINE_LINMATH explicit FLOATNAME(LVecBase4)(const FLOATNAME(LVecBase3) &copy, FLOATTYPE w);
INLINE_LINMATH FLOATNAME(LVecBase4)(const FLOATNAME(LPoint3) &point);
INLINE_LINMATH FLOATNAME(LVecBase4)(const FLOATNAME(LVector3) &vector);
ALLOC_DELETED_CHAIN(FLOATNAME(LVecBase4));

2
panda/src/pnmimage/pnmimage_base.h
View File

@ -41,7 +41,7 @@ typedef unsigned char gray;
struct pixel {
PUBLISHED:
pixel() = default;
pixel(gray fill) : r(fill), g(fill), b(fill) { }
explicit pixel(gray fill) : r(fill), g(fill), b(fill) { }
pixel(gray r, gray g, gray b) : r(r), g(g), b(b) { }
gray operator [](int i) const { nassertr(i >= 0 && i < 3, 0); return *(&r + i); }

2
panda/src/putil/buttonHandle.h
View File

@ -30,7 +30,7 @@ PUBLISHED:
// its value, it might happen after the value had already been set
// previously by another static initializer!
INLINE ButtonHandle() = default;
constexpr ButtonHandle(int index);
explicit constexpr ButtonHandle(int index);
ButtonHandle(const std::string &name);
PUBLISHED:

4
panda/src/putil/loaderOptions.h
View File

@ -49,8 +49,8 @@ PUBLISHED:
TF_no_filters = 0x0400, // disallow using texture pool filters
};
LoaderOptions(int flags = LF_search | LF_report_errors);
constexpr LoaderOptions(int flags, int texture_flags);
explicit LoaderOptions(int flags = LF_search | LF_report_errors);
explicit constexpr LoaderOptions(int flags, int texture_flags);
INLINE void set_flags(int flags);
INLINE int get_flags() const;