summaryrefslogtreecommitdiffstats
path: root/kbruch
diff options
context:
space:
mode:
Diffstat (limited to 'kbruch')
-rw-r--r--kbruch/ChangeLog4
-rw-r--r--kbruch/src/exercisecompare.cpp8
-rw-r--r--kbruch/src/exerciseconvert.cpp8
-rw-r--r--kbruch/src/exercisefactorize.cpp76
-rw-r--r--kbruch/src/exercisefactorize.h16
-rw-r--r--kbruch/src/fractionbasewidget.cpp2
-rw-r--r--kbruch/src/mainqtwidget.cpp4
-rw-r--r--kbruch/src/ratio.h2
-rw-r--r--kbruch/src/statisticsview.cpp28
-rw-r--r--kbruch/src/statisticsview.h2
-rw-r--r--kbruch/src/taskview.cpp10
-rw-r--r--kbruch/src/taskvieweroptionsbase.ui6
12 files changed, 83 insertions, 83 deletions
diff --git a/kbruch/ChangeLog b/kbruch/ChangeLog
index be301b7b..688ef69f 100644
--- a/kbruch/ChangeLog
+++ b/kbruch/ChangeLog
@@ -1,6 +1,6 @@
2003-04-28 Sebastian Stein <seb.kde@hpfsc.de>
- * fixed tqlayout problem with help of Dominique Devries
+ * fixed layout problem with help of Dominique Devries
* compiler warnings (<iosteam>) removed by Dominique Devries
@@ -10,7 +10,7 @@
2003-04-24 Sebastian Stein <seb.kde@hpfsc.de>
- * experiments with the tqlayout problem, but found no solution
+ * experiments with the layout problem, but found no solution
* removed #define TRUE, used type bool instead
diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp
index c00c6dd0..f74bd0a9 100644
--- a/kbruch/src/exercisecompare.cpp
+++ b/kbruch/src/exercisecompare.cpp
@@ -24,7 +24,7 @@
/* these includes are needed for TQt support */
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -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 tqlayout
+ // show the whole layout
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 TQt4, you can set the direction
- // of the tqlayout to LTR (instead of inherit), but on TQt3
+ // of the layout to LTR (instead of inherit), but on TQt3
// the only way of fixing it is inserting the widgets in reversed
- // order to the tqlayout.
+ // order to the layout.
//
// 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 0c97688a..3535eeae 100644
--- a/kbruch/src/exerciseconvert.cpp
+++ b/kbruch/src/exerciseconvert.cpp
@@ -26,7 +26,7 @@
/* these includes are needed for TQt support */
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
@@ -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 TQt4, you can set the direction
- // of the tqlayout to LTR (instead of inherit), but on TQt3
+ // of the layout to LTR (instead of inherit), but on TQt3
// the only way of fixing it is inserting the widgets in reversed
- // order to the tqlayout.
+ // order to the layout.
//
// 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 tqlayout
+ // show the whole layout
baseWidget->show();
// add tooltip and qwhatsthis help to the widget
diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp
index aa12a766..d9b5f9d3 100644
--- a/kbruch/src/exercisefactorize.cpp
+++ b/kbruch/src/exercisefactorize.cpp
@@ -26,7 +26,7 @@
/* these includes are needed for TQt support */
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
@@ -64,40 +64,40 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name):
Form1Layout = new TQVBoxLayout( this, 11, 6, "Form1Layout");
- tqlayout9 = new TQVBoxLayout( 0, 0, 6, "tqlayout9");
+ layout9 = new TQVBoxLayout( 0, 0, 6, "layout9");
// The following method fix the problem in
// bug #116831, reverse order in RTL desktops.
// Amit Ramon amit.ramon@kdemail.net
- tqlayout4 = createFactorsLayout();
- tqlayout9->addLayout(tqlayout4);
+ layout4 = createFactorsLayout();
+ layout9->addLayout(layout4);
spacer2 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
- tqlayout9->addItem( spacer2 );
+ layout9->addItem( spacer2 );
- tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
+ layout2 = new TQVBoxLayout( 0, 0, 6, "layout2");
// The following method fix the problem in
// bug #116831, reverse order in RTL desktops.
// Amit Ramon amit.ramon@kdemail.net
- tqlayout1 = createButtonsLayout();
- tqlayout2->addLayout(tqlayout1);
+ layout1 = createButtonsLayout();
+ layout2->addLayout(layout1);
m_removeLastFactorButton = new TQPushButton( this, "m_removeLastFactorButton" );
- tqlayout2->addWidget( m_removeLastFactorButton );
- tqlayout9->addLayout( tqlayout2 );
+ layout2->addWidget( m_removeLastFactorButton );
+ layout9->addLayout( layout2 );
spacer4 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
- tqlayout9->addItem( spacer4 );
+ layout9->addItem( spacer4 );
- tqlayout7 = new TQHBoxLayout( 0, 0, 6, "tqlayout7");
+ layout7 = new TQHBoxLayout( 0, 0, 6, "layout7");
spacer3 = new TQSpacerItem( 361, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- tqlayout7->addItem( spacer3 );
+ layout7->addItem( spacer3 );
m_checkButton = new TQPushButton( this, "m_checkButton" );
- tqlayout7->addWidget( m_checkButton );
- tqlayout9->addLayout( tqlayout7 );
- Form1Layout->addLayout( tqlayout9 );
+ layout7->addWidget( m_checkButton );
+ layout9->addLayout( layout7 );
+ Form1Layout->addLayout( layout9 );
// the current task
TQString tmp_str;
@@ -228,16 +228,16 @@ void ExerciseFactorize::update()
//
// The following method was added to fix
-// bug #116831 (reverse tqlayout in RTL desktops)
+// bug #116831 (reverse layout in RTL desktops)
// Amit Ramon amit.ramon@kdemail.net
//
-/** Create the tqlayout that hold the exercise widgets
+/** Create the layout that hold the exercise widgets
*/
TQHBoxLayout* ExerciseFactorize::createFactorsLayout()
{
// first create all widgets
- TQHBoxLayout* tqlayout = new TQHBoxLayout( 0, 0, 6, "tqlayout4");
+ TQHBoxLayout* layout = new TQHBoxLayout( 0, 0, 6, "layout4");
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 tqlayout.
+ // now add the widgets to the layout.
// if we are in a RTL desktop, add them
// in a reverse order
if (TQApplication::reverseLayout())
{
- tqlayout->addItem( spacer1 );
- tqlayout->addWidget( result_label );
- tqlayout->addWidget( m_factorsWidget );
- tqlayout->addWidget( m_factorsEnteredEdit );
- tqlayout->addWidget( m_equalSignLabel );
- tqlayout->addWidget( m_taskLabel );
+ layout->addItem( spacer1 );
+ layout->addWidget( result_label );
+ layout->addWidget( m_factorsWidget );
+ layout->addWidget( m_factorsEnteredEdit );
+ layout->addWidget( m_equalSignLabel );
+ layout->addWidget( m_taskLabel );
}
else
{
- tqlayout->addWidget( m_taskLabel );
- tqlayout->addWidget( m_equalSignLabel );
- tqlayout->addWidget( m_factorsEnteredEdit );
- tqlayout->addWidget( m_factorsWidget );
- tqlayout->addWidget( result_label );
- tqlayout->addItem( spacer1 );
+ layout->addWidget( m_taskLabel );
+ layout->addWidget( m_equalSignLabel );
+ layout->addWidget( m_factorsEnteredEdit );
+ layout->addWidget( m_factorsWidget );
+ layout->addWidget( result_label );
+ layout->addItem( spacer1 );
}
- return tqlayout;
+ return layout;
}
//
// The following method was added to fix
-// bug #116831 (reverse tqlayout in RTL desktops)
+// bug #116831 (reverse layout in RTL desktops)
// Amit Ramon amit.ramon@kdemail.net
//
-/** Create the tqlayout that hold the exercise widgets
+/** Create the layout 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* tqlayout = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout1");
+ TQGridLayout* layout = new TQGridLayout( 0, 1, 1, 0, 6, "layout1");
// first row buttons
m_factor2Button = new TQPushButton( this, "m_factor2Button" );
@@ -348,12 +348,12 @@ TQGridLayout* ExerciseFactorize::createButtonsLayout()
for (int col = 0; col < _COLS; col++)
{
- tqlayout->addWidget(buttons[row][buttonIdx], row, col );
+ layout->addWidget(buttons[row][buttonIdx], row, col );
buttonIdx += step;
}
}
- return tqlayout;
+ return layout;
}
diff --git a/kbruch/src/exercisefactorize.h b/kbruch/src/exercisefactorize.h
index 8a6f5c2c..c5ded345 100644
--- a/kbruch/src/exercisefactorize.h
+++ b/kbruch/src/exercisefactorize.h
@@ -116,14 +116,14 @@ private:
//
// the following two methods were added to fix
- // bug #116831 (reverse tqlayout in RTL desktops)
+ // bug #116831 (reverse layout in RTL desktops)
// Amit Ramon amit.ramon@kdemail.net
//
- /** create the factor widgets tqlayout */
+ /** create the factor widgets layout */
TQHBoxLayout* createFactorsLayout();
- /** create the (answer) buttons tqlayout */
+ /** create the (answer) buttons layout */
TQGridLayout* createButtonsLayout();
@@ -136,14 +136,14 @@ private:
protected:
TQVBoxLayout* Form1Layout;
- TQVBoxLayout* tqlayout9;
+ TQVBoxLayout* layout9;
TQSpacerItem* spacer4;
- TQHBoxLayout* tqlayout4;
+ TQHBoxLayout* layout4;
TQSpacerItem* spacer1;
TQSpacerItem* spacer2;
- TQVBoxLayout* tqlayout2;
- TQGridLayout* tqlayout1;
- TQHBoxLayout* tqlayout7;
+ TQVBoxLayout* layout2;
+ TQGridLayout* layout1;
+ TQHBoxLayout* layout7;
TQSpacerItem* spacer3;
private slots:
diff --git a/kbruch/src/fractionbasewidget.cpp b/kbruch/src/fractionbasewidget.cpp
index b8dbfacd..c1fec755 100644
--- a/kbruch/src/fractionbasewidget.cpp
+++ b/kbruch/src/fractionbasewidget.cpp
@@ -161,7 +161,7 @@ void FractionBaseWidget::setColorAndFont()
/* set font */
m_font = SettingsClass::taskFont();
- // tqrepaint
+ // repaint
update();
return;
diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp
index ed0836c8..f04fc17a 100644
--- a/kbruch/src/mainqtwidget.cpp
+++ b/kbruch/src/mainqtwidget.cpp
@@ -109,7 +109,7 @@ MainQtWidget::MainQtWidget()
#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
#else
- resize(TQSize(TQMAX(toolBar()->tqsizeHint().width(), tqsizeHint().width()), tqsizeHint().height()));
+ resize(TQSize(TQMAX(toolBar()->sizeHint().width(), sizeHint().width()), sizeHint().height()));
#endif
// now show the last exercise
m_exercises->showPage(SettingsClass::activeExercise());
@@ -243,7 +243,7 @@ void MainQtWidget::setupActions()
#if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3)
if (!initialGeometrySet())
- resize( TQSize(725, 330).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(725, 330).expandedTo(minimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
#endif
diff --git a/kbruch/src/ratio.h b/kbruch/src/ratio.h
index c9ee687a..f0b69d92 100644
--- a/kbruch/src/ratio.h
+++ b/kbruch/src/ratio.h
@@ -18,7 +18,7 @@
#ifndef RATIO_H
#define RATIO_H
-#include <tqtextstream.h>
+#include <textstream.h>
/** Represents a ratio
* This class represents 1 ratio. There are several functions provided to
diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp
index 6c73b2b8..8e6db5d6 100644
--- a/kbruch/src/statisticsview.cpp
+++ b/kbruch/src/statisticsview.cpp
@@ -20,7 +20,7 @@
/* the includes are needed for TQt support */
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -48,17 +48,17 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name):
/* set the caption of the window */
// setCaption(i18n("Statistics"));
- /* add a tqlayout as a base */
- tqlayout1 = new TQVBoxLayout(this);
- tqlayout1->setSpacing(6);
- tqlayout1->setMargin(6);
+ /* add a layout as a base */
+ layout1 = new TQVBoxLayout(this);
+ layout1->setSpacing(6);
+ layout1->setMargin(6);
/* now add a v-spacer */
TQSpacerItem * v_spacer = new TQSpacerItem(1, 1);
- tqlayout1->addItem(v_spacer);
+ layout1->addItem(v_spacer);
/* create a grid to show the labels */
- labelGrid = new TQGridLayout(tqlayout1, 3, 2);
+ labelGrid = new TQGridLayout(layout1, 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);
- tqlayout1->addItem(v_spacer);
+ layout1->addItem(v_spacer);
/* the Reset button */
- buttonLayout = new TQHBoxLayout(tqlayout1);
+ buttonLayout = new TQHBoxLayout(layout1);
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(); /* tqrepaint the statistics */
+ (void) calc(); /* repaint the statistics */
}
/* called, if a task was solved wrong */
void StatisticsView::addWrong()
{
++m_count;
- (void) calc(); /* tqrepaint the statistics */
+ (void) calc(); /* repaint the statistics */
}
@@ -169,7 +169,7 @@ void StatisticsView::calc()
TQString new_text;
TQString number;
- new_text = TQString("<b>%1</b>").tqarg(m_count);
+ new_text = TQString("<b>%1</b>").arg(m_count);
result1Label->setText(new_text);
/* we have to be careful with division by 0 */
@@ -179,11 +179,11 @@ void StatisticsView::calc()
result3Label->setText("- (- %)");
} else {
/* set the correct label */
- new_text = TQString("%1 (%2 %)").tqarg(m_correct).tqarg(int(double(m_correct) / m_count * 100));
+ new_text = TQString("%1 (%2 %)").arg(m_correct).arg(int(double(m_correct) / m_count * 100));
result2Label->setText(new_text);
/* set the incorrect label */
- new_text = TQString("%1 (%2 %)").tqarg(m_count - m_correct).tqarg(int(double(m_count - m_correct) / m_count * 100));
+ new_text = TQString("%1 (%2 %)").arg(m_count - m_correct).arg(int(double(m_count - m_correct) / m_count * 100));
result3Label->setText(new_text);
}
}
diff --git a/kbruch/src/statisticsview.h b/kbruch/src/statisticsview.h
index 9b2821b8..c95eec0e 100644
--- a/kbruch/src/statisticsview.h
+++ b/kbruch/src/statisticsview.h
@@ -66,7 +66,7 @@ private:
TQPushButton * resetBtn;
TQHBoxLayout * buttonLayout;
- TQVBoxLayout * tqlayout1;
+ TQVBoxLayout * layout1;
TQGridLayout * labelGrid;
TQLabel * result1Label;
TQLabel * result2Label;
diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp
index 2cb4f8ec..9c1b1ace 100644
--- a/kbruch/src/taskview.cpp
+++ b/kbruch/src/taskview.cpp
@@ -26,7 +26,7 @@
/* these includes are needed for TQt support */
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqtooltip.h>
@@ -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 TQt4, you can set the direction
- // of the tqlayout to LTR (instead of inherit), but on TQt3
+ // of the layout to LTR (instead of inherit), but on TQt3
// the only way of fixing it is inserting the widgets in reversed
- // order to the tqlayout.
+ // order to the layout.
//
// 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 tqlayout
+ // show the whole layout
baseWidget->show();
- // show the whole tqlayout
+ // show the whole layout
m_taskWidget->show();
m_resultWidget->hide();
diff --git a/kbruch/src/taskvieweroptionsbase.ui b/kbruch/src/taskvieweroptionsbase.ui
index 8938ac96..66f45d15 100644
--- a/kbruch/src/taskvieweroptionsbase.ui
+++ b/kbruch/src/taskvieweroptionsbase.ui
@@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -42,7 +42,7 @@
</widget>
<widget class="TQGroupBox">
<property name="name">
- <cstring>tqcolorGroupBox</cstring>
+ <cstring>colorGroupBox</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -57,7 +57,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<property name="geometry">
<rect>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-04 16:56:53 +0000