New upstream version 24.0.1+dfsg1
This commit is contained in:
parent
b14f9eae6d
commit
5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
|
|
@ -30,31 +30,41 @@
|
|||
template<typename T> class BPtr {
|
||||
T *ptr;
|
||||
|
||||
BPtr(BPtr const&) = delete;
|
||||
BPtr(BPtr const &) = delete;
|
||||
|
||||
BPtr &operator=(BPtr const&) = delete;
|
||||
BPtr &operator=(BPtr const &) = delete;
|
||||
|
||||
public:
|
||||
inline BPtr(T *p=nullptr) : ptr(p) {}
|
||||
inline BPtr(BPtr &&other) : ptr(other.ptr) {other.ptr = nullptr;}
|
||||
inline ~BPtr() {bfree(ptr);}
|
||||
inline BPtr(T *p = nullptr) : ptr(p) {}
|
||||
inline BPtr(BPtr &&other) : ptr(other.ptr) { other.ptr = nullptr; }
|
||||
inline ~BPtr() { bfree(ptr); }
|
||||
|
||||
inline T *operator=(T *p) {bfree(ptr); ptr = p; return p;}
|
||||
inline operator T*() {return ptr;}
|
||||
inline T **operator&() {bfree(ptr); ptr = nullptr; return &ptr;}
|
||||
inline T *operator=(T *p)
|
||||
{
|
||||
bfree(ptr);
|
||||
ptr = p;
|
||||
return p;
|
||||
}
|
||||
inline operator T *() { return ptr; }
|
||||
inline T **operator&()
|
||||
{
|
||||
bfree(ptr);
|
||||
ptr = nullptr;
|
||||
return &ptr;
|
||||
}
|
||||
|
||||
inline bool operator!() {return ptr == NULL;}
|
||||
inline bool operator==(T p) {return ptr == p;}
|
||||
inline bool operator!=(T p) {return ptr != p;}
|
||||
inline bool operator!() { return ptr == NULL; }
|
||||
inline bool operator==(T p) { return ptr == p; }
|
||||
inline bool operator!=(T p) { return ptr != p; }
|
||||
|
||||
inline T *Get() const {return ptr;}
|
||||
inline T *Get() const { return ptr; }
|
||||
};
|
||||
|
||||
class ConfigFile {
|
||||
config_t *config;
|
||||
|
||||
ConfigFile(ConfigFile const&) = delete;
|
||||
ConfigFile &operator=(ConfigFile const&) = delete;
|
||||
ConfigFile(ConfigFile const &) = delete;
|
||||
ConfigFile &operator=(ConfigFile const &) = delete;
|
||||
|
||||
public:
|
||||
inline ConfigFile() : config(NULL) {}
|
||||
|
|
@ -62,10 +72,7 @@ public:
|
|||
{
|
||||
other.config = nullptr;
|
||||
}
|
||||
inline ~ConfigFile()
|
||||
{
|
||||
config_close(config);
|
||||
}
|
||||
inline ~ConfigFile() { config_close(config); }
|
||||
|
||||
inline bool Create(const char *file)
|
||||
{
|
||||
|
|
@ -87,13 +94,10 @@ public:
|
|||
return config_open(&config, file, openType);
|
||||
}
|
||||
|
||||
inline int Save()
|
||||
{
|
||||
return config_save(config);
|
||||
}
|
||||
inline int Save() { return config_save(config); }
|
||||
|
||||
inline int SaveSafe(const char *temp_ext,
|
||||
const char *backup_ext = nullptr)
|
||||
const char *backup_ext = nullptr)
|
||||
{
|
||||
return config_save_safe(config, temp_ext, backup_ext);
|
||||
}
|
||||
|
|
@ -104,32 +108,32 @@ public:
|
|||
config = NULL;
|
||||
}
|
||||
|
||||
inline operator config_t*() const {return config;}
|
||||
inline operator config_t *() const { return config; }
|
||||
};
|
||||
|
||||
class TextLookup {
|
||||
lookup_t *lookup;
|
||||
|
||||
TextLookup(TextLookup const&) = delete;
|
||||
TextLookup(TextLookup const &) = delete;
|
||||
|
||||
TextLookup &operator=(TextLookup const&) = delete;
|
||||
TextLookup &operator=(TextLookup const &) = delete;
|
||||
|
||||
public:
|
||||
inline TextLookup(lookup_t *lookup=nullptr) : lookup(lookup) {}
|
||||
inline TextLookup(lookup_t *lookup = nullptr) : lookup(lookup) {}
|
||||
inline TextLookup(TextLookup &&other) : lookup(other.lookup)
|
||||
{
|
||||
other.lookup = nullptr;
|
||||
}
|
||||
inline ~TextLookup() {text_lookup_destroy(lookup);}
|
||||
inline ~TextLookup() { text_lookup_destroy(lookup); }
|
||||
|
||||
inline TextLookup& operator=(lookup_t *val)
|
||||
inline TextLookup &operator=(lookup_t *val)
|
||||
{
|
||||
text_lookup_destroy(lookup);
|
||||
lookup = val;
|
||||
return *this;
|
||||
}
|
||||
|
||||
inline operator lookup_t*() const {return lookup;}
|
||||
inline operator lookup_t *() const { return lookup; }
|
||||
|
||||
inline const char *GetString(const char *lookupVal) const
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue