Conversion to the cmake building system.

Added a man page taken from the Debian packaging system.
Changed the doc folder's layout.

Signed-off-by: gregory guy <gregory-tde@laposte.net>

CMake: Use tde_add_project_translations common macro.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

3 files changed, 70 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..4996d27
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,62 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${QALCULATE_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### qalculate-tde (executable)
+
+tde_add_executable( qalculate-tde AUTOMOC
+
+  SOURCES
+        buttonwithindexsignal.cpp kqalculate.cpp
+        main.cpp preferences.cpp qalculatebuttonwithdata.cpp
+        qalculateconvertnumberbasesdialog.cpp
+        qalculateconvertunitsdialog.cpp	qalculatedatasetsdialog.cpp
+        qalculatedecimalsdialog.cpp	qalculateeditdataobjectdialog.cpp
+        qalculateeditdatasetdialog.cpp	qalculateeditfunctiondialog.cpp
+        qalculateeditmatrixvectordialog.cpp	qalculateeditnamesdialog.cpp
+        qalculateeditunitdialog.cpp	qalculateeditunknownvariabledialog.cpp
+        qalculateeditvariabledialog.cpp	qalculateexportcsvdialog.cpp
+        qalculateexpressionedit.cpp	qalculatefunctionsdialog.cpp
+        qalculateimportcsvdialog.cpp qalculateinsertfunctiondialog.cpp
+        qalculateinsertmatrixvectordialog.cpp qalculate_tde_utils.cpp
+        qalculateperiodictabledialog.cpp qalculateplotdialog.cpp
+        qalculateprecisiondialog.cpp qalculatepreferencesdialog.cpp
+        qalculatesetbasedialog.cpp qalculateunitsdialog.cpp
+        qalculatevariablesdialog.cpp qalculateresultdisplay.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     ${CMAKE_THREAD_LIBS_INIT}
+     ${QALCULATE_LIBRARIES}
+ 
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( )
+
+
+##### other data
+
+install(
+    FILES qalculate_tdeui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/qalculate_tde
+)
+
+
+tde_create_translated_desktop( qalculate_tde.desktop )
diff --git a/src/qalculateexpressionedit.cpp b/src/qalculateexpressionedit.cpp
index 3eff804..0dfc5b9 100644
--- a/src/qalculateexpressionedit.cpp
+++ b/src/qalculateexpressionedit.cpp
@@ -413,7 +413,7 @@ void QalculateExpressionEdit::keyPressEvent(TQKeyEvent *e) {
 	switch(e->key()) {
 		case Key_Period: {
 			if(e->state() == Keypad) {
-				insert(CALCULATOR->getDecimalPoint());	
+				insert(CALCULATOR->getDecimalPoint().c_str());	
 				e->accept();
 				return;
 			}
@@ -421,7 +421,7 @@ void QalculateExpressionEdit::keyPressEvent(TQKeyEvent *e) {
 		}
 		case Key_Comma: {
 			if(e->state() == Keypad) {
-				insert(CALCULATOR->getDecimalPoint());
+				insert(CALCULATOR->getDecimalPoint().c_str());
 				e->accept();
 				return;
 			}
diff --git a/src/qalculateinsertmatrixvectordialog.cpp b/src/qalculateinsertmatrixvectordialog.cpp
index 07835aa..d8791e9 100644
--- a/src/qalculateinsertmatrixvectordialog.cpp
+++ b/src/qalculateinsertmatrixvectordialog.cpp
@@ -170,7 +170,7 @@ void QalculateInsertMatrixVectorDialog::slotOk() {
 					TQString str2 = elementsTable->text(index_r, index_c).stripWhiteSpace();
 					if(!str2.isEmpty()) {
 						if(b) {
-							matrixstr += CALCULATOR->getComma();
+							matrixstr += CALCULATOR->getComma().c_str();
 							matrixstr += " ";
 						} else {
 							b = true;
@@ -186,7 +186,7 @@ void QalculateInsertMatrixVectorDialog::slotOk() {
 		bool b1 = false;
 		for(int index_r = 0; index_r < r; index_r++) {
 			if(b1) {
-				matrixstr += CALCULATOR->getComma();
+				matrixstr += CALCULATOR->getComma().c_str();
 				matrixstr += " ";
 			} else {
 				b1 = true;
@@ -195,7 +195,7 @@ void QalculateInsertMatrixVectorDialog::slotOk() {
 			bool b2 = false;
 			for(int index_c = 0; index_c < c; index_c++) {
 				if(b2) {
-					matrixstr += CALCULATOR->getComma();
+					matrixstr += CALCULATOR->getComma().c_str();
 					matrixstr += " ";
 				} else {
 					b2 = true;
@@ -219,7 +219,7 @@ void QalculateInsertMatrixVectorDialog::insertSelection() {
 					TQString str2 = elementsTable->text(index_r, index_c).stripWhiteSpace();
 					if(!str2.isEmpty()) {
 						if(b) {
-							matrixstr += CALCULATOR->getComma();
+							matrixstr += CALCULATOR->getComma().c_str();
 							matrixstr += " ";
 						} else {
 							b = true;
@@ -235,7 +235,7 @@ void QalculateInsertMatrixVectorDialog::insertSelection() {
 		bool b1 = false;
 		for(int index_r = sel.topRow(); index_r <= sel.bottomRow(); index_r++) {
 			if(b1) {
-				matrixstr += CALCULATOR->getComma();
+				matrixstr += CALCULATOR->getComma().c_str();
 				matrixstr += " ";
 			} else {
 				b1 = true;
@@ -244,7 +244,7 @@ void QalculateInsertMatrixVectorDialog::insertSelection() {
 			bool b2 = false;
 			for(int index_c = sel.leftCol(); index_c <= sel.rightCol(); index_c++) {
 				if(b2) {
-					matrixstr += CALCULATOR->getComma();
+					matrixstr += CALCULATOR->getComma().c_str();
 					matrixstr += " ";
 				} else {
 					b2 = true;