diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-04 02:22:38 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-04 02:22:38 +0000 |
commit | 98a12d05a48814bec3870b9a6d5865475cfa1c95 (patch) | |
tree | a711801e47696fb0cf162abd7330e0b5b480ba39 /kbruch | |
parent | 421a1845137c7c396b5d03bce53237fcb149d602 (diff) | |
download | tdeedu-98a12d05a48814bec3870b9a6d5865475cfa1c95.tar.gz tdeedu-98a12d05a48814bec3870b9a6d5865475cfa1c95.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1211429 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kbruch')
-rw-r--r-- | kbruch/src/exercisecompare.cpp | 6 | ||||
-rw-r--r-- | kbruch/src/exerciseconvert.cpp | 6 | ||||
-rw-r--r-- | kbruch/src/exercisefactorize.cpp | 74 | ||||
-rw-r--r-- | kbruch/src/exercisefactorize.h | 16 | ||||
-rw-r--r-- | kbruch/src/fractionbasewidget.cpp | 2 | ||||
-rw-r--r-- | kbruch/src/fractionbasewidget.h | 2 | ||||
-rw-r--r-- | kbruch/src/mainqtwidget.cpp | 4 | ||||
-rw-r--r-- | kbruch/src/statisticsview.cpp | 20 | ||||
-rw-r--r-- | kbruch/src/statisticsview.h | 2 | ||||
-rw-r--r-- | kbruch/src/taskview.cpp | 8 | ||||
-rw-r--r-- | kbruch/src/taskvieweroptionsbase.ui | 12 |
11 files changed, 76 insertions, 76 deletions
diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp index f6652e56..75be74a9 100644 --- a/kbruch/src/exercisecompare.cpp +++ b/kbruch/src/exercisecompare.cpp @@ -129,7 +129,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): // that the user can start typing without moving the focus m_signButton->setFocus(); - // show the whole layout + // show the whole tqlayout baseWidget->show(); // add tooltip and qwhatsthis help to the widget @@ -301,9 +301,9 @@ void ExerciseCompare::slotSignButtonClicked() { // in RTL desktops, we still need to allign the // execise to the left. On Qt4, you can set the direction - // of the layout to LTR (instead of inherit), but on Qt3 + // of the tqlayout to LTR (instead of inherit), but on Qt3 // the only way of fixing it is inserting the widgets in reversed - // order to the layout. + // order to the tqlayout. // // But... as an ugly hack, we can also display the "other" operation // thats damm ugly, but will work as well :) diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp index 967c960d..be94cb50 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -120,9 +120,9 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): // in RTL desktops, we still need to allign the // execise to the left. On Qt4, you can set the direction - // of the layout to LTR (instead of inherit), but on Qt3 + // of the tqlayout to LTR (instead of inherit), but on Qt3 // the only way of fixing it is inserting the widgets in reversed - // order to the layout. + // order to the tqlayout. // // if you need help with this feel free to contact me - Diego <elcuco@kde.org> ) // This should fix parts of bug #116831 @@ -163,7 +163,7 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): // that the user can start typing without moving the focus numer_edit->setFocus(); - // show the whole layout + // show the whole tqlayout baseWidget->show(); // add tooltip and qwhatsthis help to the widget diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp index 3a2d64dd..d97b9482 100644 --- a/kbruch/src/exercisefactorize.cpp +++ b/kbruch/src/exercisefactorize.cpp @@ -64,40 +64,40 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout"); - layout9 = new TQVBoxLayout( 0, 0, 6, "layout9"); + tqlayout9 = new TQVBoxLayout( 0, 0, 6, "tqlayout9"); // The following method fix the problem in // bug #116831, reverse order in RTL desktops. // Amit Ramon amit.ramon@kdemail.net - layout4 = createFactorsLayout(); - layout9->addLayout(layout4); + tqlayout4 = createFactorsLayout(); + tqlayout9->addLayout(tqlayout4); spacer2 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - layout9->addItem( spacer2 ); + tqlayout9->addItem( spacer2 ); - layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); + tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); // The following method fix the problem in // bug #116831, reverse order in RTL desktops. // Amit Ramon amit.ramon@kdemail.net - layout1 = createButtonsLayout(); - layout2->addLayout(layout1); + tqlayout1 = createButtonsLayout(); + tqlayout2->addLayout(tqlayout1); m_removeLastFactorButton = new TQPushButton( this, "m_removeLastFactorButton" ); - layout2->addWidget( m_removeLastFactorButton ); - layout9->addLayout( layout2 ); + tqlayout2->addWidget( m_removeLastFactorButton ); + tqlayout9->addLayout( tqlayout2 ); spacer4 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - layout9->addItem( spacer4 ); + tqlayout9->addItem( spacer4 ); - layout7 = new TQHBoxLayout( 0, 0, 6, "layout7"); + tqlayout7 = new TQHBoxLayout( 0, 0, 6, "tqlayout7"); spacer3 = new TQSpacerItem( 361, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - layout7->addItem( spacer3 ); + tqlayout7->addItem( spacer3 ); m_checkButton = new TQPushButton( this, "m_checkButton" ); - layout7->addWidget( m_checkButton ); - layout9->addLayout( layout7 ); - Form1Layout->addLayout( layout9 ); + tqlayout7->addWidget( m_checkButton ); + tqlayout9->addLayout( tqlayout7 ); + Form1Layout->addLayout( tqlayout9 ); // the current task TQString tmp_str; @@ -228,16 +228,16 @@ void ExerciseFactorize::update() // // The following method was added to fix -// bug #116831 (reverse layout in RTL desktops) +// bug #116831 (reverse tqlayout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // -/** Create the layout that hold the exercise widgets +/** Create the tqlayout that hold the exercise widgets */ TQHBoxLayout* ExerciseFactorize::createFactorsLayout() { // first create all widgets - TQHBoxLayout* layout = new TQHBoxLayout( 0, 0, 6, "layout4"); + TQHBoxLayout* tqlayout = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); m_taskLabel = new TQLabel( this, "m_taskLabel" ); @@ -258,46 +258,46 @@ TQHBoxLayout* ExerciseFactorize::createFactorsLayout() spacer1 = new TQSpacerItem( 25, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - // now add the widgets to the layout. + // now add the widgets to the tqlayout. // if we are in a RTL desktop, add them // in a reverse order if (TQApplication::reverseLayout()) { - layout->addItem( spacer1 ); - layout->addWidget( result_label ); - layout->addWidget( m_factorsWidget ); - layout->addWidget( m_factorsEnteredEdit ); - layout->addWidget( m_equalSignLabel ); - layout->addWidget( m_taskLabel ); + tqlayout->addItem( spacer1 ); + tqlayout->addWidget( result_label ); + tqlayout->addWidget( m_factorsWidget ); + tqlayout->addWidget( m_factorsEnteredEdit ); + tqlayout->addWidget( m_equalSignLabel ); + tqlayout->addWidget( m_taskLabel ); } else { - layout->addWidget( m_taskLabel ); - layout->addWidget( m_equalSignLabel ); - layout->addWidget( m_factorsEnteredEdit ); - layout->addWidget( m_factorsWidget ); - layout->addWidget( result_label ); - layout->addItem( spacer1 ); + tqlayout->addWidget( m_taskLabel ); + tqlayout->addWidget( m_equalSignLabel ); + tqlayout->addWidget( m_factorsEnteredEdit ); + tqlayout->addWidget( m_factorsWidget ); + tqlayout->addWidget( result_label ); + tqlayout->addItem( spacer1 ); } - return layout; + return tqlayout; } // // The following method was added to fix -// bug #116831 (reverse layout in RTL desktops) +// bug #116831 (reverse tqlayout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // -/** Create the layout that hold the exercise widgets +/** Create the tqlayout that hold the exercise widgets */ TQGridLayout* ExerciseFactorize::createButtonsLayout() { const int _COLS = 4; // number of buttons in each row const int _ROWS = 2; // number of rows - TQGridLayout* layout = new TQGridLayout( 0, 1, 1, 0, 6, "layout1"); + TQGridLayout* tqlayout = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout1"); // first row buttons m_factor2Button = new TQPushButton( this, "m_factor2Button" ); @@ -348,12 +348,12 @@ TQGridLayout* ExerciseFactorize::createButtonsLayout() for (int col = 0; col < _COLS; col++) { - layout->addWidget(buttons[row][buttonIdx], row, col ); + tqlayout->addWidget(buttons[row][buttonIdx], row, col ); buttonIdx += step; } } - return layout; + return tqlayout; } diff --git a/kbruch/src/exercisefactorize.h b/kbruch/src/exercisefactorize.h index 41a89066..ee5da192 100644 --- a/kbruch/src/exercisefactorize.h +++ b/kbruch/src/exercisefactorize.h @@ -115,14 +115,14 @@ private: // // the following two methods were added to fix - // bug #116831 (reverse layout in RTL desktops) + // bug #116831 (reverse tqlayout in RTL desktops) // Amit Ramon amit.ramon@kdemail.net // - /** create the factor widgets layout */ + /** create the factor widgets tqlayout */ TQHBoxLayout* createFactorsLayout(); - /** create the (answer) buttons layout */ + /** create the (answer) buttons tqlayout */ TQGridLayout* createButtonsLayout(); @@ -135,14 +135,14 @@ private: protected: TQVBoxLayout* Form1Layout; - TQVBoxLayout* layout9; + TQVBoxLayout* tqlayout9; TQSpacerItem* spacer4; - TQHBoxLayout* layout4; + TQHBoxLayout* tqlayout4; TQSpacerItem* spacer1; TQSpacerItem* spacer2; - TQVBoxLayout* layout2; - TQGridLayout* layout1; - TQHBoxLayout* layout7; + TQVBoxLayout* tqlayout2; + TQGridLayout* tqlayout1; + TQHBoxLayout* tqlayout7; TQSpacerItem* spacer3; private slots: diff --git a/kbruch/src/fractionbasewidget.cpp b/kbruch/src/fractionbasewidget.cpp index 07f60c84..a36ce43c 100644 --- a/kbruch/src/fractionbasewidget.cpp +++ b/kbruch/src/fractionbasewidget.cpp @@ -161,7 +161,7 @@ void FractionBaseWidget::setColorAndFont() /* set font */ m_font = SettingsClass::taskFont(); - // repaint + // tqrepaint update(); return; diff --git a/kbruch/src/fractionbasewidget.h b/kbruch/src/fractionbasewidget.h index 21b2fdc8..ed2cc8d1 100644 --- a/kbruch/src/fractionbasewidget.h +++ b/kbruch/src/fractionbasewidget.h @@ -44,7 +44,7 @@ public: /** destructor */ ~FractionBaseWidget(); - /** updates the widget by first getting the settings and then repainting */ + /** updates the widget by first getting the settings and then tqrepainting */ void updateAndRepaint(); protected: diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index 3ac59d46..2cc0cc29 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -109,7 +109,7 @@ MainQtWidget::MainQtWidget() #if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3) #else - resize(TQSize(QMAX(toolBar()->sizeHint().width(), sizeHint().width()), sizeHint().height())); + resize(TQSize(QMAX(toolBar()->tqsizeHint().width(), tqsizeHint().width()), tqsizeHint().height())); #endif // now show the last exercise m_exercises->showPage(SettingsClass::activeExercise()); @@ -243,7 +243,7 @@ void MainQtWidget::setupActions() #if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3) if (!initialGeometrySet()) - resize( TQSize(725, 330).expandedTo(minimumSizeHint())); + resize( TQSize(725, 330).expandedTo(tqminimumSizeHint())); setupGUI(ToolBar | Keys | StatusBar | Create); setAutoSaveSettings(); #endif diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp index d6b8ff37..a3984707 100644 --- a/kbruch/src/statisticsview.cpp +++ b/kbruch/src/statisticsview.cpp @@ -48,17 +48,17 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* set the caption of the window */ // setCaption(i18n("Statistics")); - /* add a layout as a base */ - layout1 = new TQVBoxLayout(this); - layout1->setSpacing(6); - layout1->setMargin(6); + /* add a tqlayout as a base */ + tqlayout1 = new TQVBoxLayout(this); + tqlayout1->setSpacing(6); + tqlayout1->setMargin(6); /* now add a v-spacer */ TQSpacerItem * v_spacer = new TQSpacerItem(1, 1); - layout1->addItem(v_spacer); + tqlayout1->addItem(v_spacer); /* create a grid to show the labels */ - labelGrid = new TQGridLayout(layout1, 3, 2); + labelGrid = new TQGridLayout(tqlayout1, 3, 2); /* add 6 labels to the grid */ info1Label = new TQLabel(this); @@ -112,10 +112,10 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* now add a v-spacer */ v_spacer = new TQSpacerItem(1, 1); - layout1->addItem(v_spacer); + tqlayout1->addItem(v_spacer); /* the Reset button */ - buttonLayout = new TQHBoxLayout(layout1); + buttonLayout = new TQHBoxLayout(tqlayout1); resetBtn = new TQPushButton(i18n("&Reset"), this); TQObject::connect(resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetStatistics())); buttonLayout->addWidget(resetBtn); @@ -150,14 +150,14 @@ void StatisticsView::addCorrect() { ++m_count; ++m_correct; - (void) calc(); /* repaint the statistics */ + (void) calc(); /* tqrepaint the statistics */ } /* called, if a task was solved wrong */ void StatisticsView::addWrong() { ++m_count; - (void) calc(); /* repaint the statistics */ + (void) calc(); /* tqrepaint the statistics */ } diff --git a/kbruch/src/statisticsview.h b/kbruch/src/statisticsview.h index b7948761..91b54c22 100644 --- a/kbruch/src/statisticsview.h +++ b/kbruch/src/statisticsview.h @@ -65,7 +65,7 @@ private: TQPushButton * resetBtn; TQHBoxLayout * buttonLayout; - TQVBoxLayout * layout1; + TQVBoxLayout * tqlayout1; TQGridLayout * labelGrid; TQLabel * result1Label; TQLabel * result2Label; diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp index a15520a8..79c70fa0 100644 --- a/kbruch/src/taskview.cpp +++ b/kbruch/src/taskview.cpp @@ -114,9 +114,9 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, // --- that is the end of the horizontal line --- // in RTL desktops, we still need to allign the // execise to the left. On Qt4, you can set the direction - // of the layout to LTR (instead of inherit), but on Qt3 + // of the tqlayout to LTR (instead of inherit), but on Qt3 // the only way of fixing it is inserting the widgets in reversed - // order to the layout. + // order to the tqlayout. // // if you need help with this feel free to contact me - Diego <elcuco@kde.org> ) // This should fix parts of bug #116831 @@ -158,10 +158,10 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, // that the user can start typing without moving the focus numer_edit->setFocus(); - // show the whole layout + // show the whole tqlayout baseWidget->show(); - // show the whole layout + // show the whole tqlayout m_taskWidget->show(); m_resultWidget->hide(); diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui index 97cba6ed..572872ac 100644 --- a/kbruch/src/taskvieweroptionsbase.ui +++ b/kbruch/src/taskvieweroptionsbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TaskViewerOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> @@ -42,7 +42,7 @@ </widget> <widget class="QGroupBox"> <property name="name"> - <cstring>colorGroupBox</cstring> + <cstring>tqcolorGroupBox</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -57,9 +57,9 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>20</y> @@ -214,7 +214,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kfontdialog.h</includehint> <includehint>kcolorbutton.h</includehint> |