From c27c0967e9c8576c512d8059e828861c6c6c5cf1 Mon Sep 17 00:00:00 2001 From: Peter Hedlund Date: Mon, 7 May 2007 23:01:49 +0000 Subject: [PATCH] EBN/Krazy fixes. svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=662362 --- kdeeducore/keduvoccsvreader.cpp | 3 ++- kdeeducore/keduvoccsvreader.h | 5 ++++- kdeeducore/keduvoccsvwriter.cpp | 9 ++++---- kdeeducore/keduvoccsvwriter.h | 3 ++- kdeeducore/keduvocdocument.cpp | 2 +- kdeeducore/keduvocdocument.h | 4 ++-- kdeeducore/keduvocexpression.cpp | 7 +++--- kdeeducore/keduvocexpression.h | 5 ++--- kdeeducore/keduvockvtmlreader.cpp | 5 +++-- kdeeducore/keduvockvtmlreader.h | 8 +++---- kdeeducore/keduvockvtmlwriter.cpp | 8 ++++--- kdeeducore/keduvockvtmlwriter.h | 9 ++++---- kdeeducore/keduvocvokabelnreader.cpp | 3 ++- kdeeducore/keduvocvokabelnreader.h | 4 +++- kdeeducore/keduvocwqlreader.cpp | 3 ++- kdeeducore/keduvocwqlreader.h | 4 +++- kdeeducore/kvtmldefs.h | 2 +- kdeeducore/leitnerbox.cpp | 30 ++++++++++++++++---------- kdeeducore/leitnerbox.h | 6 +++--- kdeeducore/leitnersystem.cpp | 30 ++++++++++++++++---------- kdeeducore/leitnersystem.h | 32 +++++++++++++++++----------- kdeeducore/leitnersystemview.cpp | 29 +++++++++++++++---------- kdeeducore/leitnersystemview.h | 32 +++++++++++++++++----------- 23 files changed, 147 insertions(+), 96 deletions(-) diff --git a/kdeeducore/keduvoccsvreader.cpp b/kdeeducore/keduvoccsvreader.cpp index b6e85a0..bcdccf3 100644 --- a/kdeeducore/keduvoccsvreader.cpp +++ b/kdeeducore/keduvoccsvreader.cpp @@ -23,6 +23,8 @@ * * ***************************************************************************/ +#include "keduvoccsvreader.h" + #include #include @@ -30,7 +32,6 @@ #include "keduvocdocument.h" #include "keduvocexpression.h" -#include "keduvoccsvreader.h" KEduVocCsvReader::KEduVocCsvReader(QIODevice *file) { diff --git a/kdeeducore/keduvoccsvreader.h b/kdeeducore/keduvoccsvreader.h index 18e70fc..1d7fb6f 100644 --- a/kdeeducore/keduvoccsvreader.h +++ b/kdeeducore/keduvoccsvreader.h @@ -17,10 +17,13 @@ #ifndef KEDUVOCCSVREADER_H #define KEDUVOCCSVREADER_H +#include + class QIODevice; + class KEduVocDocument; -class KEduVocCsvReader : public QObject +class KEduVocCsvReader { public: KEduVocCsvReader(QIODevice *file); diff --git a/kdeeducore/keduvoccsvwriter.cpp b/kdeeducore/keduvoccsvwriter.cpp index 70230ad..d45d48d 100644 --- a/kdeeducore/keduvoccsvwriter.cpp +++ b/kdeeducore/keduvoccsvwriter.cpp @@ -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 + copyright : (C) 1999-2001 Ewald Arnold + (C) 2001 The KDE-EDU team + (C) 2007 Peter Hedlund ***************************************************************************/ /*************************************************************************** @@ -15,12 +15,13 @@ * * ***************************************************************************/ +#include "keduvoccsvwriter.h" + #include #include #include -#include "keduvoccsvwriter.h" #include "keduvocdocument.h" #include "keduvocexpression.h" diff --git a/kdeeducore/keduvoccsvwriter.h b/kdeeducore/keduvoccsvwriter.h index 486a8b7..286e77f 100644 --- a/kdeeducore/keduvoccsvwriter.h +++ b/kdeeducore/keduvoccsvwriter.h @@ -1,7 +1,7 @@ /*************************************************************************** export a KEduVocDocument to a delimited text file ----------------------------------------------------------------------- - copyright : (C) 1999-2001 Ewald Arnold + copyright : (C) 1999-2001 Ewald Arnold (C) 2001 The KDE-EDU team (C) 2007 Peter Hedlund ***************************************************************************/ @@ -19,6 +19,7 @@ #define KEDUVOCCSVWRITER_H class QFile; +class QString; class KEduVocDocument; class KEduVocCsvWriter diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp index f778ccb..0306583 100644 --- a/kdeeducore/keduvocdocument.cpp +++ b/kdeeducore/keduvocdocument.cpp @@ -1,7 +1,7 @@ /*************************************************************************** Vocabulary Document for KDE Edu ----------------------------------------------------------------------- - copyright : (C) 1999-2001 Ewald Arnold + copyright : (C) 1999-2001 Ewald Arnold (C) 2001 The KDE-EDU team (C) 2005-2007 Peter Hedlund ***************************************************************************/ diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h index 1841b88..72c513b 100644 --- a/kdeeducore/keduvocdocument.h +++ b/kdeeducore/keduvocdocument.h @@ -1,7 +1,7 @@ /*************************************************************************** Vocabulary Document for KDE Edu ----------------------------------------------------------------------- - copyright : (C) 1999-2001 Ewald Arnold + copyright : (C) 1999-2001 Ewald Arnold (C) 2001 The KDE-EDU team (C) 2005, 2007 Peter Hedlund ***************************************************************************/ @@ -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); diff --git a/kdeeducore/keduvocexpression.cpp b/kdeeducore/keduvocexpression.cpp index 74ed49f..c0e9485 100644 --- a/kdeeducore/keduvocexpression.cpp +++ b/kdeeducore/keduvocexpression.cpp @@ -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 + (C) 2001 The KDE-EDU team + (C) 2005-2007 Peter Hedlund ***************************************************************************/ /*************************************************************************** diff --git a/kdeeducore/keduvocexpression.h b/kdeeducore/keduvocexpression.h index 7591ff2..f41c961 100644 --- a/kdeeducore/keduvocexpression.h +++ b/kdeeducore/keduvocexpression.h @@ -1,10 +1,9 @@ /*************************************************************************** Vocabulary Expression for KDE Edu ----------------------------------------------------------------------- - copyright : (C) 1999-2001 Ewald Arnold + copyright : (C) 1999-2001 Ewald Arnold (C) 2001 The KDE-EDU team - (C) 2005-2007 Peter Hedlund - email : peter.hedlund@kdemail.net + (C) 2005-2007 Peter Hedlund ***************************************************************************/ /*************************************************************************** diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp index c4fb888..719304e 100644 --- a/kdeeducore/keduvockvtmlreader.cpp +++ b/kdeeducore/keduvockvtmlreader.cpp @@ -1,7 +1,7 @@ /*************************************************************************** read a KEduVocDocument from a KVTML file ----------------------------------------------------------------------- - copyright : (C) 1999-2001 Ewald Arnold + copyright : (C) 1999-2001 Ewald Arnold (C) 2001 The KDE-EDU team (C) 2005 Eric Pignet (C) 2007 Peter Hedlund @@ -16,6 +16,8 @@ * * ***************************************************************************/ +#include "keduvockvtmlreader.h" + #include #include #include @@ -24,7 +26,6 @@ #include #include -#include "keduvockvtmlreader.h" #include "keduvocdocument.h" #include "kvtmldefs.h" diff --git a/kdeeducore/keduvockvtmlreader.h b/kdeeducore/keduvockvtmlreader.h index c3a8d07..e2962f9 100644 --- a/kdeeducore/keduvockvtmlreader.h +++ b/kdeeducore/keduvockvtmlreader.h @@ -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 - (C) 2007 Peter Hedlund + copyright : (C) 1999-2001 Ewald Arnold + (C) 2001 The KDE-EDU team + (C) 2005 Eric Pignet + (C) 2007 Peter Hedlund ***************************************************************************/ /*************************************************************************** diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp index 8934dcd..968f16b 100644 --- a/kdeeducore/keduvockvtmlwriter.cpp +++ b/kdeeducore/keduvockvtmlwriter.cpp @@ -1,7 +1,7 @@ /*************************************************************************** export a KEduVocDocument to a KVTML file ----------------------------------------------------------------------- - copyright : (C) 1999-2001 Ewald Arnold + copyright : (C) 1999-2001 Ewald Arnold (C) 2001 The KDE-EDU team (C) 2005 Eric Pignet (C) 2007 Peter Hedlund @@ -16,11 +16,13 @@ * * ***************************************************************************/ -#include +#include "keduvockvtmlwriter.h" + #include #include -#include "keduvockvtmlwriter.h" +#include + #include "keduvocdocument.h" #include "keduvocexpression.h" #include "kvtmldefs.h" diff --git a/kdeeducore/keduvockvtmlwriter.h b/kdeeducore/keduvockvtmlwriter.h index 32e11a6..c012822 100644 --- a/kdeeducore/keduvockvtmlwriter.h +++ b/kdeeducore/keduvockvtmlwriter.h @@ -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 - (C) 2007 Peter Hedlund + copyright : (C) 1999-2001 Ewald Arnold + (C) 2001 The KDE-EDU team + (C) 2005 Eric Pignet + (C) 2007 Peter Hedlund ***************************************************************************/ /*************************************************************************** @@ -21,6 +21,7 @@ #include #include +#include #include "keduvocgrammar.h" #include "keduvocmultiplechoice.h" diff --git a/kdeeducore/keduvocvokabelnreader.cpp b/kdeeducore/keduvocvokabelnreader.cpp index 2078bb4..fb88c00 100644 --- a/kdeeducore/keduvocvokabelnreader.cpp +++ b/kdeeducore/keduvocvokabelnreader.cpp @@ -21,6 +21,8 @@ * * ***************************************************************************/ +#include "keduvocvokabelnreader.h" + #include #include @@ -28,7 +30,6 @@ #include "keduvocdocument.h" #include "keduvocexpression.h" -#include "keduvocvokabelnreader.h" KEduVocVokabelnReader::KEduVocVokabelnReader(QIODevice *file) { diff --git a/kdeeducore/keduvocvokabelnreader.h b/kdeeducore/keduvocvokabelnreader.h index 5a1da78..e049458 100644 --- a/kdeeducore/keduvocvokabelnreader.h +++ b/kdeeducore/keduvocvokabelnreader.h @@ -18,10 +18,12 @@ #ifndef KEDUVOCVOKABELNREADER_H #define KEDUVOCVOKABELNREADER_H +#include + class QIODevice; class KEduVocDocument; -class KEduVocVokabelnReader : public QObject +class KEduVocVokabelnReader { public: KEduVocVokabelnReader(QIODevice *file); diff --git a/kdeeducore/keduvocwqlreader.cpp b/kdeeducore/keduvocwqlreader.cpp index 44341d6..c229c34 100644 --- a/kdeeducore/keduvocwqlreader.cpp +++ b/kdeeducore/keduvocwqlreader.cpp @@ -15,12 +15,13 @@ * * ***************************************************************************/ +#include "keduvocwqlreader.h" + #include #include #include -#include "keduvocwqlreader.h" #include "keduvocdocument.h" #include "keduvocexpression.h" diff --git a/kdeeducore/keduvocwqlreader.h b/kdeeducore/keduvocwqlreader.h index 2ab1888..bbc6f06 100644 --- a/kdeeducore/keduvocwqlreader.h +++ b/kdeeducore/keduvocwqlreader.h @@ -18,10 +18,12 @@ #ifndef KEDUVOCWQLREADER_H #define KEDUVOCWQLREADER_H +#include + class QIODevice; class KEduVocDocument; -class KEduVocWqlReader : public QObject +class KEduVocWqlReader { public: KEduVocWqlReader(QIODevice *file); diff --git a/kdeeducore/kvtmldefs.h b/kdeeducore/kvtmldefs.h index eaa535d..73f0372 100644 --- a/kdeeducore/kvtmldefs.h +++ b/kdeeducore/kvtmldefs.h @@ -1,7 +1,7 @@ /*************************************************************************** Vocabulary Document for KDE Edu ----------------------------------------------------------------------- - copyright : (C) 1999-2001 Ewald Arnold + copyright : (C) 1999-2001 Ewald Arnold (C) 2001 The KDE-EDU team (C) 2005, 2007 Peter Hedlund ***************************************************************************/ diff --git a/kdeeducore/leitnerbox.cpp b/kdeeducore/leitnerbox.cpp index 83453ef..d2f63b2 100644 --- a/kdeeducore/leitnerbox.cpp +++ b/kdeeducore/leitnerbox.cpp @@ -1,14 +1,22 @@ -// -// C++ Implementation: leitnerbox -// -// Description: -// -// -// Author: Martin Pfeiffer , (C) 2005 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/*************************************************************************** + * Copyright (C) 2005 by Martin Pfeiffer * + * * + * 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() diff --git a/kdeeducore/leitnerbox.h b/kdeeducore/leitnerbox.h index 03733a3..1d4b7b2 100644 --- a/kdeeducore/leitnerbox.h +++ b/kdeeducore/leitnerbox.h @@ -1,6 +1,3 @@ -#ifndef LEITNERBOX_H -#define LEITNERBOX_H - /*************************************************************************** * Copyright (C) 2005 by Martin Pfeiffer * * * @@ -20,6 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#ifndef LEITNERBOX_H +#define LEITNERBOX_H + #include #include diff --git a/kdeeducore/leitnersystem.cpp b/kdeeducore/leitnersystem.cpp index ce65fc7..f386bd9 100644 --- a/kdeeducore/leitnersystem.cpp +++ b/kdeeducore/leitnersystem.cpp @@ -1,14 +1,22 @@ -// -// C++ Implementation: leitnersystem -// -// Description: -// -// -// Author: Martin Pfeiffer , (C) 2005 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/*************************************************************************** + * Copyright (C) 2005 by Martin Pfeiffer * + * * + * 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 diff --git a/kdeeducore/leitnersystem.h b/kdeeducore/leitnersystem.h index 4bc2ac4..f5d3f51 100644 --- a/kdeeducore/leitnersystem.h +++ b/kdeeducore/leitnersystem.h @@ -1,21 +1,27 @@ +/*************************************************************************** + * Copyright (C) 2005 by Martin Pfeiffer * + * * + * 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 , (C) 2005 -// -// Copyright: See COPYING file that comes with this distribution -// -// - #include - #include #include "leitnerbox.h" diff --git a/kdeeducore/leitnersystemview.cpp b/kdeeducore/leitnersystemview.cpp index 8463855..23f4c59 100644 --- a/kdeeducore/leitnersystemview.cpp +++ b/kdeeducore/leitnersystemview.cpp @@ -1,14 +1,21 @@ -// -// C++ Implementation: leitnersystemview -// -// Description: -// -// -// Author: Martin Pfeiffer , (C) 2005 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/*************************************************************************** + * Copyright (C) 2005 by Martin Pfeiffer * + * * + * 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" diff --git a/kdeeducore/leitnersystemview.h b/kdeeducore/leitnersystemview.h index 4d197e7..c0ceee9 100644 --- a/kdeeducore/leitnersystemview.h +++ b/kdeeducore/leitnersystemview.h @@ -1,14 +1,22 @@ -// -// C++ Interface: leitnersystemview -// -// Description: -// -// -// Author: Martin Pfeiffer , (C) 2005 -// -// Copyright: See COPYING file that comes with this distribution -// -// +/*************************************************************************** + * Copyright (C) 2005 by Martin Pfeiffer * + * * + * 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* ); -- 2.47.3