]> Git trees. - libqmvoc.git/commitdiff
EBN/Krazy fixes.
authorPeter Hedlund <peter@peterandlinda.com>
Mon, 7 May 2007 23:01:49 +0000 (23:01 +0000)
committerPeter Hedlund <peter@peterandlinda.com>
Mon, 7 May 2007 23:01:49 +0000 (23:01 +0000)
svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=662362

23 files changed:
kdeeducore/keduvoccsvreader.cpp
kdeeducore/keduvoccsvreader.h
kdeeducore/keduvoccsvwriter.cpp
kdeeducore/keduvoccsvwriter.h
kdeeducore/keduvocdocument.cpp
kdeeducore/keduvocdocument.h
kdeeducore/keduvocexpression.cpp
kdeeducore/keduvocexpression.h
kdeeducore/keduvockvtmlreader.cpp
kdeeducore/keduvockvtmlreader.h
kdeeducore/keduvockvtmlwriter.cpp
kdeeducore/keduvockvtmlwriter.h
kdeeducore/keduvocvokabelnreader.cpp
kdeeducore/keduvocvokabelnreader.h
kdeeducore/keduvocwqlreader.cpp
kdeeducore/keduvocwqlreader.h
kdeeducore/kvtmldefs.h
kdeeducore/leitnerbox.cpp
kdeeducore/leitnerbox.h
kdeeducore/leitnersystem.cpp
kdeeducore/leitnersystem.h
kdeeducore/leitnersystemview.cpp
kdeeducore/leitnersystemview.h

index b6e85a0a4626ba78fbe4d205dc28bdf47aa246f0..bcdccf3d6ed162a3a35ff46907b8b0fb18315a65 100644 (file)
@@ -23,6 +23,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "keduvoccsvreader.h"
+
 #include <QIODevice>
 #include <QTextStream>
 
@@ -30,7 +32,6 @@
 
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"
-#include "keduvoccsvreader.h"
 
 KEduVocCsvReader::KEduVocCsvReader(QIODevice *file)
 {
index 18e70fc2071402c222bcd50167786a5fb4466aeb..1d7fb6f78a8f914a95dce0816db8728d431bd362 100644 (file)
 #ifndef KEDUVOCCSVREADER_H
 #define KEDUVOCCSVREADER_H
 
+#include <QString>
+
 class QIODevice;
+
 class KEduVocDocument;
 
-class KEduVocCsvReader : public QObject
+class KEduVocCsvReader
 {
 public:
   KEduVocCsvReader(QIODevice *file);
index 70230adb0afbc696263461054051d2006e6e5414..d45d48d4128fd80f598fbdc4acd485b6d2605908 100644 (file)
@@ -1,9 +1,9 @@
 /***************************************************************************
                    export a KEduVocDocument to a delimited text file
     -----------------------------------------------------------------------
-    copyright           : (C) 1999-2001 Ewald Arnold
-                          (C) 2001 The KDE-EDU team
-                          (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
+    copyright       : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
+                      (C) 2001 The KDE-EDU team
+                      (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  ***************************************************************************/
 
+#include "keduvoccsvwriter.h"
+
 #include <QFile>
 #include <QTextStream>
 
 #include <KLocale>
 
-#include "keduvoccsvwriter.h"
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"
 
index 486a8b75522b910c81dc311ff4b312fb00896ea5..286e77fc12e18e751880e155708a3b28f6c5d38e 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************
                     export a KEduVocDocument to a delimited text file
     -----------------------------------------------------------------------
-    copyright           : (C) 1999-2001 Ewald Arnold
+    copyright           : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
                           (C) 2001 The KDE-EDU team
                           (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
@@ -19,6 +19,7 @@
 #define KEDUVOCCSVWRITER_H
 
 class QFile;
+class QString;
 class KEduVocDocument;
 
 class KEduVocCsvWriter
index f778ccbb120f24292186b0525e8e05d1bfa6177b..030658356f5593096367be4e89d8f050e5efe971 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************
                         Vocabulary Document for KDE Edu
     -----------------------------------------------------------------------
-    copyright      : (C) 1999-2001 Ewald Arnold
+    copyright      : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
                      (C) 2001 The KDE-EDU team
                      (C) 2005-2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
index 1841b88cc5beb6ba7e6e93796556aaa5272759dc..72c513b3b1790652327d09b0d743ad6dd63f1963 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************
                    Vocabulary Document for KDE Edu
     -----------------------------------------------------------------------
-    copyright     : (C) 1999-2001 Ewald Arnold
+    copyright     : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
                     (C) 2001 The KDE-EDU team
                     (C) 2005, 2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
@@ -497,7 +497,7 @@ public:
    * Delete a lesson.
    * @param lessonIndex which lesson
    * @param deleteMode either KVocDocument::DeleteEmptyLesson (delete only if empty) or KVocDocument::DeleteEntriesAndLesson (delete including vocabulary in that lesson)
-   * @returns if the deletion was successfull. If there are vocabularies in the lesson, but DeleteEmptyLesson, this will return false and not delete the lesson.
+   * @returns if the deletion was successful. If there are vocabularies in the lesson, but DeleteEmptyLesson, this will return false and not delete the lesson.
    */
   bool deleteLesson(int lessonIndex, int deleteMode);
 
index 74ed49fc3c1a2627465ae999a45de4a76df3c6f2..c0e94858ea21b247ce34b51785a143ce1987f7a6 100644 (file)
@@ -1,10 +1,9 @@
 /***************************************************************************
                         Vocabulary Expression for KDE Edu
     -----------------------------------------------------------------------
-    copyright            : (C) 1999-2001 Ewald Arnold
-                           (C) 2001 The KDE-EDU team
-                           (C) 2005-2007 Peter Hedlund
-    email                : peter.hedlund@kdemail.net
+    copyright      : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
+                     (C) 2001 The KDE-EDU team
+                     (C) 2005-2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
index 7591ff252980b5cb1f9a1a9b4a42ede09de6c344..f41c961163ff5e7df61c0105d5f20b88dfe91478 100644 (file)
@@ -1,10 +1,9 @@
 /***************************************************************************
                         Vocabulary Expression for KDE Edu
     -----------------------------------------------------------------------
-    copyright            : (C) 1999-2001 Ewald Arnold
+    copyright            : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
                            (C) 2001 The KDE-EDU team
-                           (C) 2005-2007 Peter Hedlund
-    email                : peter.hedlund@kdemail.net
+                           (C) 2005-2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
index c4fb888e59239ed7a90dc544bcb72b65eebaf863..719304e6afea0a2d0989e98b4a6f2cbf8d73de85 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************
                      read a KEduVocDocument from a KVTML file
     -----------------------------------------------------------------------
-    copyright           : (C) 1999-2001 Ewald Arnold
+    copyright           : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
                           (C) 2001 The KDE-EDU team
                           (C) 2005 Eric Pignet <eric at erixpage.com>
                           (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
@@ -16,6 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "keduvockvtmlreader.h"
+
 #include <QTextStream>
 #include <QList>
 #include <QStringList>
@@ -24,7 +26,6 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include "keduvockvtmlreader.h"
 #include "keduvocdocument.h"
 #include "kvtmldefs.h"
 
index c3a8d07afc5d61866e8e6a8d920bcdf0b0015bbc..e2962f9c3457c6a1768a5ac52d6f0cb7f69e9128 100644 (file)
@@ -1,10 +1,10 @@
 /***************************************************************************
                      read a KEduVocDocument from a KVTML file
     -----------------------------------------------------------------------
-    copyright           : (C) 1999-2001 Ewald Arnold
-                          (C) 2001 The KDE-EDU team
-                          (C) 2005 Eric Pignet <eric at erixpage.com>
-                          (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
+    copyright      : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
+                     (C) 2001 The KDE-EDU team
+                     (C) 2005 Eric Pignet <eric at erixpage.com>
+                     (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
index 8934dcdd51b7577ce7989864d701c199dc3b254b..968f16b4ba46546db0b2c48d5fd3d7d1126b62e2 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************
                    export a KEduVocDocument to a KVTML file
     -----------------------------------------------------------------------
-    copyright           : (C) 1999-2001 Ewald Arnold
+    copyright           : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
                           (C) 2001 The KDE-EDU team
                           (C) 2005 Eric Pignet <eric at erixpage.com>
                           (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
  *                                                                         *
  ***************************************************************************/
 
-#include <kdebug.h>
+#include "keduvockvtmlwriter.h"
+
 #include <QTextStream>
 #include <QFile>
 
-#include "keduvockvtmlwriter.h"
+#include <kdebug.h>
+
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"
 #include "kvtmldefs.h"
index 32e11a6095e58a2c6932949373547d627f29ffc0..c012822093a929984c70e7851ab8f38aec13bade 100644 (file)
@@ -1,10 +1,10 @@
 /***************************************************************************
                      export a KEduVocDocument to a KVTML file
     -----------------------------------------------------------------------
-    copyright           : (C) 1999-2001 Ewald Arnold
-                          (C) 2001 The KDE-EDU team
-                          (C) 2005 Eric Pignet <eric at erixpage.com>
-                          (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
+    copyright       : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
+                      (C) 2001 The KDE-EDU team
+                      (C) 2005 Eric Pignet <eric at erixpage.com>
+                      (C) 2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
 
 /***************************************************************************
@@ -21,6 +21,7 @@
 
 #include <QtXml/QDomDocument>
 #include <QList>
+#include <QFile>
 
 #include "keduvocgrammar.h"
 #include "keduvocmultiplechoice.h"
index 2078bb49ea80b1c79985273559bf0a4eb3970e97..fb88c00abbc4106fe171eb0fabeda0738577313b 100644 (file)
@@ -21,6 +21,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "keduvocvokabelnreader.h"
+
 #include <QIODevice>
 
 #include <klocale.h>
@@ -28,7 +30,6 @@
 
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"
-#include "keduvocvokabelnreader.h"
 
 KEduVocVokabelnReader::KEduVocVokabelnReader(QIODevice *file)
 {
index 5a1da78f7cad377485a8d42812baccb38c96ee2f..e04945840acbfbf7769bf5e1771e6d63c4453935 100644 (file)
 #ifndef KEDUVOCVOKABELNREADER_H
 #define KEDUVOCVOKABELNREADER_H
 
+#include <QString>
+
 class QIODevice;
 class KEduVocDocument;
 
-class KEduVocVokabelnReader : public QObject
+class KEduVocVokabelnReader
 {
 public:
   KEduVocVokabelnReader(QIODevice *file);
index 44341d62cb3fc53bfe486db4282b5dac28e0bb07..c229c34f5b68b16bc962404490687cc622bc5d34 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
+#include "keduvocwqlreader.h"
+
 #include <QTextStream>
 #include <QIODevice>
 
 #include <klocale.h>
 
-#include "keduvocwqlreader.h"
 #include "keduvocdocument.h"
 #include "keduvocexpression.h"
 
index 2ab18889ac445820693254e0b09221780e00286a..bbc6f062109678ad01b911f536726f2d3281f2ad 100644 (file)
 #ifndef KEDUVOCWQLREADER_H
 #define KEDUVOCWQLREADER_H
 
+#include <QString>
+
 class QIODevice;
 class KEduVocDocument;
 
-class KEduVocWqlReader : public QObject
+class KEduVocWqlReader
 {
 public:
   KEduVocWqlReader(QIODevice *file);
index eaa535dc3688f52e1a6ff0ae12c5863a02bbb7b1..73f037230abbce07bc8a87f102e5bfdb87ae1bfb 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************
                    Vocabulary Document for KDE Edu
     -----------------------------------------------------------------------
-    copyright     : (C) 1999-2001 Ewald Arnold
+    copyright     : (C) 1999-2001 Ewald Arnold <kvoctrain@ewald-arnold.de>
                     (C) 2001 The KDE-EDU team
                     (C) 2005, 2007 Peter Hedlund <peter.hedlund@kdemail.net>
  ***************************************************************************/
index 83453ef0ed25ba7d3d4aef16019e4fcd0489c0f3..d2f63b2052aefd43547361679b1ba09898e6c585 100644 (file)
@@ -1,14 +1,22 @@
-//
-// C++ Implementation: leitnerbox
-//
-// Description:
-//
-//
-// Author: Martin Pfeiffer <martin-pfeiffer-bensheim@web.de>, (C) 2005
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/***************************************************************************
+ *   Copyright (C) 2005      by Martin Pfeiffer <hubipete@gmx.net>         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
 #include "leitnerbox.h"
 
 LeitnerBox::LeitnerBox()
index 03733a3d6ed78855733bee31a355fb77eed17d0f..1d4b7b2a05202dbe513d6cb52ac53827c5a0470c 100644 (file)
@@ -1,6 +1,3 @@
-#ifndef LEITNERBOX_H
-#define LEITNERBOX_H
-
 /***************************************************************************
  *   Copyright (C) 2005      by Martin Pfeiffer <hubipete@gmx.net>         *
  *                                                                         *
@@ -20,6 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#ifndef LEITNERBOX_H
+#define LEITNERBOX_H
+
 #include <libkdeedu_core_export.h>
 
 #include <QString>
index ce65fc7161109841c5c40efb445bd74ae658bdb3..f386bd9936b9af99ba305f0fdc53a177d6cd143b 100644 (file)
@@ -1,14 +1,22 @@
-//
-// C++ Implementation: leitnersystem
-//
-// Description:
-//
-//
-// Author: Martin Pfeiffer <martin-pfeiffer-bensheim@web.de>, (C) 2005
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/***************************************************************************
+ *   Copyright (C) 2005      by Martin Pfeiffer <hubipete@gmx.net>         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
 #include "leitnersystem.h"
 
 #include <kdebug.h>
index 4bc2ac4300db198dd5ae195fd25733d8ff8db952..f5d3f51dce70a887570eed31d331a13be03b9281 100644 (file)
@@ -1,21 +1,27 @@
+/***************************************************************************
+ *   Copyright (C) 2005      by Martin Pfeiffer <hubipete@gmx.net>         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
 #ifndef LEITNERSYSTEM_H
 #define LEITNERSYSTEM_H
 
-//
-// C++ Interface: leitnersystem
-//
-// Description:
-//
-//
-// Author: Martin Pfeiffer <martin-pfeiffer-bensheim@web.de>, (C) 2005
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
 #include <libkdeedu_core_export.h>
 
-
 #include <QStringList>
 
 #include "leitnerbox.h"
index 8463855faa9068d5ef77d1afb9703f4f018d0b76..23f4c5948ab19dc978f80de7590ba3dda5a1977c 100644 (file)
@@ -1,14 +1,21 @@
-//
-// C++ Implementation: leitnersystemview
-//
-// Description:
-//
-//
-// Author: Martin Pfeiffer <martin-pfeiffer-bensheim@web.de>, (C) 2005
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/***************************************************************************
+ *   Copyright (C) 2005      by Martin Pfeiffer <hubipete@gmx.net>         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
 
 #include "leitnersystemview.h"
 
index 4d197e7f9de5cf4d212ea3ee23e2a4af6d883177..c0ceee9556620414312d26f790a926f03290073e 100644 (file)
@@ -1,14 +1,22 @@
-//
-// C++ Interface: leitnersystemview
-//
-// Description: 
-//
-//
-// Author: Martin Pfeiffer <martin-pfeiffer-bensheim@web.de>, (C) 2005
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/***************************************************************************
+ *   Copyright (C) 2005      by Martin Pfeiffer <hubipete@gmx.net>         *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+ ***************************************************************************/
+
 #ifndef LEITNERSYSTEMVIEW_H
 #define LEITNERSYSTEMVIEW_H
 
@@ -50,7 +58,7 @@ public:
        void highlightBox( int box );
        
 Q_SIGNALS:
-       void boxClicked(int box);               //is emited if the user clicks on a box 
+       void boxClicked(int box);  //is emitted if the user clicks on a box 
 
 protected:
        virtual void paintEvent( QPaintEvent* );