diff --git a/analitza/additionchains.h b/analitza/additionchains.h --- a/analitza/additionchains.h +++ b/analitza/additionchains.h @@ -21,8 +21,8 @@ //NOTE this code generates the whole thing ... // see seq function in -// http://rosettacode.org/wiki/Addition-chain_exponentiation/Achain.c or -// http://www-cs-faculty.stanford.edu/~knuth/programs/achain4.w +// https://rosettacode.org/wiki/Addition-chain_exponentiation/Achain.c or +// https://www-cs-faculty.stanford.edu/~knuth/programs/achain4.w // int main(int argc, char *argv[]) // { // const int MAX_N = 2048; diff --git a/analitza/analitzautils.cpp b/analitza/analitzautils.cpp --- a/analitza/analitzautils.cpp +++ b/analitza/analitzautils.cpp @@ -640,7 +640,7 @@ foreach(const QString& d, deps) { const Object* o=v->value(d); if(o && isLambda(o)) { - ret += "\t"+current+" -> "+d+";\n"; + ret += '\t'+current+" -> "+d+";\n"; } } } diff --git a/analitza/htmlexpressionwriter.cpp b/analitza/htmlexpressionwriter.cpp --- a/analitza/htmlexpressionwriter.cpp +++ b/analitza/htmlexpressionwriter.cpp @@ -154,7 +154,7 @@ foreach(Object* o, a->m_params) { Object::ObjectType type=o->type(); switch(type) { - if(type == Object::oper) + case Object::oper: Q_ASSERT(false); break; case Object::variable: diff --git a/analitza/mathmlexpressionwriter.h b/analitza/mathmlexpressionwriter.h --- a/analitza/mathmlexpressionwriter.h +++ b/analitza/mathmlexpressionwriter.h @@ -35,7 +35,7 @@ class MathMLExpressionWriter : public AbstractExpressionVisitor { public: - MathMLExpressionWriter(const Object* o); + explicit MathMLExpressionWriter(const Object* o); virtual QVariant visit(const None* var) override; virtual QVariant visit(const Ci* var) override; diff --git a/analitza/operations.cpp b/analitza/operations.cpp --- a/analitza/operations.cpp +++ b/analitza/operations.cpp @@ -415,7 +415,7 @@ case Operator::arccot: oper->setValue(log(a+pow(a*a+1., 0.5))); break; - case Operator::arcsinh: //see http://en.wikipedia.org/wiki/Inverse_hyperbolic_function + case Operator::arcsinh: //see https://en.wikipedia.org/wiki/Inverse_hyperbolic_function oper->setValue(asinh(a)); break; case Operator::arccosh: @@ -835,7 +835,7 @@ if (exp>1) products[1] = static_cast(reduceMatrixMatrix(Operator::times, matrix, matrix, correct)); - //NOTE see http://rosettacode.org/wiki/Addition-chain_exponentiation#C for more details + //NOTE see https://rosettacode.org/wiki/Addition-chain_exponentiation#C for more details for (i = 2; i <= len; ++i) for (j = i - 1; j; --j) for (k = j; k >= 0; --k) diff --git a/analitzaplot/examples/audioplots.cpp b/analitzaplot/examples/audioplots.cpp --- a/analitzaplot/examples/audioplots.cpp +++ b/analitzaplot/examples/audioplots.cpp @@ -1,3 +1,21 @@ +/************************************************************************************* + * Copyright (C) 2019 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * + *************************************************************************************/ + #include #include #include diff --git a/analitzaplot/plotsmodel.cpp b/analitzaplot/plotsmodel.cpp --- a/analitzaplot/plotsmodel.cpp +++ b/analitzaplot/plotsmodel.cpp @@ -165,7 +165,7 @@ } return false; } - } + } //fallthrough case Qt::CheckStateRole: m_items[index.row()]->setVisible(value.toBool()); return true; @@ -252,7 +252,7 @@ QString PlotsModel::freeId() const { - return "f"+QString::number(m_namingCount); + return 'f'+QString::number(m_namingCount); } void PlotsModel::setResolution(int res) diff --git a/analitzaplot/private/functiongraphfactory.cpp b/analitzaplot/private/functiongraphfactory.cpp --- a/analitzaplot/private/functiongraphfactory.cpp +++ b/analitzaplot/private/functiongraphfactory.cpp @@ -85,8 +85,8 @@ std::sort(arguments.begin(), arguments.end()); //TODO: turn this id into an internal struct - QString id = QString::number((int)dim)+"|"+ - QString::number((int)coordinateSystemFunction)+"|"+ + QString id = QString::number((int)dim)+'|'+ + QString::number((int)coordinateSystemFunction)+'|'+ arguments.join(QStringLiteral(",")); Q_ASSERT(!contains(id)); // verificar que no se registren los mismos tipos diff --git a/analitzaplot/private/utils/marchingcubes.cpp b/analitzaplot/private/utils/marchingcubes.cpp --- a/analitzaplot/private/utils/marchingcubes.cpp +++ b/analitzaplot/private/utils/marchingcubes.cpp @@ -15,7 +15,7 @@ // // You should have received a copy of the GNU General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA /** \file \brief MarchingCubes Algorithm diff --git a/declarative/qml/Graph2D.qml b/declarative/qml/Graph2D.qml --- a/declarative/qml/Graph2D.qml +++ b/declarative/qml/Graph2D.qml @@ -1,3 +1,21 @@ +/************************************************************************************* + * Copyright (C) 2013-2017 by Aleix Pol * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * + *************************************************************************************/ + import QtQuick 2.0 import org.kde.analitza 1.0