bash-tech/squawk
1
0
Fork 0
forked from blue/squawk
Code Pull requests Activity

merge conflicts, text copying from context menu in message line

Browse source
This commit is contained in:
Blue 2022-04-30 21:41:25 +03:00
commit c3a45ec58c
Signed by untrusted user: blue
GPG key ID: 9B203B252A63EE38
38 changed files with 1221 additions and 798 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shared/global.cpp
View file

@ -19,6 +19,7 @@
#include "global.h"
#include "enums.h"
#include "ui/models/roster.h"
Shared::Global* Shared::Global::instance = 0;
const std::set<QString> Shared::Global::supportedImagesExts = {"png", "jpg", "webp", "jpeg", "gif", "svg"};

3
shared/global.h
View file

@ -47,7 +47,6 @@ namespace Shared {
class Global {
Q_DECLARE_TR_FUNCTIONS(Global)
public:
struct FileInfo {
enum class Preview {
@ -64,7 +63,7 @@ namespace Shared {
};
Global();
static Global* getInstance();
static QString getName(Availability av);
static QString getName(ConnectionState cs);