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

List:       kde-commits
Subject:    KDE/kdeedu/kalgebra
From:       Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date:       2010-04-17 1:27:58
Message-ID: 20100417012758.4A13CAC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1115596 by apol:

Adapt to changes in analitza


 M  +3 -3      analitzagui/algebrahighlighter.cpp  
 M  +4 -4      analitzagui/algebrahighlighter.h  
 M  +2 -2      calgebra/main.cpp  
 M  +2 -2      plasmoid/kalgebraplasma.h  


--- trunk/KDE/kdeedu/kalgebra/analitzagui/algebrahighlighter.cpp #1115595:1115596
@@ -18,18 +18,18 @@
  *************************************************************************************/
 
 #include "algebrahighlighter.h"
-#include <analitza/expressionparser.h>
 #include <QApplication>
 #include <QStack>
 #include <QPalette>
 
 #include <analitza/expression.h>
-#include <analitza/analitza.h>
+#include <analitza/analyzer.h>
 #include <analitza/variables.h>
 #include <analitza/container.h>
 #include <analitza/explexer.h>
+#include <analitza/expressionparser.h>
 
-AlgebraHighlighter::AlgebraHighlighter(QTextDocument *doc, const Analitza::Analitza *na)
+AlgebraHighlighter::AlgebraHighlighter(QTextDocument *doc, const Analitza::Analyzer *na)
 	: QSyntaxHighlighter(doc), m_correct(true), m_mode(Autodetect), m_pos(0), a(na)
 {
 	bold.setFontWeight(QFont::Bold);
--- trunk/KDE/kdeedu/kalgebra/analitzagui/algebrahighlighter.h #1115595:1115596
@@ -27,7 +27,7 @@
  *	@author <aleixpol@kde.org>  
  */
 
-namespace Analitza { class Analitza; }
+namespace Analitza { class Analyzer; }
 
 class ANALITZAGUI_EXPORT AlgebraHighlighter : public QSyntaxHighlighter
 {
@@ -41,7 +41,7 @@
 		} Mode;
 		
 		/** Constructor. Creates an AlgebraHighlighter from a QTextDocument @p doc. */
-		explicit AlgebraHighlighter(QTextDocument *doc, const Analitza::Analitza* na=0);
+		explicit AlgebraHighlighter(QTextDocument *doc, const Analitza::Analyzer* na=0);
 		//int highlightParagraph(const QString &text, int endStateOfLastPara);
 		
 		/** Returns the currently highlight mode. */
@@ -61,7 +61,7 @@
 		void setPos(uint p) { m_pos=p; }
 		
 		/** Sets the corresponding Analitza class. */
-		void setAnalitza(const Analitza::Analitza* na) { a = na; }
+		void setAnalitza(const Analitza::Analyzer* na) { a = na; }
 		
 		///@returns the name of the function that's being edited, if any
 		QString editingName() const;
@@ -89,7 +89,7 @@
 		QString m_aName;
 		
 		QTextCharFormat bold;
-		const Analitza::Analitza* a;
+		const Analitza::Analyzer* a;
 };
 
 #endif
--- trunk/KDE/kdeedu/kalgebra/calgebra/main.cpp #1115595:1115596
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA   *
  *************************************************************************************/
 
-#include "analitza.h"
+#include "analyzer.h"
 #include "expression.h"
 #include "explexer.h"
 #include "expressionparser.h"
@@ -30,7 +30,7 @@
 
 using Analitza::Expression;
 
-Analitza::Analitza a;
+Analitza::Analyzer a;
 
 enum CalcType { Evaluate, Calculate };
 
--- trunk/KDE/kdeedu/kalgebra/plasmoid/kalgebraplasma.h #1115595:1115596
@@ -25,7 +25,7 @@
 #include <Plasma/LineEdit>
 #include <KLineEdit>
 #include <QGraphicsLinearLayout>
-#include "analitza.h"
+#include "analyzer.h"
 
 class QSizeF;
 class QLabel;
@@ -55,7 +55,7 @@
 		QGraphicsLinearLayout* m_layout;
 		Plasma::LineEdit *m_input;
 		Plasma::Label *m_output;
-		Analitza::Analitza a;
+		Analitza::Analyzer a;
 };
 
 // This is the command that links your applet to the .desktop file
[prev in list] [next in list] [prev in thread] [next in thread]