libscience:

- compile without QT3_SUPPORT
- initialize some variables to sane defaults

kdeeducore:
- less QT3_SUPPORT

extdate:
- a bit less QT3_SUPPORT
- make the tests compile (and run)

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

diff --git a/extdate/extdatepicker.cpp b/extdate/extdatepicker.cpp
index 143aff7a0455db19400d4024669c12815d39ce0e..79871876ccee9575a935686f1248afa1377bc91a 100644 (file)
--- a/extdate/extdatepicker.cpp
+++ b/extdate/extdatepicker.cpp
@@ -370,7 +370,7 @@ ExtDatePicker::selectMonthClicked()
   //date.setYMD(date.year(), month, 1);
   //date.setYMD(date.year(), month, QMIN(day, date.daysInMonth()));
   d->calendar->setYMD(date, d->calendar->year(date), month,
-                   QMIN(day, d->calendar->daysInMonth(date)));
+                   qMin(day, d->calendar->daysInMonth(date)));
   // ----- set this month
   setDate(date);
 }
@@ -405,7 +405,7 @@ ExtDatePicker::selectYearClicked()
       //date.setYMD(year, date.month(), 1);
       //date.setYMD(year, date.month(), QMIN(day, date.daysInMonth()));
       d->calendar->setYMD(date, year, d->calendar->month(date),
-                       QMIN(day, d->calendar->daysInMonth(date)));
+                       qMin(day, d->calendar->daysInMonth(date)));
       // ----- set this month
       setDate(date);
     } else {
@@ -489,8 +489,8 @@ ExtDatePicker::setFontSize(int s)
          d->calendar->year(table->getDate()), false);
       if (str.isNull()) break;
       r=metrics.boundingRect(str);
-      maxMonthRect.setWidth(QMAX(r.width(), maxMonthRect.width()));
-      maxMonthRect.setHeight(QMAX(r.height(),  maxMonthRect.height()));
+      maxMonthRect.setWidth(qMax(r.width(), maxMonthRect.width()));
+      maxMonthRect.setHeight(qMax(r.height(),  maxMonthRect.height()));
     }
 
   QStyleOptionToolButton qsotb;

diff --git a/extdate/extdatetbl.cpp b/extdate/extdatetbl.cpp
index 852d231b90e43596e954795a16c824f8663fedd7..94b29210db6bc0a63edce39f539ec073dc7adade 100644 (file)
--- a/extdate/extdatetbl.cpp
+++ b/extdate/extdatetbl.cpp
@@ -395,13 +395,13 @@ ExtDateTable::setFontSize(int size)
   for(count=0; count<7; ++count)
     {
       rect=metrics.boundingRect(d->calendar->weekDayName(count+1, true));
-      maxCell.setWidth(QMAX(maxCell.width(), rect.width()));
-      maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
+      maxCell.setWidth(qMax(maxCell.width(), rect.width()));
+      maxCell.setHeight(qMax(maxCell.height(), rect.height()));
     }
   // ----- compare with a real wide number and add some space:
   rect=metrics.boundingRect(QString::fromLatin1("88"));
-  maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
-  maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
+  maxCell.setWidth(qMax(maxCell.width()+2, rect.width()));
+  maxCell.setHeight(qMax(maxCell.height()+4, rect.height()));
 }
 
 void

diff --git a/extdate/extdatetime.cpp b/extdate/extdatetime.cpp
index 7cd96512b9bec834dad839d9080f2ac61d6c3674..d311bfc3d6f6e9fa3feefbe9c24a23b9fde1e5c4 100644 (file)
--- a/extdate/extdatetime.cpp
+++ b/extdate/extdatetime.cpp
@@ -470,7 +470,7 @@ ExtDate ExtDate::fromString( const QString& s, Qt::DateFormat f )
                {
                        //Three possible date formats:
                        //dd mth yyyy; mth dd yyyy; wkd mth dd yyyy
-                       QStringList ss = QStringList::split( " ", s );
+                       QStringList ss = s.split( " " );
                        bool ok = false;
                        int month = -1;
                        uint imonth = 0;
@@ -1122,7 +1122,7 @@ ExtDateTime ExtDateTime::fromString( const QString& s, Qt::DateFormat f )
                QTime time;
                QString sd = s;
                int hour, minute, second;
-               int pivot = s.find( QRegExp(QString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+               int pivot = s.indexOf( QRegExp(QString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
                if ( pivot != -1 ) {
                        hour = s.mid( pivot, 2 ).toInt();
                        minute = s.mid( pivot+3, 2 ).toInt();

diff --git a/extdate/extdatewidget.cpp b/extdate/extdatewidget.cpp
index fc01fe6535142256bc66cd45a92899273ceae999..ba45c33712b3b6785407aa0e3de336d8abf9cd76 100644 (file)
--- a/extdate/extdatewidget.cpp
+++ b/extdate/extdatewidget.cpp
@@ -108,7 +108,7 @@ void ExtDateWidget::init(const ExtDate& date)
     QString str = d->calendar->monthName(i,
        d->calendar->year(date));
     if (str.isNull()) break;
-    d->m_month->insertItem(str);
+    d->m_month->addItem(str);
   }
 
   d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(),
@@ -158,15 +158,15 @@ void ExtDateWidget::slotDateChanged( )
   int y,m,day;
 
   y = d->m_year->value();
-  y = QMIN(QMAX(y, d->calendar->minValidYear()), d->calendar->maxValidYear());
+  y = qMin(qMax(y, d->calendar->minValidYear()), d->calendar->maxValidYear());
 
   d->calendar->setYMD(date, y, 1, 1);
   m = d->m_month->currentItem()+1;
-  m = QMIN(QMAX(m,1), d->calendar->monthsInYear(date));
+  m = qMin(qMax(m,1), d->calendar->monthsInYear(date));
 
   d->calendar->setYMD(date, y, m, 1);
   day = d->m_day->value();
-  day = QMIN(QMAX(day,1), d->calendar->daysInMonth(date));
+  day = qMin(qMax(day,1), d->calendar->daysInMonth(date));
 
   d->calendar->setYMD(date, y, m, day);
   setDate(date);

diff --git a/extdate/tests/edpicker_main.cpp b/extdate/tests/edpicker_main.cpp
index 213c2dde4d478ecd3291e45cdd61466be3eb4684..27704688e47599bacad1e7eec86c69b8996b3574 100644 (file)
--- a/extdate/tests/edpicker_main.cpp
+++ b/extdate/tests/edpicker_main.cpp
@@ -2,6 +2,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
+#include <klocale.h>
 
 static const char description[] = I18N_NOOP("ExtDatePicker test program");
 static const char notice[] = I18N_NOOP("Compares KDatePicker and ExtDatePicker");

diff --git a/extdate/tests/edtedit_main.cpp b/extdate/tests/edtedit_main.cpp
index 99da895b60ba2cf6f39a11dd91ba956f3dff901f..a0790dd60d92c3a3f99faf7920510ef3e7a458b0 100644 (file)
--- a/extdate/tests/edtedit_main.cpp
+++ b/extdate/tests/edtedit_main.cpp
@@ -2,6 +2,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
+#include <klocale.h>
 
 static const char description[] = I18N_NOOP("ExtDateTimeEdit test program");
 static const char notice[] = I18N_NOOP("Displays an ExtDateTimeEdit widget to test");

diff --git a/kdeeducore/keduvocdocument.cpp b/kdeeducore/keduvocdocument.cpp
index 81288e28ff13ce99d7fbcb6bbfcd6ee95fcaa00e..e7098712c104b66105e31214bbf569e5d79019de 100644 (file)
--- a/kdeeducore/keduvocdocument.cpp
+++ b/kdeeducore/keduvocdocument.cpp
@@ -1003,11 +1003,11 @@ int KEduVocDocument::search(QString substr, int id, int first, int last, bool wo
   if (id == 0) {
     for (int i = first; i < last; i++) {
       if (word_start) {
-        if (entry(i)->original().find(substr, 0, false) == 0)  // case insensitive
+        if (entry(i)->original().indexOf(substr, 0, Qt::CaseInsensitive) == 0)  // case insensitive
           return i;
       }
       else {
-        if (entry(i)->original().find(substr, 0, false) > -1)  // case insensitive
+        if (entry(i)->original().indexOf(substr, 0, Qt::CaseInsensitive) > -1)  // case insensitive
           return i;
       }
     }
@@ -1015,11 +1015,11 @@ int KEduVocDocument::search(QString substr, int id, int first, int last, bool wo
   else {
     for (int i = first; i < last; i++) {
       if (word_start) {
-        if (entry(i)->translation(id).find(substr, 0, false) == 0) // case insensitive
+        if (entry(i)->translation(id).indexOf(substr, 0, Qt::CaseInsensitive) == 0) // case insensitive
           return i;
       }
       else {
-        if (entry(i)->translation(id).find(substr, 0, false) > -1) // case insensitive
+        if (entry(i)->translation(id).indexOf(substr, 0, Qt::CaseInsensitive) > -1) // case insensitive
           return i;
       }
     }
@@ -1036,7 +1036,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFileType(const QString &filenam
 
    QDataStream is( &f );
 
-   Q_INT8 c1, c2, c3, c4, c5;
+   qint8 c1, c2, c3, c4, c5;
    is >> c1
       >> c2
       >> c3
@@ -1062,7 +1062,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFileType(const QString &filenam
    if (line == WQL_IDENT)
      return wql;
 
-   if (line.find (VCB_SEPARATOR) >= 0)
+   if (line.indexOf(VCB_SEPARATOR) >= 0)
      return vt_vcb;
 
    if (line == LEX_IDENT_50)
@@ -1086,7 +1086,7 @@ public:
   {
     QString s1 = exp->original();
     QString s2 = y.exp->original();
-    int cmp = QString::compare(s1.upper(), s2.upper());
+    int cmp = QString::compare(s1.toUpper(), s2.toUpper());
     if (cmp != 0)
       return cmp < 0;
 
@@ -1094,7 +1094,7 @@ public:
 
       s1 = exp->translation(i);
       s2 = y.exp->translation(i);
-      cmp = QString::compare(s1.upper(), s2.upper() );
+      cmp = QString::compare(s1.toUpper(), s2.toUpper() );
       if (cmp != 0)
         return cmp < 0;
     }

diff --git a/kdeeducore/keduvocexpression.cpp b/kdeeducore/keduvocexpression.cpp
index 23e8f9792608b0e8abaca3b3c699d3dd7e48f38e..f64c0d20843ee1c7cbda7921396bfe441f632a03 100644 (file)
--- a/kdeeducore/keduvocexpression.cpp
+++ b/kdeeducore/keduvocexpression.cpp
@@ -57,7 +57,7 @@ KEduVocExpression::KEduVocExpression(const QString &s, const QString & separator
   m_lesson = lesson;
 
   if (separator.length() ) {
-    int pos = expr.find(separator);
+    int pos = expr.indexOf(separator);
 
     if (pos == -1) {
       setOriginal(expr.simplified());
@@ -69,7 +69,7 @@ KEduVocExpression::KEduVocExpression(const QString &s, const QString & separator
 //      s.simplified();
 
       // gather all translations
-      while ((pos = expr.find(separator)) != -1) {
+      while ((pos = expr.indexOf(separator)) != -1) {
         se = expr.left(pos).simplified();
         addTranslation(se, KV_NORM_GRADE, KV_NORM_GRADE);
         expr.remove (0, pos + separator.length() );

diff --git a/kdeeducore/keduvockvtmlreader.cpp b/kdeeducore/keduvockvtmlreader.cpp
index 32c2e2ea7c88f60ce7399c6d991f43ab0854ef01..a754ab8e839dbf8bd52316a4f8037bbca17d8166 100644 (file)
--- a/kdeeducore/keduvockvtmlreader.cpp
+++ b/kdeeducore/keduvockvtmlreader.cpp
@@ -327,7 +327,7 @@ bool KEduVocKvtmlReader::readConjug(QDomElement &domElementParent, QList<KEduVoc
 
       if (type.length() != 0 && type.left(1) == UL_USER_TENSE)
       {
-        int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
+        int num = qMin(type.mid (1, 40).toInt(), 1000); // paranoia check
         if( num > (int) m_doc->m_tenseDescriptions.size() )
         {
           // description missing ?
@@ -777,7 +777,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
   if (!domAttrGrade.isNull())
   {
     QString s = domAttrGrade.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.indexOf(';')) >= 1)
     {
       grade = s.left(pos).toInt();
       rev_grade = s.mid(pos+1, s.length()).toInt();
@@ -792,7 +792,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
   if (!domAttrCount.isNull())
   {
     QString s = domAttrCount.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.indexOf(';')) >= 1)
     {
       count = s.left(pos).toInt();
       rev_count = s.mid(pos+1, s.length()).toInt();
@@ -807,7 +807,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
   if (!domAttrBad.isNull())
   {
     QString s = domAttrBad.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.indexOf(';')) >= 1)
     {
       bcount = s.left(pos).toInt();
       rev_bcount = s.mid(pos+1, s.length()).toInt();
@@ -822,7 +822,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
   if (!domAttrDate.isNull())
   {
     QString s = domAttrDate.value();
-    if ((pos = s.find(';')) >= 1)
+    if ((pos = s.indexOf(';')) >= 1)
     {
       date.setTime_t(s.left(pos).toInt());
       rev_date.setTime_t(s.mid(pos+1, s.length()).toInt());
@@ -869,7 +869,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
     usage = domAttrUsage.value();
     if (usage.length() != 0 && usage.left(1) == UL_USER_USAGE)
     {
-      int num = QMIN(usage.mid (1, 40).toInt(), 1000); // paranioa check
+      int num = qMin(usage.mid (1, 40).toInt(), 1000); // paranioa check
       if( num > (int) m_doc->m_usageDescriptions.size() )
       {
         // description missing ?
@@ -907,7 +907,7 @@ bool KEduVocKvtmlReader::readExpressionChildAttributes( QDomElement &domElementE
 
     if (type.length() != 0 && type.left(1) == QM_USER_TYPE)
     {
-      int num = QMIN(type.mid (1, 40).toInt(), 1000); // paranoia check
+      int num = qMin(type.mid (1, 40).toInt(), 1000); // paranoia check
       if( num > (int) m_doc->m_typeDescriptions.size() )
       {
         // description missing ?
@@ -1003,7 +1003,7 @@ bool KEduVocKvtmlReader::readExpression(QDomElement &domElementParent)
 
     if (exprtype.length() != 0 && exprtype.left(1) == QM_USER_TYPE)
     {
-      int num = QMIN(exprtype.mid (1, 40).toInt(), 1000); // paranoia check
+      int num = qMin(exprtype.mid (1, 40).toInt(), 1000); // paranoia check
       if( num > (int) m_doc->m_typeDescriptions.size() )
       {
         // description missing ?
@@ -1621,7 +1621,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
   if (!domAttrGenerator.isNull())
   {
     m_doc->m_generator = domAttrGenerator.value();
-    int pos = m_doc->m_generator.findRev (KVD_VERS_PREFIX);
+    int pos = m_doc->m_generator.lastIndexOf(KVD_VERS_PREFIX);
     if (pos >= 0)
     {
       m_doc->m_version = m_doc->m_generator;
@@ -1665,7 +1665,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const QString &elem)
       "read documents with unknown elements.\n"
      );
   QString msg = format.arg(elem);
-  QApplication::setOverrideCursor(Qt::ArrowCursor, true);
+  QApplication::changeOverrideCursor(Qt::ArrowCursor);
   QString s = kapp->makeStdCaption(i18n("Unknown element"));
   KMessageBox::sorry(0, ln+msg, s);
   QApplication::restoreOverrideCursor();
@@ -1673,7 +1673,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const QString &elem)
 
 void KEduVocKvtmlReader::domError(const QString &text )
 {
-  QApplication::setOverrideCursor(Qt::ArrowCursor, true);
+  QApplication::changeOverrideCursor(Qt::ArrowCursor);
   QString s = kapp->makeStdCaption(i18n("Error"));
   QString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
   QString msg = text;

diff --git a/kdeeducore/keduvockvtmlwriter.cpp b/kdeeducore/keduvockvtmlwriter.cpp
index 719c7c5acb5cd75847447106efc64e45a1e885aa..b99e2923f8e62f42de3d7dee8bcc507a340d7125 100644 (file)
--- a/kdeeducore/keduvockvtmlwriter.cpp
+++ b/kdeeducore/keduvockvtmlwriter.cpp
@@ -268,7 +268,7 @@ bool KEduVocKvtmlWriter::saveConjugHeader(QDomDocument &domDoc, QDomElement &dom
   QDomElement domElementConjug = domDoc.createElement(KV_CONJUG_GRP);
   QString s;
 
-  for (int ent = 0; ent < QMIN((int) curr_conjug.size(), m_doc->numIdentifiers()); ent++)
+  for (int ent = 0; ent < qMin((int) curr_conjug.size(), m_doc->numIdentifiers()); ent++)
   {
     QDomElement domElementEntry = domDoc.createElement(KV_CON_ENTRY);
 
@@ -477,7 +477,7 @@ bool KEduVocKvtmlWriter::saveArticleKvtMl(QDomDocument &domDoc, QDomElement &dom
   QDomElement domElementArticle = domDoc.createElement(KV_ARTICLE_GRP);
   QString def, indef, s;
 
-  for (int lfn = 0; lfn < QMIN((int) m_doc->m_articles.size(), m_doc->numIdentifiers()); lfn++)
+  for (int lfn = 0; lfn < qMin((int) m_doc->m_articles.size(), m_doc->numIdentifiers()); lfn++)
   {
     QDomElement domElementEntry = domDoc.createElement(KV_ART_ENTRY);
     if (lfn == 0)
@@ -781,7 +781,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
 
     QString s;
     QString entype = s = (*first).type(0);
-    int pos = s.find (QM_TYPE_DIV);
+    int pos = s.indexOf(QM_TYPE_DIV);
     if (pos >= 0)
       entype = s.left (pos);
     else
@@ -901,7 +901,7 @@ bool KEduVocKvtmlWriter::writeDoc(KEduVocDocument *doc, const QString &generator
 
       QString s;
       QString entype = s = (*first).type(0);
-      int pos = s.find (QM_TYPE_DIV);
+      int pos = s.indexOf(QM_TYPE_DIV);
       if (pos >= 0)
         entype = s.left (pos);
       else

diff --git a/kdeeducore/keduvowqlreader.cpp b/kdeeducore/keduvowqlreader.cpp
index a15756082cb238291e441b7a7652f4baa6dd305e..d5e5c969959a820f7a65a5480394575235ee9f96 100644 (file)
--- a/kdeeducore/keduvowqlreader.cpp
+++ b/kdeeducore/keduvowqlreader.cpp
@@ -61,18 +61,18 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   // TODO these loops cause crashes if the input file is invalid !
   while (inputStream.readLine() != "[Font Info]");
   s = inputStream.readLine();
-  int p = s.find("=", 0);
+  int p = s.indexOf("=", 0);
   QString fam = s.right(s.length() - (p + 1));
   fam = fam.mid(1, fam.length() - 2);
   //g->font().setFamily(s);
 
   s = inputStream.readLine();
-  p = s.find("=", 0);
+  p = s.indexOf("=", 0);
   s = s.right(s.length() - (p + 1));
   int ps = s.toInt(0);
 
   s = inputStream.readLine();
-  p = s.find("=", 0);
+  p = s.indexOf("=", 0);
   s = s.right(s.length() - (p + 1));
   int b = 0;
   if (s == "1")
@@ -81,7 +81,7 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   }
 
   s = inputStream.readLine();
-  p = s.find("=", 0);
+  p = s.indexOf("=", 0);
   s = s.right(s.length() - (p + 1));
   bool it = (s == "1");
 
@@ -97,12 +97,12 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   inputStream.readLine(); //skip value for width of row headers
 
   s = inputStream.readLine();
-  p = s.find("=", 0);
+  p = s.indexOf("=", 0);
   s = s.right(s.length() - (p + 1));
   m_doc->setSizeHint(0, s.toInt());
 
   s = inputStream.readLine();
-  p = s.find("=", 0);
+  p = s.indexOf("=", 0);
   s = s.right(s.length() - (p + 1));
   m_doc->setSizeHint(1, s.toInt());
 
@@ -135,7 +135,7 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   while ((inputStream.readLine() != "[Vocabulary]"));
 
   s = inputStream.readLine();
-  p = s.find("   [", 0);
+  p = s.indexOf("   [", 0);
   s = s.left(p);
   s = s.simplified();
   m_doc->m_identifiers.push_back(s);
@@ -144,7 +144,7 @@ bool KEduVocWqlReader::readDoc(KEduVocDocument *doc)
   while (!s.isNull())
   {
     s = inputStream.readLine();
-    p = s.find("[", 0);
+    p = s.indexOf("[", 0);
     QString r = s.mid(p + 1, 10);
     int h = r.toInt();
     s = s.left(p);

diff --git a/kdeeducore/leitnersystem.cpp b/kdeeducore/leitnersystem.cpp
index f7d662712ebbf1be0587e920f109df6c78579516..f8e85a218615b49ed602c5d85628c9820e5a5e4f 100644 (file)
--- a/kdeeducore/leitnersystem.cpp
+++ b/kdeeducore/leitnersystem.cpp
@@ -150,7 +150,7 @@ int LeitnerSystem::number( LeitnerBox* box ) const
        if( box == 0 )
                return -1;
 
-       return m_boxes.findIndex( *box );
+       return m_boxes.indexOf( *box );
 }
 
 bool LeitnerSystem::setBoxName( int box, const QString& name )

diff --git a/kdeeducore/prefleitner.cpp b/kdeeducore/prefleitner.cpp
index f18d7d75955f848c85131c93602f833bac941452..3473c1b6594e9c544c8c00b9a18a71b100c49b55 100644 (file)
--- a/kdeeducore/prefleitner.cpp
+++ b/kdeeducore/prefleitner.cpp
@@ -64,8 +64,8 @@ PrefLeitner::PrefLeitner( QWidget* parent, LeitnerSystem* system ) : QDialog( pa
        m_selectedSystem = system;
        
        //insert the list of box' names in the comboboxes
-       cmbWrong->insertStringList( m_selectedSystem->getBoxNameList() );
-       cmbCorrect->insertStringList( m_selectedSystem->getBoxNameList() );
+       cmbWrong->addItems( m_selectedSystem->getBoxNameList() );
+       cmbCorrect->addItems( m_selectedSystem->getBoxNameList() );
 
        //show leitnersystem
        m_leitnerSystemView->setSystem( m_selectedSystem );
@@ -102,8 +102,8 @@ void PrefLeitner::slotBoxName( const QString& newName )
 
 void PrefLeitner::newSystem()
 {
-       cmbCorrect->insertStringList( m_selectedSystem->getBoxNameList() );
-       cmbWrong->insertStringList( m_selectedSystem->getBoxNameList() );
+       cmbCorrect->addItems( m_selectedSystem->getBoxNameList() );
+       cmbWrong->addItems( m_selectedSystem->getBoxNameList() );
 
        refreshSystemView();
 }
@@ -117,8 +117,8 @@ void PrefLeitner::slotBoxClicked( int box )
 {
        m_selectedBox = m_selectedSystem->boxWithNumber( box );
 
-       cmbCorrect->setCurrentItem( m_selectedSystem->correctBoxNumber( box ) );
-       cmbWrong->setCurrentItem( m_selectedSystem->wrongBoxNumber( box ) );
+       cmbCorrect->setCurrentIndex( m_selectedSystem->correctBoxNumber( box ) );
+       cmbWrong->setCurrentIndex( m_selectedSystem->wrongBoxNumber( box ) );
        lndBoxName->setText( m_selectedBox->boxName() );
 }
 

diff --git a/libscience/Makefile.am b/libscience/Makefile.am
index 1d9b0449eb3ee55c51612b0b5a2662036e0cd9e0..03c5cc85b5cebfe5c8dcdc16545a5e590613e357 100644 (file)
--- a/libscience/Makefile.am
+++ b/libscience/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = . data tests
+KDE_CXXFLAGS = -UQT3_SUPPORT
 
 INCLUDES= $(all_includes)
 

diff --git a/libscience/elementparser.cpp b/libscience/elementparser.cpp
index ff76c4428e485e71fa32a3e6e41ebebdfbe91be1..e0d82023dbeb08967cd1f4e09e4ae8150ac1874d 100644 (file)
--- a/libscience/elementparser.cpp
+++ b/libscience/elementparser.cpp
@@ -21,7 +21,11 @@ email                : cniehaus@kde.org
 #include <kdebug.h>
 
 ElementSaxParser::ElementSaxParser()
-       : QXmlDefaultHandler(), currentElement_(0), 
+       : QXmlDefaultHandler(),
+       currentDataObject_(0),
+       currentUnit_(ChemicalDataObject::noUnit),
+       currentElement_(0),
+       inElement_(false),
        inName_(false),
        inMass_(false),
        inExactMass_(false),