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

List:       kde-commits
Subject:    KDE/kdeedu/kgeography/src
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2007-10-26 17:40:06
Message-ID: 1193420406.778094.25380.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 729708 by aacid:

Really obey the ignore flag

Bug discovered by Yukiko Bando, translators rock!


 M  +2 -2      askwidget.cpp  
 M  +2 -0      askwidget.h  
 M  +2 -2      boxasker.cpp  
 M  +0 -3      boxasker.h  
 M  +1 -0      mapasker.h  
 M  +1 -0      placeasker.h  


--- trunk/KDE/kdeedu/kgeography/src/askwidget.cpp #729707:729708
@@ -78,8 +78,8 @@
 	QString aux;
 	if (p_asked.count() < p_count)
 	{
-		aux = p_map -> getRandomDivision(division::eClick);
-		while (p_asked.indexOf(aux) != -1) aux = p_map -> getRandomDivision(division::eClick);
+		aux = p_map -> getRandomDivision(askMode());
+		while (p_asked.indexOf(aux) != -1) aux = p_map -> getRandomDivision(askMode());
 		p_asked << aux;
 		nextQuestionHook(aux);
 	}
--- trunk/KDE/kdeedu/kgeography/src/askwidget.h #729707:729708
@@ -15,6 +15,7 @@
 #include <qwidget.h>
 
 #include "answer.h"
+#include "division.h"
 
 class QLabel;
 
@@ -49,6 +50,7 @@
 		QString lastDivisionAsked();
 		void nextQuestion();
 		virtual void nextQuestionHook(const QString &division) = 0;
+		virtual division::askMode askMode() const = 0;
 		void questionAnswered(bool wasCorrect);
 		void resetAnswers();
 	
--- trunk/KDE/kdeedu/kgeography/src/boxasker.cpp #729707:729708
@@ -92,9 +92,9 @@
 		{
 			otherDivision = p_map -> getRandomDivision(askMode());
 			while (auxList.contains(otherDivision))
-                otherDivision = p_map -> getRandomDivision(askMode());
+				otherDivision = p_map -> getRandomDivision(askMode());
 			if (nextBoxAskerQuestionHook(otherDivision, j, false))
-                ++j;
+				++j;
 			auxList << otherDivision;
 		}
 		else ++j;
--- trunk/KDE/kdeedu/kgeography/src/boxasker.h #729707:729708
@@ -13,8 +13,6 @@
 
 #include "askwidget.h"
 
-#include "division.h"
-
 class KPushButton;
 
 class QLabel;
@@ -33,7 +31,6 @@
 		void nextQuestionHook(const QString &division);
 		void setQuestion(const QString &q);
 		virtual void setAnswerHook(int userSays) = 0;
-		virtual division::askMode askMode() const = 0;
 
 		void keyReleaseEvent(QKeyEvent *e);
 		
--- trunk/KDE/kdeedu/kgeography/src/mapasker.h #729707:729708
@@ -35,6 +35,7 @@
 		void mousePressEvent(QMouseEvent *e);
 		QString getQuestionHook() const;
 		void showEvent(QShowEvent *e);
+		division::askMode askMode() const { return division::eClick; }
 
 	public slots:
 		void setMovement(bool b);
--- trunk/KDE/kdeedu/kgeography/src/placeasker.h #729707:729708
@@ -37,6 +37,7 @@
 		void mousePressEvent(QMouseEvent *e);
 		QString getQuestionHook() const;
 		void showEvent(QShowEvent *e);
+		division::askMode askMode() const { return division::eClick; }
 
 	public slots:
 		void setMovement(bool b);
[prev in list] [next in list] [prev in thread] [next in thread]