TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 30 insertions, 30 deletions

diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp
index 5c07c9c3..6207760f 100644
--- a/keduca/keduca/keducaview.cpp
+++ b/keduca/keduca/keducaview.cpp
@@ -37,8 +37,8 @@
 #include <tqlabel.h>
 #include <tqtextedit.h>
 
-KEducaView::KEducaView( TQWidget *parent, const char *name )
-    : TQWidgetStack( parent, name ), _keducaFile( 0 ), _timeoutTimer( 0 )
+KEducaView::KEducaView( TQWidget *tqparent, const char *name )
+    : TQWidgetStack( tqparent, name ), _keducaFile( 0 ), _timeoutTimer( 0 )
 {
     init();
 }
@@ -59,8 +59,8 @@ void KEducaView::init()
 {
     // Intro Screen
     _introWidget = new TQLabel( this, "introScreen" );
-    _introWidget->setBackgroundColor( Qt::white );
-    _introWidget->setAlignment( AlignCenter );
+    _introWidget->setBackgroundColor( TQt::white );
+    _introWidget->tqsetAlignment( AlignCenter );
     _introWidget->setPixmap( TQPixmap( locate("data","keduca/pics/keduca_init.png") ) );
     addWidget( _introWidget, 0 );
 
@@ -74,7 +74,7 @@ void KEducaView::init()
 
     // Question Widget
     _questionWidget = new TQVBox( this, "questionWidget" );
-    _split  = new TQSplitter( TQSplitter::Vertical, _questionWidget );
+    _split  = new TQSplitter( Qt::Vertical, _questionWidget );
     _questionText = new KQuestion( _split, "kquestion" );
     _buttonGroup = new KGroupEduca( _split, "ButtonGroup" );
     _buttonGroup->setRadioButtonExclusive( true );
@@ -121,7 +121,7 @@ void KEducaView::slotButtonNext()
       _questionText->countdown(0);
     }
 
-    if( ( visibleWidget() == _questionWidget ) && !_isInitStatus )
+    if( ( visibleWidget() == _questionWidget ) && !_isInittqStatus )
       setResults();
 
     _buttonGroup->clearAnswers();
@@ -147,7 +147,7 @@ void KEducaView::slotButtonNext()
 /** Button Save action */
 void KEducaView::slotButtonSave()
 {
-    KFileDialog *dialog=new KFileDialog(TQString::null, TQString::null, this, "file dialog", true);
+    KFileDialog *dialog=new KFileDialog(TQString(), TQString(), this, "file dialog", true);
     dialog->setCaption( i18n("Save Results As") );
     dialog->setKeepLocation( true );
     dialog->setOperationMode( KFileDialog::Saving );
@@ -209,16 +209,16 @@ void KEducaView::showRecord()
     // SHOW QUESTION *******************************************************************
     _questionText->setPixmap( _keducaFile->getPicturePixmap() );
     questionTextTemp =  "<table width=100%><tr><td><b>"
-                        + i18n("Question %1").arg(_keducaFileIndex) + "</b>";
+                        + i18n("Question %1").tqarg(_keducaFileIndex) + "</b>";
 
     if( _keducaFile->getTotalPoints() > 0 )
       questionTextTemp  += "</td><td align=center bgColor=#336699><font color=#ffffff><b>"
-                        + _keducaFile->getQuestion( FileRead::QF_POINTS )
+                        + _keducaFile->getQuestion( FileRead::TQF_POINTS )
                         + " " + i18n("Points")
                         + "</b></font>";
                        
     questionTextTemp    += "</tr></td></table><hr/><table><tr><td>"
-                        + _keducaFile->getQuestion( FileRead::QF_TEXT )
+                        + _keducaFile->getQuestion( FileRead::TQF_TEXT )
                         + "</td></tr></table>";
 
     _questionText->setText( questionTextTemp );
@@ -261,15 +261,15 @@ void KEducaView::showRecord()
 
     
     // START THE TIMER *****************************************************************
-    if( _keducaFile->getQuestionInt(FileRead::QF_TIME) > 0 )
+    if( _keducaFile->getQuestionInt(FileRead::TQF_TIME) > 0 )
     {
         KMessageBox::information( this,
                                   i18n( "You have %1 seconds to complete this question.\n\n"
                                         "Press OK when you are ready." )
-                                  .arg( _keducaFile->getQuestion(FileRead::QF_TIME) ) );
+                                  .tqarg( _keducaFile->getQuestion(FileRead::TQF_TIME) ) );
      }
 
-    int timeout = _keducaFile->getQuestionInt(FileRead::QF_TIME);
+    int timeout = _keducaFile->getQuestionInt(FileRead::TQF_TIME);
     if (timeout > 0)
     {
       if (!_timeoutTimer)
@@ -290,7 +290,7 @@ void KEducaView::showRecord()
 
 void KEducaView::questionTimedOut()
 {
-  _currentTime += _keducaFile->getQuestionInt(FileRead::QF_TIME);
+  _currentTime += _keducaFile->getQuestionInt(FileRead::TQF_TIME);
   slotButtonNext();
 }
 
@@ -353,13 +353,13 @@ void KEducaView::setResults()
       {
       _correctAnswer++;
       if( _keducaFile->getTotalPoints() > 0 )
-        _correctPoints += _keducaFile->getQuestionInt(FileRead::QF_POINTS);
+        _correctPoints += _keducaFile->getQuestionInt(FileRead::TQF_POINTS);
       }
     else
       {
       _incorrectAnswer++;
       if( _keducaFile->getTotalPoints() > 0 )
-        _incorrectPoints += _keducaFile->getQuestionInt(FileRead::QF_POINTS);
+        _incorrectPoints += _keducaFile->getQuestionInt(FileRead::TQF_POINTS);
       }
     
   _results += getTableQuestion( isCorrect, correctAnswer, yourAnswer );
@@ -404,7 +404,7 @@ bool KEducaView::openURL( const KURL &url)
     if ( !_keducaFile->openFile( url ) )
         return false;
 
-    _isInitStatus = true;
+    _isInittqStatus = true;
     _results = "<HTML>";
     _correctAnswer = 0;
     _correctPoints = 0;
@@ -436,12 +436,12 @@ void KEducaView::configWrite()
     Settings::writeConfig();
 }
 
-/** current Status Points */
+/** current tqStatus Points */
 TQString KEducaView::currentStatusPoints()
 {
-  TQString tempStatus;
+  TQString temptqStatus;
  
-  tempStatus = insertTable()
+  temptqStatus = insertTable()
               + insertRow( i18n("Statistics"), true, 4)
               + insertRow( i18n("Correct questions"),
                            TQString().setNum( _correctAnswer ),
@@ -449,20 +449,20 @@ TQString KEducaView::currentStatusPoints()
                            TQString().setNum( _incorrectAnswer ), true);
 
   if( _keducaFile->getTotalPoints() > 0 )
-    tempStatus += insertRow( i18n("Total points"), true, 4 )
+    temptqStatus += insertRow( i18n("Total points"), true, 4 )
                 + insertRow( i18n("Correct points"),
                              TQString().setNum( _correctPoints ),
                              i18n("Incorrect points"),
                              TQString().setNum( _incorrectPoints ), true );
 
   if( _keducaFile->getTotalTime() > 0 )
-    tempStatus += insertRow( i18n("Time"), true, 4 )
+    temptqStatus += insertRow( i18n("Time"), true, 4 )
                 + insertRow( i18n("Total time"),
                              TQString().setNum( _keducaFile->getTotalTime() ),
                              i18n("Time in tests"),
                              TQString().setNum( _currentTime ), true );
-  tempStatus += insertTableClose();
-  return tempStatus;
+  temptqStatus += insertTableClose();
+  return temptqStatus;
 }
 
 /** Set HTML table view with correct and incorrect answers */
@@ -476,10 +476,10 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct,
 
   _currentResults += "></TD><TD VALIGN=TOP>";
 
-  _currentResults += "<B><FONT COLOR=#336699>" + _keducaFile->getQuestion( FileRead::QF_TEXT ) + "</FONT></B>";
+  _currentResults += "<B><FONT COLOR=#336699>" + _keducaFile->getQuestion( FileRead::TQF_TEXT ) + "</FONT></B>";
 
-  if( _keducaFile->getQuestionInt(FileRead::QF_POINTS) > 0 )
-    _currentResults += "<SMALL> ( " + _keducaFile->getQuestion(FileRead::QF_POINTS) + " " + i18n("Points") + " )</SMALL>";
+  if( _keducaFile->getQuestionInt(FileRead::TQF_POINTS) > 0 )
+    _currentResults += "<SMALL> ( " + _keducaFile->getQuestion(FileRead::TQF_POINTS) + " " + i18n("Points") + " )</SMALL>";
     
   _currentResults += "<HR><SMALL>";
 
@@ -503,15 +503,15 @@ TQString KEducaView::getTableQuestion( bool isCorrect, const TQString &correct,
 /** Define the next questions (random, secuencial) */
 bool KEducaView::questionNext()
 {
-  if( !Settings::randomQuestions() && !_isInitStatus )
+  if( !Settings::randomQuestions() && !_isInittqStatus )
     {
     _keducaFile->recordNext();
     return _keducaFile->recordEOF() ? false : true;
     }
 
-  if( _isInitStatus )
+  if( _isInittqStatus )
     {
-    _isInitStatus = false;
+    _isInittqStatus = false;
     if( !Settings::randomQuestions() ) return true;
     }