Fix some kdeedu build issues

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236928 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

23 files changed, 146 insertions, 146 deletions

diff --git a/kalzium/src/eqchemview.h b/kalzium/src/eqchemview.h
index 718c1c9f..c0b88f9c 100644
--- a/kalzium/src/eqchemview.h
+++ b/kalzium/src/eqchemview.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.           *
  ***************************************************************************/
 
-#ifndef _ETQCHEMVIEW_H_
-#define _ETQCHEMVIEW_H_
+#ifndef _EQCHEMVIEW_H_
+#define _EQCHEMVIEW_H_
 
 #include <tqwidget.h>
 #include <kdialogbase.h>
@@ -103,4 +103,4 @@ class EQChemDialog : public KDialogBase
 		void slotHelp();
 };
 
-#endif // _ETQCHEMVIEW_H_
+#endif // _EQCHEMVIEW_H_
diff --git a/kalzium/src/eqresult.h b/kalzium/src/eqresult.h
index 2b862d3b..ef361ba8 100644
--- a/kalzium/src/eqresult.h
+++ b/kalzium/src/eqresult.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef _ETQRESULT_H_
-#define _ETQRESULT_H_
+#ifndef _EQRESULT_H_
+#define _EQRESULT_H_
 
 #include <tqlistbox.h>
 #include <tqsimplerichtext.h>
@@ -87,5 +87,5 @@ private:
     bool m_alternate_color;
 };
 
-#endif // _ETQRESULT_H_
+#endif // _EQRESULT_H_
 
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 1c80d040..72fb8200 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -145,7 +145,7 @@ void Kalzium::setupActions()
 	m_SidebarAction = new KAction(i18n("Show &Sidebar"), "sidebar", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar");
 	
 #ifdef HAVE_FACILE
-	m_ETQSolverAction = new KAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowETQSolver()), actionCollection(), "tools_eqsolver");
+	m_EQSolverAction = new KAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver");
 #endif
 	
 	// tools actions
@@ -250,7 +250,7 @@ void Kalzium::slotGlossary()
 	m_glossarydlg->show();
 }
 
-void Kalzium::slotShowETQSolver()
+void Kalzium::slotShowEQSolver()
 {
 #ifdef HAVE_FACILE
 	EQChemDialog *dlg = new EQChemDialog( this );
diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h
index 44b2583e..7994fd76 100644
--- a/kalzium/src/kalzium.h
+++ b/kalzium/src/kalzium.h
@@ -96,7 +96,7 @@ class Kalzium : public KMainWindow
 		KAction *m_pTooltipAction;
 		KAction *m_pLegendAction;
 		KAction *m_SidebarAction;
-		KAction *m_ETQSolverAction;
+		KAction *m_EQSolverAction;
 
 		KToggleAction *m_actionNoScheme;
 		KToggleAction *m_actionGroups;
@@ -139,7 +139,7 @@ class Kalzium : public KMainWindow
 		 */
 		void slotShowScheme(int);
 
-		void slotShowETQSolver();
+		void slotShowEQSolver();
 		
 		void slotShowLegend();
 		
diff --git a/kbruch/testcases/primenumber_test.cpp b/kbruch/testcases/primenumber_test.cpp
index 0a5ee2b6..c0e322fb 100644
--- a/kbruch/testcases/primenumber_test.cpp
+++ b/kbruch/testcases/primenumber_test.cpp
@@ -36,52 +36,52 @@ class primenumber_test
 	/** test the prime number algorithm */
 	void test_isPrimeNumber()
 	{
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(0) == 0);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(2) == 1);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(3) == 1);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(4) == 0);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(5) == 1);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(6) == 0);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(7) == 1);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(8) == 0);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(9) == 0);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(23) == 1);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(9) == 0);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(9) == 0);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(6) == 0);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(101) == 1);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(323) == 0); // 17 * 19
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(1001) == 0); // 7 * 143
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(1002) == 0); // 2 * 501
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(3) == 1);
-		BOOST_RETQUIRE(m_primenumber.isPrimeNumber(2) == 1);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(0) == 0);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(2) == 1);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(3) == 1);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(4) == 0);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(5) == 1);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(6) == 0);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(7) == 1);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(8) == 0);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(9) == 0);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(23) == 1);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(9) == 0);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(9) == 0);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(6) == 0);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(101) == 1);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(323) == 0); // 17 * 19
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(1001) == 0); // 7 * 143
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(1002) == 0); // 2 * 501
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(3) == 1);
+		BOOST_REQUIRE(m_primenumber.isPrimeNumber(2) == 1);
 	}
 
 	/** test the get_first() function */
 	void test_get_first()
 	{
-		BOOST_RETQUIRE(m_primenumber.get_first() == 2);
+		BOOST_REQUIRE(m_primenumber.get_first() == 2);
 	}
 
 	/** test the move and get functions */
 	void test_move_get_func()
 	{
 		m_primenumber.move_first();
-		BOOST_RETQUIRE(m_primenumber.get_current() == 2);
-		BOOST_RETQUIRE(m_primenumber.get_next() == 3);
+		BOOST_REQUIRE(m_primenumber.get_current() == 2);
+		BOOST_REQUIRE(m_primenumber.get_next() == 3);
 
 		m_primenumber.move_forward();
-		BOOST_RETQUIRE(m_primenumber.get_current() == 5);
+		BOOST_REQUIRE(m_primenumber.get_current() == 5);
 
 		m_primenumber.move_back();
-		BOOST_RETQUIRE(m_primenumber.get_current() == 3);
+		BOOST_REQUIRE(m_primenumber.get_current() == 3);
 		
 		unsigned int tmp = m_primenumber.get_last();
 		m_primenumber.move_last();
-		BOOST_RETQUIRE(m_primenumber.get_current() == tmp);
+		BOOST_REQUIRE(m_primenumber.get_current() == tmp);
 
 		m_primenumber.move_forward();
-		BOOST_RETQUIRE(m_primenumber.get_last() != tmp);
+		BOOST_REQUIRE(m_primenumber.get_last() != tmp);
 	}
 
 	private:
diff --git a/kbruch/testcases/ratio_test.cpp b/kbruch/testcases/ratio_test.cpp
index 0dac9dfe..bdc4419b 100644
--- a/kbruch/testcases/ratio_test.cpp
+++ b/kbruch/testcases/ratio_test.cpp
@@ -38,29 +38,29 @@ class ratio_test
 	{
 		// check basic initialisation
 		ratio * ratio_a = new ratio();
-		BOOST_RETQUIRE(ratio_a->numerator() == 0);
-		BOOST_RETQUIRE(ratio_a->denominator() == 1);
+		BOOST_REQUIRE(ratio_a->numerator() == 0);
+		BOOST_REQUIRE(ratio_a->denominator() == 1);
 
 		// a denominator with value 0 is never allowed
 		ratio * ratio_b = new ratio(2, 0);
-		BOOST_RETQUIRE(ratio_b->numerator() == 2);
-		BOOST_RETQUIRE(ratio_b->denominator() == 1); // division by zero not allowed
+		BOOST_REQUIRE(ratio_b->numerator() == 2);
+		BOOST_REQUIRE(ratio_b->denominator() == 1); // division by zero not allowed
 
 		// a new ratio should always be reduced
 		ratio * ratio_c = new ratio(2, 4);
-		BOOST_RETQUIRE(ratio_c->numerator() == 1);
-		BOOST_RETQUIRE(ratio_c->denominator() == 2);
+		BOOST_REQUIRE(ratio_c->numerator() == 1);
+		BOOST_REQUIRE(ratio_c->denominator() == 2);
 
 		// check copy constructor
 		ratio * ratio_d = new ratio(*ratio_c);
-		BOOST_RETQUIRE(ratio_d->numerator() == 1);
-		BOOST_RETQUIRE(ratio_d->denominator() == 2);
+		BOOST_REQUIRE(ratio_d->numerator() == 1);
+		BOOST_REQUIRE(ratio_d->denominator() == 2);
 
 		// the copy constructor is not allowed to reduce the new ratio
 		ratio_d->setNumerator(4, false);
 		ratio * ratio_e = new ratio(*ratio_d);
-		BOOST_RETQUIRE(ratio_e->numerator() == 4);
-		BOOST_RETQUIRE(ratio_e->denominator() == 2);
+		BOOST_REQUIRE(ratio_e->numerator() == 4);
+		BOOST_REQUIRE(ratio_e->denominator() == 2);
 
 		delete(ratio_a);
 		delete(ratio_b);
@@ -77,33 +77,33 @@ class ratio_test
 		// check setNumerator() and numerator() (get)
 		ratio * ratio_a = new ratio();
 		ratio_a->setNumerator(10);
-		BOOST_RETQUIRE(ratio_a->numerator() == 10);
-		BOOST_RETQUIRE(ratio_a->denominator() == 1);
+		BOOST_REQUIRE(ratio_a->numerator() == 10);
+		BOOST_REQUIRE(ratio_a->denominator() == 1);
 		
 		// check setDenominator() and denominator() (get)
 		ratio_a->setDenominator(7);
-		BOOST_RETQUIRE(ratio_a->numerator() == 10);
-		BOOST_RETQUIRE(ratio_a->denominator() == 7);
+		BOOST_REQUIRE(ratio_a->numerator() == 10);
+		BOOST_REQUIRE(ratio_a->denominator() == 7);
 
 		// now check if the ratio gets reduced
 		ratio_a->setNumerator(14);
-		BOOST_RETQUIRE(ratio_a->numerator() == 2);
-		BOOST_RETQUIRE(ratio_a->denominator() == 1);
+		BOOST_REQUIRE(ratio_a->numerator() == 2);
+		BOOST_REQUIRE(ratio_a->denominator() == 1);
 
 		// lets do the same, but with out reducing
 		ratio_a->setNumerator(14, false);
 		ratio_a->setDenominator(7, false);
-		BOOST_RETQUIRE(ratio_a->numerator() == 14);
-		BOOST_RETQUIRE(ratio_a->denominator() == 7);
+		BOOST_REQUIRE(ratio_a->numerator() == 14);
+		BOOST_REQUIRE(ratio_a->denominator() == 7);
 
 		// now the = operator
 		ratio * ratio_b = new ratio();
 		*ratio_b = *ratio_a;
-		BOOST_RETQUIRE(ratio_b->numerator() == 14);
-		BOOST_RETQUIRE(ratio_b->denominator() == 7);
+		BOOST_REQUIRE(ratio_b->numerator() == 14);
+		BOOST_REQUIRE(ratio_b->denominator() == 7);
 
 		// make sure we didn't just copied the pointers
-		BOOST_RETQUIRE(ratio_a != ratio_b);
+		BOOST_REQUIRE(ratio_a != ratio_b);
 
 		delete(ratio_a);
 		delete(ratio_b);
@@ -116,13 +116,13 @@ class ratio_test
 	{
 		ratio ratio_a;
 		ratio_a = 8;
-		BOOST_RETQUIRE(ratio_a.numerator() == 8);
-		BOOST_RETQUIRE(ratio_a.denominator() == 1);
+		BOOST_REQUIRE(ratio_a.numerator() == 8);
+		BOOST_REQUIRE(ratio_a.denominator() == 1);
 
 		ratio ratio_b(2, 3);
 		ratio_a =  ratio_b;
-		BOOST_RETQUIRE(ratio_a.numerator() == 2);
-		BOOST_RETQUIRE(ratio_a.denominator() == 3);
+		BOOST_REQUIRE(ratio_a.numerator() == 2);
+		BOOST_REQUIRE(ratio_a.denominator() == 3);
 
 		return;
 	}
@@ -140,29 +140,29 @@ class ratio_test
 
 		// check + operator
 		ratio ratio_c = *ratio_a + *ratio_b;
-		BOOST_RETQUIRE(ratio_c.numerator() == 5);
-		BOOST_RETQUIRE(ratio_c.denominator() == 2);
+		BOOST_REQUIRE(ratio_c.numerator() == 5);
+		BOOST_REQUIRE(ratio_c.denominator() == 2);
 
 		// it should be the same if we change the addends
 		ratio_c = *ratio_b + *ratio_a;
-		BOOST_RETQUIRE(ratio_c.numerator() == 5);
-		BOOST_RETQUIRE(ratio_c.denominator() == 2);
+		BOOST_REQUIRE(ratio_c.numerator() == 5);
+		BOOST_REQUIRE(ratio_c.denominator() == 2);
 
 		// check - operator
 		ratio_c = *ratio_b - *ratio_a;
-		BOOST_RETQUIRE(ratio_c.numerator() == -3);
-		BOOST_RETQUIRE(ratio_c.denominator() == 2);
+		BOOST_REQUIRE(ratio_c.numerator() == -3);
+		BOOST_REQUIRE(ratio_c.denominator() == 2);
 
 		// it should not be the same if we change the subtrahends
 		ratio_c = *ratio_a - *ratio_b;
-		BOOST_RETQUIRE(ratio_c.numerator() == 3);
-		BOOST_RETQUIRE(ratio_c.denominator() == 2);
+		BOOST_REQUIRE(ratio_c.numerator() == 3);
+		BOOST_REQUIRE(ratio_c.denominator() == 2);
 
 		// now check if we can get 0/1
 		*ratio_a = *ratio_b;
 		ratio_c = *ratio_a - *ratio_b;
-		BOOST_RETQUIRE(ratio_c.numerator() == 0);
-		BOOST_RETQUIRE(ratio_c.denominator() == 1);
+		BOOST_REQUIRE(ratio_c.numerator() == 0);
+		BOOST_REQUIRE(ratio_c.denominator() == 1);
 		
 		delete(ratio_a);
 		delete(ratio_b);
@@ -183,32 +183,32 @@ class ratio_test
 
 		// check * operator
 		ratio ratio_c = *ratio_a * *ratio_b;
-		BOOST_RETQUIRE(ratio_c.numerator() == 1);
-		BOOST_RETQUIRE(ratio_c.denominator() == 2);
+		BOOST_REQUIRE(ratio_c.numerator() == 1);
+		BOOST_REQUIRE(ratio_c.denominator() == 2);
 
 		// it should be the same if we change the addends
 		ratio_c = *ratio_b * *ratio_a;
-		BOOST_RETQUIRE(ratio_c.numerator() == 1);
-		BOOST_RETQUIRE(ratio_c.denominator() == 2);
+		BOOST_REQUIRE(ratio_c.numerator() == 1);
+		BOOST_REQUIRE(ratio_c.denominator() == 2);
 
 		// check / operator
 		ratio_c = *ratio_b / *ratio_a;
-		BOOST_RETQUIRE(ratio_c.numerator() == 1);
-		BOOST_RETQUIRE(ratio_c.denominator() == 8);
+		BOOST_REQUIRE(ratio_c.numerator() == 1);
+		BOOST_REQUIRE(ratio_c.denominator() == 8);
 
 		// it should not be the same if we change the subtrahends
 		ratio_c = *ratio_a / *ratio_b;
-		BOOST_RETQUIRE(ratio_c.numerator() == 8);
-		BOOST_RETQUIRE(ratio_c.denominator() == 1);
+		BOOST_REQUIRE(ratio_c.numerator() == 8);
+		BOOST_REQUIRE(ratio_c.denominator() == 1);
 
 		// now check if we can get 0/1
 		*ratio_a = 0;
 		ratio_c = *ratio_a * *ratio_b;
-		BOOST_RETQUIRE(ratio_c.numerator() == 0);
-		BOOST_RETQUIRE(ratio_c.denominator() == 1);
+		BOOST_REQUIRE(ratio_c.numerator() == 0);
+		BOOST_REQUIRE(ratio_c.denominator() == 1);
 		ratio_c = *ratio_a / *ratio_b;
-		BOOST_RETQUIRE(ratio_c.numerator() == 0);
-		BOOST_RETQUIRE(ratio_c.denominator() == 1);
+		BOOST_REQUIRE(ratio_c.numerator() == 0);
+		BOOST_REQUIRE(ratio_c.denominator() == 1);
 		
 		delete(ratio_a);
 		delete(ratio_b);
@@ -221,8 +221,8 @@ class ratio_test
 	{
 		ratio ratio_a(2, 3);
 		ratio_a.reziproc();
-		BOOST_RETQUIRE(ratio_a.numerator() == 3);
-		BOOST_RETQUIRE(ratio_a.denominator() == 2);
+		BOOST_REQUIRE(ratio_a.numerator() == 3);
+		BOOST_REQUIRE(ratio_a.denominator() == 2);
 
 		return;
 	}
@@ -234,8 +234,8 @@ class ratio_test
 		ratio_a.setNumerator(51, false);
 		ratio_a.setDenominator(17, false);
 		ratio_a.reduce();
-		BOOST_RETQUIRE(ratio_a.numerator() == 3);
-		BOOST_RETQUIRE(ratio_a.denominator() == 1);
+		BOOST_REQUIRE(ratio_a.numerator() == 3);
+		BOOST_REQUIRE(ratio_a.denominator() == 1);
 
 		return;
 	}
@@ -249,11 +249,11 @@ class ratio_test
 		ratio ratio_d(2, -3);
 		ratio ratio_e(-2, 3);
 
-		BOOST_RETQUIRE((ratio_a == ratio_a) == true);
-		BOOST_RETQUIRE((ratio_a == ratio_b) == true);
-		BOOST_RETQUIRE((ratio_a == ratio_c) == true);
-		BOOST_RETQUIRE((ratio_a == ratio_d) == false);
-		BOOST_RETQUIRE((ratio_a == ratio_e) == false);
+		BOOST_REQUIRE((ratio_a == ratio_a) == true);
+		BOOST_REQUIRE((ratio_a == ratio_b) == true);
+		BOOST_REQUIRE((ratio_a == ratio_c) == true);
+		BOOST_REQUIRE((ratio_a == ratio_d) == false);
+		BOOST_REQUIRE((ratio_a == ratio_e) == false);
 
 		return;
 	}
@@ -267,21 +267,21 @@ class ratio_test
 		ratio ratio_d(2, -3);
 		ratio ratio_e(-2, 3);
 
-		BOOST_RETQUIRE((ratio_a < ratio_a) == false);
-		BOOST_RETQUIRE((ratio_a < ratio_b) == false);
-		BOOST_RETQUIRE((ratio_a < ratio_c) == false);
-		BOOST_RETQUIRE((ratio_a < ratio_d) == false);
-		BOOST_RETQUIRE((ratio_a < ratio_e) == false);
+		BOOST_REQUIRE((ratio_a < ratio_a) == false);
+		BOOST_REQUIRE((ratio_a < ratio_b) == false);
+		BOOST_REQUIRE((ratio_a < ratio_c) == false);
+		BOOST_REQUIRE((ratio_a < ratio_d) == false);
+		BOOST_REQUIRE((ratio_a < ratio_e) == false);
 
 		ratio_a = ratio(-2, 3);
 
-		BOOST_RETQUIRE((ratio_a < ratio_a) == false);
-		BOOST_RETQUIRE((ratio_a < ratio_b) == true);
-		BOOST_RETQUIRE((ratio_a < ratio_c) == true);
-		BOOST_RETQUIRE((ratio_a < ratio_d) == false);
-		BOOST_RETQUIRE((ratio_a < ratio_e) == false);
+		BOOST_REQUIRE((ratio_a < ratio_a) == false);
+		BOOST_REQUIRE((ratio_a < ratio_b) == true);
+		BOOST_REQUIRE((ratio_a < ratio_c) == true);
+		BOOST_REQUIRE((ratio_a < ratio_d) == false);
+		BOOST_REQUIRE((ratio_a < ratio_e) == false);
 
-		BOOST_RETQUIRE((ratio(5, 8) < ratio(2, 1)) == true);
+		BOOST_REQUIRE((ratio(5, 8) < ratio(2, 1)) == true);
 
 		return;
 	}
@@ -296,21 +296,21 @@ class ratio_test
 		ratio ratio_e(-2, 3);
 		ratio ratio_f(-4, 3);
 
-		BOOST_RETQUIRE((ratio_a > ratio_a) == false);
-		BOOST_RETQUIRE((ratio_a > ratio_b) == false);
-		BOOST_RETQUIRE((ratio_a > ratio_c) == false);
-		BOOST_RETQUIRE((ratio_a > ratio_d) == true);
-		BOOST_RETQUIRE((ratio_a > ratio_e) == true);
-		BOOST_RETQUIRE((ratio_a > ratio_f) == true);
+		BOOST_REQUIRE((ratio_a > ratio_a) == false);
+		BOOST_REQUIRE((ratio_a > ratio_b) == false);
+		BOOST_REQUIRE((ratio_a > ratio_c) == false);
+		BOOST_REQUIRE((ratio_a > ratio_d) == true);
+		BOOST_REQUIRE((ratio_a > ratio_e) == true);
+		BOOST_REQUIRE((ratio_a > ratio_f) == true);
 
 		ratio_a = ratio(-2, 3);
 
-		BOOST_RETQUIRE((ratio_a > ratio_a) == false);
-		BOOST_RETQUIRE((ratio_a > ratio_b) == false);
-		BOOST_RETQUIRE((ratio_a > ratio_c) == false);
-		BOOST_RETQUIRE((ratio_a > ratio_d) == false);
-		BOOST_RETQUIRE((ratio_a > ratio_e) == false);
-		BOOST_RETQUIRE((ratio_a > ratio_f) == true);
+		BOOST_REQUIRE((ratio_a > ratio_a) == false);
+		BOOST_REQUIRE((ratio_a > ratio_b) == false);
+		BOOST_REQUIRE((ratio_a > ratio_c) == false);
+		BOOST_REQUIRE((ratio_a > ratio_d) == false);
+		BOOST_REQUIRE((ratio_a > ratio_e) == false);
+		BOOST_REQUIRE((ratio_a > ratio_f) == true);
 
 		return;
 	}
diff --git a/kiten/edict_doc.html b/kiten/edict_doc.html
index cbd2189b..b762bf44 100644
--- a/kiten/edict_doc.html
+++ b/kiten/edict_doc.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML>
 <HEAD>
-<META HTTP-ETQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META NAME="Generator" CONTENT="Jim's Markup Program - V0.99">
 <TITLE>EDICT Documentation</TITLE>
 </HEAD>
diff --git a/kiten/edict_kanjidic_licence.html b/kiten/edict_kanjidic_licence.html
index a17128ed..999357fe 100644
--- a/kiten/edict_kanjidic_licence.html
+++ b/kiten/edict_kanjidic_licence.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML>
 <HEAD>
-<META HTTP-ETQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <META NAME="Generator" CONTENT="Jim's Markup Program - V0.99">
 <TITLE>ELECTRONIC DICTIONARY RESEARCH AND DEVELOPMENT GROUP - MONASH UNIVERSITY</TITLE>
 </HEAD>
diff --git a/kiten/xjdic.h b/kiten/xjdic.h
index a6d34822..c000cba9 100644
--- a/kiten/xjdic.h
+++ b/kiten/xjdic.h
@@ -76,7 +76,7 @@ typedef struct {
 	int32_t	xjdreq_indexpos;
 	short		xjdreq_schlen;
 	unsigned char	xjdreq_schstr[21];
-	} RETQ_PDU;
+	} REQ_PDU;
 
 typedef struct {
 	int32_t	xjdrsp_checksum;
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index 1194d4bd..2c442d48 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -905,7 +905,7 @@ void DetailDialog::centerTelescope()
   int selectedCoord(0);
   SkyPoint sp;
   
-  // Find the first device with ETQUATORIAL_EOD_COORD or ETQUATORIAL_COORD and with SLEW element
+  // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element
   // i.e. the first telescope we tqfind!
   
   INDIMenu *imenu = ksw->getINDIMenu();
@@ -917,10 +917,10 @@ void DetailDialog::centerTelescope()
     {
        indidev = imenu->mgr.at(i)->indi_dev.at(j);
        indidev->stdDev->currentObject = NULL;
-       prop = indidev->findProp("ETQUATORIAL_EOD_COORD");
+       prop = indidev->findProp("EQUATORIAL_EOD_COORD");
        	if (prop == NULL)
 	{
-		  prop = indidev->findProp("ETQUATORIAL_COORD");
+		  prop = indidev->findProp("EQUATORIAL_COORD");
 		  if (prop == NULL)
                   {
                     prop = indidev->findProp("HORIZONTAL_COORD");
diff --git a/kstars/kstars/indi/apmount.cpp b/kstars/kstars/indi/apmount.cpp
index b400dbcb..a9857df3 100644
--- a/kstars/kstars/indi/apmount.cpp
+++ b/kstars/kstars/indi/apmount.cpp
@@ -231,7 +231,7 @@ void APMount::initProperties()
 
    fillNumber(&EqN[0], "RA", "RA  H:M:S", "%10.6m",  0., 24., 0., 0.);
    fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.);
-   fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE);
+   fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE);
 
    fillNumber(&GeoN[0], "LAT",  "Lat.  D:M:S +N", "%10.6m",  -90.,  90., 0., 0.);
    fillNumber(&GeoN[1], "LONG", "Long. D:M:S +E", "%10.6m", 0., 360., 0., 0.);
diff --git a/kstars/kstars/indi/celestrongps.cpp b/kstars/kstars/indi/celestrongps.cpp
index e25c95ac..5eb7fe81 100644
--- a/kstars/kstars/indi/celestrongps.cpp
+++ b/kstars/kstars/indi/celestrongps.cpp
@@ -65,7 +65,7 @@ static INumber eq[] = {
 };
 //TODO decide appropiate TIME_OUT
 static INumberVectorProperty eqNum = {
-    mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE,
+    mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE,
     eq, NARRAY(eq), "", 0};
 
 /* Fundamental group */
diff --git a/kstars/kstars/indi/lx200basic.cpp b/kstars/kstars/indi/lx200basic.cpp
index 1d41e652..a812caa6 100644
--- a/kstars/kstars/indi/lx200basic.cpp
+++ b/kstars/kstars/indi/lx200basic.cpp
@@ -165,7 +165,7 @@ void LX200Basic::initProperties()
 
    fillNumber(&EqN[0], "RA", "RA  H:M:S", "%10.6m",  0., 24., 0., 0.);
    fillNumber(&EqN[1], "DEC", "Dec D:M:S", "%10.6m", -90., 90., 0., 0.);
-   fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "ETQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE);
+   fillNumberVector(&EqNP, EqN, NARRAY(EqN), mydev, "EQUATORIAL_EOD_COORD" , "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE);
 
    
 }
diff --git a/kstars/kstars/indi/lx200generic.cpp b/kstars/kstars/indi/lx200generic.cpp
index d498ba62..afe1b952 100644
--- a/kstars/kstars/indi/lx200generic.cpp
+++ b/kstars/kstars/indi/lx200generic.cpp
@@ -118,7 +118,7 @@ INumber eq[] = {
 //TODO decide appropiate TIME_OUT
 // N.B. No Static identifier as it is needed for external linkage
 INumberVectorProperty eqNum = {
-    mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE,
+    mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", BASIC_GROUP, IP_RW, 0, IPS_IDLE,
     eq, NARRAY(eq), "", 0};
 
 /* Fundamental group */
diff --git a/kstars/kstars/indi/temmadriver.h b/kstars/kstars/indi/temmadriver.h
index 8bd2ccc1..79926c3f 100644
--- a/kstars/kstars/indi/temmadriver.h
+++ b/kstars/kstars/indi/temmadriver.h
@@ -172,14 +172,14 @@ static ITextVectorProperty Port		= {
 	IP_RW, 0, IPS_OK, PortT, NARRAY(PortT), "", 0};
 
 /*******************************/
-/* ETQUATORIAL_COORD RW property */
+/* EQUATORIAL_COORD RW property */
 /*******************************/
 static INumber eq[] = {
 	{"RA"		,"RA H:M:S" , "%10.6m", 0, 24, 0, 0, 0, 0, 0},	
 	{"DEC", "Dec D:M:S", "%10.6m", -90, 90, 0, 0, 0, 0, 0}
 };
 static INumberVectorProperty eqNum = { 
-	mydev, "ETQUATORIAL_EOD_COORD", "Equatorial JNow", 
+	mydev, "EQUATORIAL_EOD_COORD", "Equatorial JNow", 
 	MAIN_GROUP , IP_RW, 0, IPS_IDLE, eq, NARRAY(eq), "", 0};
 
 /*******************************/
diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp
index 02c6f8f1..9d724b56 100644
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@@ -81,7 +81,7 @@
 /* INDI standard property used across all clients to enable interoperability. */
 
 const char * indi_std[NINDI_STD] = 
-  {"CONNECTION", "DEVICE_PORT", "TIME", "SDTIME", "GEOGRAPHIC_COORD", "ETQUATORIAL_COORD", "ETQUATORIAL_EOD_COORD", "HORIZONTAL_COORD", "ABORT_MOTION", "ON_COORD_SET", "SOLAR_SYSTEM", "MOVEMENT", "PARK", "CCD_EXPOSE_DURATION", "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCDPREVIEW_STREAM", "CCDPREVIEW_CTRL", "VIDEO_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT" };
+  {"CONNECTION", "DEVICE_PORT", "TIME", "SDTIME", "GEOGRAPHIC_COORD", "EQUATORIAL_COORD", "EQUATORIAL_EOD_COORD", "HORIZONTAL_COORD", "ABORT_MOTION", "ON_COORD_SET", "SOLAR_SYSTEM", "MOVEMENT", "PARK", "CCD_EXPOSE_DURATION", "CCD_TEMPERATURE", "CCD_FRAME", "CCD_FRAME_TYPE", "CCD_BINNING", "CCD_INFO", "CCDPREVIEW_STREAM", "CCDPREVIEW_CTRL", "VIDEO_STREAM", "FOCUS_SPEED", "FOCUS_MOTION", "FOCUS_TIMER", "FILTER_SLOT" };
 
 /*******************************************************************
 ** INDI Device: The work-horse. Responsible for handling its
diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h
index a7f10f08..09571062 100644
--- a/kstars/kstars/indielement.h
+++ b/kstars/kstars/indielement.h
@@ -49,7 +49,7 @@ typedef enum {PG_NONE = 0, PG_TEXT, PG_NUMERIC, PG_BUTTONS,
 /* INDI std properties */
 /* N.B. Need to modify corresponding entry in indidevice.cpp when changed */    
 enum stdProperties { CONNECTION, DEVICE_PORT, TIME, SDTIME, GEOGRAPHIC_COORD,   /* General */
-                     ETQUATORIAL_COORD, ETQUATORIAL_EOD_COORD, HORIZONTAL_COORD,  /* Telescope */
+                     EQUATORIAL_COORD, EQUATORIAL_EOD_COORD, HORIZONTAL_COORD,  /* Telescope */
                      ABORT_MOTION, ON_COORD_SET, SOLAR_SYSTEM, MOVEMENT, PARK,  /* Telescope */
                      CCD_EXPOSE_DURATION, CCD_TEMPERATURE, CCD_FRAME,           /* CCD */
                      CCD_FRAME_TYPE, CCD_BINNING, CCD_INFO, CCDPREVIEW_STREAM,  /* CCD */
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index 4ad0c4d6..f01551c7 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -301,8 +301,8 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d
 	 CCDPreviewWindow->setCCDInfo(fwhm, mu);
 	 break;
 
-       case ETQUATORIAL_COORD:
-       case ETQUATORIAL_EOD_COORD:
+       case EQUATORIAL_COORD:
+       case EQUATORIAL_EOD_COORD:
 	if (!dp->isOn()) break;
 	el = pp->findElement("RA");
 	if (!el) return;
@@ -742,11 +742,11 @@ void INDIStdDevice::timerDone()
         return;
        }
 	
-       prop = dp->findProp("ETQUATORIAL_EOD_COORD");
+       prop = dp->findProp("EQUATORIAL_EOD_COORD");
        
        if (prop == NULL)
        {
-         prop = dp->findProp("ETQUATORIAL_COORD");
+         prop = dp->findProp("EQUATORIAL_COORD");
 	 if (prop) useJ2000 = true;
        }
        
@@ -862,10 +862,10 @@ INDIStdProperty::INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, IN
    	if (stdDev->devTimer->isActive())
 		 	stdDev->devTimer->stop();
 
-   	prop = pp->pg->dp->findProp("ETQUATORIAL_EOD_COORD");
+   	prop = pp->pg->dp->findProp("EQUATORIAL_EOD_COORD");
        	if (prop == NULL)
 	{
-		  prop = pp->pg->dp->findProp("ETQUATORIAL_COORD");
+		  prop = pp->pg->dp->findProp("EQUATORIAL_COORD");
 		  if (prop == NULL)
                   {
                     prop = pp->pg->dp->findProp("HORIZONTAL_COORD");
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index 9ff1e72c..8a5ce618 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -654,7 +654,7 @@ void KStars::setINDITargetCoord(TQString deviceName, double RA, double DEC)
     return;
   }
   
-  prop = dev->findProp("ETQUATORIAL_EOD_COORD");
+  prop = dev->findProp("EQUATORIAL_EOD_COORD");
   if (!prop) return;
   
   el   = prop->findElement("RA");
@@ -698,7 +698,7 @@ void KStars::setINDITargetName(TQString deviceName, TQString objectName)
     return;
   }
   
-  prop = dev->findProp("ETQUATORIAL_EOD_COORD");
+  prop = dev->findProp("EQUATORIAL_EOD_COORD");
   if (!prop) return;
   
   el   = prop->findElement("RA");
diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp
index 81c575b4..d6c515fc 100644
--- a/kstars/kstars/skymapdraw.cpp
+++ b/kstars/kstars/skymapdraw.cpp
@@ -166,11 +166,11 @@ void SkyMap::drawTelescopeSymbols(TQPainter &psky) {
 					 if (portConnect->state == PS_BUSY)
 					  return;
 
-					eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("ETQUATORIAL_EOD_COORD");
+					eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("EQUATORIAL_EOD_COORD");
 					
 					if (eqNum == NULL)
 					{
-						eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("ETQUATORIAL_COORD");
+						eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("EQUATORIAL_COORD");
 						if (eqNum == NULL)
                                                 {
 						  eqNum = devMenu->mgr.at(i)->indi_dev.at(j)->findProp("HORIZONTAL_COORD");
diff --git a/kstars/kstars/tools/modcalcequinox.h b/kstars/kstars/tools/modcalcequinox.h
index 2480f9cd..eac67f51 100644
--- a/kstars/kstars/tools/modcalcequinox.h
+++ b/kstars/kstars/tools/modcalcequinox.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef MODCALCETQUINOX_H
-#define MODCALCETQUINOX_H
+#ifndef MODCALCEQUINOX_H
+#define MODCALCEQUINOX_H
 
 #include <kapplication.h>
 #include <tqwidget.h>
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index 163040b9..67e0ad74 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -345,7 +345,7 @@ void ObservingList::slotSlewToObject()
   int selectedCoord(0);
   SkyPoint sp;
   
-  // Find the first device with ETQUATORIAL_EOD_COORD or ETQUATORIAL_COORD and with SLEW element
+  // Find the first device with EQUATORIAL_EOD_COORD or EQUATORIAL_COORD and with SLEW element
   // i.e. the first telescope we tqfind!
   
   INDIMenu *imenu = ks->getINDIMenu();
@@ -357,10 +357,10 @@ void ObservingList::slotSlewToObject()
     {
        indidev = imenu->mgr.at(i)->indi_dev.at(j);
        indidev->stdDev->currentObject = NULL;
-       prop = indidev->findProp("ETQUATORIAL_EOD_COORD");
+       prop = indidev->findProp("EQUATORIAL_EOD_COORD");
        	if (prop == NULL)
 	{
-		  prop = indidev->findProp("ETQUATORIAL_COORD");
+		  prop = indidev->findProp("EQUATORIAL_COORD");
 		  if (prop == NULL)
                   {
                     prop = indidev->findProp("HORIZONTAL_COORD");
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 31667d00..471e50c9 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -166,11 +166,11 @@ ScriptBuilder::ScriptBuilder( TQWidget *tqparent, const char *name )
 	INDIFunctionList.append( setINDIScopeActionFunc);
 	
 	setINDITargetCoordFunc = new ScriptFunction ( "setINDITargetCoord", i18n( "Set the telescope target coordinates to the RA/Dec coordinates.  RA is expressed in Hours; DEC is expressed in Degrees." ), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "RA", "double", "DEC" );
-	setINDITargetCoordFunc->setINDIProperty("ETQUATORIAL_EOD_COORD");
+	setINDITargetCoordFunc->setINDIProperty("EQUATORIAL_EOD_COORD");
 	INDIFunctionList.append ( setINDITargetCoordFunc );
 	
 	setINDITargetNameFunc = new ScriptFunction( "setINDITargetName", i18n("Set the telescope target coorinates to the RA/Dec coordinates of the selected object."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "objectName");
-	setINDITargetNameFunc->setINDIProperty("ETQUATORIAL_EOD_COORD");
+	setINDITargetNameFunc->setINDIProperty("EQUATORIAL_EOD_COORD");
 	INDIFunctionList.append( setINDITargetNameFunc);
 	
 	setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "long", "double", "lat");