mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 02:22:13 +08:00
157 lines
6.5 KiB
Diff
157 lines
6.5 KiB
Diff
|
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 ®exp = 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 b7e29c4..4458a43 100644
|
||
|
--- a/src/backends/julia/juliakeywords.cpp
|
||
|
+++ b/src/backends/julia/juliakeywords.cpp
|
||
|
@@ -58,7 +58,7 @@ void JuliaKeywords::loadKeywords()
|
||
|
|
||
|
void JuliaKeywords::addVariable(const QString &variable)
|
||
|
{
|
||
|
- if (not m_variables.contains(variable)) {
|
||
|
+ if (!m_variables.contains(variable)) {
|
||
|
m_variables << variable;
|
||
|
}
|
||
|
}
|
||
|
@@ -71,7 +71,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..cf73f12 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()
|