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, 11 insertions, 11 deletions

diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp
index dbd807a6..6c73a91f 100644
--- a/ktouch/src/ktouchstatistics.cpp
+++ b/ktouch/src/ktouchstatistics.cpp
@@ -34,8 +34,8 @@
 #include "ktouch.h"
 #include "ktouchchartwidget.h"
 
-KTouchStatistics::KTouchStatistics(TQWidget* parent)
-	: KTouchStatisticsDlg(parent)
+KTouchStatistics::KTouchStatistics(TQWidget* tqparent)
+	: KTouchStatisticsDlg(tqparent)
 {
 	sessionsRadio->setChecked(true);
 	WPMRadio->setChecked(true);
@@ -122,7 +122,7 @@ void KTouchStatistics::lectureActivated(int index) {
 // ----------------------------------------------------------------------------
 
 void KTouchStatistics::clearHistory() {
-	if (KMessageBox::warningContinueCancel(this, i18n("Erase all statistics data for the current user?"),TQString::null,KStdGuiItem::del()) 
+	if (KMessageBox::warningContinueCancel(this, i18n("Erase all statistics data for the current user?"),TQString(),KStdGuiItem::del()) 
 		== KMessageBox::Continue)
 	{
 		KTouchPtr->clearStatistics(); // clear statistics data in KTouch
@@ -161,7 +161,7 @@ void KTouchStatistics::updateCurrentSessionTab() {
 				else					levelnums += ",";
 			}
 			levels_count = 0;
-			levelnums += TQString("%1").arg(*it+1);
+			levelnums += TQString("%1").tqarg(*it+1);
 			
 		}
 		else {
@@ -233,7 +233,7 @@ void KTouchStatistics::updateCurrentSessionTab() {
 
 void KTouchStatistics::updateCurrentLevelTab() {
 	// level info
-	levelLabel2->setText( TQString("%1").arg(m_currLevelStats.m_levelNum+1) );
+	levelLabel2->setText( TQString("%1").tqarg(m_currLevelStats.m_levelNum+1) );
     // general stats group
     elapsedTimeLCDLevel->display(static_cast<int>(m_currLevelStats.m_elapsedTime));
     totalCharsLCDLevel->display(static_cast<int>(m_currLevelStats.m_totalChars) );
@@ -328,7 +328,7 @@ void KTouchStatistics::updateChartTab() {
 				{
 					double t = m_currSessionStats.m_elapsedTime;
 					double wpm = m_currSessionStats.m_words/t*60.0;
-					double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24);
+					double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24);
 					data.push_back(std::make_pair(tp, wpm) );
 				}
 				chartWidget->LeftAxis.setLabel( i18n("Words per minute") );
@@ -352,7 +352,7 @@ void KTouchStatistics::updateChartTab() {
 				{
 					double t = m_currSessionStats.m_elapsedTime;
 					double cpm = m_currSessionStats.m_correctChars/t*60.0;
-					double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24);
+					double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24);
 					data.push_back(std::make_pair(tp, cpm) );
 				}
 				chartWidget->LeftAxis.setLabel( i18n("Characters per minute") );
@@ -376,7 +376,7 @@ void KTouchStatistics::updateChartTab() {
 				{
 					double tc = m_currSessionStats.m_totalChars;
 					double corr = m_currSessionStats.m_correctChars/tc;
-					double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24);
+					double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24);
 					data.push_back(std::make_pair(tp, corr) );
 				}
 				chartWidget->LeftAxis.setLabel( i18n("Correctness") );
@@ -407,7 +407,7 @@ void KTouchStatistics::updateChartTab() {
 					double t = m_currSessionStats.m_elapsedTime;
 					double cpm = m_currSessionStats.m_correctChars/t*60.0;
 					double skill = corr*cpm;
-					double tp = TQDateTime::currentDateTime().toTime_t()/(3600.0*24);
+					double tp = TQDateTime::tqcurrentDateTime().toTime_t()/(3600.0*24);
 					data.push_back(std::make_pair(tp, skill) );
 				}
 				chartWidget->LeftAxis.setLabel( i18n("Skill") );
@@ -455,11 +455,11 @@ void KTouchStatistics::updateChartTab() {
 void KTouchStatistics::updateChartTab() {
     if (m_trainer->m_sessionHistory.size()<2) {
         chartTypeButtonGroup->setEnabled(false);
-        chartWidget->setEraseColor( Qt::gray );
+        chartWidget->setEraseColor( TQt::gray );
     }
     else {
         chartTypeButtonGroup->setEnabled(true);
-        chartWidget->setEraseColor( Qt::white );
+        chartWidget->setEraseColor( TQt::white );
     };
     if (charSpeedButton->isChecked())
         chartWidget->setChartType( KTouchChartWidget::CharsPerMinute );