From d546ef47139269493945df46685a41273521d11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 23 Feb 2020 16:16:16 +0100
Subject: =?UTF-8?q?Applied=20patch=20from=20upstream:=20fix=20compilation?=
 =?UTF-8?q?=20problem=0A9c4708ba7a4a40b08b1083ee75b23ad66a411a50?=


diff --git a/src/texteditor/AbstractCharacterBasedApplication.cpp b/src/texteditor/AbstractCharacterBasedApplication.cpp
index cad4cc4..163b2f0 100644
--- a/src/texteditor/AbstractCharacterBasedApplication.cpp
+++ b/src/texteditor/AbstractCharacterBasedApplication.cpp
@@ -218,12 +218,12 @@ QString AbstractCharacterBasedApplication::recentlyUsedPath()
 	return m->recently_used_path;
 }
 
-std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::screen()
+std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::char_screen()
 {
 	return &m->screen;
 }
 
-const std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::screen() const
+const std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::char_screen() const
 {
 	return &m->screen;
 }
diff --git a/src/texteditor/AbstractCharacterBasedApplication.h b/src/texteditor/AbstractCharacterBasedApplication.h
index e7418f9..596d656 100644
--- a/src/texteditor/AbstractCharacterBasedApplication.h
+++ b/src/texteditor/AbstractCharacterBasedApplication.h
@@ -233,8 +233,8 @@ protected:
 	SelectionAnchor selection_anchor_1;
 protected:
 
-	std::vector<Character> *screen();
-	std::vector<Character> const *screen() const;
+	std::vector<Character> *char_screen();
+	std::vector<Character> const *char_screen() const;
 	std::vector<uint8_t> *line_flags();
 
 	void initEditor();
diff --git a/src/texteditor/TextEditorWidget.cpp b/src/texteditor/TextEditorWidget.cpp
index a2b23ab..26298a6 100644
--- a/src/texteditor/TextEditorWidget.cpp
+++ b/src/texteditor/TextEditorWidget.cpp
@@ -324,7 +324,7 @@ void TextEditorWidget::paintScreen(QPainter *painter)
 			text.reserve(w);
 			int o = y * w;
 			CharAttr charattr;
-			Character const *line = &screen()->at(o);
+			Character const *line = &char_screen()->at(o);
 			int n = 0;
 			while (x + n < w) {
 				uint32_t c = line[x + n].c;
-- 
2.24.1

