trying linter settings

This commit is contained in:
Blue 2023-11-17 21:52:33 -03:00
parent 8f5325b291
commit 93c5be412e
Signed by untrusted user: blue
GPG Key ID: 9B203B252A63EE38
3 changed files with 3903 additions and 294 deletions

3640
.uncrustify.cfg Normal file

File diff suppressed because it is too large Load Diff

View File

@ -17,13 +17,13 @@
*/
#include "info.h"
Shared::Info::Info(const QString &addr, EntryType tp):
type(tp),
address(addr),
vcard(nullptr),
activeKeys(nullptr),
inactiveKeys(nullptr) {
Shared::Info::Info (const QString& addr, EntryType tp):
type(tp),
address(addr),
vcard(nullptr),
activeKeys(nullptr),
inactiveKeys(nullptr)
{
switch (type) {
case EntryType::none:
break;
@ -38,19 +38,20 @@ inactiveKeys(nullptr) {
}
}
Shared::Info::Info():
type(EntryType::none),
address(""),
vcard(nullptr),
activeKeys(nullptr),
inactiveKeys(nullptr) {}
Shared::Info::Info ():
type(EntryType::none),
address(""),
vcard(nullptr),
activeKeys(nullptr),
inactiveKeys(nullptr) {}
Shared::Info::Info(const Shared::Info &other):
type(other.type),
address(other.address),
vcard(nullptr),
activeKeys(nullptr),
inactiveKeys(nullptr) {
Shared::Info::Info (const Shared::Info& other):
type(other.type),
address(other.address),
vcard(nullptr),
activeKeys(nullptr),
inactiveKeys(nullptr)
{
switch (type) {
case EntryType::none:
break;
@ -65,31 +66,29 @@ inactiveKeys(nullptr) {
}
}
Shared::Info::Info(Info &&other):
type(other.type),
address(other.address),
vcard(other.vcard),
activeKeys(other.activeKeys),
inactiveKeys(other.inactiveKeys) {
Shared::Info::Info (Info&& other):
type(other.type),
address(other.address),
vcard(other.vcard),
activeKeys(other.activeKeys),
inactiveKeys(other.inactiveKeys)
{
other.type = EntryType::none;
}
Shared::Info &Shared::Info::operator=(Info &&other) {
Shared::Info& Shared::Info::operator = (Info&& other) {
type = other.type;
address = other.address;
vcard = other.vcard;
activeKeys = other.activeKeys;
inactiveKeys = other.inactiveKeys;
other.type = EntryType::none;
return *this;
}
Shared::Info &Shared::Info::operator=(const Info &other) {
Shared::Info& Shared::Info::operator = (const Info& other) {
type = other.type;
address = other.address;
switch (type) {
case EntryType::none:
break;
@ -102,15 +101,15 @@ Shared::Info &Shared::Info::operator=(const Info &other) {
default:
throw 351;
}
return *this;
}
Shared::Info::~Info() {
Shared::Info::~Info ()
{
turnIntoNone();
}
void Shared::Info::turnIntoNone() {
void Shared::Info::turnIntoNone () {
switch (type) {
case EntryType::none:
break;
@ -129,9 +128,7 @@ void Shared::Info::turnIntoNone() {
type = EntryType::none;
}
void Shared::Info::turnIntoContact(
const Shared::VCard &crd, const std::list<KeyInfo> &aks, const std::list<KeyInfo> &iaks
) {
void Shared::Info::turnIntoContact (const Shared::VCard& crd, const std::list<KeyInfo>& aks, const std::list<KeyInfo>& iaks) {
switch (type) {
case EntryType::none:
vcard = new VCard(crd);
@ -147,11 +144,10 @@ void Shared::Info::turnIntoContact(
default:
break;
}
type = EntryType::contact;
}
void Shared::Info::turnIntoContact(Shared::VCard *crd, std::list<KeyInfo> *aks, std::list<KeyInfo> *iaks) {
void Shared::Info::turnIntoContact (Shared::VCard* crd, std::list<KeyInfo>* aks, std::list<KeyInfo>* iaks) {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -167,13 +163,10 @@ void Shared::Info::turnIntoContact(Shared::VCard *crd, std::list<KeyInfo> *aks,
default:
break;
}
type = EntryType::contact;
}
void Shared::Info::turnIntoOwnAccount(
const Shared::VCard &crd, const std::list<KeyInfo> &aks, const std::list<KeyInfo> &iaks
) {
void Shared::Info::turnIntoOwnAccount (const Shared::VCard& crd, const std::list<KeyInfo>& aks, const std::list<KeyInfo>& iaks) {
switch (type) {
case EntryType::none:
vcard = new VCard(crd);
@ -189,11 +182,10 @@ void Shared::Info::turnIntoOwnAccount(
default:
break;
}
type = EntryType::ownAccount;
}
void Shared::Info::turnIntoOwnAccount(Shared::VCard *crd, std::list<KeyInfo> *aks, std::list<KeyInfo> *iaks) {
void Shared::Info::turnIntoOwnAccount (Shared::VCard* crd, std::list<KeyInfo>* aks, std::list<KeyInfo>* iaks) {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -209,27 +201,26 @@ void Shared::Info::turnIntoOwnAccount(Shared::VCard *crd, std::list<KeyInfo> *ak
default:
break;
}
type = EntryType::ownAccount;
}
void Shared::Info::setAddress(const QString &addr) {
void Shared::Info::setAddress (const QString& addr) {
address = addr;
}
QString Shared::Info::getAddress() const {
QString Shared::Info::getAddress () const {
return address;
}
const QString &Shared::Info::getAddressRef() const {
const QString& Shared::Info::getAddressRef () const {
return address;
}
Shared::EntryType Shared::Info::getType() const {
Shared::EntryType Shared::Info::getType () const {
return type;
}
std::list<Shared::KeyInfo> &Shared::Info::getActiveKeysRef() {
std::list<Shared::KeyInfo>& Shared::Info::getActiveKeysRef () {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -240,7 +231,7 @@ std::list<Shared::KeyInfo> &Shared::Info::getActiveKeysRef() {
}
}
const std::list<Shared::KeyInfo> &Shared::Info::getActiveKeysRef() const {
const std::list<Shared::KeyInfo>& Shared::Info::getActiveKeysRef () const {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -251,7 +242,7 @@ const std::list<Shared::KeyInfo> &Shared::Info::getActiveKeysRef() const {
}
}
std::list<Shared::KeyInfo> *Shared::Info::getActiveKeys() {
std::list<Shared::KeyInfo>* Shared::Info::getActiveKeys () {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -262,7 +253,7 @@ std::list<Shared::KeyInfo> *Shared::Info::getActiveKeys() {
}
}
const std::list<Shared::KeyInfo> *Shared::Info::getActiveKeys() const {
const std::list<Shared::KeyInfo>* Shared::Info::getActiveKeys () const {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -273,7 +264,7 @@ const std::list<Shared::KeyInfo> *Shared::Info::getActiveKeys() const {
}
}
std::list<Shared::KeyInfo> &Shared::Info::getInactiveKeysRef() {
std::list<Shared::KeyInfo>& Shared::Info::getInactiveKeysRef () {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -284,7 +275,7 @@ std::list<Shared::KeyInfo> &Shared::Info::getInactiveKeysRef() {
}
}
const std::list<Shared::KeyInfo> &Shared::Info::getInactiveKeysRef() const {
const std::list<Shared::KeyInfo>& Shared::Info::getInactiveKeysRef () const {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -295,7 +286,7 @@ const std::list<Shared::KeyInfo> &Shared::Info::getInactiveKeysRef() const {
}
}
std::list<Shared::KeyInfo> *Shared::Info::getInactiveKeys() {
std::list<Shared::KeyInfo>* Shared::Info::getInactiveKeys () {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -306,7 +297,7 @@ std::list<Shared::KeyInfo> *Shared::Info::getInactiveKeys() {
}
}
const std::list<Shared::KeyInfo> *Shared::Info::getInactiveKeys() const {
const std::list<Shared::KeyInfo>* Shared::Info::getInactiveKeys () const {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -317,7 +308,7 @@ const std::list<Shared::KeyInfo> *Shared::Info::getInactiveKeys() const {
}
}
const Shared::VCard &Shared::Info::getVCardRef() const {
const Shared::VCard& Shared::Info::getVCardRef () const {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -328,7 +319,7 @@ const Shared::VCard &Shared::Info::getVCardRef() const {
}
}
Shared::VCard &Shared::Info::getVCardRef() {
Shared::VCard& Shared::Info::getVCardRef () {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -339,7 +330,7 @@ Shared::VCard &Shared::Info::getVCardRef() {
}
}
const Shared::VCard *Shared::Info::getVCard() const {
const Shared::VCard* Shared::Info::getVCard () const {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -350,7 +341,7 @@ const Shared::VCard *Shared::Info::getVCard() const {
}
}
Shared::VCard *Shared::Info::getVCard() {
Shared::VCard* Shared::Info::getVCard () {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -361,7 +352,7 @@ Shared::VCard *Shared::Info::getVCard() {
}
}
void Shared::Info::setActiveKeys(std::list<KeyInfo> *keys) {
void Shared::Info::setActiveKeys (std::list<KeyInfo>* keys) {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:
@ -372,7 +363,7 @@ void Shared::Info::setActiveKeys(std::list<KeyInfo> *keys) {
}
}
void Shared::Info::setVCard(Shared::VCard *card) {
void Shared::Info::setVCard (Shared::VCard* card) {
switch (type) {
case EntryType::contact:
case EntryType::ownAccount:

View File

@ -25,71 +25,49 @@
#include <list>
namespace Shared {
/**
* This class should contain all nessesary data to display
* roster element info (contact, or out of roster contact, or MUC, or MIX in the future)
*
* under development yet
*/
class Info {
class Info : public QObject, public VCard {
public:
Info();
Info(const QString& address, EntryType = EntryType::none);
Info(const Info& other);
Info(Info&& other);
virtual ~Info();
Info ();
Info (const QString& address, EntryType = EntryType::none);
Info (const Info& other);
Info (Info&& other);
virtual ~Info ();
Info& operator = (const Info& other);
Info& operator = (Info&& other);
QString getAddress() const;
const QString& getAddressRef() const;
void setAddress(const QString& address);
EntryType getType() const;
void turnIntoNone();
void turnIntoContact(
const VCard& card = VCard(),
const std::list<KeyInfo>& activeKeys = {},
const std::list<KeyInfo>& inactiveKeys = {}
);
void turnIntoContact(
VCard* card = new VCard,
std::list<KeyInfo>* activeKeys = new std::list<KeyInfo>,
std::list<KeyInfo>* inactiveKeys = new std::list<KeyInfo>
);
void turnIntoOwnAccount(
const VCard& card = VCard(),
const std::list<KeyInfo>& activeKeys = {},
const std::list<KeyInfo>& inactiveKeys = {}
);
void turnIntoOwnAccount(
VCard* card = new VCard,
std::list<KeyInfo>* activeKeys = new std::list<KeyInfo>,
std::list<KeyInfo>* inactiveKeys = new std::list<KeyInfo>
);
const VCard& getVCardRef() const;
VCard& getVCardRef();
const VCard* getVCard() const;
VCard* getVCard();
void setVCard(Shared::VCard* card);
const std::list<KeyInfo>& getActiveKeysRef() const;
std::list<KeyInfo>& getActiveKeysRef();
const std::list<KeyInfo>* getActiveKeys() const;
std::list<KeyInfo>* getActiveKeys();
void setActiveKeys(std::list<KeyInfo>* keys);
const std::list<KeyInfo>& getInactiveKeysRef() const;
std::list<KeyInfo>& getInactiveKeysRef();
const std::list<KeyInfo>* getInactiveKeys() const;
std::list<KeyInfo>* getInactiveKeys();
QString getAddress () const;
const QString& getAddressRef () const;
void setAddress (const QString& address);
EntryType getType () const;
void turnIntoNone ();
void turnIntoContact (const VCard& card = VCard(), const std::list<KeyInfo>& activeKeys = {}, const std::list<KeyInfo>& inactiveKeys = {});
void turnIntoContact (VCard* card = new VCard, std::list<KeyInfo>* activeKeys = new std::list<KeyInfo>, std::list<KeyInfo>* inactiveKeys = new std::list<KeyInfo>);
void turnIntoOwnAccount (const VCard& card = VCard(), const std::list<KeyInfo>& activeKeys = {}, const std::list<KeyInfo>& inactiveKeys = {});
void turnIntoOwnAccount (VCard* card = new VCard, std::list<KeyInfo>* activeKeys = new std::list<KeyInfo>, std::list<KeyInfo>* inactiveKeys = new std::list<KeyInfo>);
const VCard& getVCardRef () const;
VCard& getVCardRef ();
const VCard* getVCard () const;
VCard* getVCard ();
void setVCard (Shared::VCard* card);
const std::list<KeyInfo>& getActiveKeysRef () const;
std::list<KeyInfo>& getActiveKeysRef ();
const std::list<KeyInfo>* getActiveKeys () const;
std::list<KeyInfo>* getActiveKeys ();
void setActiveKeys (std::list<KeyInfo>* keys);
const std::list<KeyInfo>& getInactiveKeysRef () const;
std::list<KeyInfo>& getInactiveKeysRef ();
const std::list<KeyInfo>* getInactiveKeys () const;
std::list<KeyInfo>* getInactiveKeys ();
private:
EntryType type;
QString address;
VCard* vcard;
std::list<KeyInfo>* activeKeys;
std::list<KeyInfo>* inactiveKeys;