Rename obsolete tq methods to standard names

pull/1/head
Timothy Pearson 11 years ago
parent 746abe8440
commit ba6b214198

@ -19,7 +19,7 @@ Add:
- The menustructure is now more consistent
- One icon has been added
- Make the mainwidget a QScrollView. This make sizehandling easier
- Improved tqlayout of the detailed information dialog
- Improved layout of the detailed information dialog
- Added a widget which shows you a table of the isotopes
- Added EqChem, a chemical equation solver
- Added several glossary-items

@ -94,10 +94,10 @@ void DetailedInfoDlg::setElement(Element *element)
KHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString& icontext, const TQString& iconname )
{
TQFrame *frame = addPage(title, icontext, BarIcon(iconname));
TQVBoxLayout *tqlayout = new TQVBoxLayout( frame );
tqlayout->setMargin( 0 );
TQVBoxLayout *layout = new TQVBoxLayout( frame );
layout->setMargin( 0 );
KHTMLPart *w = new KHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) );
tqlayout->addWidget( w->view() );
layout->addWidget( w->view() );
return w;
}

@ -41,7 +41,7 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
yData = new AxisData();
TQHBoxLayout *tqlayout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() );
TQHBoxLayout *layout = new TQHBoxLayout(plainPage(), 0, KDialog::spacingHint() );
m_pPlotSetupWidget = new PlotSetupWidget( plainPage(), "plotsetup" );
m_pPlotSetupWidget->from->setMaxValue( d->numberOfElements() - 1 );
@ -51,10 +51,10 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name )
m_pPlotWidget->setMinimumWidth( 200 );
m_pPlotWidget->resize( 400, m_pPlotWidget->height() );
tqlayout->addWidget( m_pPlotSetupWidget );
tqlayout->addWidget( m_pPlotWidget );
tqlayout->setStretchFactor( m_pPlotSetupWidget, 0 );
tqlayout->setStretchFactor( m_pPlotWidget, 1 );
layout->addWidget( m_pPlotSetupWidget );
layout->addWidget( m_pPlotWidget );
layout->setStretchFactor( m_pPlotSetupWidget, 0 );
layout->setStretchFactor( m_pPlotWidget, 1 );
// setup the list of names
EList::iterator it = d->ElementList.begin();

@ -50,7 +50,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent)
{
settingsChanged();
TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView tqlayout");
TQGridLayout *l = new TQGridLayout(this, 2, 2, 11, 6, "eqchemView::eqchemView layout");
m_eqResult = new EqResult(this);
m_eqedit = new KLineEdit(this);

@ -106,7 +106,7 @@ class Kalzium : public KMainWindow
KToggleAction *m_actionCrystal;
/**
* the tqlayout of the central Widget ( CentralWidget )
* the layout of the central Widget ( CentralWidget )
*/
TQVBoxLayout *m_pCentralLayout;

@ -26,7 +26,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -69,7 +69,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -114,7 +114,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout32</cstring>
<cstring>layout32</cstring>
</property>
<vbox>
<property name="name">
@ -44,7 +44,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout28</cstring>
<cstring>layout28</cstring>
</property>
<hbox>
<property name="name">
@ -70,7 +70,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout29</cstring>
<cstring>layout29</cstring>
</property>
<hbox>
<property name="name">
@ -96,7 +96,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout30</cstring>
<cstring>layout30</cstring>
</property>
<hbox>
<property name="name">
@ -122,7 +122,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout31</cstring>
<cstring>layout31</cstring>
</property>
<hbox>
<property name="name">
@ -163,7 +163,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout26</cstring>
<cstring>layout26</cstring>
</property>
<vbox>
<property name="name">
@ -171,7 +171,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout23</cstring>
<cstring>layout23</cstring>
</property>
<hbox>
<property name="name">
@ -197,7 +197,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout24</cstring>
<cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@ -223,7 +223,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout25</cstring>
<cstring>layout25</cstring>
</property>
<hbox>
<property name="name">
@ -249,7 +249,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout26</cstring>
<cstring>layout26</cstring>
</property>
<hbox>
<property name="name">
@ -290,7 +290,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout22</cstring>
<cstring>layout22</cstring>
</property>
<vbox>
<property name="name">
@ -298,7 +298,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@ -324,7 +324,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout19</cstring>
<cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@ -350,7 +350,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout18</cstring>
<cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@ -376,7 +376,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@ -402,7 +402,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@ -428,7 +428,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@ -454,7 +454,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout14</cstring>
<cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@ -480,7 +480,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@ -521,7 +521,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout14</cstring>
<cstring>layout14</cstring>
</property>
<vbox>
<property name="name">
@ -529,7 +529,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@ -558,7 +558,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -584,7 +584,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -625,7 +625,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout36</cstring>
<cstring>layout36</cstring>
</property>
<vbox>
<property name="name">
@ -633,7 +633,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout12_2</cstring>
<cstring>layout12_2</cstring>
</property>
<hbox>
<property name="name">
@ -659,7 +659,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout19_2</cstring>
<cstring>layout19_2</cstring>
</property>
<hbox>
<property name="name">
@ -685,7 +685,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout18_2</cstring>
<cstring>layout18_2</cstring>
</property>
<hbox>
<property name="name">
@ -711,7 +711,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout17_2</cstring>
<cstring>layout17_2</cstring>
</property>
<hbox>
<property name="name">
@ -737,7 +737,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16_2</cstring>
<cstring>layout16_2</cstring>
</property>
<hbox>
<property name="name">
@ -763,7 +763,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15_2</cstring>
<cstring>layout15_2</cstring>
</property>
<hbox>
<property name="name">
@ -789,7 +789,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout14_2</cstring>
<cstring>layout14_2</cstring>
</property>
<hbox>
<property name="name">
@ -815,7 +815,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13_2</cstring>
<cstring>layout13_2</cstring>
</property>
<hbox>
<property name="name">
@ -841,7 +841,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout35</cstring>
<cstring>layout35</cstring>
</property>
<hbox>
<property name="name">

@ -67,7 +67,7 @@ the state of matter</string>
</spacer>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -102,7 +102,7 @@ the state of matter</string>
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -38,7 +38,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -110,7 +110,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -35,7 +35,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -78,7 +78,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -86,7 +86,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -114,7 +114,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<grid>
<property name="name">
@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -55,7 +55,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -63,7 +63,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@ -111,7 +111,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -119,7 +119,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -161,7 +161,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<grid>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -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

@ -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 :)

@ -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

@ -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;
}

@ -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:

@ -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);

@ -66,7 +66,7 @@ private:
TQPushButton * resetBtn;
TQHBoxLayout * buttonLayout;
TQVBoxLayout * tqlayout1;
TQVBoxLayout * layout1;
TQGridLayout * labelGrid;
TQLabel * result1Label;
TQLabel * result2Label;

@ -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();

@ -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">
@ -57,7 +57,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<property name="geometry">
<rect>

@ -38,7 +38,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
int extra_width, indicator_width;
extra_width = 8;
indicator_width = tqstyle().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
indicator_width = style().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
y = 0;
x = indicator_width + extra_width; //###
@ -68,7 +68,7 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
_doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
if ( hasFocus() ) {
// TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo,
// TQRect br = style().itemRect( p, x, y, rw, rh+yo,
// AlignLeft|AlignVCenter|ShowPrefix,
// isEnabled(),
// pixmap(), text().visual() );
@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){
br.setBottom( br.bottom()+2);
br = br.intersect( TQRect(0,0,rw, rh+yo ) );
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
}
}

@ -45,9 +45,9 @@ void KEducaPrefs::setPageGeneral()
TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" );
buttonGroup1->setTitle( i18n( "General" ) );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
buttonGroup1->tqlayout()->setSpacing( 0 );
buttonGroup1->tqlayout()->setMargin( 0 );
TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() );
buttonGroup1->layout()->setSpacing( 0 );
buttonGroup1->layout()->setMargin( 0 );
TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() );
buttonGroup1Layout->setAlignment( TQt::AlignTop );
buttonGroup1Layout->setSpacing( 6 );
buttonGroup1Layout->setMargin( 11 );
@ -63,9 +63,9 @@ void KEducaPrefs::setPageGeneral()
TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" );
GroupBox1->setTitle( i18n( "Order" ) );
GroupBox1->setColumnLayout(0, Qt::Vertical );
GroupBox1->tqlayout()->setSpacing( 0 );
GroupBox1->tqlayout()->setMargin( 0 );
TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->tqlayout() );
GroupBox1->layout()->setSpacing( 0 );
GroupBox1->layout()->setMargin( 0 );
TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() );
GroupBox1Layout->setAlignment( TQt::AlignTop );
GroupBox1Layout->setSpacing( 6 );
GroupBox1Layout->setMargin( 11 );

@ -37,7 +37,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
int x, y, w, h;
int extra_width, indicator_width;
extra_width = 8;
indicator_width = tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
indicator_width = style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0);
y = 0;
x = indicator_width + extra_width; //###
@ -67,7 +67,7 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
_doc->draw(p, cr.x()+xo, cr.y()+yo, cr, colorGroup(), 0);
if ( hasFocus() ) {
// TQRect br = tqstyle().itemRect( p, x, y, rw, rh+yo,
// TQRect br = style().itemRect( p, x, y, rw, rh+yo,
// AlignLeft|AlignVCenter|ShowPrefix,
// isEnabled(),
// pixmap(), text().visual() );
@ -78,6 +78,6 @@ void KRadioEduca::drawButtonLabel( TQPainter *p)
br.setTop( br.top()-2 );
br.setBottom( br.bottom()+2);
br = br.intersect( TQRect(0,0,rw, rh+yo ) );
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup());
}
}

@ -293,7 +293,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="1">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -325,7 +325,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -502,7 +502,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@ -510,7 +510,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -575,7 +575,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -630,7 +630,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout17</cstring>
<cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@ -679,7 +679,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<vbox>
<property name="name">

@ -82,9 +82,9 @@ void KControlHeader::init()
TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" );
GroupBox7->setTitle( i18n( "Description" ) );
GroupBox7->setColumnLayout(0, Qt::Vertical );
GroupBox7->tqlayout()->setSpacing( 0 );
GroupBox7->tqlayout()->setMargin( 0 );
TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->tqlayout() );
GroupBox7->layout()->setSpacing( 0 );
GroupBox7->layout()->setMargin( 0 );
TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() );
GroupBox7Layout->setAlignment( TQt::AlignTop );
GroupBox7Layout->setSpacing( 6 );
GroupBox7Layout->setMargin( 11 );
@ -147,9 +147,9 @@ void KControlHeader::init()
TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" );
GroupBox8->setTitle( i18n( "Picture" ) );
GroupBox8->setColumnLayout(0, Qt::Vertical );
GroupBox8->tqlayout()->setSpacing( 0 );
GroupBox8->tqlayout()->setMargin( 0 );
TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->tqlayout() );
GroupBox8->layout()->setSpacing( 0 );
GroupBox8->layout()->setMargin( 0 );
TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() );
GroupBox8Layout->setAlignment( TQt::AlignTop );
GroupBox8Layout->setSpacing( 6 );
GroupBox8Layout->setMargin( 11 );
@ -165,9 +165,9 @@ void KControlHeader::init()
TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" );
GroupBox6->setTitle( i18n( "Author" ) );
GroupBox6->setColumnLayout(0, Qt::Vertical );
GroupBox6->tqlayout()->setSpacing( 0 );
GroupBox6->tqlayout()->setMargin( 0 );
TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->tqlayout() );
GroupBox6->layout()->setSpacing( 0 );
GroupBox6->layout()->setMargin( 0 );
TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() );
GroupBox6Layout->setAlignment( TQt::AlignTop );
GroupBox6Layout->setSpacing( 6 );
GroupBox6Layout->setMargin( 11 );

@ -188,7 +188,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@ -58,7 +58,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -81,7 +81,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@ -264,7 +264,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -59,8 +59,8 @@ kgeography::kgeography() : KMainWindow(), p_firstShow(true), p_mustShowResultsDi
p_askDivisionFlags = new KPushButton(i18n("G&uess Flag of Division..."), p_leftWidget);
TQWhatsThis::add(p_askDivisionFlags, i18n("In this quiz you have to guess the flag of a division given its name"));
p_underLeftWidget = new TQVBox(p_leftWidget);
p_underLeftWidget -> tqlayout() -> setSpacing(KDialog::spacingHint());
p_underLeftWidget -> tqlayout() -> setMargin(KDialog::marginHint());
p_underLeftWidget -> layout() -> setSpacing(KDialog::spacingHint());
p_underLeftWidget -> layout() -> setMargin(KDialog::marginHint());
p_leftWidget -> setStretchFactor(p_underLeftWidget, 1);
setCentralWidget(p_bigWidget);

@ -51,7 +51,7 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou
if (asker)
{
TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> tqlayout());
TQBoxLayout *vbl = dynamic_cast<TQBoxLayout*>(w -> layout());
p_next = new TQLabel(w);
p_next -> setAlignment(AlignTop | AlignHCenter);
p_fill = new TQWidget(w);

@ -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">