diff --git a/uppsrc/CodeEditor/CodeEditor.cpp b/uppsrc/CodeEditor/CodeEditor.cpp index a7957fab7..9bb377e00 100644 --- a/uppsrc/CodeEditor/CodeEditor.cpp +++ b/uppsrc/CodeEditor/CodeEditor.cpp @@ -195,7 +195,6 @@ void CodeEditor::CopyWord() { void CodeEditor::DuplicateLine() { - int p = GetCursor(); int i = GetLine(cursor); int pos = GetPos(i); int len = GetLineLength(i); diff --git a/uppsrc/CodeEditor/LogSyntax.cpp b/uppsrc/CodeEditor/LogSyntax.cpp index 5e7ea1ab6..302b6ebb3 100644 --- a/uppsrc/CodeEditor/LogSyntax.cpp +++ b/uppsrc/CodeEditor/LogSyntax.cpp @@ -10,7 +10,6 @@ inline bool Is3(const wchar *s, int c) void LogSyntax::Highlight(const wchar *s, const wchar *end, HighlightOutput& hls, CodeEditor *editor, int line, int pos) { const HlStyle& ink = hl_style[INK_NORMAL]; - const HlStyle& paper = hl_style[PAPER_NORMAL]; HlStyle err = hl_style[INK_ERROR]; err.bold = true; bool hl_line = false; diff --git a/uppsrc/CodeEditor/LogSyntax.h b/uppsrc/CodeEditor/LogSyntax.h index 0f6b90899..7bbd26ab9 100644 --- a/uppsrc/CodeEditor/LogSyntax.h +++ b/uppsrc/CodeEditor/LogSyntax.h @@ -2,7 +2,4 @@ class LogSyntax : public EditorSyntax { public: virtual void Highlight(const wchar *s, const wchar *end, HighlightOutput& hls, CodeEditor *editor, int line, int pos); - -private: - HighlightOutput *hout; }; diff --git a/uppsrc/CtrlCore/GtkClip.cpp b/uppsrc/CtrlCore/GtkClip.cpp index 1ceb12001..6d6fe0543 100644 --- a/uppsrc/CtrlCore/GtkClip.cpp +++ b/uppsrc/CtrlCore/GtkClip.cpp @@ -362,7 +362,7 @@ Vector GetClipFiles(const String& data) Vector f = Split(data, '\n'); for(int i = 0; i < f.GetCount(); i++) if(f[i].StartsWith("file://")) - r.Add(f[i].Mid(7)); + r.Add(UrlDecode(f[i].Mid(7))); return r; } @@ -379,7 +379,7 @@ void AppendFiles(VectorMap& data, const Vector& files) return; String h; for(int i = 0; i < files.GetCount(); i++) - h << "file://" << files[i] << '\n'; + h << "file://" << UrlEncode(files[i]) << '\n'; data.GetAdd("files") = h; } diff --git a/uppsrc/CtrlCore/X11Clip.cpp b/uppsrc/CtrlCore/X11Clip.cpp index 67cc83839..4b3a0369d 100644 --- a/uppsrc/CtrlCore/X11Clip.cpp +++ b/uppsrc/CtrlCore/X11Clip.cpp @@ -363,7 +363,7 @@ Vector GetClipFiles(const String& data) Vector f = Split(Filter(data, JustLf), '\n'); for(int i = 0; i < f.GetCount(); i++) if(f[i].StartsWith("file://")) - r.Add(f[i].Mid(7)); + r.Add(UrlDecode(f[i].Mid(7))); return r; } @@ -384,7 +384,7 @@ void AppendFiles(VectorMap& data, const Vector& files) return; String h; for(int i = 0; i < files.GetCount(); i++) - h << "file://" << files[i] << '\n'; + h << "file://" << UrlEncode(files[i]) << '\n'; data.GetAdd("text/uri-list") = h; } diff --git a/uppsrc/CtrlCore/init b/uppsrc/CtrlCore/init index aa63470cf..27c33a181 100644 --- a/uppsrc/CtrlCore/init +++ b/uppsrc/CtrlCore/init @@ -3,7 +3,7 @@ #include "Draw/init" #include "plugin\bmp/init" #include "RichText/init" -#define BLITZ_INDEX__ F656a4ea94e4f808b1ec63034b0e6c5ac +#define BLITZ_INDEX__ Fe2ff541f9bb9f4ad3f5bcc23a34e1b73 #include "CtrlCore.icpp" #undef BLITZ_INDEX__ #endif diff --git a/uppsrc/Esc/Esc.cpp b/uppsrc/Esc/Esc.cpp index 136b6c5ff..da5d36432 100644 --- a/uppsrc/Esc/Esc.cpp +++ b/uppsrc/Esc/Esc.cpp @@ -845,11 +845,12 @@ void Esc::Assign(Esc::SRVal& r) Assign(r, v); } else - if(!(v.IsArray() && b.IsVoid())) + if(!(v.IsArray() && b.IsVoid())) { if(v.IsInt64() && b.IsInt64()) Assign(r, Int(v, "+=") + Int(b, "+=")); else Assign(r, Number(v, "+=") + Number(b, "+=")); + } } else if(Char2('-', '=')) { diff --git a/uppsrc/Esc/EscStdLib.cpp b/uppsrc/Esc/EscStdLib.cpp index 460f7aa75..57b9fdbb2 100644 --- a/uppsrc/Esc/EscStdLib.cpp +++ b/uppsrc/Esc/EscStdLib.cpp @@ -45,11 +45,12 @@ void ESC_to_number(EscEscape& e) { if(e[0].IsArray()) { double d = ScanDouble((String)e[0]); - if(!IsNull(d)) + if(!IsNull(d)) { if(d <= INT64_MAX && d >= INT64_MIN) e = ScanInt64((String)e[0]); else e = d; + } } } diff --git a/uppsrc/TextDiffCtrl/TextCtrl.cpp b/uppsrc/TextDiffCtrl/TextCtrl.cpp index 88a177d62..29e690735 100644 --- a/uppsrc/TextDiffCtrl/TextCtrl.cpp +++ b/uppsrc/TextDiffCtrl/TextCtrl.cpp @@ -213,7 +213,6 @@ void TextCompareCtrl::Paint(Draw& draw) draw.DrawRect(gx + gutter_width - 2, ty, 2, by - ty, Black); } - Font ifont = Font(font).Italic(); for(int i = first_line; i <= last_line; i++) { const Line& l = lines[i]; int y = i * letter.cy - offset.cy; diff --git a/uppsrc/ide/Errors.cpp b/uppsrc/ide/Errors.cpp index cdea570c6..dd295d70e 100644 --- a/uppsrc/ide/Errors.cpp +++ b/uppsrc/ide/Errors.cpp @@ -73,7 +73,6 @@ bool Ide::FindLineError(const String& ln, FindLineErrorCache& cache, ErrorInfo& if(p.Char(':') && p.IsInt()) f.linepos = p.ReadInt(); const char *ms = p.GetPtr(); - int pos = int(ms - ~ln); f.kind = 3; if(ln.Find("warning") >= 0) f.kind = 2; diff --git a/uppsrc/ide/Navigator.cpp b/uppsrc/ide/Navigator.cpp index 0b23b3a41..26710c8d3 100644 --- a/uppsrc/ide/Navigator.cpp +++ b/uppsrc/ide/Navigator.cpp @@ -20,7 +20,6 @@ int DrawFileName0(Draw& w, const Rect& r, const String& h, Color ink, int x) return 0; String s = GetFileName(GetFileFolder(h)) + "/"; x += r.left; - int y = r.top + (r.GetHeight() - GetStdFontCy()) / 2; PaintTeXt(w, x, r.top, s, StdFont(), ink); s = GetFileName(h); PaintTeXt(w, x, r.top, s, StdFont().Bold(), ink); @@ -120,7 +119,6 @@ void Navigator::SyncNavLines() navlines.Clear(); int ii = list.GetCursor(); if(ii >= 0 && ii < litem.GetCount()) { - int ln = GetCurrentLine() + 1; Vector l = GetNavLines(*litem[ii]); for(int i = 0; i < l.GetCount(); i++) { String p = GetCppFile(l[i].file); @@ -341,7 +339,6 @@ int Navigator::NavigatorDisplay::DoPaint(Draw& w, const Rect& r, const Value& q, PaintCppItemImage(w, x, ry, m.access, m.kind, focuscursor); x += 15; - int x0 = x; Vector n = ParseItemNatural(m.name, m.natural, m.ptype, m.pname, m.type, m.tname, m.ctname, ~m.natural + m.at); int starti = 0;