[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-09-22 17:18:08
Message-ID: 20100922171809.002F8AC88E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1178307 by apol:

Unify include syntax for analitza libraries across kalgebra.


 M  +3 -0      CMakeLists.txt  
 M  +0 -2      analitzagui/CMakeLists.txt  
 M  +0 -2      analitzagui/algebrahighlighter.cpp  
 M  +1 -1      calgebra/CMakeLists.txt  
 M  +4 -4      calgebra/main.cpp  
 M  +0 -1      plasmoid/CMakeLists.txt  
 M  +1 -1      plasmoid/kalgebraplasma.cpp  
 M  +1 -1      plasmoid/kalgebraplasma.h  
 M  +1 -1      src/CMakeLists.txt  


--- trunk/KDE/kdeedu/kalgebra/CMakeLists.txt #1178306:1178307
@@ -13,12 +13,15 @@
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config-kalgebra.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/src/config-kalgebra.h)  option(INSTALL_ANALITZA_HEADERS \
"Analitza headers will be installed. No ABI compatibility is going to happen for now" \
OFF)  
+include_directories(.)
+
 #adding subdirs
 add_subdirectory(analitza)
 add_subdirectory(analitzagui)
 add_subdirectory(src)
 add_subdirectory(icons)
 add_subdirectory(plasmoid)
+# add_subdirectory(utils)
 
 if(HAVE_READLINE)
 	add_subdirectory(calgebra)
--- trunk/KDE/kdeedu/kalgebra/analitzagui/CMakeLists.txt #1178306:1178307
@@ -1,7 +1,5 @@
 project(analitzagui)
 
-include_directories(..)
-
 add_subdirectory(tests)
 
 set(analitzagui_SRCS
--- trunk/KDE/kdeedu/kalgebra/analitzagui/algebrahighlighter.cpp #1178306:1178307
@@ -76,8 +76,6 @@
 	QColor variable(pal.color(QPalette::Active, QPalette::LinkVisited));
 	QColor id(150,0,50);
 	QColor uncorrect(Qt::red);
-	QColor brHighlight(0xff,0xa0,0xff);
-	QColor prHighlight(0xff,0xff,0x80);
 	m_editingParameter=0;
 	m_editingName.clear();
 	
--- trunk/KDE/kdeedu/kalgebra/calgebra/CMakeLists.txt #1178306:1178307
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/kalgebra/analitza ${READLINE_INCLUDE_DIR})
+include_directories(${READLINE_INCLUDE_DIR})
 
 set(calgebra_SRCS
 	main.cpp
--- trunk/KDE/kdeedu/kalgebra/calgebra/main.cpp #1178306:1178307
@@ -16,10 +16,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA   \
                *
  *************************************************************************************/
  
-#include "analyzer.h"
-#include "expression.h"
-#include "explexer.h"
-#include "expressionparser.h"
+#include <analitza/expression.h>
+#include <analitza/analyzer.h>
+#include <analitza/explexer.h>
+#include <analitza/expressionparser.h>
 
 #include <cstdio>
 #include <readline/readline.h>
--- trunk/KDE/kdeedu/kalgebra/plasmoid/CMakeLists.txt #1178306:1178307
@@ -1,7 +1,6 @@
 project(kalgebra-plasmoid)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-include_directories(${CMAKE_SOURCE_DIR}/kalgebra/analitza)
 set(kalgebraplasma_SRCS kalgebraplasma.cpp)
 
 kde4_add_plugin(plasma_applet_kalgebra ${kalgebraplasma_SRCS})
--- trunk/KDE/kdeedu/kalgebra/plasmoid/kalgebraplasma.cpp #1178306:1178307
@@ -32,7 +32,7 @@
 #include <plasma/tooltipcontent.h>
 #include <plasma/tooltipmanager.h>
 
-#include "expression.h"
+#include <analitza/expression.h>
 
 using namespace Plasma;
 using Analitza::Expression;
--- trunk/KDE/kdeedu/kalgebra/plasmoid/kalgebraplasma.h #1178306:1178307
@@ -25,7 +25,7 @@
 #include <Plasma/LineEdit>
 #include <KLineEdit>
 #include <QGraphicsLinearLayout>
-#include "analyzer.h"
+#include <analitza/analyzer.h>
 
 class QSizeF;
 class QLabel;
--- trunk/KDE/kdeedu/kalgebra/src/CMakeLists.txt #1178306:1178307
@@ -1,4 +1,4 @@
-include_directories(.. ${OPENGL_INCLUDE_DIR} \
${CMAKE_SOURCE_DIR}/libkdeedu/qtmmlwidget/ ) \
+include_directories(${OPENGL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/libkdeedu/qtmmlwidget/ \
)  
 set(kalgebra_SRCS
 	kalgebra.cpp


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