github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core, CtrlLib, RichEdit, ide: Fix warnigns on macOS. (#336)

Browse source
This commit is contained in:
Zbigniew Rębacz 2026-01-12 08:18:05 +01:00 • committed by GitHub
parent 61a62676ed
commit 1596195267
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/Core/SSL/AES.cpp
View file

@ -18,10 +18,10 @@ namespace {
}
Aes256Gcm::Aes256Gcm()
: iteration(AES_GCM_DEFAULT_ITERATION)
, chunksize(1024)
, ctx(nullptr)
: ctx(nullptr)
, cipher(nullptr)
, chunksize(1024)
, iteration(AES_GCM_DEFAULT_ITERATION)
{
SslInitThread();

6
uppsrc/CtrlLib/BeginnerInfo.cpp
View file

@ -70,12 +70,6 @@ void PaintBasicHints(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, const
r.tm = msecs();
}
typedef bool (*MouseHook)(Ctrl *ctrl, bool inframe, int event, Point p,
int zdelta, dword keyflags);
typedef bool (*KeyHook)(Ctrl *ctrl, dword key, int count);
typedef bool (*StateHook)(Ctrl *ctrl, int reason);
typedef void (*PaintHook)(Ctrl *ctrl, Draw& draw, const Rect& clip);
static auto Stop = [](bool testmousepos = false) {
int tm = msecs();
Point mousepos;

2
uppsrc/RichEdit/DiagramEditor.h
View file

@ -64,6 +64,8 @@ public:
private:
struct DropColumns : public MultiButton, public Display {
ColumnPopUp popup;
using MultiButton::Paint;
void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const override;
DropColumns();

7
uppsrc/RichEdit/DiagramRight.cpp
View file

@ -78,14 +78,9 @@ void DiagramEditor::RightDown(Point p, dword keyflags)
mdata = LoadFile(path);
if(IsNull(mdata))
return;
bool loaded = false;
if(IsSVG(mdata)) {
loaded = true;
}
else {
if(!IsSVG(mdata)) {
StringStream ss(mdata);
One<StreamRaster> r = StreamRaster::OpenAny(ss);
loaded = true;
}
if(IsNull(size)) {
Exclamation(t_("Unsupported image format."));

7
uppsrc/ide/Core/PPinfo.cpp
View file

@ -80,7 +80,6 @@ void PPInfo::PPFile::Parse(Stream& in)
guarded = false;
blitz = AUTO;
int linei = 0;
bool incomment = false;
String guard_id;
@ -120,7 +119,6 @@ void PPInfo::PPFile::Parse(Stream& in)
while(*l.Last() == '\\' && !in.IsEof()) {
l.TrimLast();
linei++;
l.Cat(in.GetLine());
}
@ -197,14 +195,13 @@ void PPInfo::PPFile::Parse(Stream& in)
}
}
catch(...) {}
if(first)
if(first) {
for(char s : l)
if(s != ' ' && s != '\t') {
first = false;
break;
}
linei++;
}
}
}