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

List:       kde-commits
Subject:    [cantor/qmlresult] src/backends/kalgebra: Adapt to analitzaplot changes
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2012-10-01 0:22:29
Message-ID: 20121001002229.0DB41A605D () git ! kde ! org
[Download RAW message or body]

Git commit 32ae51ac80711df1b5f7e4abb492a896c3c1c4b5 by Aleix Pol.
Committed on 01/10/2012 at 02:23.
Pushed by apol into branch 'qmlresult'.

Adapt to analitzaplot changes

add the Analitza namespace when appropriate

M  +8    -8    src/backends/kalgebra/graph2dmobile.h
M  +1    -0    src/backends/kalgebra/kalgebraexpression.cpp
M  +4    -2    src/backends/kalgebra/kalgebraexpression.h
M  +1    -1    src/backends/kalgebra/kalgebrasession.cpp

http://commits.kde.org/cantor/32ae51ac80711df1b5f7e4abb492a896c3c1c4b5

diff --git a/src/backends/kalgebra/graph2dmobile.h b/src/backends/kalgebra/graph2dmobile.h
index 670e593..ad3af03 100644
--- a/src/backends/kalgebra/graph2dmobile.h
+++ b/src/backends/kalgebra/graph2dmobile.h
@@ -23,7 +23,7 @@
 #include <QDeclarativeItem>
 #include <analitzaplot/plotter2d.h>
 
-class Graph2DMobile : public QDeclarativeItem, public Plotter2D
+class Graph2DMobile : public QDeclarativeItem, public Analitza::Plotter2D
 {
 	Q_OBJECT
 	Q_PROPERTY(QAbstractItemModel* model READ model WRITE setModel);
@@ -33,30 +33,30 @@ class Graph2DMobile : public QDeclarativeItem, public Plotter2D
 	Q_PROPERTY(int currentFunction READ currentFunction WRITE setCurrentFunction)
 	public:
 		Graph2DMobile(QDeclarativeItem* parent = 0);
-		
+
 		virtual void forceRepaint();
 		virtual void viewportChanged() {}
 		virtual void modelChanged();
 		virtual int currentFunction() const { return m_currentFunction; }
-		
+
 		virtual void paint(QPainter* p, const QStyleOptionGraphicsItem* options, QWidget* w);
-		
+
 		void setCurrentFunction(int f) { m_currentFunction = f; }
-		
+
 	public slots:
 		void translate(qreal x, qreal y);
 		void scale(qreal s, int x, int y);
 		void resetViewport();
-		
+
 	private slots:
 		void updateFuncs(const QModelIndex& start, const QModelIndex& end);
 		void addFuncs(const QModelIndex& parent, int start, int end);
 		void removeFuncs(const QModelIndex& parent, int start, int end);
-		
+
 	private:
 		bool m_dirty;
 		int m_currentFunction;
-		
+
 		QPixmap m_buffer;
 		QRectF defViewport;
 };
diff --git a/src/backends/kalgebra/kalgebraexpression.cpp b/src/backends/kalgebra/kalgebraexpression.cpp
index 5b82c30..f1b14d3 100644
--- a/src/backends/kalgebra/kalgebraexpression.cpp
+++ b/src/backends/kalgebra/kalgebraexpression.cpp
@@ -33,6 +33,7 @@
 #include <analitzaplot/planecurve.h>
 #include <analitzagui/variablesmodel.h>
 
+using namespace Analitza;
 
 KAlgebraExpression::KAlgebraExpression( KAlgebraSession* session )
     : Cantor::Expression(session)
diff --git a/src/backends/kalgebra/kalgebraexpression.h b/src/backends/kalgebra/kalgebraexpression.h
index 1097126..cbc9077 100644
--- a/src/backends/kalgebra/kalgebraexpression.h
+++ b/src/backends/kalgebra/kalgebraexpression.h
@@ -21,7 +21,9 @@
 
 #include "expression.h"
 
-class PlotsModel;
+namespace Analitza {
+class PlotsModel;}
+
 class KAlgebraSession;
 
 class KAlgebraExpression : public Cantor::Expression
@@ -37,7 +39,7 @@ class KAlgebraExpression : public Cantor::Expression
     private:
         KAlgebraSession* m_session;
         QStringList addFunction(const QString& expression, double up, double down);
-        PlotsModel* m_model;
+        Analitza::PlotsModel* m_model;
 };
 
 #endif
diff --git a/src/backends/kalgebra/kalgebrasession.cpp b/src/backends/kalgebra/kalgebrasession.cpp
index 6b88438..8c21e1e 100644
--- a/src/backends/kalgebra/kalgebrasession.cpp
+++ b/src/backends/kalgebra/kalgebrasession.cpp
@@ -39,7 +39,7 @@ KAlgebraSession::KAlgebraSession( Cantor::Backend* backend)
     m_variablesModel = new VariablesModel(m_analyzer->variables());
     m_operatorsModel->setVariables(m_analyzer->variables());
 
-    qmlRegisterType<PlotsModel>("org.kde.analitza", 1, 0, "PlotsModel");
+    qmlRegisterType<Analitza::PlotsModel>("org.kde.analitza", 1, 0, "PlotsModel");
     qmlRegisterType<Graph2DMobile>("org.kde.analitza", 1, 0, "Graph2DView");
     qmlRegisterType<VariablesModel>("org.kde.analitza", 1, 0, "VariablesModel");
     qmlRegisterType<QAbstractItemModel>();
[prev in list] [next in list] [prev in thread] [next in thread]