[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kalgebra/src
From:       Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date:       2007-10-31 21:55:07
Message-ID: 1193867707.117206.11142.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 731516 by apol:

FIXED compilation warning on g++ 4.2


 M  +1 -1      analitza/analitza.cpp  
 M  +1 -1      analitza/operator.cpp  
 M  +1 -1      analitza/operator.h  
 M  +1 -0      dictionary.cpp  
 M  +1 -0      functionimpl.cpp  
 M  +2 -2      operatorsmodel.cpp  


--- trunk/KDE/kdeedu/kalgebra/src/analitza/analitza.cpp #731515:731516
@@ -893,7 +893,7 @@
 			a = b==2.0 ? sqrt(a) : pow(a, 1.0/b);
 			break;
 		default:
-			m_err << i18n("The operator <em>%1</em> has not been implemented", \
Operator::m_words[op]); +			m_err << i18n("The operator <em>%1</em> has not been \
implemented", QString(Operator::m_words[op]));  break;
 	}
 	
--- trunk/KDE/kdeedu/kalgebra/src/analitza/operator.cpp #731515:731516
@@ -18,7 +18,7 @@
 
 #include "operator.h"
 
-char* Operator::m_words[nOfOps] = {
+char Operator::m_words[nOfOps][10] = {
 	"onone",
 	"plus", "times", "minus", "divide", "quotient",
 	"power", "root", "factorial",
--- trunk/KDE/kdeedu/kalgebra/src/analitza/operator.h #731515:731516
@@ -105,7 +105,7 @@
 		/** Returns the multiplicity operator of an operator @p t. e.g. 5+5+5+5=5*4 -> \
times is the multiplicityOperator of plus. */  static OperatorType \
multiplicityOperator(const OperatorType& t);  
-		static char* m_words[nOfOps];
+		static char m_words[nOfOps][10];
 		
 		/** Returns this operator @p o precedence. */
 		static unsigned int operatorWeight(OperatorType o);
--- trunk/KDE/kdeedu/kalgebra/src/dictionary.cpp #731515:731516
@@ -66,6 +66,7 @@
 
 void Dictionary::activated(const QModelIndex& idx, const QModelIndex& prev)
 {
+	Q_UNUSED(prev);
 	QModelIndex nameIdx, descriptionIdx, exampleIdx;
 	nameIdx = idx.sibling(idx.row(), 0);
 	descriptionIdx = idx.sibling(idx.row(), 1);
--- trunk/KDE/kdeedu/kalgebra/src/functionimpl.cpp #731515:731516
@@ -330,5 +330,6 @@
 
 QLineF FunctionPolar::derivative(const QPointF& p) const
 {
+	Q_UNUSED(p);
 	return QLineF();
 }
--- trunk/KDE/kdeedu/kalgebra/src/operatorsmodel.cpp #731515:731516
@@ -82,7 +82,7 @@
 	return ret;
 }
 
-int OperatorsModel::rowCount(const QModelIndex & parent) const
+int OperatorsModel::rowCount(const QModelIndex &) const
 {
 	int count=Operator::nOfOps;
 	if(m_vars)
@@ -90,7 +90,7 @@
 	return count-2;
 }
 
-int OperatorsModel::columnCount(const QModelIndex & parent) const
+int OperatorsModel::columnCount(const QModelIndex &) const
 {
 	return 3;
 }


[prev in list] [next in list] [prev in thread] [next in thread]