diff --git a/kbruch/src/kbruch.cpp b/kbruch/src/kbruch.cpp index aaca2b02..50e71843 100644 --- a/kbruch/src/kbruch.cpp +++ b/kbruch/src/kbruch.cpp @@ -48,7 +48,7 @@ int main(int argc, char * argv[]) KApplication kbruch; - MainTQtWidget * kbruchApp = new MainTQtWidget(); + MainQtWidget * kbruchApp = new MainQtWidget(); kbruch.setMainWidget(kbruchApp); kbruchApp->show(); diff --git a/kbruch/src/kbruch.h b/kbruch/src/kbruch.h index a79dccb5..e0f5ca0e 100644 --- a/kbruch/src/kbruch.h +++ b/kbruch/src/kbruch.h @@ -31,7 +31,7 @@ static const char description[] = I18N_NOOP("KBruch"); -class MainTQtWidget; +class MainQtWidget; class task; class ratio; class primzahl; diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index 7212f56a..f7a19005 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -46,10 +46,10 @@ /* ------ public member functions ------ */ -MainTQtWidget::MainTQtWidget() +MainQtWidget::MainQtWidget() { #ifdef DEBUG - kdDebug() << "constructor MainTQtWidget" << endl; + kdDebug() << "constructor MainQtWidget" << endl; #endif // get the settings @@ -116,14 +116,14 @@ MainTQtWidget::MainTQtWidget() slotAboutToShowPage(m_exercises->pageWidget(m_exercises->activePageIndex())); } -MainTQtWidget::~MainTQtWidget() +MainQtWidget::~MainQtWidget() { } /* ------ private member functions ------ */ -void MainTQtWidget::readOptions() +void MainQtWidget::readOptions() { m_addSub = SettingsClass::addsub(); m_mulDiv = SettingsClass::muldiv(); @@ -138,7 +138,7 @@ void MainTQtWidget::readOptions() } } -void MainTQtWidget::writeOptions() +void MainQtWidget::writeOptions() { SettingsClass::setActiveExercise(m_exercises->activePageIndex()); @@ -151,7 +151,7 @@ void MainTQtWidget::writeOptions() SettingsClass::writeConfig(); } -void MainTQtWidget::setupActions() +void MainQtWidget::setupActions() { // new task action m_NewTaskAction = new KAction(i18n("&New"), "filenew", KStdAccel::shortcut(KStdAccel::New), @@ -252,10 +252,10 @@ void MainTQtWidget::setupActions() /* ------ private slots ------ */ -void MainTQtWidget::NewTask() +void MainQtWidget::NewTask() { #ifdef DEBUG - kdDebug() << "NewTask MainTQtWidget" << endl; + kdDebug() << "NewTask MainQtWidget" << endl; kdDebug() << "pageIndex(m_taskview): " << m_exercises->pageIndex(m_taskview) << endl; kdDebug() << "pageIndex(m_exerciseCompare): " << m_exercises->pageIndex(m_exerciseCompare) << endl; kdDebug() << "pageIndex(m_exerciseConvert): " << m_exercises->pageIndex(m_exerciseConvert) << endl; @@ -307,10 +307,10 @@ void MainTQtWidget::NewTask() return; } -void MainTQtWidget::NrOfTermsBoxSlot() +void MainQtWidget::NrOfTermsBoxSlot() { #ifdef DEBUG - kdDebug() << "MainTQtWidget::NrOfTermsBoxSlot()" << endl; + kdDebug() << "MainQtWidget::NrOfTermsBoxSlot()" << endl; #endif TQString curr_nr = m_NrOfTermsBox->currentText(); m_MaxMainDenominatorBox->clear(); @@ -363,10 +363,10 @@ void MainTQtWidget::NrOfTermsBoxSlot() (void) m_taskview->setTaskParameters(m_addSub, m_mulDiv, m_nrRatios, m_maxMainDenominator); } -void MainTQtWidget::MaxMainDenominatorBoxSlot() +void MainQtWidget::MaxMainDenominatorBoxSlot() { #ifdef DEBUG - kdDebug() << "MainTQtWidget::MaxMainDenominatorBoxSlot()" << endl; + kdDebug() << "MainQtWidget::MaxMainDenominatorBoxSlot()" << endl; #endif // get the max. size from the ComboBox, convert it to a number and store @@ -378,10 +378,10 @@ void MainTQtWidget::MaxMainDenominatorBoxSlot() (void) m_taskview->setTaskParameters(m_addSub, m_mulDiv, m_nrRatios, m_maxMainDenominator); } -void MainTQtWidget::OperationBoxSlot() +void MainQtWidget::OperationBoxSlot() { #ifdef DEBUG - kdDebug() << "MainTQtWidget::OperationBoxSlot()" << endl; + kdDebug() << "MainQtWidget::OperationBoxSlot()" << endl; #endif int index = m_OperationBox->currentItem(); // get selected item @@ -413,7 +413,7 @@ void MainTQtWidget::OperationBoxSlot() (void) m_taskview->setTaskParameters(m_addSub, m_mulDiv, m_nrRatios, m_maxMainDenominator); } -void MainTQtWidget::slotPrefs() +void MainQtWidget::slotPrefs() { // do not show dialog twice if (KConfigDialog::showDialog("settings")) @@ -444,7 +444,7 @@ void MainTQtWidget::slotPrefs() return; } -void MainTQtWidget::slotApplySettings() +void MainQtWidget::slotApplySettings() { // update the task view m_taskview->update(); @@ -455,10 +455,10 @@ void MainTQtWidget::slotApplySettings() return; } -void MainTQtWidget::slotAboutToShowPage(TQWidget * page) +void MainQtWidget::slotAboutToShowPage(TQWidget * page) { #ifdef DEBUG - kdDebug() << "slotAboutToShowPage MainTQtWidget" << endl; + kdDebug() << "slotAboutToShowPage MainQtWidget" << endl; kdDebug() << "pageIndex(m_taskview): " << m_exercises->pageIndex(m_taskview) << endl; kdDebug() << "pageIndex(m_exerciseCompare): " << m_exercises->pageIndex(m_exerciseCompare) << endl; kdDebug() << "pageIndex(m_exerciseConvert): " << m_exercises->pageIndex(m_exerciseConvert) << endl; @@ -480,7 +480,7 @@ void MainTQtWidget::slotAboutToShowPage(TQWidget * page) return; } -bool MainTQtWidget::queryExit() +bool MainQtWidget::queryExit() { writeOptions(); return true; diff --git a/kbruch/src/mainqtwidget.h b/kbruch/src/mainqtwidget.h index 989a998e..d6506cde 100644 --- a/kbruch/src/mainqtwidget.h +++ b/kbruch/src/mainqtwidget.h @@ -37,17 +37,17 @@ class TaskView; * \author Sebastian Stein * \author Eva Brucherseifer **/ -class MainTQtWidget : public KMainWindow +class MainQtWidget : public KMainWindow { Q_OBJECT TQ_OBJECT public: /** constructor */ - MainTQtWidget(); + MainQtWidget(); /** destructor */ - ~MainTQtWidget(); + ~MainQtWidget(); private: /** read the config file */ @@ -143,4 +143,4 @@ class MainTQtWidget : public KMainWindow bool queryExit(); }; -#endif // MainTQtWidget +#endif // MainQtWidget