summaryrefslogtreecommitdiffstats
path: root/kde/patch/cantor/cantor_julia.patch
blob: 5c381cae322123b0a5b0f30690c2deb23c5e87e2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
Patch taken from:
https://gitweb.gentoo.org/repo/gentoo.git/plain/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch

From 45322d9f58f50df3d4d5755d4199e579f6fd8646 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sat, 11 Feb 2017 22:46:35 +0100
Subject: [PATCH] [julia] Fix build with -fno-operator-names

REVIEW: 129942
---
 src/backends/julia/juliaexpression.cpp         |  6 +++---
 src/backends/julia/juliaextensions.cpp         |  4 ++--
 src/backends/julia/juliahighlighter.cpp        |  4 ++--
 src/backends/julia/juliakeywords.cpp           | 10 +++++-----
 src/backends/julia/juliaserver/juliaserver.cpp |  4 ++--
 src/backends/julia/juliaserver/main.cpp        |  4 ++--
 src/backends/julia/juliasession.cpp            |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/backends/julia/juliaexpression.cpp b/src/backends/julia/juliaexpression.cpp
index 27cdd85..618200d 100644
--- a/src/backends/julia/juliaexpression.cpp
+++ b/src/backends/julia/juliaexpression.cpp
@@ -40,7 +40,7 @@ void JuliaExpression::evaluate()
 
     // Plots integration
     m_plot_filename.clear();
-    if (juliaSession->integratePlots() and checkPlotShowingCommands()) {
+    if (juliaSession->integratePlots() && checkPlotShowingCommands()) {
         // Simply add plot saving command to the end of execution
         QStringList inlinePlotFormats;
         inlinePlotFormats << QLatin1String("svg");
@@ -73,8 +73,8 @@ void JuliaExpression::finalize()
         setResult(new Cantor::TextResult(juliaSession->getOutput()));
         setStatus(Cantor::Expression::Error);
     } else {
-        if (not m_plot_filename.isEmpty()
-                and QFileInfo(m_plot_filename).exists()) {
+        if (!m_plot_filename.isEmpty()
+                && QFileInfo(m_plot_filename).exists()) {
             // If we have plot in result, show it
             setResult(
                 new Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename)));
diff --git a/src/backends/julia/juliaextensions.cpp b/src/backends/julia/juliaextensions.cpp
index 4585c6f..ad5e3a9 100644
--- a/src/backends/julia/juliaextensions.cpp
+++ b/src/backends/julia/juliaextensions.cpp
@@ -138,7 +138,7 @@ QString JuliaPlotExtension::plotFunction2d(
 {
     auto new_left = left;
     auto new_right = right;
-    if (new_left.isEmpty() and new_right.isEmpty()) {
+    if (new_left.isEmpty() && new_right.isEmpty()) {
         new_left = QLatin1String("-1");
         new_right = QLatin1String("1");
     } else if (new_left.isEmpty()) {
@@ -165,7 +165,7 @@ QString JuliaPlotExtension::plotFunction3d(
 {
 
     auto update_interval = [](Interval &interval) {
-        if (interval.first.isEmpty() and interval.second.isEmpty()) {
+        if (interval.first.isEmpty() && interval.second.isEmpty()) {
             interval.first = QLatin1String("-1");
             interval.second = QLatin1String("1");
         } else if (interval.first.isEmpty()) {
diff --git a/src/backends/julia/juliahighlighter.cpp b/src/backends/julia/juliahighlighter.cpp
index 4795361..f7d3622 100644
--- a/src/backends/julia/juliahighlighter.cpp
+++ b/src/backends/julia/juliahighlighter.cpp
@@ -98,7 +98,7 @@ void JuliaHighlighter::highlightBlock(const QString &text)
     while (pos < text.length()) {
         // Trying to close current environments
         bool triggered = false;
-        for (int i = 0; i < flags.size() and not triggered; i++) {
+        for (int i = 0; i < flags.size() && !triggered; i++) {
             int flag = flags[i];
             QRegExp &regexp = regexps_ends[i];
             QTextCharFormat &format = formats[i];
@@ -144,7 +144,7 @@ void JuliaHighlighter::highlightBlock(const QString &text)
             singleLineCommentStart.indexIn(text, pos);
 
         if (singleLineCommentStartPos != -1
-                and singleLineCommentStartPos < minPos) {
+                && singleLineCommentStartPos < minPos) {
             // single line comment starts earlier
             setFormat(pos, text.length() - pos, commentFormat());
             break;
diff --git a/src/backends/julia/juliakeywords.cpp b/src/backends/julia/juliakeywords.cpp
index f0a5846..8a0efec 100644
--- a/src/backends/julia/juliakeywords.cpp
+++ b/src/backends/julia/juliakeywords.cpp
@@ -62,11 +62,11 @@ void JuliaKeywords::loadFromFile()
         const QStringRef name = xml.name();
 
         if (name == QLatin1String("keywords")
-                or name == QLatin1String("variables")
-                or name == QLatin1String("plot_showing_commands")) {
+                || name == QLatin1String("variables")
+                || name == QLatin1String("plot_showing_commands")) {
             while (xml.readNextStartElement()) {
                 Q_ASSERT(
-                    xml.isStartElement() and xml.name() == QLatin1String("word")
+                    xml.isStartElement() && xml.name() == QLatin1String("word")
                 );
 
                 const QString text = xml.readElementText();
@@ -91,7 +91,7 @@ void JuliaKeywords::loadFromFile()
 
 void JuliaKeywords::addVariable(const QString &variable)
 {
-    if (not m_variables.contains(variable)) {
+    if (!m_variables.contains(variable)) {
         m_variables << variable;
     }
 }
@@ -104,7 +104,7 @@ void JuliaKeywords::clearVariables()
 
 void JuliaKeywords::addFunction(const QString &function)
 {
-    if (not m_functions.contains(function)) {
+    if (!m_functions.contains(function)) {
         m_functions << function;
     }
 }
diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
index c9beb4c..91585cf 100644
--- a/src/backends/julia/juliaserver/juliaserver.cpp
+++ b/src/backends/julia/juliaserver/juliaserver.cpp
@@ -47,7 +47,7 @@ void JuliaServer::runJuliaCommand(const QString &command)
 {
     // Redirect stdout, stderr to temprorary files
     QTemporaryFile output, error;
-    if (not output.open() or not error.open()) {
+    if (!output.open() || !error.open()) {
         qFatal("Unable to create temprorary files for stdout/stderr");
         return;
     }
@@ -90,7 +90,7 @@ void JuliaServer::runJuliaCommand(const QString &command)
         bool is_nothing = jl_unbox_bool(
             static_cast<jl_value_t *>(jl_call2(equality, nothing, val))
         );
-        if (not is_nothing) {
+        if (!is_nothing) {
             jl_static_show(JL_STDOUT, val);
         }
         m_was_exception = false;
diff --git a/src/backends/julia/juliaserver/main.cpp b/src/backends/julia/juliaserver/main.cpp
index ad7e4d9..11687ec 100644
--- a/src/backends/julia/juliaserver/main.cpp
+++ b/src/backends/julia/juliaserver/main.cpp
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
 
-    if (not QDBusConnection::sessionBus().isConnected()) {
+    if (!QDBusConnection::sessionBus().isConnected()) {
         qWarning() << "Can't connect to the D-Bus session bus.\n"
                       "To start it, run: eval `dbus-launch --auto-syntax`";
         return 1;
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
     const QString &serviceName =
         QString::fromLatin1("org.kde.Cantor.Julia-%1").arg(app.applicationPid());
 
-    if (not QDBusConnection::sessionBus().registerService(serviceName)) {
+    if (!QDBusConnection::sessionBus().registerService(serviceName)) {
         qWarning() << QDBusConnection::sessionBus().lastError().message();
         return 2;
     }
diff --git a/src/backends/julia/juliasession.cpp b/src/backends/julia/juliasession.cpp
index 425e6cb..9183e11 100644
--- a/src/backends/julia/juliasession.cpp
+++ b/src/backends/julia/juliasession.cpp
@@ -86,7 +86,7 @@ void JuliaSession::login()
         QDBusConnection::sessionBus()
     );
 
-    if (not m_interface->isValid()) {
+    if (!m_interface->isValid()) {
         qWarning() << QDBusConnection::sessionBus().lastError().message();
         return;
     }
@@ -213,7 +213,7 @@ bool JuliaSession::getWasException()
 {
     const QDBusReply<bool> &reply =
         m_interface->call(QLatin1String("getWasException"));
-    return reply.isValid() and reply.value();
+    return reply.isValid() && reply.value();
 }
 
 void JuliaSession::listVariables()
-- 
2.10.2