KDE/kdeedu/parley/src/practiceold

SVN commit 1005251 by gladhorn:

rename showSolutionFinished to currentEntryFinished, remove more cruft

 M  +1 -1      AdjQueryDlg.cpp  
 M  +1 -1      SimpleQueryDlg.cpp  
 M  +2 -2      VerbQueryDlg.cpp  
 M  +1 -1      mixedletterpracticedialog.cpp  
 M  +1 -1      practicedialog.cpp  
 M  +2 -7      practicedialog.h  
 M  +1 -1      testentrymanager.cpp  


--- trunk/KDE/kdeedu/parley/src/practiceold/AdjQueryDlg.cpp #1005250:1005251
@@ -161,7 +161,7 @@
     if (all_known) {
 //  know_it->setDefault(true);
         resultCorrect();
-        emit showSolutionFinished();
+        emit currentEntryFinished();
     } else {
         mw->dont_know->setDefault(true);
         setAnswerTainted();
--- trunk/KDE/kdeedu/parley/src/practiceold/SimpleQueryDlg.cpp #1005250:1005251
@@ -179,7 +179,7 @@
     double result = verifyAnswer(mw->answerField->text(), answerstring);
     if ( result == 1.0 ) {
         resultCorrect();
-        emit showSolutionFinished();
+        emit currentEntryFinished();
     } else {
         setWidgetStyle( mw->answerField, NegativeResult );
         setAnswerTainted();
--- trunk/KDE/kdeedu/parley/src/practiceold/VerbQueryDlg.cpp #1005250:1005251
@@ -173,7 +173,7 @@
     if ( m_tenses.isEmpty() ) {
         kDebug() << "Warning, no conjugations found.";
         resultCorrect(); // don't ask this again
-        emit showSolutionFinished();
+        emit currentEntryFinished();
         return;
     }
 
@@ -387,7 +387,7 @@
         m_tenses.removeAt(m_tenses.indexOf(m_currentTense));
         if ( m_tenses.isEmpty() ) {
             resultCorrect();
-            emit showSolutionFinished();
+            emit currentEntryFinished();
         } else {
             setupTense( m_tenses.value(0));
         }
--- trunk/KDE/kdeedu/parley/src/practiceold/mixedletterpracticedialog.cpp 
#1005250:1005251
@@ -139,7 +139,7 @@
     double result = verifyAnswer(answerLineEdit->text(), 
m_entry->entry()->translation(Prefs::solutionLanguage())->text());
     if ( result == 1.0 ) {
         resultCorrect();
-        emit showSolutionFinished();
+        emit currentEntryFinished();
     } else {
         setWidgetStyle( answerLineEdit, NegativeResult );
         setAnswerTainted();
--- trunk/KDE/kdeedu/parley/src/practiceold/practicedialog.cpp #1005250:1005251
@@ -320,7 +320,7 @@
     if ( m_showSolutionTimer ) {
         m_showSolutionTimer->stop();
     }
-    emit showSolutionFinished();
+    emit currentEntryFinished();
 }
 
 
--- trunk/KDE/kdeedu/parley/src/practiceold/practicedialog.h #1005250:1005251
@@ -62,8 +62,6 @@
      */
     PracticeDialog(const QString & caption, KEduVocDocument *doc, QWidget 
*parent);
 
-    void setTestEntryManager(TestEntryManager* testEntryManager);
-
     /**
      * Default dtor
      */
@@ -85,7 +83,7 @@
 
 signals:
     void signalResult(TestEntryManager::Result);
-    void showSolutionFinished();
+    void currentEntryFinished();
 
 public slots:
     /**
@@ -164,7 +162,7 @@
 
     virtual void closeEvent(QCloseEvent*e);
 
-    KEduVocDocument   *m_doc;
+    KEduVocDocument *m_doc;
     TestEntry* m_entry;
     int m_testType;
 
@@ -196,9 +194,6 @@
      */
     bool answerTainted();
 
-    /// The vocabulary will come from here
-//     TestEntryManager    *m_entryManager;
-
 private:
 
     QTimer    *m_answerTimer;
--- trunk/KDE/kdeedu/parley/src/practiceold/testentrymanager.cpp 
#1005250:1005251
@@ -190,7 +190,7 @@
         kError() << "unknown test type";
     }
     connect(m_practiceDialog, SIGNAL(signalResult(TestEntryManager::Result)), 
SLOT(slotResult(TestEntryManager::Result)));
-    connect(m_practiceDialog, SIGNAL(showSolutionFinished()), 
SLOT(setNextEntry()));
+    connect(m_practiceDialog, SIGNAL(currentEntryFinished()), 
SLOT(setNextEntry()));
     setNextEntry();
     m_practiceDialog->exec();