misc krazy fixes

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=588794

diff --git a/extdate/extdatepicker.cpp b/extdate/extdatepicker.cpp
index 815036d897428c109a8eb1ceb6cecbfef8daddbe..cd8a5f08014af28538cf727f6180723a7d8481bb 100644 (file)
--- a/extdate/extdatepicker.cpp
+++ b/extdate/extdatepicker.cpp
@@ -21,19 +21,12 @@
 */
 
 #include <QApplication>
+#include <QComboBox>
 #include <QLayout>
 #include <QStyle>
 #include <QToolButton>
-#include <q3popupmenu.h>
-//Added by qt3to4:
-#include <QKeyEvent>
-#include <QEvent>
-#include <QFrame>
-#include <QHBoxLayout>
-#include <QBoxLayout>
-#include <QVBoxLayout>
-#include <QResizeEvent>
-#include <QComboBox>
+#include <Q3PopupMenu>
+
 #include <kdialog.h>
 #include <klocale.h>
 #include <kicon.h>
@@ -87,7 +80,7 @@ void ExtDatePicker::fillWeeksCombo(const ExtDate &date)
   {
     int year = 0;
     QString week = i18n("Week %1", d->calendar->weekNumber(day, &year));
-    if ( year != date.year() ) week += "*";  // show that this is a week from a different year
+    if ( year != date.year() ) week += '*';  // show that this is a week from a different year
     d->selectWeek->addItem(week);
   }
 }

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index a8721ea3fd3b74f22997849e7e6cc03714c5690b..50f868db5953c3e8cd65f7114e20c08472f01889 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -1001,7 +1001,7 @@ void KEduVocDocument::setFont(QFont* font)
 }
 
 
-int KEduVocDocument::search(QString substr, int id, int first, int last, bool word_start)
+int KEduVocDocument::search(const QString &substr, int id, int first, int last, bool word_start)
 {
   if (last >= numEntries() || last < 0)
     last = numEntries();

diff --git a/kdeeducore/keduvocdocument.h b/kdeeducore/keduvocdocument.h
index ef59315742e98af147f1e29e9fa9fa96e723738a..2f536cbf97bc2ca7de52282f009ab535167eb401 100644 (file)
--- a/kdeeducore/keduvocdocument.h
+++ b/kdeeducore/keduvocdocument.h
@@ -561,7 +561,7 @@ class EDUCORE_EXPORT KEduVocDocument : public QObject
    *                   true:always from beginning of word
    * @returns          the index of found entry, -1 if none
    */
-  int search(QString substr, int id, int first=0, int last=-1, bool word_start = false);
+  int search(const QString &substr, int id, int first=0, int last=-1, bool word_start = false);
 
   /**
    * @returns the URL of the XML file

diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index 5470bf4d8cf70ea035d560b2fd10191c21543758..eb9edde5f5c83f98206c81de6c3b983028207872 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -139,7 +139,7 @@ bool KEduVocKvtmlWriter::saveLessonKvtMl (QDomDocument &domDoc, QDomElement &dom
 
 
 bool KEduVocKvtmlWriter::saveConjug(QDomDocument &domDoc, QDomElement &domElementParent,
-                                    const KEduVocConjugation &curr_conjug, QString type)
+                                    const KEduVocConjugation &curr_conjug, const QString &type)
 {
   if (!curr_conjug.pers1Singular(type).isEmpty() )
   {

diff --git a/kdeeducore/keduvockvtmlwriter.h b/kdeeducore/keduvockvtmlwriter.h
index 2ca8312680caef3d42da5e926a625c92a1a46721..66d49dd14fa8df1ecabacff06e461bbfd59a79ab 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.h
+++ b/kdeeducore/keduvockvtmlwriter.h
@@ -84,7 +84,7 @@ public:
   bool saveConjugHeader  (QDomDocument &domDoc, QDomElement &domElementParent,
                           QList<KEduVocConjugation> &curr_conjug);
   bool saveConjug        (QDomDocument &domDoc, QDomElement &domElementParent,
-                          const KEduVocConjugation &curr_conjug, QString type);
+                          const KEduVocConjugation &curr_conjug, const QString &type);
   bool saveConjugEntry   (QDomDocument &domDoc, QDomElement &domElementParent,
                           KEduVocConjugation &curr_conjug);
 

diff --git a/kdeeducore/leitnersystem.cpp b/kdeeducore/leitnersystem.cpp
index c196c4e00a71faaf1d448a43a52787c851b07550..0533d60980bb6b275a36b2494e2be288969d7cea 100644 (file)
--- a/kdeeducore/leitnersystem.cpp
+++ b/kdeeducore/leitnersystem.cpp
@@ -13,7 +13,7 @@
 
 #include <kdebug.h>
 
-LeitnerSystem::LeitnerSystem(QList<LeitnerBox>& boxes, QString name)
+LeitnerSystem::LeitnerSystem(const QList<LeitnerBox> &boxes, const QString &name)
 {
        if( !boxes.empty() )
                m_boxes = boxes;

diff --git a/kdeeducore/leitnersystem.h b/kdeeducore/leitnersystem.h
index 8257a78818e7133d3aba0ffe77bc33ae233bc5ef..dd778379254fdf73de992f1e62c5d536ce9e0657 100644 (file)
--- a/kdeeducore/leitnersystem.h
+++ b/kdeeducore/leitnersystem.h
@@ -34,7 +34,7 @@ public:
         * @param boxes reference to a QList of LeitnerBox
         * @param name the new LeitnerSystems name
         */
-       LeitnerSystem( QList<LeitnerBox>& boxes, QString name );
+       LeitnerSystem( const QList<LeitnerBox> &boxes, const QString &name );
 
        /**Destructor*/
        ~LeitnerSystem();