Rename obsolete tq methods to standard names

pull/1/head
Timothy Pearson 13 years ago
parent 7e66d7c361
commit abcbb68498

@ -29,7 +29,7 @@
</property>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -221,7 +221,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<vbox>
<property name="name">
@ -229,7 +229,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -325,7 +325,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@ -333,7 +333,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">

@ -39,10 +39,10 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
path_edit->setMinimumWidth(fm.width('X')*35);
connect( path_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotPrefixChanged() ) );
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
TQGridLayout *grid = new TQGridLayout(2, 2);
tqlayout->addLayout(grid);
layout->addLayout(grid);
grid->addWidget(name_label, 0, 0);
grid->addWidget(name_edit, 0, 1);
grid->addWidget(path_label, 1, 0);
@ -50,7 +50,7 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
TQFrame *frame = new TQFrame(this);
frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
tqlayout->addWidget(frame, 0);
layout->addWidget(frame, 0);
KButtonBox *buttonbox = new KButtonBox(this);
buttonbox->addStretch();
@ -59,8 +59,8 @@ AddPrefixDialog::AddPrefixDialog( const TQString& nameEdit, const TQString& path
m_pOk->setDefault(true);
connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
buttonbox->tqlayout();
tqlayout->addWidget(buttonbox, 0);
buttonbox->layout();
layout->addWidget(buttonbox, 0);
slotPrefixChanged();
}

@ -42,12 +42,12 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare
(void) new TQLabel(i18n("Language:"), hbox);
lang_combo = new TQComboBox(hbox);
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->addWidget(hbox);
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->addWidget(hbox);
TQFrame *frame = new TQFrame(this);
frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
tqlayout->addWidget(frame, 0);
layout->addWidget(frame, 0);
KButtonBox *buttonbox = new KButtonBox(this);
buttonbox->addStretch();
@ -56,8 +56,8 @@ AddTranslationDialog::AddTranslationDialog(AutoProjectPart *part, TQWidget *pare
ok_button->setDefault(true);
connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
buttonbox->tqlayout();
tqlayout->addWidget(buttonbox, 0);
buttonbox->layout();
layout->addWidget(buttonbox, 0);
TQStringList rawlist, list;
rawlist << "af" << "ar" << "bg" << "bo" << "br" << "bs" << "ca" << "cs" << "cy" << "da"

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

@ -73,7 +73,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
{
m_part = part;
// widgets and tqlayout
// widgets and layout
TQVBoxLayout* lo = new TQVBoxLayout(this);
TQHBox *hlow = new TQHBox (this);

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -282,7 +282,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@ -298,7 +298,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<grid>
<property name="name">
@ -405,7 +405,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<grid>
<property name="name">

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

@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -166,7 +166,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -226,7 +226,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@ -79,7 +79,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -139,7 +139,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="4" colspan="1">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">

@ -28,7 +28,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">

@ -47,10 +47,10 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
TQGridLayout *grid = new TQGridLayout(2, 2);
tqlayout->addLayout(grid);
layout->addLayout(grid);
grid->addWidget(varname_label, 0, 0);
grid->addWidget(varname_edit, 0, 1);
grid->addWidget(value_label, 1, 0);
@ -58,7 +58,7 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
TQFrame *frame = new TQFrame(this);
frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
tqlayout->addWidget(frame, 0);
layout->addWidget(frame, 0);
KButtonBox *buttonbox = new KButtonBox(this);
buttonbox->addStretch();
@ -67,8 +67,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
m_pOk->setDefault(true);
connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
buttonbox->tqlayout();
tqlayout->addWidget(buttonbox, 0);
buttonbox->layout();
layout->addWidget(buttonbox, 0);
slotTextChanged();
}

@ -61,7 +61,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -104,7 +104,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -232,7 +232,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -377,7 +377,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout147</cstring>
<cstring>layout147</cstring>
</property>
<hbox>
<property name="name">
@ -426,7 +426,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout30</cstring>
<cstring>layout30</cstring>
</property>
<hbox>
<property name="name">
@ -762,7 +762,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout69</cstring>
<cstring>layout69</cstring>
</property>
<vbox>
<property name="name">
@ -825,7 +825,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout68</cstring>
<cstring>layout68</cstring>
</property>
<vbox>
<property name="name">
@ -855,7 +855,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout67</cstring>
<cstring>layout67</cstring>
</property>
<hbox>
<property name="name">
@ -999,7 +999,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -1079,7 +1079,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@ -1106,7 +1106,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<vbox>
<property name="name">
@ -1175,7 +1175,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -1202,7 +1202,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<vbox>
<property name="name">
@ -1271,7 +1271,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -1356,7 +1356,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout26</cstring>
<cstring>layout26</cstring>
</property>
<hbox>
<property name="name">
@ -1431,7 +1431,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout27</cstring>
<cstring>layout27</cstring>
</property>
<hbox>
<property name="name">
@ -1458,7 +1458,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9_2</cstring>
<cstring>layout9_2</cstring>
</property>
<vbox>
<property name="name">
@ -1527,7 +1527,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout28_2</cstring>
<cstring>layout28_2</cstring>
</property>
<hbox>
<property name="name">
@ -1634,7 +1634,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout26</cstring>
<cstring>layout26</cstring>
</property>
<hbox>
<property name="name">
@ -1642,7 +1642,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout23</cstring>
<cstring>layout23</cstring>
</property>
<vbox>
<property name="name">
@ -1682,7 +1682,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout24</cstring>
<cstring>layout24</cstring>
</property>
<vbox>
<property name="name">
@ -1722,7 +1722,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout84</cstring>
<cstring>layout84</cstring>
</property>
<vbox>
<property name="name">
@ -1776,7 +1776,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout85</cstring>
<cstring>layout85</cstring>
</property>
<vbox>
<property name="name">
@ -1889,7 +1889,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout24</cstring>
<cstring>layout24</cstring>
</property>
<hbox>
<property name="name">
@ -1952,7 +1952,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout23</cstring>
<cstring>layout23</cstring>
</property>
<vbox>
<property name="name">
@ -1960,7 +1960,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout22</cstring>
<cstring>layout22</cstring>
</property>
<vbox>
<property name="name">
@ -2023,7 +2023,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout33</cstring>
<cstring>layout33</cstring>
</property>
<hbox>
<property name="name">
@ -2062,7 +2062,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout32</cstring>
<cstring>layout32</cstring>
</property>
<hbox>
<property name="name">
@ -2141,7 +2141,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout34</cstring>
<cstring>layout34</cstring>
</property>
<hbox>
<property name="name">

@ -31,7 +31,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -56,14 +56,14 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part,
ok_button->setDefault(true);
connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
buttonbox->tqlayout();
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
tqlayout->addWidget(filename_label);
tqlayout->addWidget(filename_edit);
tqlayout->addWidget(usetemplate_box);
tqlayout->addWidget(frame, 0);
tqlayout->addWidget(buttonbox, 0);
buttonbox->layout();
TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
layout->addWidget(filename_label);
layout->addWidget(filename_edit);
layout->addWidget(usetemplate_box);
layout->addWidget(frame, 0);
layout->addWidget(buttonbox, 0);
m_part = part;
}

@ -155,7 +155,7 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& )
TQSize QDesignerToolBarSeparator::sizeHint() const
{
int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
if ( orient ==Qt::Horizontal )
return TQSize( extent, 0 );
@ -171,7 +171,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
if ( orientation() ==Qt::Horizontal )
flags |= TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
colorGroup(), flags );
}

@ -674,21 +674,21 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
: Command( n, fw ), layout( wl, parent, fw, layoutBase )
{
}
void LayoutHorizontalCommand::execute()
{
formWindow()->clearSelection( FALSE );
tqlayout.doLayout();
layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutHorizontalCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
tqlayout.undoLayout();
layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@ -697,21 +697,21 @@ void LayoutHorizontalCommand::unexecute()
LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE )
: Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
{
}
void LayoutHorizontalSplitCommand::execute()
{
formWindow()->clearSelection( FALSE );
tqlayout.doLayout();
layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutHorizontalSplitCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
tqlayout.undoLayout();
layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@ -720,21 +720,21 @@ void LayoutHorizontalSplitCommand::unexecute()
LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
: Command( n, fw ), layout( wl, parent, fw, layoutBase )
{
}
void LayoutVerticalCommand::execute()
{
formWindow()->clearSelection( FALSE );
tqlayout.doLayout();
layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutVerticalCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
tqlayout.undoLayout();
layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@ -743,21 +743,21 @@ void LayoutVerticalCommand::unexecute()
LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TRUE, TRUE )
: Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
{
}
void LayoutVerticalSplitCommand::execute()
{
formWindow()->clearSelection( FALSE );
tqlayout.doLayout();
layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutVerticalSplitCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
tqlayout.undoLayout();
layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@ -766,21 +766,21 @@ void LayoutVerticalSplitCommand::unexecute()
LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres )
: Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
: Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
{
}
void LayoutGridCommand::execute()
{
formWindow()->clearSelection( FALSE );
tqlayout.doLayout();
layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
void LayoutGridCommand::unexecute()
{
formWindow()->clearSelection( FALSE );
tqlayout.undoLayout();
layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
}
@ -793,21 +793,21 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) );
margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) );
tqlayout = 0;
layout = 0;
if ( lay == WidgetFactory::HBox )
tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
else if ( lay == WidgetFactory::VBox )
tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
else if ( lay == WidgetFactory::Grid )
tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
}
void BreakLayoutCommand::execute()
{
if ( !tqlayout )
if ( !layout )
return;
formWindow()->clearSelection( FALSE );
tqlayout->breakLayout();
layout->breakLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) );
@ -815,10 +815,10 @@ void BreakLayoutCommand::execute()
void BreakLayoutCommand::unexecute()
{
if ( !tqlayout )
if ( !layout )
return;
formWindow()->clearSelection( FALSE );
tqlayout->doLayout();
layout->doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild();
MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing );
MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin );

@ -290,7 +290,7 @@ public:
Type type() const { return LayoutHorizontal; }
private:
HorizontalLayout tqlayout;
HorizontalLayout layout;
};
@ -306,7 +306,7 @@ public:
Type type() const { return LayoutHorizontalSplitter; }
private:
HorizontalLayout tqlayout;
HorizontalLayout layout;
};
@ -322,7 +322,7 @@ public:
Type type() const { return LayoutVertical; }
private:
VerticalLayout tqlayout;
VerticalLayout layout;
};
@ -338,7 +338,7 @@ public:
Type type() const { return LayoutVerticalSplitter; }
private:
VerticalLayout tqlayout;
VerticalLayout layout;
};
@ -354,7 +354,7 @@ public:
Type type() const { return LayoutGrid; }
private:
GridLayout tqlayout;
GridLayout layout;
};
@ -369,7 +369,7 @@ public:
Type type() const { return BreakLayout; }
private:
Layout *tqlayout;
Layout *layout;
int spacing;
int margin;
TQWidget *lb;

@ -35,18 +35,18 @@
FileChooser::FileChooser( TQWidget *parent, const char *name )
: TQWidget( parent, name ), md( File )
{
TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
tqlayout->setMargin( 0 );
TQHBoxLayout *layout = new TQHBoxLayout( this );
layout->setMargin( 0 );
lineEdit = new TQLineEdit( this, "filechooser_lineedit" );
tqlayout->addWidget( lineEdit );
layout->addWidget( lineEdit );
connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) );
button = new TQPushButton( "...", this, "filechooser_button" );
button->setFixedWidth( button->fontMetrics().width( " ... " ) );
tqlayout->addWidget( button );
layout->addWidget( button );
connect( button, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( chooseFile() ) );

@ -577,7 +577,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
switch ( currTool ) {
case POINTER_TOOL:
if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
// if the clicked widget is not in a tqlayout, raise it
// if the clicked widget is not in a layout, raise it
if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
w->raise();
if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection
@ -592,7 +592,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
if ( !sel ) { // ...and widget no selectted: unselect all
clearSelection( FALSE );
} else { // ...widget selected
// only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), unselect its childs
// only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs
if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) {
TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
setPropertyShowingBlocked( TRUE );
@ -958,15 +958,15 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
if ( wa == it.key()->parentWidget() )
goto make_move_command;
// break tqlayout if necessary
// break layout if necessary
if ( WidgetFactory::layoutType( wa ) != WidgetFactory::NoLayout ) {
if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
i18n( "You tried to insert a widget into the "
"tqlayout Container Widget '%1'.\n"
"layout Container Widget '%1'.\n"
"This is not possible. "
"In order to insert the widget, the tqlayout of '%1'\n"
"In order to insert the widget, the layout of '%1'\n"
"must first be broken.\n"
"Break the tqlayout or cancel the operation?" ).
"Break the layout or cancel the operation?" ).
arg( wa->name() ).
arg( wa->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) )
goto make_move_command; // cancel
@ -1067,11 +1067,11 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
if ( WidgetFactory::layoutType( insertParent ) != WidgetFactory::NoLayout ) {
if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
i18n( "You tried to insert a widget into the "
"tqlayout Container Widget '%1'.\n"
"layout Container Widget '%1'.\n"
"This is not possible. "
"In order to insert the widget, the tqlayout of '%1'\n"
"In order to insert the widget, the layout of '%1'\n"
"must first be broken.\n"
"Break the tqlayout or cancel the operation?" ).
"Break the layout or cancel the operation?" ).
arg( insertParent->name() ).
arg( insertParent->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) == 0 ) {
breakLayout( insertParent );
@ -2581,7 +2581,7 @@ void FormWindow::setMainContainer( TQWidget *w )
delete mContainer;
mContainer = w;
insertedWidgets.insert( mContainer, mContainer );
delete tqlayout();
delete layout();
TQHBoxLayout *l = new TQHBoxLayout( this );
l->addWidget( w );
if ( resetPropertyWidget ) {

@ -146,9 +146,9 @@ void KDevDesignerPart::setupActions( )
action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
stateSync(action, m_widget->actionEditAdjustSize);
action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithtqlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
stateSync(action, m_widget->actionEditHLayout);
action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvtqlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
stateSync(action, m_widget->actionEditVLayout);
action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
stateSync(action, m_widget->actionEditGridLayout);

@ -85,7 +85,7 @@ void Layout::setup()
TQWidget *w = 0;
// Go through all widgets of the list we got. As we can only
// tqlayout widgets which have the same parent, we first do some
// layout widgets which have the same parent, we first do some
// sorting which means create a list for each parent containing
// its child here. After that we keep working on the list of
// childs which has the most entries.
@ -120,7 +120,7 @@ void Layout::setup()
}
// If we found no list (because no widget did fit at all) or the
// best list has only one entry and we do not tqlayout a container,
// best list has only one entry and we do not layout a container,
// we leave here.
if ( !lastList || ( lastList->count() < 2 &&
( !layoutBase ||
@ -133,11 +133,11 @@ void Layout::setup()
}
// Now we have a new and clean widget list, which makes sense
// to tqlayout
// to layout
widgets = *lastList;
// Also use the only correct parent later, so store it
parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
// Now calculate the position where the tqlayout-meta-widget should
// Now calculate the position where the layout-meta-widget should
// be placed and connect to widgetDestroyed() signals of the
// widgets to get informed if one gets deleted to be able to
// handle that and do not crash in this case
@ -149,7 +149,7 @@ void Layout::setup()
geometries.insert( w, TQRect( w->pos(), w->size() ) );
// Change the Z-order, as saving/loading uses the Z-order for
// writing/creating widgets and this has to be the same as in
// the tqlayout. Else saving + loading will give different results
// the layout. Else saving + loading will give different results
w->raise();
}
}
@ -182,7 +182,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
return TRUE;
}
void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
void Layout::finishLayout( bool needMove, TQLayout *layout )
{
if ( needMove )
layoutBase->move( startPoint );
@ -193,7 +193,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
layoutBase->setGeometry( oldGeometry );
oldGeometry = g;
layoutBase->show();
tqlayout->activate();
layout->activate();
formWindow->insertWidget( layoutBase );
formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
TQString n = layoutBase->name();
@ -311,16 +311,16 @@ void HorizontalLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) )
return;
TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else
tqlayout->addWidget( w );
layout->addWidget( w );
if ( ::tqqt_cast<TQLayoutWidget*>(w) )
( (TQLayoutWidget*)w )->updateSizePolicy();
}
@ -330,7 +330,7 @@ void HorizontalLayout::doLayout()
if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
finishLayout( needMove, tqlayout );
finishLayout( needMove, layout );
}
@ -375,16 +375,16 @@ void VerticalLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) )
return;
TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else
tqlayout->addWidget( w );
layout->addWidget( w );
if ( ::tqqt_cast<TQLayoutWidget*>(w) )
( (TQLayoutWidget*)w )->updateSizePolicy();
}
@ -394,7 +394,7 @@ void VerticalLayout::doLayout()
if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
finishLayout( needMove, tqlayout );
finishLayout( needMove, layout );
}
@ -747,7 +747,7 @@ void GridLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) )
return;
QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
if ( !grid )
buildGrid();
@ -759,18 +759,18 @@ void GridLayout::doLayout()
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
if ( rs * cs == 1 ) {
tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
layout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
} else {
tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
}
if ( ::tqqt_cast<TQLayoutWidget*>(w) )
( (TQLayoutWidget*)w )->updateSizePolicy();
w->show();
} else {
qWarning("ooops, widget '%s' does not fit in tqlayout", w->name() );
qWarning("ooops, widget '%s' does not fit in layout", w->name() );
}
}
finishLayout( needMove, tqlayout );
finishLayout( needMove, layout );
}
void GridLayout::setup()
@ -787,7 +787,7 @@ void GridLayout::buildGrid()
// Pixel to cell conversion:
// By keeping a list of start'n'stop values (x & y) for each widget,
// it is possible to create a very small grid of cells to represent
// the widget tqlayout.
// the widget layout.
// -----------------------------------------------------------------
// We need a list of both start and stop values for x- & y-axis
@ -829,7 +829,7 @@ void GridLayout::buildGrid()
current++;
}
// Create the smallest grid possible to represent the current tqlayout
// Create the smallest grid possible to represent the current layout
// Since no widget will be placed in the last row and column, we'll
// skip them to increase speed even further
delete grid;

@ -51,7 +51,7 @@ public:
virtual void undoLayout();
virtual void breakLayout();
virtual bool prepareLayout( bool &needMove, bool &needReparent );
virtual void finishLayout( bool needMove, TQLayout *tqlayout );
virtual void finishLayout( bool needMove, TQLayout *layout );
protected:
TQWidgetList widgets;

@ -822,7 +822,7 @@ void MainWindow::helpAbout()
dlg.aboutLicense->setText( iface->aboutText() );
}
dlg.aboutVersion->setText(TQString("Version ") + TQString(TQT_VERSION_STR));
dlg.resize( dlg.width(), dlg.tqlayout()->heightForWidth(dlg.width()) );
dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) );
dlg.exec();
}
@ -1279,7 +1279,7 @@ void MainWindow::insertFormWindow( FormWindow *fw )
{
if ( fw )
TQWhatsThis::add( fw, i18n( "<b>The Form Window</b>"
"<p>Use the various tools to add widgets or to change the tqlayout "
"<p>Use the various tools to add widgets or to change the layout "
"and behavior of the components in the form. Select one or multiple "
"widgets to move them or lay them out. If a single widget is chosen it can "
"be resized using the resize handles.</p>"

@ -330,14 +330,14 @@ void MainWindow::setupLayoutActions()
connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) );
actionEditAdjustSize->setEnabled( FALSE );
actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithtqlayout.png"),
actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithlayout.png"),
i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 );
actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") );
actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally" ) );
connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) );
actionEditHLayout->setEnabled( FALSE );
actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvtqlayout.png"),
actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvlayout.png"),
i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 );
actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") );
actionEditVLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically" ) );
@ -367,7 +367,7 @@ void MainWindow::setupLayoutActions()
actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"),
i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 );
actionEditBreakLayout->setStatusTip(i18n("Breaks the selected tqlayout") );
actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") );
actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) );
connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) );
actionEditBreakLayout->setEnabled( FALSE );
@ -1567,7 +1567,7 @@ void MainWindow::editPaste()
} else {
TQMessageBox::information( this, i18n( "Paste Error" ),
i18n( "Cannot paste widgets. Designer could not find a container\n"
"to paste into which does not contain a tqlayout. Break the tqlayout\n"
"to paste into which does not contain a layout. Break the layout\n"
"of the container you want to paste into and select this container\n"
"and then paste again." ) );
}

@ -585,7 +585,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
{
TQPainter p( this );
TQRect r = rect();
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
style().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
r, colorGroup() );
drawItems( p );
}

@ -303,16 +303,16 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
}
r->spacing = spacing;
TQLayout * tqlayout = 0;
WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
if ( tqlayout ) {
TQLayout * layout = 0;
WidgetFactory::layoutType( (TQWidget*)o, layout );
if ( layout ) {
int spadef = 6;
if ( MainWindow::self->formWindow() )
spadef = MainWindow::self->formWindow()->layoutDefaultSpacing();
if ( spacing == -1 )
tqlayout->setSpacing( spadef );
layout->setSpacing( spadef );
else
tqlayout->setSpacing( spacing );
layout->setSpacing( spacing );
}
}
@ -346,8 +346,8 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
}
r->margin = margin;
TQLayout * tqlayout = 0;
WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
TQLayout * layout = 0;
WidgetFactory::layoutType( (TQWidget*)o, layout );
bool isInnerLayout = TRUE;
@ -358,18 +358,18 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
isInnerLayout = FALSE;
if ( tqlayout ) {
if ( layout ) {
int mardef = 11;
if ( MainWindow::self->formWindow() )
mardef = MainWindow::self->formWindow()->layoutDefaultMargin();
if ( margin == -1 ) {
if ( isInnerLayout )
tqlayout->setMargin( 1 );
layout->setMargin( 1 );
else
tqlayout->setMargin( TQMAX( 1, mardef ) );
layout->setMargin( TQMAX( 1, mardef ) );
}
else
tqlayout->setMargin( TQMAX( 1, margin ) );
layout->setMargin( TQMAX( 1, margin ) );
}
}

@ -250,15 +250,15 @@ void PaletteEditorAdvanced::onCentral( int item )
case 0:
default:
c = editPalette.active().color( centralFromItem(item) );
p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap();
p = editPalette.active().brush( centralFromItem(item) ).pixmap();
break;
case 1:
c = editPalette.inactive().color( centralFromItem(item) );
p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap();
p = editPalette.inactive().brush( centralFromItem(item) ).pixmap();
break;
case 2:
c = editPalette.disabled().color( centralFromItem(item) );
p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap();
p = editPalette.disabled().brush( centralFromItem(item) ).pixmap();
break;
}
@ -514,17 +514,17 @@ void PaletteEditorAdvanced::updateStyledButtons()
default:
central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) );
pm = editPalette.active().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
pm = editPalette.active().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
break;
case 1:
central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) );
pm = editPalette.inactive().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
pm = editPalette.inactive().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
break;
case 2:
central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) );
pm = editPalette.disabled().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
pm = editPalette.disabled().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
break;
}

@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
reg -= mid;
p.setClipRegion( reg );
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
p.restore();
drawItems( &p );
}
@ -1034,7 +1034,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
if ( i->isSeparator() ) {
tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p,
style().tqdrawPrimitive( TQStyle::PE_Separator, p,
TQRect( r.x(), r.y() + 2, r.width(), 1 ),
colorGroup(), TQStyle::Style_Sunken | f );
return;
@ -1042,7 +1042,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
const TQAction * a = i->action();
if ( a->isToggleAction() && a->isOn() ) {
tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
style().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
TQRect( x , y, iconWidth, h ),
colorGroup(), f );
} else {
@ -1064,7 +1064,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
TQPainter::AlignLeft | TQPainter::AlignVCenter,
a->accel() );
if ( i->count() ) // Item has submenu
tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
style().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ),
colorGroup(), f );
}
@ -1093,7 +1093,7 @@ void PopupMenuEditor::drawItems( TQPainter * p )
int idx = 0;
TQColorGroup enabled = colorGroup();
TQColorGroup disabled = tqpalette().disabled();
TQColorGroup disabled = palette().disabled();
TQRect focus;
TQRect rect( borderSize, borderSize, width() - borderSize * 2, 0 );

@ -95,7 +95,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -294,7 +294,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg,
void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r )
{
p->save();
TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg,
TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg,
TQStyle::Style_Sunken, TQStyleOption(1,1) );
p->restore();
}
@ -414,7 +414,7 @@ void PropertyItem::createResetButton()
setupStyle( resetButton );
resetButton->setPixmap( DesignerResetPix );
resetButton->setFixedWidth( resetButton->sizeHint().width() );
hbox->tqlayout()->setAlignment( TQt::AlignRight );
hbox->layout()->setAlignment( TQt::AlignRight );
listview->addChild( hbox );
hbox->hide();
TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
@ -2692,13 +2692,13 @@ void EnumBox::paintEvent( TQPaintEvent * )
&g.brush( TQColorGroup::Button ) );
return;
}
tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All,
(arrowDown ?
TQStyle::SC_ComboBoxArrow :
TQStyle::SC_None ));
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField );
re = TQStyle::visualRect(re, this);
p.setClipRect( re );
@ -2742,7 +2742,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e )
if ( e->button() != Qt::LeftButton )
return;
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
arrowRect = TQStyle::visualRect(arrowRect, this);

@ -238,7 +238,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
++i;
}
// If we can't find the actual translatable keyname,
// fall back on the tqunicode representation of it...
// fall back on the unicode representation of it...
// Or else characters like Key_aring may not get displayed
// ( Really depends on you locale )
if ( !keyname[i].name )
@ -622,8 +622,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
if ( formwindow ) {
formwindow->killAccels( TQT_TQOBJECT(formwindow) );
if ( formwindow->tqlayout() )
formwindow->tqlayout()->activate();
if ( formwindow->layout() )
formwindow->layout()->activate();
if ( hadGeometry )
formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
expandedTo( formwindow->minimumSizeHint() ) ) );
@ -1347,14 +1347,14 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
return; // no children to save
TQString closeTag;
// if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer
TQLayout *tqlayout = 0;
// if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer
TQLayout *layout = 0;
QDesignerGridLayout* grid = 0;
if ( !::tqqt_cast<TQSplitter*>(obj) &&
WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
obj->isWidgetType() &&
WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout );
WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) {
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout );
switch ( lay ) {
case WidgetFactory::HBox:
closeTag = makeIndent( indent ) + "</hbox>";
@ -1370,15 +1370,15 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
closeTag = makeIndent( indent ) + "</grid>";
ts << makeIndent( indent ) << "<grid>" << endl;
++indent;
grid = (QDesignerGridLayout*) tqlayout;
grid = (QDesignerGridLayout*) layout;
break;
default:
break;
}
// save properties of tqlayout
// save properties of layout
if ( lay != WidgetFactory::NoLayout )
saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent );
saveObjectProperties( TQT_TQOBJECT(layout), ts, indent );
}
@ -1743,7 +1743,7 @@ void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup
saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) );
indent--;
ts << makeIndent( indent ) << "</color>" << endl;
TQPixmap* pm = cg.tqbrush( (TQColorGroup::ColorRole)r ).pixmap();
TQPixmap* pm = cg.brush( (TQColorGroup::ColorRole)r ).pixmap();
if ( pm && !pm->isNull() )
savePixmap( *pm, ts, indent );
}
@ -1756,7 +1756,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c )
ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl;
}
TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout )
TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout )
{
lastItem = 0;
TQDomElement n = e.firstChild().toElement();
@ -1798,16 +1798,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
w = (TQWidget*)obj;
if ( ::tqqt_cast<TQMainWindow*>(w) )
w = ( (TQMainWindow*)w )->centralWidget();
if ( tqlayout ) {
switch ( WidgetFactory::layoutType( tqlayout ) ) {
if ( layout ) {
switch ( WidgetFactory::layoutType( layout ) ) {
case WidgetFactory::HBox:
( (TQHBoxLayout*)tqlayout )->addWidget( w );
( (TQHBoxLayout*)layout )->addWidget( w );
break;
case WidgetFactory::VBox:
( (TQVBoxLayout*)tqlayout )->addWidget( w );
( (TQVBoxLayout*)layout )->addWidget( w );
break;
case WidgetFactory::Grid:
( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
col, col + colspan - 1 );
break;
default:
@ -1817,7 +1817,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
if ( !toplevel )
toplevel = w;
tqlayout = 0;
layout = 0;
if ( w && formwindow ) {
if ( !parent ||
@ -1848,22 +1848,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
while ( !n.isNull() ) {
if ( n.tagName() == "spacer" ) {
createSpacer( n, w, tqlayout, Qt::Horizontal );
createSpacer( n, w, layout, Qt::Horizontal );
} else if ( n.tagName() == "widget" ) {
createObject( n, w, tqlayout );
createObject( n, w, layout );
} else if ( n.tagName() == "hbox" ) {
tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox );
obj = TQT_TQOBJECT(tqlayout);
layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox );
obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
continue;
} else if ( n.tagName() == "grid" ) {
tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid );
obj = TQT_TQOBJECT(tqlayout);
layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid );
obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
continue;
} else if ( n.tagName() == "vbox" ) {
tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox );
obj = TQT_TQOBJECT(tqlayout);
layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox );
obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
continue;
} else if ( n.tagName() == "property" && obj ) {
@ -2104,7 +2104,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
}
}
TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o )
TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o )
{
TQDomElement n = e.firstChild().toElement();
int row = e.attribute( "row" ).toInt();
@ -2128,11 +2128,11 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
spacer->setInteraciveMode( TRUE );
if ( formwindow )
formwindow->insertWidget( spacer, pasting );
if ( tqlayout ) {
if ( ::tqqt_cast<TQBoxLayout*>(tqlayout) )
( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->alignment() );
if ( layout ) {
if ( ::tqqt_cast<TQBoxLayout*>(layout) )
( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() );
else
( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
spacer->alignment() );
}
return spacer;

@ -111,8 +111,8 @@ private:
void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent );
void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent );
TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 );
TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o );
TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 );
TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o );
void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
void createColumn( const TQDomElement &e, TQWidget *widget );
void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e);

@ -151,21 +151,21 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
void StyledButton::drawButton( TQPainter *paint )
{
tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
drawButtonLabel(paint);
if (hasFocus())
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
style().subRect(TQStyle::SR_PushButtonFocusRect, this),
colorGroup(), TQStyle::Style_Default);
}
void StyledButton::drawButtonLabel( TQPainter *paint )
{
TQColor pen = isEnabled() ?
hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText()
: tqpalette().disabled().buttonText();
hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText()
: palette().disabled().buttonText();
paint->setPen( pen );
if(!isEnabled()) {
@ -184,7 +184,7 @@ void StyledButton::onEditor()
{
switch (edit) {
case ColorEditor: {
TQColor c = TQColorDialog::getColor( tqpalette().active().background(), this );
TQColor c = TQColorDialog::getColor( palette().active().background(), this );
if ( c.isValid() ) {
setColor( c );
emit changed();

@ -553,11 +553,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo
return w;
}
/*! Creates a tqlayout on the widget \a widget of the type \a type
/*! Creates a layout on the widget \a widget of the type \a type
which can be \c HBox, \c VBox or \c Grid.
*/
TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, LayoutType type )
TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, LayoutType type )
{
int spacing = MainWindow::self->currentLayoutDefaultSpacing();
int margin = 0;
@ -570,40 +570,40 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
widget && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) )
margin = MainWindow::self->currentLayoutDefaultMargin();
if ( !tqlayout && ::tqqt_cast<TQTabWidget*>(widget) )
if ( !layout && ::tqqt_cast<TQTabWidget*>(widget) )
widget = ((TQTabWidget*)widget)->currentPage();
if ( !tqlayout && ::tqqt_cast<TQWizard*>(widget) )
if ( !layout && ::tqqt_cast<TQWizard*>(widget) )
widget = ((TQWizard*)widget)->currentPage();
if ( !tqlayout && ::tqqt_cast<TQMainWindow*>(widget) )
if ( !layout && ::tqqt_cast<TQMainWindow*>(widget) )
widget = ((TQMainWindow*)widget)->centralWidget();
if ( !tqlayout && ::tqqt_cast<TQWidgetStack*>(widget) )
if ( !layout && ::tqqt_cast<TQWidgetStack*>(widget) )
widget = ((TQWidgetStack*)widget)->visibleWidget();
if ( !tqlayout && ::tqqt_cast<TQToolBox*>(widget) )
if ( !layout && ::tqqt_cast<TQToolBox*>(widget) )
widget = ((TQToolBox*)widget)->currentItem();
MetaDataBase::addEntry( TQT_TQOBJECT(widget) );
TQLayout *l = 0;
int align = 0;
if ( !tqlayout && ::tqqt_cast<TQGroupBox*>(widget) ) {
if ( !layout && ::tqqt_cast<TQGroupBox*>(widget) ) {
TQGroupBox *gb = (TQGroupBox*)widget;
gb->setColumnLayout( 0, Qt::Vertical );
tqlayout = gb->tqlayout();
tqlayout->setMargin( 0 );
tqlayout->setSpacing( 0 );
layout = gb->layout();
layout->setMargin( 0 );
layout->setSpacing( 0 );
switch ( type ) {
case HBox:
l = new TQHBoxLayout( tqlayout );
l = new TQHBoxLayout( layout );
break;
case VBox:
l = new TQVBoxLayout( tqlayout );
l = new TQVBoxLayout( layout );
break;
case Grid:
l = new QDesignerGridLayout( tqlayout );
l = new QDesignerGridLayout( layout );
break;
default:
return 0;
@ -612,16 +612,16 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
MetaDataBase::setMargin( TQT_TQOBJECT(gb), metamargin );
MetaDataBase::setSpacing( TQT_TQOBJECT(gb), metaspacing );
} else {
if ( tqlayout ) {
if ( layout ) {
switch ( type ) {
case HBox:
l = new TQHBoxLayout( tqlayout );
l = new TQHBoxLayout( layout );
break;
case VBox:
l = new TQVBoxLayout( tqlayout );
l = new TQVBoxLayout( layout );
break;
case Grid:
l = new QDesignerGridLayout( tqlayout );
l = new QDesignerGridLayout( layout );
break;
default:
return 0;
@ -673,7 +673,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
widget = ((TQWidgetStack*)widget)->visibleWidget();
if ( ::tqqt_cast<TQToolBox*>(widget) )
widget = ((TQToolBox*)widget)->currentItem();
delete widget->tqlayout();
delete widget->layout();
}
/*! Factory functions for creating a widget of the type \a className
@ -1001,14 +1001,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
/*! Find out which type the tqlayout of the widget is. Returns \c HBox,
\c VBox, \c Grid or \c NoLayout. \a tqlayout points to this
TQWidget::tqlayout() of \a w or to 0 after the function call.
/*! Find out which type the layout of the widget is. Returns \c HBox,
\c VBox, \c Grid or \c NoLayout. \a layout points to this
TQWidget::layout() of \a w or to 0 after the function call.
*/
WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout )
WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&layout )
{
tqlayout = 0;
layout = 0;
if ( ::tqqt_cast<TQTabWidget*>(w) )
w = ((TQTabWidget*)w)->currentPage();
@ -1024,9 +1024,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
if ( ::tqqt_cast<TQSplitter*>(w) )
return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox;
if ( !w || !w->tqlayout() )
if ( !w || !w->layout() )
return NoLayout;
TQLayout *lay = w->tqlayout();
TQLayout *lay = w->layout();
if ( ::tqqt_cast<TQGroupBox*>(w) ) {
TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING );
@ -1034,7 +1034,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
lay = (TQLayout*)l->first();
delete l;
}
tqlayout = lay;
layout = lay;
if ( ::tqqt_cast<TQHBoxLayout*>(lay) )
return HBox;
@ -1048,13 +1048,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
/*!
\overload
*/
WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout )
WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
{
if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout) )
if ( ::tqqt_cast<TQHBoxLayout*>(layout) )
return HBox;
else if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout) )
else if ( ::tqqt_cast<TQVBoxLayout*>(layout) )
return VBox;
else if ( ::tqqt_cast<TQGridLayout*>(tqlayout) )
else if ( ::tqqt_cast<TQGridLayout*>(layout) )
return Grid;
return NoLayout;
}
@ -1069,9 +1069,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
}
TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
TQWidget *WidgetFactory::layoutParent( TQLayout *layout )
{
TQObject *o = TQT_TQOBJECT(tqlayout);
TQObject *o = TQT_TQOBJECT(layout);
while ( o ) {
if ( o->isWidgetType() )
return (TQWidget*)o;
@ -1601,7 +1601,7 @@ bool TQLayoutWidget::event( TQEvent *e )
/*
This function must be called on TQLayoutWidget creation and whenever
the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout
the TQLayoutWidget's parent layout changes (e.g., from a TQHBoxLayout
to a TQVBoxLayout), because of the (illogical) way layouting works.
*/
void TQLayoutWidget::updateSizePolicy()
@ -1624,14 +1624,14 @@ void TQLayoutWidget::updateSizePolicy()
int ht = (int) TQSizePolicy::Preferred;
int vt = (int) TQSizePolicy::Preferred;
if ( tqlayout() ) {
if ( layout() ) {
/*
parentLayout is set to the parent tqlayout if there is one and if it is
parentLayout is set to the parent layout if there is one and if it is
top level, in which case layouting is illogical.
*/
TQLayout *parentLayout = 0;
if ( parent() && parent()->isWidgetType() ) {
parentLayout = ((TQWidget *)parent())->tqlayout();
parentLayout = ((TQWidget *)parent())->layout();
if ( parentLayout &&
::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) )
parentLayout = 0;
@ -1640,7 +1640,7 @@ void TQLayoutWidget::updateSizePolicy()
TQObjectListIt it( childrenListObject() );
TQObject *o;
if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout()) ) {
if ( ::tqqt_cast<TQVBoxLayout*>(layout()) ) {
if ( ::tqqt_cast<TQHBoxLayout*>(parentLayout) )
vt = TQSizePolicy::Minimum;
else
@ -1661,7 +1661,7 @@ void TQLayoutWidget::updateSizePolicy()
if ( w->sizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
} else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
} else if ( ::tqqt_cast<TQHBoxLayout*>(layout()) ) {
if ( ::tqqt_cast<TQVBoxLayout*>(parentLayout) )
ht = TQSizePolicy::Minimum;
else
@ -1682,7 +1682,7 @@ void TQLayoutWidget::updateSizePolicy()
if ( !w->sizePolicy().mayShrinkVertically() )
vt &= ~TQSizePolicy::Maximum;
}
} else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
} else if ( ::tqqt_cast<TQGridLayout*>(layout()) ) {
ht = TQSizePolicy::Fixed;
vt = TQSizePolicy::Fixed;
if ( parentLayout ) {
@ -1709,19 +1709,19 @@ void TQLayoutWidget::updateSizePolicy()
}
}
#ifdef USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
if ( layout()->expanding() & TQSizePolicy::Horizontally )
#else // USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
if ( layout()->expanding() & TQSizePolicy::Horizontally )
#endif // USE_QT4
ht = TQSizePolicy::Expanding;
#ifdef USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
if ( layout()->expanding() & TQSizePolicy::Vertically )
#else // USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
if ( layout()->expanding() & TQSizePolicy::Vertically )
#endif // USE_QT4
vt = TQSizePolicy::Expanding;
tqlayout()->invalidate();
layout()->invalidate();
}
sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );

@ -78,13 +78,13 @@ public:
static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE,
const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal );
static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type );
static void deleteLayout( TQWidget *widget );
static LayoutType layoutType( TQWidget *w );
static LayoutType layoutType( TQWidget *w, TQLayout *&tqlayout );
static LayoutType layoutType( TQLayout *tqlayout );
static TQWidget *layoutParent( TQLayout *tqlayout );
static LayoutType layoutType( TQWidget *w, TQLayout *&layout );
static LayoutType layoutType( TQLayout *layout );
static TQWidget *layoutParent( TQLayout *layout );
static TQWidget* containerOfWidget( TQWidget *w );
static TQWidget* widgetOfContainer( TQWidget *w );

@ -121,8 +121,8 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) &&
parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project &&
( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) {
g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
g.setColor( TQColorGroup::Text, listView()->palette().disabled().color( TQColorGroup::Text) );
g.setColor( TQColorGroup::HighlightedText, listView()->palette().disabled().color( TQColorGroup::Text) );
} else {
g.setColor( TQColorGroup::Text, TQt::black );
}

@ -470,7 +470,7 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
if ( subLayoutNo != -1 ) {
/*
Remove the sub-tqlayout's Object_End marker, append the grid
Remove the sub-layout's Object_End marker, append the grid
cell and the correct name property, and put the Object_End
marker back.
*/

@ -907,7 +907,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
{
TQObject *obj = 0;
TQWidget *widget = 0;
TQLayout *tqlayout = 0;
TQLayout *layout = 0;
TQWidget *parentWidget = 0;
TQLayout *parentLayout = 0;
@ -942,11 +942,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
type = VBox;
}
if ( parentLayout != 0 && parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
tqlayout = createLayout( 0, 0, type );
layout = createLayout( 0, 0, type );
} else {
tqlayout = createLayout( parentWidget, parentLayout, type );
layout = createLayout( parentWidget, parentLayout, type );
}
obj = TQT_TQOBJECT(tqlayout);
obj = TQT_TQOBJECT(layout);
} else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) {
unpackCString( strings, in, className );
widget = ((TQMainWindow *) parent)->menuBar();
@ -1092,7 +1092,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
inputColumnOrRow( strings, in, obj, TRUE );
break;
case Object_Spacer:
inputSpacer( strings, in, tqlayout );
inputSpacer( strings, in, layout );
break;
case Object_Separator:
((TQToolBar *) widget)->addSeparator();
@ -1160,10 +1160,10 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
} else {
((TQBoxLayout *) parentLayout)->addWidget( widget );
}
} else if ( tqlayout != 0 ) {
} else if ( layout != 0 ) {
if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
((TQGridLayout *) parentLayout)->addMultiCellLayout(
tqlayout, row, row + rowspan - 1, column,
layout, row, row + rowspan - 1, column,
column + colspan - 1 );
}
}
@ -1568,7 +1568,7 @@ bool TQWidgetFactory::supportsWidget( const TQString &widget )
}
TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent,
TQLayout* tqlayout, const TQString &classNameArg )
TQLayout* layout, const TQString &classNameArg )
{
d->lastItem = 0;
TQDomElement n = e.firstChild().toElement();
@ -1589,12 +1589,12 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
bool isTQLayoutWidget = FALSE;
if ( !className.isEmpty() ) {
if ( !tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
className = TQWIDGET_OBJECT_NAME_STRING;
isTQLayoutWidget = TRUE;
}
if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
// hide tqlayout widgets
if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
// hide layout widgets
w = parent;
} else {
obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 ));
@ -1605,16 +1605,16 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
toplevel = w;
if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
w = ( (TQMainWindow*)w )->centralWidget();
if ( tqlayout ) {
switch( layoutType( tqlayout ) ) {
if ( layout ) {
switch( layoutType( layout ) ) {
case HBox:
( (TQHBoxLayout*)tqlayout )->addWidget( w );
( (TQHBoxLayout*)layout )->addWidget( w );
break;
case VBox:
( (TQVBoxLayout*)tqlayout )->addWidget( w );
( (TQVBoxLayout*)layout )->addWidget( w );
break;
case Grid:
( (TQGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
( (TQGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
col, col + colspan - 1 );
break;
default:
@ -1622,7 +1622,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
}
}
tqlayout = 0;
layout = 0;
}
}
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
@ -1636,45 +1636,45 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
int idx = 0;
while ( !n.isNull() ) {
if ( n.tagName() == "spacer" ) {
createSpacer( n, tqlayout );
createSpacer( n, layout );
} else if ( n.tagName() == "widget" ) {
TQMap< TQString, TQString> *oldDbControls = dbControls;
createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
dbControls = oldDbControls;
} else if ( n.tagName() == "hbox" ) {
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget );
TQLayout *parentLayout = layout;
if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
layout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::HBox, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
layout = createLayout( w, layout, TQWidgetFactory::HBox, isTQLayoutWidget );
obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "grid" ) {
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget );
TQLayout *parentLayout = layout;
if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
layout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::Grid, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
layout = createLayout( w, layout, TQWidgetFactory::Grid, isTQLayoutWidget );
obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "vbox" ) {
TQLayout *parentLayout = tqlayout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget );
TQLayout *parentLayout = layout;
if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
layout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::VBox, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
layout = createLayout( w, layout, TQWidgetFactory::VBox, isTQLayoutWidget );
obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "property" && obj ) {
@ -1728,47 +1728,47 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
return w;
}
TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout,
LayoutType type, bool isTQLayoutWidget )
{
int spacing = defSpacing;
int margin = defMargin;
if ( tqlayout || !widget || isTQLayoutWidget )
if ( layout || !widget || isTQLayoutWidget )
margin = 0;
if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
widget = ((TQTabWidget*)widget)->currentPage();
if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
widget = ((TQWizard*)widget)->currentPage();
if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
widget = ((TQWidgetStack*)widget)->visibleWidget();
if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
widget = ((TQToolBox*)widget)->currentItem();
TQLayout *l = 0;
int align = 0;
if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
TQGroupBox *gb = (TQGroupBox*)widget;
gb->setColumnLayout( 0, Qt::Vertical );
tqlayout = gb->tqlayout();
tqlayout->setMargin( 0 );
tqlayout->setSpacing( 0 );
layout = gb->layout();
layout->setMargin( 0 );
layout->setSpacing( 0 );
align = TQt::AlignTop;
}
if ( tqlayout ) {
if ( layout ) {
switch ( type ) {
case HBox:
l = new TQHBoxLayout( tqlayout );
l = new TQHBoxLayout( layout );
break;
case VBox:
l = new TQVBoxLayout( tqlayout );
l = new TQVBoxLayout( layout );
break;
case Grid:
l = new TQGridLayout( tqlayout );
l = new TQGridLayout( layout );
break;
default:
return 0;
@ -1794,13 +1794,13 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
return l;
}
TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) const
TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) const
{
if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox;
else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
return VBox;
else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
return Grid;
return NoLayout;
}
@ -1917,7 +1917,7 @@ void TQWidgetFactory::setProperty( TQObject* widget, const TQString &prop, const
setProperty( widget, prop, value );
}
void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
{
TQDomElement n = e.firstChild().toElement();
int row = e.attribute( "row" ).toInt();
@ -1952,11 +1952,11 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
colspan = 1;
TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum,
orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum );
if ( tqlayout ) {
if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
( (TQBoxLayout*)tqlayout )->addItem( item );
if ( layout ) {
if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
( (TQBoxLayout*)layout )->addItem( item );
else
( (TQGridLayout*)tqlayout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter );
}
}

@ -66,12 +66,12 @@ private:
void loadImageCollection( const TQDomElement &e );
void loadConnections( const TQDomElement &e, TQObject *connector );
void loadTabOrder( const TQDomElement &e );
TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg );
TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE );
TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg );
TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type, bool isTQLayoutWidget = FALSE );
LayoutType layoutType( TQLayout *l ) const;
void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
void createSpacer( const TQDomElement &e, TQLayout *tqlayout );
void createSpacer( const TQDomElement &e, TQLayout *layout );
TQImage loadFromCollection( const TQString &name );
TQPixmap loadPixmap( const TQString &name );
TQPixmap loadPixmap( const TQDomElement &e );

@ -1773,7 +1773,7 @@ tokens {
// part 3: Non-RM synthetic tokens.
// They exist mainly to normalize the node structure with respect to
// optional items. (Without them, the presence or absence of an optional
// item would change the node tqlayout, but we want a fixed tqlayout.)
// item would change the node layout, but we want a fixed layout.)
ABSTRACT_FUNCTION_DECLARATION;
ABSTRACT_PROCEDURE_DECLARATION;
ACCESS_TO_FUNCTION_DECLARATION;

@ -25,7 +25,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter,
const TQString& source,
const TQString& filename )
: m_reporter( reporter ),
m_source( source.tqunicode(), source.length() ),
m_source( source.unicode(), source.length() ),
m_fileName( filename )
{
}

@ -79,7 +79,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -133,7 +133,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@ -178,7 +178,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<grid>
<property name="name">

@ -90,7 +90,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -144,7 +144,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@ -189,7 +189,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<grid>
<property name="name">

@ -17,7 +17,7 @@
: TQWidget(parent),
DCOPObject("%{APPNAME}Iface")
{
// setup our tqlayout manager to automatically add our widgets
// setup our layout manager to automatically add our widgets
TQHBoxLayout *top_layout = new TQHBoxLayout(this);
top_layout->setAutoAdd(true);

@ -25,8 +25,8 @@
%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent)
: TQFrame(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
new TQLabel(i18n("Add something here"), this);
}
@ -34,8 +34,8 @@
%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent)
: TQFrame(parent)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
tqlayout->setAutoAdd(true);
TQHBoxLayout *layout = new TQHBoxLayout(this);
layout->setAutoAdd(true);
new TQLabel(i18n("Add something here"), this);
}

@ -15,7 +15,7 @@
<property name="autoFillBackground" >
<bool>true</bool>
</property>
<tqlayout class="TQGridLayout" >
<layout class="TQGridLayout" >
<property name="leftMargin" >
<number>11</number>
</property>
@ -204,7 +204,7 @@
</property>
</widget>
</item>
</tqlayout>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>

@ -9,7 +9,7 @@
<height>156</height>
</rect>
</property>
<tqlayout class="TQGridLayout" >
<layout class="TQGridLayout" >
<item row="0" column="0" >
<widget class="TQLabel" name="textLabel2_2" >
<property name="text" >
@ -136,7 +136,7 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
</tqlayout>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>

@ -35,9 +35,9 @@
part()->widget()->setFocus();
setFocusProxy(part()->widget());
TQBoxLayout* tqlayout = new TQHBoxLayout(this, 0, -1, "kdissertviewtqlayout" );
TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" );
part()->widget()->reparent( this, TQPoint(0, 0) );
tqlayout->addWidget( part()->widget() );
layout->addWidget( part()->widget() );
// connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) );
}

@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){
/*
* Send the key
* ke is the tqunicode
* ke is the unicode
* _ke + 0x41 is the keycode
* m_state Normally the state
* down/up

@ -15,7 +15,7 @@
<property name="windowTitle" >
<string>%{APPNAME}</string>
</property>
<tqlayout class="TQVBoxLayout" >
<layout class="TQVBoxLayout" >
<property name="margin" >
<number>11</number>
</property>
@ -39,6 +39,6 @@
</property>
</widget>
</item>
</tqlayout>
</layout>
</widget>
</ui>

@ -561,7 +561,7 @@ void CCConfigWidget::openPluginPaths()
kdDebug(9024) << "Plugin paths opened" << endl;
QtBuildConfig* c = m_pPart->qtBuildConfig();
KDialog d( this );
TQVBoxLayout* maintqlayout = new TQVBoxLayout( &d );
TQVBoxLayout* mainlayout = new TQVBoxLayout( &d );
KPushButton* ok = new KPushButton( KStdGuiItem::ok(), &d );
connect( ok, TQT_SIGNAL(clicked()), &d, TQT_SLOT(accept()));
KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), &d );
@ -576,8 +576,8 @@ void CCConfigWidget::openPluginPaths()
req->setMode( KFile::Directory );
KEditListBox* p = new KEditListBox( i18n( "Plugin Paths" ), req->customEditor(), &d );
p->insertStringList( c->designerPluginPaths() );
maintqlayout->addWidget( p );
maintqlayout->addLayout( btns );
mainlayout->addWidget( p );
mainlayout->addLayout( btns );
d.resize( 450, 250 );
if( d.exec() == TQDialog::Accepted)
{

@ -36,7 +36,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<hbox>
<property name="name">
@ -77,7 +77,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@ -227,7 +227,7 @@ completion-box.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout14</cstring>
<cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
@ -299,7 +299,7 @@ argument hint</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@ -397,7 +397,7 @@ Note: Parsing may become very slow when this is enabled
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -605,7 +605,7 @@ if they were one("a=b" is equivalent to "a&lt;&lt;b;b&lt;&lt;a")</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -905,7 +905,7 @@ This option only applies to QMake projects.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -974,7 +974,7 @@ This option only applies to QMake projects.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -1006,7 +1006,7 @@ This option only applies to QMake projects.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -1149,7 +1149,7 @@ This option only applies to QMake projects.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -1178,7 +1178,7 @@ This option only applies to QMake projects.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -1250,7 +1250,7 @@ This option only applies to QMake projects.</string>
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout5_2</cstring>
<cstring>layout5_2</cstring>
</property>
<hbox>
<property name="name">

@ -101,9 +101,9 @@ private:
GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
: TQWidget( parent, name ), controller( new FlagCheckBoxController )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
tqlayout->setAutoAdd( true );
tqlayout->addSpacing( 10 );
TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
layout->setAutoAdd( true );
layout->addSpacing( 10 );
TQVButtonGroup *output_group = new TQVButtonGroup( i18n( "Output" ), this );
new FlagCheckBox( output_group, controller,
@ -114,7 +114,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha
"-save-temps", i18n( "Do not delete intermediate output like assembler files" ) );
TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
tqlayout->addSpacing( 10 );
layout->addSpacing( 10 );
TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this );
if ( type != GccOptionsPlugin::GPP )
@ -142,7 +142,7 @@ GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const cha
"-short-double", i18n( "Make 'double' the same as 'float'" ) );
TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
tqlayout->addStretch();
layout->addStretch();
}
@ -167,8 +167,8 @@ void GeneralTab::writeFlags( TQStringList *list )
OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
tqlayout->setAutoAdd( true );
TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
layout->setAutoAdd( true );
TQVButtonGroup *group = new TQVButtonGroup( i18n( "Optimization Level" ), this );
Odefault = new TQRadioButton( i18n( "Default" ), group );
@ -211,7 +211,7 @@ OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent,
}
TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
tqlayout->addStretch();
layout->addStretch();
}
@ -264,9 +264,9 @@ void OptimizationTab::writeFlags( TQStringList *list )
G77Tab::G77Tab( TQWidget *parent, const char *name )
: TQWidget( parent, name ), controller( new FlagCheckBoxController )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
tqlayout->setAutoAdd( true );
tqlayout->addSpacing( 10 );
TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
layout->setAutoAdd( true );
layout->addSpacing( 10 );
TQVButtonGroup *dialect_group = new TQVButtonGroup( i18n( "Dialect" ), this );
new FlagCheckBox( dialect_group, controller,
@ -283,7 +283,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name )
"-fonetrip", i18n( "DO loops are executed at least once" ) );
TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
tqlayout->addSpacing( 10 );
layout->addSpacing( 10 );
TQVButtonGroup *codegen_group = new TQVButtonGroup( i18n( "Code Generation" ), this );
new FlagCheckBox( codegen_group, controller,
@ -294,7 +294,7 @@ G77Tab::G77Tab( TQWidget *parent, const char *name )
"-fbounds-check", i18n( "Generate run-time checks for array subscripts" ) );
TQApplication::sendPostedEvents( this, TQEvent::ChildInserted );
tqlayout->addStretch();
layout->addStretch();
}
@ -319,8 +319,8 @@ void G77Tab::writeFlags( TQStringList *list )
Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
: TQWidget( parent, name ), controller( new FlagCheckBoxController )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
tqlayout->setAutoAdd( true );
TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
layout->setAutoAdd( true );
new FlagCheckBox( this, controller,
"-w", i18n( "Inhibit all warnings" ) );
@ -417,8 +417,8 @@ void Warnings1Tab::writeFlags( TQStringList *list )
Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name )
: TQWidget( parent, name )
{
TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
tqlayout->setAutoAdd( true );
TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
layout->setAutoAdd( true );
wrestBox = new FlagListBox( this );
@ -463,7 +463,7 @@ Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const
"deprecated by using the 'deprecated' attribute</qt>" ) );
new FlagListItem( wrestBox,
"-Wpacked", i18n( "<qt>Warn if a structure is given the packed attribute, but the packed\n"
"attribute has no effect on the tqlayout or size of the structure</qt>" ) );
"attribute has no effect on the layout or size of the structure</qt>" ) );
new FlagListItem( wrestBox,
"-Wpadded", i18n( "<qt>Warn if padding is included in a structure, either to align an\n"
"element of the structure or to align the whole structure</qt>" ) );

@ -62,7 +62,7 @@ If disabled, the parser will typically only run when the file is saved.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -446,7 +446,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -640,7 +640,7 @@ Namespace1::Namespace2::...::NamespaceN</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -77,7 +77,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
buttonbox->addStretch();
TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok());
TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel());
buttonbox->tqlayout();
buttonbox->layout();
topLayout->addWidget(buttonbox);
connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));

@ -102,7 +102,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -208,7 +208,7 @@ check this option.</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -303,7 +303,7 @@ check this option.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<grid>
<property name="name">

@ -1234,7 +1234,7 @@ TQWidget* ComplexEditCell::createEditor() const
TQPushButton* b = new TQPushButton("...", box);
// This is exactly what is done in TQDesigner source in the
// similar context. Haven't had any success making the good look
// with tqlayout, I suppose that sizeHint for button is always larger
// with layout, I suppose that sizeHint for button is always larger
// than 20.
b->setFixedWidth( 20 );

@ -356,8 +356,8 @@ void OutputText::copyAll()
// Make sure the text is pastable both with Ctrl-C and with
// middle click.
TQApplication::tqclipboard()->setText(text, TQClipboard::Clipboard);
TQApplication::tqclipboard()->setText(text, TQClipboard::Selection);
TQApplication::clipboard()->setText(text, TQClipboard::Clipboard);
TQApplication::clipboard()->setText(text, TQClipboard::Selection);
}
void OutputText::toggleShowInternalCommands()

@ -84,7 +84,7 @@ namespace GDBDebugger
{
TQVBoxLayout* l = new TQVBoxLayout(this);
// Grid tqlayout: labels + address field
// Grid layout: labels + address field
TQGridLayout* gl = new TQGridLayout(l);
gl->setColSpacing(0, 2);

@ -988,7 +988,7 @@ void VariableTree::keyPressEvent(TQKeyEvent* e)
void VariableTree::copyToClipboard(TQListViewItem* item)
{
TQClipboard *qb = KApplication::tqclipboard();
TQClipboard *qb = KApplication::clipboard();
TQString text = item->text( 1 );
qb->setText( text, TQClipboard::Clipboard );
@ -1624,7 +1624,7 @@ void VarItem::updateSpecialRepresentation(const TQString& xs)
s = s.mid(i+2);
}
// A hack to nicely display TQStrings. The content of TQString is tqunicode
// A hack to nicely display TQStrings. The content of TQString is unicode
// for for ASCII only strings we get ascii character mixed with \000.
// Remove those \000 now.
@ -1736,7 +1736,7 @@ bool VarItem::handleSpecialTypes()
else
varTree->controller()->addCommand(
new ValueSpecialRepresentationCommand(
this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.tqunicode[0])@$kdev_s) : \"\""));
this, "print ($kdev_s>0) ? (*((char*)&$kdev_d.unicode[0])@$kdev_s) : \"\""));
return true;
}
@ -1853,7 +1853,7 @@ void VarItem::paintCell(TQPainter *p, const TQColorGroup &cg,
if (!alive_)
{
/* Draw this as disabled. */
TQListViewItem::paintCell(p, varTree()->TQWidget::tqpalette().disabled(),
TQListViewItem::paintCell(p, varTree()->TQWidget::palette().disabled(),
column, width, align);
}
else

@ -35,7 +35,7 @@
</spacer>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -238,7 +238,7 @@ size_t TypeDescData::hashKey() {
int len = m_cleanName.length();
for ( int a = 0; a < len; a++ )
ret += m_cleanName[ a ].tqunicode() * 3 * (11*(a+1));
ret += m_cleanName[ a ].unicode() * 3 * (11*(a+1));
int n = 1;
@ -266,7 +266,7 @@ size_t TypeDescData::hashKey2() {
int len = m_cleanName.length();
for ( int a = 0; a < len; a++ )
ret += m_cleanName[ a ].tqunicode() * 19 * (7*(a+1));
ret += m_cleanName[ a ].unicode() * 19 * (7*(a+1));
int n = 1;

@ -115,8 +115,8 @@ private:
OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
TQVButtonGroup *group = new TQVButtonGroup(i18n("Optimization Level"), this);
Odefault = new TQRadioButton(i18n("Default"), group);
@ -137,7 +137,7 @@ OptimizationTab::OptimizationTab(PgiOptionsPlugin::Type type, TQWidget *parent,
optBox = 0;
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
@ -198,8 +198,8 @@ void OptimizationTab::writeFlags(TQStringList *list)
HpfTab::HpfTab(TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
hpfBox = new TQListView(this);
hpfBox->addColumn(TQString());
@ -208,7 +208,7 @@ HpfTab::HpfTab(TQWidget *parent, const char *name)
new TQCheckListItem(hpfBox, *p, TQCheckListItem::CheckBox);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}

@ -103,7 +103,7 @@
* o supports UNICODE?
* Using Unicode charVocabulay makes code file big, but only
* in the bitsets at the end. I need to make ANTLR generate
* tqunicode bitsets more efficiently.
* unicode bitsets more efficiently.
* Version 1.19 (April 25, 2002)
* Terence added in nice fixes by John Pybus concerning floating
* constants and problems with super() calls. John did a nice

@ -25,7 +25,7 @@ public class %{APPNAME}View extends QWidget
public %{APPNAME}View(QWidget parent)
{
super(parent, null);
// setup our tqlayout manager to automatically add our widgets
// setup our layout manager to automatically add our widgets
top_layout = new QHBoxLayout(this);
top_layout.setAutoAdd(true);

@ -31,8 +31,8 @@ public class %{APPNAME}PrefPageOne extends QFrame {
public %{APPNAME}PrefPageOne(QWidget parent)
{
super(parent);
QHBoxLayout tqlayout = new QHBoxLayout(this);
tqlayout.setAutoAdd(true);
QHBoxLayout layout = new QHBoxLayout(this);
layout.setAutoAdd(true);
new QLabel("Add something here", this);
}
@ -42,8 +42,8 @@ public class %{APPNAME}PrefPageTwo extends QFrame {
public %{APPNAME}PrefPageTwo(QWidget parent)
{
super(parent);
QHBoxLayout tqlayout = new QHBoxLayout(this);
tqlayout.setAutoAdd(true);
QHBoxLayout layout = new QHBoxLayout(this);
layout.setAutoAdd(true);
new QLabel("Add something here", this);
}

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

@ -97,7 +97,7 @@ options {
* o supports UNICODE?
* Using Unicode charVocabulay makes code file big, but only
* in the bitsets at the end. I need to make ANTLR generate
* tqunicode bitsets more efficiently.
* unicode bitsets more efficiently.
* Version 1.19 (April 25, 2002)
* Terence added in nice fixes by John Pybus concerning floating
* constants and problems with super() calls. John did a nice
@ -1050,7 +1050,7 @@ options {
k=4; // four characters of lookahead
// charVocabulary='\u0003'..'\uFFFF';
charVocabulary='\u0003'..'\u00FF';
// without inlining some bitset tests, couldn't do tqunicode;
// without inlining some bitset tests, couldn't do unicode;
// I need to make ANTLR generate smaller bitsets; see
// bottom of JavaLexer.java
codeGenBitsetTestThreshold=20;

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -135,7 +135,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@ -169,7 +169,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout2_2</cstring>
<cstring>layout2_2</cstring>
</property>
<vbox>
<property name="name">

@ -24,7 +24,7 @@ BackgroundParser::BackgroundParser( ProblemReporter* reporter,
const TQString& source,
const TQString& filename )
: m_reporter( reporter ),
m_source( source.tqunicode(), source.length() ),
m_source( source.unicode(), source.length() ),
m_fileName( filename )
{
}

@ -26,8 +26,8 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
pathController(new FlagPathEditController()),
editController(new FlagEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
TQVButtonGroup *map_group = new TQVButtonGroup(i18n("Map File"), this);
TQRadioButton *m_defaultMap = new TQRadioButton(i18n("Off"), map_group);
@ -39,19 +39,19 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
new FlagRadioButton(map_group, radioController,
"-GD", i18n("Detailed"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
new FlagPathEdit(this, "", pathController,
"--dynamicloader=", i18n("Default dynamic loader:"), KFile::File);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
new FlagSpinEdit(this, 0, 2147483647, 1024, 1048576, editController,
"-$M", i18n("Reserved address space:"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
tqlayout->addStretch();
layout->addStretch();
}
LinkerTab::~LinkerTab( )
@ -80,8 +80,8 @@ void LinkerTab::writeFlags( TQStringList * str )
LocationsTab::LocationsTab( TQWidget * parent, const char * name )
:TQWidget(parent, name), pathController(new FlagPathEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
new FlagPathEdit(this, ":", pathController,
"-I", i18n("Include search path (delimited by \":\"):"));
@ -92,7 +92,7 @@ LocationsTab::LocationsTab( TQWidget * parent, const char * name )
new FlagPathEdit(this, ":", pathController,
"-O", i18n("Object search path (delimited by \":\"):"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
LocationsTab::~LocationsTab( )
@ -115,8 +115,8 @@ void LocationsTab::writeFlags( TQStringList * str )
Locations2Tab::Locations2Tab( TQWidget * parent, const char * name )
:TQWidget(parent, name), pathController(new FlagPathEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
new FlagPathEdit(this, "", pathController,
"-E", i18n("Executable output directory:"));
@ -127,7 +127,7 @@ Locations2Tab::Locations2Tab( TQWidget * parent, const char * name )
new FlagPathEdit(this, "", pathController,
"-LN", i18n("Package source code directory:"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
Locations2Tab::~Locations2Tab( )
@ -151,8 +151,8 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
:TQWidget(parent, name), controller(new FlagCheckBoxController()),
editController(new FlagEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
TQVButtonGroup *build_group = new TQVButtonGroup(i18n("Build"), this);
new FlagCheckBox(build_group, controller,
@ -165,7 +165,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
"-Z", i18n("Disable implicit package compilation"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
new FlagListEdit(this, ":", editController, "-D", i18n("Conditional defines (delimited by \":\"):"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
@ -173,7 +173,7 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
new FlagListEdit(this, ":", editController, "-A", i18n("Unit aliases in form unit=alias (delimited by \":\"):"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *message_group = new TQVButtonGroup(i18n("Messages"), this);
new FlagCheckBox(message_group, controller,
@ -182,12 +182,12 @@ GeneralTab::GeneralTab( TQWidget * parent, const char * name )
"-W", i18n("Output warning messages"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *package_group = new TQVButtonGroup(i18n("Packages"), this);
new FlagListEdit(package_group, ":", editController, "-LU", i18n("Build with packages (delimited by \":\"):"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
GeneralTab::~GeneralTab( )
@ -215,10 +215,10 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
listController(new FlagEditController()),
radioController(new FlagRadioButtonController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
// tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
// layout->setAutoAdd(true);
TQGridLayout *tqlayout2 = new TQGridLayout(tqlayout, 2, 2, KDialog::spacingHint());
TQGridLayout *layout2 = new TQGridLayout(layout, 2, 2, KDialog::spacingHint());
TQVButtonGroup *align_group = new TQVButtonGroup(i18n("Code Alignment && Stack Frames"), this);
TQRadioButton *align_def = new TQRadioButton(i18n("Default (-$A8)"), align_group);
@ -234,7 +234,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
new FlagCheckBox(align_group, controller,
"'-$W+'", i18n("Generate stack frames"), "'-$W-'");
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout2->addWidget(align_group, 0, 0);
layout2->addWidget(align_group, 0, 0);
TQVButtonGroup *enum_group = new TQVButtonGroup(i18n("Enumeration Size"), this);
TQRadioButton *enum_def = new TQRadioButton(i18n("Default (-$Z1)"), enum_group);
@ -246,7 +246,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
new FlagRadioButton(enum_group, radioController,
"'-$Z4'", i18n("Unsigned double word (4096M values)"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout2->addWidget(enum_group, 0, 1);
layout2->addWidget(enum_group, 0, 1);
TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this);
new FlagCheckBox(compile_group, controller,
@ -266,7 +266,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
new FlagCheckBox(compile_group, controller,
"'-$J+'", i18n("Writable typed constants"), "'-$J-'");
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout2->addWidget(compile_group, 1, 0);
layout2->addWidget(compile_group, 1, 0);
TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this);
new FlagCheckBox(run_group, controller,
@ -280,9 +280,9 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
new FlagCheckBox(run_group, controller,
"'-$R+'", i18n("Range checking"), "'-$R-'");
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout2->addWidget(run_group, 1, 1);
layout2->addWidget(run_group, 1, 1);
tqlayout->addStretch();
layout->addStretch();
}
CodegenTab::~CodegenTab( )
@ -312,17 +312,17 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
: TQWidget(parent, name), controller(new FlagCheckBoxController()),
radioController(new FlagRadioButtonController)
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
// tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
// layout->setAutoAdd(true);
TQVButtonGroup *optim_group = new TQVButtonGroup(i18n("Optimization"), this);
new FlagCheckBox(optim_group, controller,
"'-$O+'", i18n("Enable optimizations"), "'-$O-'", "'-$O+'");
tqlayout->addWidget(optim_group);
layout->addWidget(optim_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this);
new FlagCheckBox(debug_group, controller,
@ -335,7 +335,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
"-VN", i18n("Namespace debug info"));
symboldb = new FlagCheckBox(debug_group, controller,
"-VR", i18n("Write symbol info in an .rsm file"));
tqlayout2->addWidget(debug_group);
layout2->addWidget(debug_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
TQVButtonGroup *debug_add = new TQVButtonGroup(i18n("Symbol Reference Information"), this);
@ -347,20 +347,20 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
"'-$YD'", i18n("Definition information"));
new FlagRadioButton(debug_add, radioController,
"'-$Y+'", i18n("Full reference information"));
tqlayout2->addWidget(debug_add);
layout2->addWidget(debug_add);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQHBoxLayout *tqlayout3 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
TQHBoxLayout *layout3 = new TQHBoxLayout(layout, KDialog::spacingHint());
TQPushButton *release = new TQPushButton(i18n("Release"), this);
TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
tqlayout3->addWidget(release);
tqlayout3->addWidget(debug);
layout3->addWidget(release);
layout3->addWidget(debug);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
tqlayout->addStretch();
layout->addStretch();
}
DebugOptimTab::~ DebugOptimTab( )

@ -26,14 +26,14 @@
FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
: TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
TQVButtonGroup *output_group = new TQVButtonGroup(i18n("Output"), this);
new FlagCheckBox(output_group, controller,
"-vr", i18n("Format errors like GCC does"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *verbose_group = new TQVButtonGroup(i18n("Verbose"), this);
new FlagCheckBox(verbose_group, controller,
@ -54,7 +54,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
"-vd", i18n("Write other debugging info"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *other_group = new TQVButtonGroup(i18n("Other Information"), this);
new FlagCheckBox(other_group, controller,
@ -74,7 +74,7 @@ FeedbackTab::FeedbackTab(TQWidget *parent, const char *name)
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
FeedbackTab::~FeedbackTab()
@ -98,8 +98,8 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char *
:TQWidget(parent, name), controller(new FlagCheckBoxController()),
pathController(new FlagPathEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
new FlagPathEdit(this, ":", pathController,
"-Fu", i18n("Unit search path (delimited by \":\"):"));
@ -110,7 +110,7 @@ FilesAndDirectoriesTab::FilesAndDirectoriesTab( TQWidget * parent, const char *
new FlagPathEdit(this, ":", pathController,
"-Fl", i18n("Library search path (delimited by \":\"):"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
FilesAndDirectoriesTab::~FilesAndDirectoriesTab( )
@ -135,8 +135,8 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
:TQWidget(parent, name), controller(new FlagCheckBoxController()),
pathController(new FlagPathEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
new FlagPathEdit(this, "", pathController,
"-FE", i18n("Write executables and units in:"));
@ -145,14 +145,14 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
new FlagPathEdit(this, "", pathController,
"-o", i18n("Executable name:"), KFile::File);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(20);
layout->addSpacing(20);
new FlagPathEdit(this, "", pathController,
"-e", i18n("Location of as and ld programs:"));
new FlagPathEdit(this, "", pathController,
"-FL", i18n("Dynamic linker executable:"), KFile::File);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(20);
layout->addSpacing(20);
new FlagPathEdit(this, "", pathController,
"-Fr", i18n("Compiler messages file:"), KFile::File);
@ -160,7 +160,7 @@ FilesAndDirectoriesTab2::FilesAndDirectoriesTab2( TQWidget * parent, const char
"-Fe", i18n("Write compiler messages to file:"), KFile::File);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
FilesAndDirectoriesTab2::~FilesAndDirectoriesTab2( )
@ -185,8 +185,8 @@ void FilesAndDirectoriesTab2::writeFlags( TQStringList * str )
LanguageTab::LanguageTab( TQWidget * parent, const char * name )
: TQWidget(parent, name), controller(new FlagCheckBoxController(TQStringList::split(",","-v")))
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
TQVButtonGroup *compat_group = new TQVButtonGroup(i18n("Pascal Compatibility"), this);
new FlagCheckBox(compat_group, controller,
@ -198,7 +198,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
new FlagCheckBox(compat_group, controller,
"-Sp", i18n("GNU Pascal compatibility mode"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *ccompat_group = new TQVButtonGroup(i18n("C/C++ Compatibility"), this);
new FlagCheckBox(ccompat_group, controller,
@ -208,7 +208,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
new FlagCheckBox(ccompat_group, controller,
"-Sm", i18n("Support C style macros"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *lang_group = new TQVButtonGroup(i18n("Language"), this);
new FlagCheckBox(lang_group, controller,
@ -221,7 +221,7 @@ LanguageTab::LanguageTab( TQWidget * parent, const char * name )
"-St", i18n("Allow the static keyword in objects"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
LanguageTab::~ LanguageTab( )
@ -243,10 +243,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
: TQWidget(parent, name), controller(new FlagCheckBoxController()),
asmController(new FlagRadioButtonController)
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
// tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
// layout->setAutoAdd(true);
TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
TQVButtonGroup *info_group = new TQVButtonGroup(i18n("Assembler Info"), this);
new FlagCheckBox(info_group, controller,
@ -257,9 +257,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
"-ar", i18n("List register allocation and release info"));
new FlagCheckBox(info_group, controller,
"-at", i18n("List temporary allocations and deallocations"));
tqlayout2->addWidget(info_group);
layout2->addWidget(info_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
//tqlayout->addSpacing(10);
//layout->addSpacing(10);
TQVButtonGroup *asmkind_group = new TQVButtonGroup(i18n("Assembler Reader"), this);
TQRadioButton *m_defaultkind = new TQRadioButton(i18n("Use default reader"), asmkind_group);
@ -270,9 +270,9 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
"-Rintel", i18n("Intel style assembler"));
new FlagRadioButton(asmkind_group, asmController,
"-Rdirect", i18n("Direct assembler"));
tqlayout2->addWidget(asmkind_group);
layout2->addWidget(asmkind_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *asm_group = new TQVButtonGroup(i18n("Assembler Output"), this);
@ -298,10 +298,10 @@ AssemblerTab::AssemblerTab( TQWidget * parent, const char * name )
"-Acoff", i18n("Use coff"));
new FlagRadioButton(asm_group, asmController,
"-Apecoff", i18n("Use pecoff"));
tqlayout->addWidget(asm_group);
layout->addWidget(asm_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
AssemblerTab::~ AssemblerTab( )
@ -328,12 +328,12 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
: TQWidget(parent, name), controller(new FlagCheckBoxController()),
optimController(new FlagRadioButtonController)
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
// tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
// layout->setAutoAdd(true);
TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
TQBoxLayout *tqlayout3 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint());
TQBoxLayout *layout3 = new TQVBoxLayout(layout2, KDialog::spacingHint());
TQVButtonGroup *debug_group = new TQVButtonGroup(i18n("Debugging"), this);
new FlagCheckBox(debug_group, controller,
@ -346,18 +346,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
"-gh", i18n("Use heaptrc unit"), "-!gh");
new FlagCheckBox(debug_group, controller,
"-gc", i18n("Generate checks for pointers"), "-!gc");
tqlayout3->addWidget(debug_group);
layout3->addWidget(debug_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout3->addSpacing(10);
layout3->addSpacing(10);
TQVButtonGroup *profile_group = new TQVButtonGroup(i18n("Profiling"), this);
new FlagCheckBox(profile_group, controller,
"-pg", i18n("Generate profiler code for gprof"), "-!pg");
tqlayout3->addWidget(profile_group);
layout3->addWidget(profile_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout3->addSpacing(10);
layout3->addSpacing(10);
TQBoxLayout *tqlayout4 = new TQVBoxLayout(tqlayout2, KDialog::spacingHint());
TQBoxLayout *layout4 = new TQVBoxLayout(layout2, KDialog::spacingHint());
TQVButtonGroup *optim_group1 = new TQVButtonGroup(i18n("General Optimization"), this);
m_default = new TQRadioButton(i18n("Default"), optim_group1);
@ -366,9 +366,9 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
"-Og", i18n("Generate smaller code"));
optim1 = new FlagRadioButton(optim_group1, optimController,
"-OG", i18n("Generate faster code"));
tqlayout4->addWidget(optim_group1);
layout4->addWidget(optim_group1);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout4->addSpacing(10);
layout4->addSpacing(10);
TQVButtonGroup *optim_group2 = new TQVButtonGroup(i18n("Optimization Levels"), this);
m_default2 = new TQRadioButton(i18n("Default"), optim_group2);
@ -379,11 +379,11 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
"-O2", i18n("Level 2"));
optim2 = new FlagRadioButton(optim_group2, optimController,
"-O3", i18n("Level 3"));
tqlayout4->addWidget(optim_group2);
layout4->addWidget(optim_group2);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout4->addSpacing(10);
layout4->addSpacing(10);
TQHBoxLayout *tqlayout5 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
TQHBoxLayout *layout5 = new TQHBoxLayout(layout, KDialog::spacingHint());
TQVButtonGroup *optim_group3 = new TQVButtonGroup(i18n("Architecture"), this);
m_default3 = new TQRadioButton(i18n("Default"), optim_group3);
@ -394,7 +394,7 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
"-Op2", i18n("Pentium/PentiumMMX"));
new FlagRadioButton(optim_group3, optimController,
"-Op2", i18n("PentiumPro/PII/Cyrix 6x86/K6"));
tqlayout5->addWidget(optim_group3);
layout5->addWidget(optim_group3);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
TQVButtonGroup *optim_group4 = new TQVButtonGroup(i18n("Another Optimization"), this);
@ -402,18 +402,18 @@ DebugOptimTab::DebugOptimTab( TQWidget * parent, const char * name )
"-Or", i18n("Use register variables"), "-!Or");
new FlagCheckBox(optim_group4, controller,
"-Ou", i18n("Uncertain optimizations"), "-!Ou");
tqlayout5->addWidget(optim_group4);
layout5->addWidget(optim_group4);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
TQHBoxLayout *tqlayout6 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
TQHBoxLayout *layout6 = new TQHBoxLayout(layout, KDialog::spacingHint());
TQPushButton *release = new TQPushButton(i18n("Release"), this);
TQPushButton *debug = new TQPushButton(i18n("Debug"), this);
tqlayout6->addWidget(release);
tqlayout6->addWidget(debug);
layout6->addWidget(release);
layout6->addWidget(debug);
connect(release, TQT_SIGNAL(clicked()), this, TQT_SLOT(setReleaseOptions()));
connect(debug, TQT_SIGNAL(clicked()), this, TQT_SLOT(setDebugOptions()));
tqlayout->addStretch();
layout->addStretch();
}
DebugOptimTab::~ DebugOptimTab( )
@ -458,8 +458,8 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
: TQWidget(parent, name), controller(new FlagCheckBoxController()),
listController(new FlagEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
TQVButtonGroup *compile_group = new TQVButtonGroup(i18n("Compile Time Checks"), this);
new FlagCheckBox(compile_group, controller,
@ -467,7 +467,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
new FlagCheckBox(compile_group, controller,
"-Un", i18n("Do not check the unit name for being the same as the file name"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *run_group = new TQVButtonGroup(i18n("Run Time Checks"), this);
new FlagCheckBox(run_group, controller,
@ -479,14 +479,14 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
new FlagCheckBox(run_group, controller,
"-Co", i18n("Integer overflow checking"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
new FlagListEdit(this, ":", listController, "-d", i18n("Conditional defines (delimited by \":\"):"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
new FlagListEdit(this, ":", listController, "-u", i18n("Undefine conditional defines (delimited by \":\"):"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
new FlagSpinEdit(this, 1024, 67107840, 1, 131072, listController,
"-Cs", i18n("Stack size:"));
@ -494,7 +494,7 @@ CodegenTab::CodegenTab( TQWidget * parent, const char * name )
"-Ch", i18n("Heap size:"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
CodegenTab::~ CodegenTab( )
@ -519,9 +519,9 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
: TQWidget(parent, name), controller(new FlagCheckBoxController()),
listController(new FlagEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
TQBoxLayout *layout2 = new TQHBoxLayout(layout, KDialog::spacingHint());
TQVButtonGroup *link_group = new TQVButtonGroup(i18n("Linking Stage"), this);
new FlagCheckBox(link_group, controller,
@ -534,7 +534,7 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
"-Cn", i18n("Omit the linking stage"));
new FlagCheckBox(link_group, controller,
"-s", i18n("Create assembling and linking script"));
tqlayout2->addWidget(link_group);
layout2->addWidget(link_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
TQVButtonGroup *exec_group = new TQVButtonGroup(i18n("Executable Generation"), this);
@ -548,15 +548,15 @@ LinkerTab::LinkerTab( TQWidget * parent, const char * name )
"-XD", i18n("Link with dynamic libraries"));
new FlagCheckBox(exec_group, controller,
"-Xc", i18n("Link with the C library"));
tqlayout2->addWidget(exec_group);
layout2->addWidget(exec_group);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
FlagListEdit *led = new FlagListEdit(this, ":", listController, "-k", i18n("Options passed to the linker (delimited by \":\"):"));
tqlayout->addWidget(led);
layout->addWidget(led);
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addStretch();
layout->addStretch();
}
LinkerTab::~LinkerTab( )
@ -583,8 +583,8 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
pathController(new FlagPathEditController()),
editController(new FlagEditController())
{
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
tqlayout->setAutoAdd(true);
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
layout->setAutoAdd(true);
new FlagCheckBox(this, controller,
"-B", i18n("Recompile all used units"));
@ -595,7 +595,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
new FlagSpinEdit(this, 1, 1000, 1, 50, editController,
"-Se", i18n("Stop after the error:"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *browser_group = new TQVButtonGroup(i18n("Browser Info"), this);
TQRadioButton *m_defaultBrowser = new TQRadioButton(i18n("No browser info"), browser_group);
@ -605,7 +605,7 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
new FlagRadioButton(browser_group, radioController,
"-bl", i18n("Global and local browser info"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
TQVButtonGroup *target_group = new TQVButtonGroup(i18n("Target OS"), this);
TQRadioButton *m_defaultTarget = new TQRadioButton(i18n("Default"), target_group);
@ -625,9 +625,9 @@ MiscTab::MiscTab( TQWidget * parent, const char * name )
new FlagRadioButton(target_group, radioController,
"-TBEOS", i18n("BeOS"));
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
tqlayout->addSpacing(10);
layout->addSpacing(10);
tqlayout->addStretch();
layout->addStretch();
}
MiscTab::~ MiscTab( )

@ -14,7 +14,7 @@
<tocsect1 name="Modules: how to write and use" url="man:perlmodlib"/>
<tocsect1 name="Modules: how to install from CPAN" url="man:perlmodinstall"/>
<tocsect1 name="Formats" url="man:perlform"/>
<tocsect1 name="Unicode Support" url="man:perltqunicode"/>
<tocsect1 name="Unicode Support" url="man:perlunicode"/>
<tocsect1 name="Locale Support" url="man:perllocale"/>
<tocsect1 name="References Introduction" url="man:perlreftut"/>
<tocsect1 name="References, the rest of the story" url="man:perlref"/>

@ -557,11 +557,11 @@
<tocsect2 name="Predefined Constants" url="recode.constants.php"/>
<tocsect2 name="Recode Functions" url="ref.recode.php"/>
</tocsect1>
<tocsect1 name="Unicode" url="book.tqunicode.php">
<tocsect2 name="Introduction" url="intro.tqunicode.php"/>
<tocsect2 name="Installing/Configuring" url="tqunicode.setup.php"/>
<tocsect2 name="Predefined Constants" url="tqunicode.constants.php"/>
<tocsect2 name="Unicode Functions" url="ref.tqunicode.php"/>
<tocsect1 name="Unicode" url="book.unicode.php">
<tocsect2 name="Introduction" url="intro.unicode.php"/>
<tocsect2 name="Installing/Configuring" url="unicode.setup.php"/>
<tocsect2 name="Predefined Constants" url="unicode.constants.php"/>
<tocsect2 name="Unicode Functions" url="ref.unicode.php"/>
</tocsect1>
<tocsect1 name="Exif" url="book.exif.php">
<tocsect2 name="Introduction" url="intro.exif.php"/>
@ -3644,12 +3644,12 @@
<entry name="recode_file" url="function.recode-file.php"/>
<entry name="recode_string" url="function.recode-string.php"/>
<entry name="recode" url="function.recode.php"/>
<entry name="tqunicode_decode" url="function.tqunicode-decode.php"/>
<entry name="tqunicode_encode" url="function.tqunicode-encode.php"/>
<entry name="tqunicode_get_error_mode" url="function.tqunicode-get-error-mode.php"/>
<entry name="tqunicode_get_subst_char" url="function.tqunicode-get-subst-char.php"/>
<entry name="tqunicode_set_error_mode" url="function.tqunicode-set-error-mode.php"/>
<entry name="tqunicode_set_subst_char" url="function.tqunicode-set-subst-char.php"/>
<entry name="unicode_decode" url="function.unicode-decode.php"/>
<entry name="unicode_encode" url="function.unicode-encode.php"/>
<entry name="unicode_get_error_mode" url="function.unicode-get-error-mode.php"/>
<entry name="unicode_get_subst_char" url="function.unicode-get-subst-char.php"/>
<entry name="unicode_set_error_mode" url="function.unicode-set-error-mode.php"/>
<entry name="unicode_set_subst_char" url="function.unicode-set-subst-char.php"/>
<entry name="exif_imagetype" url="function.exif-imagetype.php"/>
<entry name="exif_read_data" url="function.exif-read-data.php"/>
<entry name="exif_tagname" url="function.exif-tagname.php"/>
@ -6571,7 +6571,7 @@
<entry name="is_resource" url="function.is-resource.php"/>
<entry name="is_scalar" url="function.is-scalar.php"/>
<entry name="is_string" url="function.is-string.php"/>
<entry name="is_tqunicode" url="function.is-tqunicode.php"/>
<entry name="is_unicode" url="function.is-unicode.php"/>
<entry name="isset" url="function.isset.php"/>
<entry name="print_r" url="function.print-r.php"/>
<entry name="serialize" url="function.serialize.php"/>

@ -351,7 +351,7 @@ the internal web browser. Please make sure that the webserver was compiled with
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -405,7 +405,7 @@ the internal web browser. Please make sure that the webserver was compiled with
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -451,7 +451,7 @@ the internal web browser. Please make sure that the webserver was compiled with
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">

@ -31,7 +31,7 @@ class %{APPNAMESC}View < Qt::Widget
# keep a reference to the DCOP Interface so it doesn't get gc'd
@dcop = %{APPNAMESC}Iface.new(self)
# setup our tqlayout manager to automatically add our widgets
# setup our layout manager to automatically add our widgets
top_layout = Qt::HBoxLayout.new(self)
top_layout.setAutoAdd(true)

@ -19,8 +19,8 @@ class %{APPNAMESC}PrefPageOne < Qt::Frame
def initialize(parent)
super(parent)
tqlayout = Qt::HBoxLayout.new(self)
tqlayout.setAutoAdd(true)
layout = Qt::HBoxLayout.new(self)
layout.setAutoAdd(true)
Qt::Label.new(i18n("Add something here"), self)
end
@ -30,8 +30,8 @@ class %{APPNAMESC}PrefPageTwo < Qt::Frame
def initialize(parent)
super(parent)
tqlayout = Qt::HBoxLayout.new(self)
tqlayout.setAutoAdd(true)
layout = Qt::HBoxLayout.new(self)
layout.setAutoAdd(true)
Qt::Label.new(i18n("Add something here"), self)
end

@ -75,7 +75,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name)
TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok());
buttonbox->addStretch();
TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel());
buttonbox->tqlayout();
buttonbox->layout();
topLayout->addWidget(buttonbox);
connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));

@ -202,7 +202,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item)
emit removeWatchExpression(((WatchVarItem*)item)->displayId());
delete item;
} else if (res == idCopyToClipboard) {
TQClipboard *qb = KApplication::tqclipboard();
TQClipboard *qb = KApplication::clipboard();
TQString text = "{ \"" + item->text( VAR_NAME_COLUMN ) + "\", " +
"\"" + item->text( VALUE_COLUMN ) + "\" }";

@ -18,7 +18,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">

@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -67,8 +67,8 @@ SqlOutputWidget::SqlOutputWidget ( TQWidget* parent, const char* name ) :
m_stack->addWidget( m_textEdit );
m_stack->addWidget( m_table );
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
tqlayout->addWidget( m_stack );
TQVBoxLayout* layout = new TQVBoxLayout( this );
layout->addWidget( m_stack );
}
SqlOutputWidget::~SqlOutputWidget()

@ -71,8 +71,8 @@ TQString SQLSupportPart::cryptStr(const TQString& aStr)
{
TQString result;
for (unsigned int i = 0; i < aStr.length(); i++)
result += (aStr[i].tqunicode() < 0x20) ? aStr[i] :
TQChar(0x1001F - aStr[i].tqunicode());
result += (aStr[i].unicode() < 0x20) ? aStr[i] :
TQChar(0x1001F - aStr[i].unicode());
return result;
}

@ -184,7 +184,7 @@ int Lexer::toInt( const Token& token )
int i = s[0] == 'L' ? 2 : 1; // wide char ?
if( s[i] == '\\' ){
// escaped char
int c = s[i+1].tqunicode();
int c = s[i+1].unicode();
switch( c ) {
case '0':
return 0;
@ -195,7 +195,7 @@ int Lexer::toInt( const Token& token )
return c;
}
} else {
return s[i].tqunicode();
return s[i].unicode();
}
} else {
return 0;

@ -244,11 +244,11 @@ public:
int currentColumn() const { return m_currentColumn; }
inline const CHARTYPE* offset( int offset ) const {
return m_source.tqunicode() + offset;
return m_source.unicode() + offset;
}
inline int getOffset( const TQChar* p ) const {
return int(p - (m_source.tqunicode()));
return int(p - (m_source.unicode()));
}
private:

@ -30,7 +30,7 @@ size_t hashStringSafe( const TQString& str ) {
size_t hash = 0;
int len = str.length();
for( int a = 0; a < len; a++ ) {
hash = str[a].tqunicode() + (hash * 17);
hash = str[a].unicode() + (hash * 17);
}
return hash;
}
@ -43,12 +43,12 @@ size_t HashedString::hashString( const TQString& str )
size_t fastHashString( const TQString& str ) {
size_t hash = 0;
if( !str.isEmpty() ) {
const TQChar* curr = str.tqunicode();
const TQChar* curr = str.unicode();
const TQChar* end = curr + str.length();
TQChar c;
for(; curr < end ;) {
c = *curr;
hash = c.tqunicode() + ( hash * 17 );
hash = c.unicode() + ( hash * 17 );
++curr;
}
}

@ -303,7 +303,7 @@ TQString URLUtil::envExpand ( const TQString& str )
if (pos < 0)
pos = len;
char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() );
char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() );
if (ret)
{

@ -114,7 +114,7 @@ void FancyListViewItem::paintCell( TQPainter *painter, const TQColorGroup &cg,
if ( isEnabled() || !lv )
p->setPen( cg.text() );
else if ( !isEnabled() && lv)
p->setPen( lv->tqpalette().disabled().text() );
p->setPen( lv->palette().disabled().text() );
int iconWidth = 0;

@ -306,22 +306,22 @@ FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter,
{
TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1);
topLayout->addWidget(new TQLabel(description, this));
TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
if (delimiter.isEmpty())
{
url = new KURLRequester(this);
url->setMode(mode);
tqlayout->addWidget(url);
layout->addWidget(url);
}
else
{
edit = new KLineEdit(this);
tqlayout->addWidget(edit);
layout->addWidget(edit);
details = new TQPushButton("...", this);
details->setMaximumWidth(30);
connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPathDetails()));
tqlayout->addWidget(details);
layout->addWidget(details);
}
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);
@ -532,16 +532,16 @@ FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditC
{
TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1);
topLayout->addWidget(new TQLabel(description, this));
TQBoxLayout *tqlayout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
TQBoxLayout *layout = new TQHBoxLayout(topLayout, KDialog::spacingHint());
edit = new KLineEdit(this);
tqlayout->addWidget(edit);
layout->addWidget(edit);
if (! listDelimiter.isEmpty())
{
details = new TQPushButton("...", this);
details->setMaximumWidth(30);
connect(details, TQT_SIGNAL(clicked()), this, TQT_SLOT(showListDetails()));
tqlayout->addWidget(details);
layout->addWidget(details);
}
TQApplication::sendPostedEvents(this, TQEvent::ChildInserted);

@ -495,7 +495,7 @@ void KDevHTMLPart::slotCopy( )
{
TQString text = selectedText();
text.replace( TQChar( 0xa0 ), ' ' );
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
cb->setText(text);
connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );

@ -73,7 +73,7 @@ void ProcessListBoxItem::paint(TQPainter *p)
{
TQColor dim, warn, err, back;
if (listBox()) {
const TQColorGroup& group = listBox()->tqpalette().active();
const TQColorGroup& group = listBox()->palette().active();
if (isSelected()) {
back = group.button();
warn = group.buttonText();

@ -105,7 +105,7 @@ public:
//predefined custom types
ValueFromList = 2000 /**<string value from a list*/,
Symbol = 2001 /**<tqunicode symbol code*/,
Symbol = 2001 /**<unicode symbol code*/,
FontName = 2002 /**<font name, e.g. "times new roman"*/,
FileURL = 2003 /**<url of a file*/,
DirectoryURL = 2004 /**<url of a directory*/,

@ -58,7 +58,7 @@ PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char
TQVariant PSymbolCombo::value() const
{
if (!(m_edit->text().isNull()))
return TQVariant(TQString("%1").arg(m_edit->text().at(0).tqunicode()));
return TQVariant(TQString("%1").arg(m_edit->text().at(0).unicode()));
else
return TQVariant(0);
}
@ -109,7 +109,7 @@ void PSymbolCombo::selectChar()
void PSymbolCombo::updateProperty(const TQString& val)
{
emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).tqunicode())));
emit propertyChanged(m_property, TQVariant(TQString("%1").arg(val.at(0).unicode())));
}
void PSymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)

@ -81,7 +81,7 @@ void QComboViewData::updateLinedGeometry()
{
if ( !ed || !combo )
return;
TQRect r = TQStyle::visualRect( combo->tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, combo,
TQRect r = TQStyle::visualRect( combo->style().querySubControlMetrics(TQStyle::CC_ComboBox, combo,
TQStyle::SC_ComboBoxEditField), combo );
// qWarning("updateLinedGeometry(): currentItem is %d", combo->currentItem() == 0 ? 0 : 1);
@ -290,7 +290,7 @@ TQSize QComboView::sizeHint() const
maxW = w;
}
*/
d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, this,
d->sizeHint = (style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut()));
return d->sizeHint;
@ -428,13 +428,13 @@ void QComboView::paintEvent( TQPaintEvent * )
}
// bool reverse = TQApplication::reverseLayout();
tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
flags, TQStyle::SC_All,
(d->arrowDown ?
TQStyle::SC_ComboBoxArrow :
TQStyle::SC_None ));
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxEditField );
re = TQStyle::visualRect(re, this);
p.setClipRect( re );
@ -472,7 +472,7 @@ void QComboView::mousePressEvent( TQMouseEvent *e )
d->discardNextMousePress = FALSE;
return;
}
TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
arrowRect = TQStyle::visualRect(arrowRect, this);
@ -749,7 +749,7 @@ void QComboView::popup()
if (y + h > sy+sh && y - h - height() >= 0 )
y = y - h - height();
TQRect rect =
tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxListBoxPopup,
TQStyleOption( x, y, w, h ) );
if ( rect.isNull() )
@ -790,7 +790,7 @@ void QComboView::updateMask()
{
TQPainter p( &bm, this );
tqstyle().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect());
style().drawComplexControlMask(TQStyle::CC_ComboBox, &p, this, rect());
}
setMask( bm );
@ -902,7 +902,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
TQPoint comboPos;
comboPos = mapFromGlobal( d->listView()->mapToGlobal(pos) );
TQRect arrowRect =
tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
TQStyle::SC_ComboBoxArrow);
arrowRect = TQStyle::visualRect(arrowRect, this);
if ( arrowRect.contains( comboPos ) ) {
@ -918,7 +918,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
}
}
} else if ((e->state() & ( Qt::RightButton | Qt::LeftButton | Qt::MidButton ) ) == 0 &&
tqstyle().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) {
style().styleHint(TQStyle::SH_ComboBox_ListMouseTracking, this)) {
// qWarning("event filter:: emu");
TQWidget *mouseW = TQApplication::widgetAt( e->globalPos(), TRUE );
// if ( mouseW == d->listView()->viewport() ) { //###

@ -45,7 +45,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">

@ -179,7 +179,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@ -219,7 +219,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@ -345,7 +345,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -388,7 +388,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -422,7 +422,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">

@ -4565,7 +4565,7 @@ func_mode_link ()
continue
;;
# Tru64 UNIX uses -model [arg] to determine the tqlayout of C++
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
-model|-arch|-isysroot)

@ -322,7 +322,7 @@ Can use * on its own for any file.</string>
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@ -473,7 +473,7 @@ The number of spaces per tab is controled by the editor.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">

@ -49,7 +49,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -86,11 +86,11 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
class_tree = new ClassToolWidget(part, this);
// classTree->setMinimumSize( 500, 400 );
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQHBoxLayout *firstrowLayout = new TQHBoxLayout();
TQHBoxLayout *secondrowLayout = new TQHBoxLayout();
tqlayout->addLayout(firstrowLayout);
tqlayout->addLayout(secondrowLayout);
layout->addLayout(firstrowLayout);
layout->addLayout(secondrowLayout);
firstrowLayout->addWidget(class_combo, 1);
firstrowLayout->addWidget(close_button, 0);
@ -104,7 +104,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
secondrowLayout->addWidget(attributes_button);
secondrowLayout->addWidget(access_combo);
tqlayout->addWidget(class_tree, 10);
layout->addWidget(class_tree, 10);
connect( class_combo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotClassComboChoice(const TQString&)) );

@ -55,16 +55,16 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
digraph = new DigraphView(splitter, "digraph view");
// member_tree = new ClassToolWidget(part, splitter);
TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQBoxLayout *combo_layout = new TQHBoxLayout();
tqlayout->addLayout(combo_layout);
layout->addLayout(combo_layout);
combo_layout->addWidget(namespace_combo);
combo_layout->addWidget(class_combo);
combo_layout->addSpacing(60);
combo_layout->addWidget(refresh_button);
combo_layout->addWidget(save_button);
combo_layout->addWidget(close_button);
tqlayout->addWidget(splitter);
layout->addWidget(splitter);
connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)),
this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) );

@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">

@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -214,7 +214,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@ -248,7 +248,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
<cstring>tqlayout21</cstring>
<cstring>layout21</cstring>
</property>
<grid>
<property name="name">

@ -71,7 +71,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">

@ -22,8 +22,8 @@ DiffDlg::DiffDlg( TQWidget *parent, const char *name ):
diffWidget = new DiffWidget( this, "Main Diff Widget" );
setMainWidget( diffWidget );
TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, spacingHint() );
tqlayout->addWidget( diffWidget );
TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() );
layout->addWidget( diffWidget );
}
DiffDlg::~DiffDlg()

@ -192,8 +192,8 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl
// te->setMinimumSize( 300, 200 );
connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
tqlayout->addWidget( te );
TQVBoxLayout* layout = new TQVBoxLayout( this );
layout->addWidget( te );
}
DiffWidget::~DiffWidget()
@ -233,7 +233,7 @@ void DiffWidget::loadExtPart( const TQString& partName )
if ( !extPart || !extPart->widget() )
return;
tqlayout()->add( extPart->widget() );
layout()->add( extPart->widget() );
setExtPartVisible( true );

@ -314,7 +314,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout12</cstring>
<cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@ -322,7 +322,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@ -646,7 +646,7 @@ changes project compiled version number</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@ -654,7 +654,7 @@ changes project compiled version number</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -702,7 +702,7 @@ Build Files</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout16</cstring>
<cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@ -710,7 +710,7 @@ Build Files</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout14</cstring>
<cstring>layout14</cstring>
</property>
<vbox>
<property name="name">
@ -755,7 +755,7 @@ Build Files</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout15</cstring>
<cstring>layout15</cstring>
</property>
<vbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout20</cstring>
<cstring>layout20</cstring>
</property>
<grid>
<property name="name">

@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@ -141,7 +141,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<grid>
<property name="name">

@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">

@ -209,7 +209,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
p->fillRect(0, 0, width, height(), cg.brush(crole));
TQFontMetrics fm(lv->fontMetrics());
int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int styleflags = TQStyle::Style_Default;
@ -229,7 +229,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
y = (fm.height() + 2 + marg - boxsize) / 2;
TQStyleOption opt(this);
lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt);
return;
@ -240,7 +240,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const
{
if ((c == 0) || (c == 1) || (c == 2))
return lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
return lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
return TQListViewItem::width(fm, lv, c);
}

@ -3773,12 +3773,12 @@ void Config::create()
);
cs->setWidgetType(ConfigString::File);
cs = addString( "LAYOUT_FILE",
"The LAYOUT_FILE tag can be used to specify a tqlayout file which will be parsed by \n"
"doxygen. The tqlayout file controls the global structure of the generated output files \n"
"in an output format independent way. The create the tqlayout file that represents \n"
"The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n"
"doxygen. The layout file controls the global structure of the generated output files \n"
"in an output format independent way. The create the layout file that represents \n"
"doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n"
"file name after the option, if omitted DoxygenLayout.xml will be used as the name \n"
"of the tqlayout file.\n"
"of the layout file.\n"
);
cs->setWidgetType(ConfigString::File);
addObsolete("DETAILS_AT_TOP");
@ -4857,7 +4857,7 @@ void Config::create()
cs = addString( "DOT_FONTNAME",
"By default doxygen will write a font called FreeSans.ttf to the output \n"
"directory and reference it in all dot files that doxygen generates. This \n"
"font does not include all possible tqunicode characters however, so when you need \n"
"font does not include all possible unicode characters however, so when you need \n"
"these (or just want a differently looking font) you can specify the font name \n"
"using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n"
"which can be done by putting it in a standard location or by setting the \n"

@ -113,13 +113,13 @@ const char **update_xpm = (const char **)update_xpm_data;
InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag)
: TQWidget(parent), state(flag), key(k)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
TQHBoxLayout *layout = new TQHBoxLayout(this);
cb = new TQCheckBox(text,this);
init();
tqlayout->addWidget(cb);
tqlayout->addStretch(1);
layout->addWidget(cb);
layout->addStretch(1);
connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool)));
}
@ -154,16 +154,16 @@ void InputBool::setEnabled(bool b)
InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal)
: TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
sp = new TQSpinBox(minVal, maxVal, 1, this);
lab = new TQLabel(sp, label+":", this);
init();
tqlayout->addWidget(lab);
tqlayout->addWidget(sp);
tqlayout->addStretch(1);
layout->addWidget(lab);
layout->addWidget(sp);
layout->addStretch(1);
connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
}
@ -203,25 +203,25 @@ InputString::InputString(const TQString & label,
le = 0; br = 0; com = 0;
if (m == StringFixed) {
TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
com = new TQComboBox(this);
lab = new TQLabel(com,label+":", this);
tqlayout->addWidget(lab);
tqlayout->addWidget(com);
tqlayout->addStretch(1);
layout->addWidget(lab);
layout->addWidget(com);
layout->addStretch(1);
} else {
TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
le = new KLineEdit(this);
lab = new TQLabel(le,label+":", this);
tqlayout->addWidget(lab, 0, 0);
layout->addWidget(lab, 0, 0);
le->setText(s);
tqlayout->addWidget(le, 0, 1);
layout->addWidget(le, 0, 1);
if (m == StringFile || m == StringDir) {
br = new TQPushButton(this);
br->setPixmap(SmallIcon(m==StringFile? "document" : "folder"));
TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
tqlayout->addWidget(br, 0, 2);
layout->addWidget(br, 0, 2);
}
}
@ -327,29 +327,29 @@ InputStrList::InputStrList(const TQString & label,
TQWidget *parent, TQStrList &sl, ListMode lm)
: TQWidget(parent), strList(sl)
{
TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5);
TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5);
TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5);
TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5);
le = new KLineEdit(dw);
lab = new TQLabel(le,label+":", this );
tqlayout->addWidget(lab, 0, 0);
boxtqlayout->addWidget(le, 1);
layout->addWidget(lab, 0, 0);
boxlayout->addWidget(le, 1);
add = new TQPushButton(dw);
add->setPixmap(TQPixmap( add_xpm ));
TQToolTip::add(add, i18n("Add item"));
boxtqlayout->addWidget(add);
boxlayout->addWidget(add);
del = new TQPushButton(dw);
del->setPixmap(TQPixmap( del_xpm ));
TQToolTip::add(del, i18n("Delete selected item"));
boxtqlayout->addWidget(del);
boxlayout->addWidget(del);
upd = new TQPushButton(dw);
upd->setPixmap(TQPixmap( update_xpm ));
TQToolTip::add(upd, i18n("Update selected item"));
boxtqlayout->addWidget(upd);
boxlayout->addWidget(upd);
lb = new TQListBox(this);
lb->setMinimumSize(400, 100);
@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label,
brFile = new TQPushButton(dw);
brFile->setPixmap(SmallIcon("document"));
TQToolTip::add(brFile, i18n("Browse to a file"));
boxtqlayout->addWidget(brFile);
boxlayout->addWidget(brFile);
}
if (lm & ListDir) {
brDir = new TQPushButton(dw);
brDir->setPixmap(SmallIcon("folder"));
TQToolTip::add(brDir, i18n("Browse to a folder"));
boxtqlayout->addWidget(brDir);
boxlayout->addWidget(brDir);
}
}
tqlayout->addWidget(dw, 0, 1);
tqlayout->addWidget(lb, 1, 1);
layout->addWidget(dw, 0, 1);
layout->addWidget(lb, 1, 1);
connect( le, TQT_SIGNAL(returnPressed()),
this, TQT_SLOT(addString()) );

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -56,7 +56,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@ -110,7 +110,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout3_2</cstring>
<cstring>layout3_2</cstring>
</property>
<vbox>
<property name="name">
@ -140,7 +140,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@ -194,7 +194,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -24,7 +24,7 @@
<height>33</height>
</rect>
</property>
<tqlayout class=TQHBOXLAYOUT_OBJECT_NAME_STRING >
<layout class=TQHBOXLAYOUT_OBJECT_NAME_STRING >
<property name="margin" >
<number>0</number>
</property>
@ -58,7 +58,7 @@
</property>
</widget>
</item>
</tqlayout>
</layout>
</widget>
</widget>
<pixmapfunction></pixmapfunction>

@ -24,7 +24,7 @@
<height>106</height>
</rect>
</property>
<tqlayout class=TQVBOXLAYOUT_OBJECT_NAME_STRING >
<layout class=TQVBOXLAYOUT_OBJECT_NAME_STRING >
<property name="margin" >
<number>0</number>
</property>
@ -58,7 +58,7 @@
</property>
</spacer>
</item>
</tqlayout>
</layout>
</widget>
</widget>
<pixmapfunction></pixmapfunction>

@ -35,10 +35,10 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
TQFontMetrics fm(pattern_edit->fontMetrics());
pattern_edit->setMinimumWidth(fm.width('X')*35);
connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
TQGridLayout *grid = new TQGridLayout(2, 2);
tqlayout->addLayout(grid);
layout->addLayout(grid);
grid->addWidget(title_label, 0, 0);
grid->addWidget(title_edit, 0, 1);
grid->addWidget(pattern_label, 1, 0);
@ -46,7 +46,7 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
TQFrame *frame = new TQFrame(this);
frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
tqlayout->addWidget(frame, 0);
layout->addWidget(frame, 0);
KButtonBox *buttonbox = new KButtonBox(this);
buttonbox->addStretch();
@ -56,8 +56,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
m_pOk->setDefault(true);
connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
buttonbox->tqlayout();
tqlayout->addWidget(buttonbox, 0);
buttonbox->layout();
layout->addWidget(buttonbox, 0);
slotTextChanged();
}

@ -50,7 +50,7 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
m_filetree->setIcon(SmallIcon("folder"));
TQWhatsThis::add(m_filetree, i18n("<b>File tree</b><p>"
"The file viewer shows all files of the project "
"in a tree tqlayout."));
"in a tree layout."));
TQHBox* filterBox = new TQHBox( this );
m_btnFilter = new TQToolButton( filterBox );

@ -31,18 +31,18 @@
ShellFilterDialog::ShellFilterDialog()
: TQDialog(0, "shell filter dialog", true)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
combo = new TQComboBox(true, this);
combo->setDuplicatesEnabled(false);
tqlayout->addWidget(combo);
layout->addWidget(combo);
KButtonBox *buttonbox = new KButtonBox(this);
start_button = buttonbox->addButton(i18n("&Start"));
start_button->setDefault(true);
cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
buttonbox->tqlayout();
tqlayout->addWidget(buttonbox);
buttonbox->layout();
layout->addWidget(buttonbox);
connect( start_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotStartClicked()) );

@ -32,18 +32,18 @@
ShellInsertDialog::ShellInsertDialog()
: TQDialog(0, "shell filter dialog", true)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
combo = new TQComboBox(true, this);
combo->setDuplicatesEnabled(false);
tqlayout->addWidget(combo);
layout->addWidget(combo);
KButtonBox *buttonbox = new KButtonBox(this);
start_button = buttonbox->addButton(i18n("&Start"));
start_button->setDefault(true);
cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
buttonbox->tqlayout();
tqlayout->addWidget(buttonbox);
buttonbox->layout();
layout->addWidget(buttonbox);
connect( start_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotStartClicked()) );

@ -88,25 +88,25 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
config = GrepViewFactory::instance()->config();
config->setGroup("GrepDialog");
TQGridLayout *tqlayout = new TQGridLayout(this, 9, 2, 10, 4);
tqlayout->setColStretch(0, 0);
tqlayout->setColStretch(1, 20);
TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4);
layout->setColStretch(0, 0);
layout->setColStretch(1, 20);
TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this);
tqlayout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
pattern_combo = new KHistoryCombo(true, this);
pattern_label->setBuddy(pattern_combo);
pattern_combo->setFocus();
pattern_combo->setHistoryItems(config->readListEntry("LastSearchItems"), true);
pattern_combo->setInsertionPolicy(TQComboBox::NoInsertion);
tqlayout->addWidget(pattern_combo, 0, 1);
layout->addWidget(pattern_combo, 0, 1);
TQLabel *template_label = new TQLabel(i18n("&Template:"), this);
tqlayout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
TQBoxLayout *template_layout = new TQHBoxLayout(4);
tqlayout->addLayout(template_layout, 1, 1);
layout->addLayout(template_layout, 1, 1);
template_edit = new KLineEdit(this);
template_label->setBuddy(template_edit);
@ -118,7 +118,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
template_layout->addWidget(template_combo, 0);
TQBoxLayout *search_opts_layout = new TQHBoxLayout(15);
tqlayout->addLayout(search_opts_layout, 2, 1);
layout->addLayout(search_opts_layout, 2, 1);
regexp_box = new TQCheckBox(i18n("&Regular Expression"), this);
regexp_box->setChecked(config->readBoolEntry("regexp", false ));
@ -130,10 +130,10 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
search_opts_layout->addWidget(case_sens_box);
TQLabel *dir_label = new TQLabel(i18n("&Directory:"), this);
tqlayout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
TQBoxLayout *dir_layout = new TQHBoxLayout(4);
tqlayout->addLayout(dir_layout, 3, 1);
layout->addLayout(dir_layout, 3, 1);
dir_combo = new KComboBox( true, this );
dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths"));
@ -158,7 +158,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
dir_layout->addWidget( synch_button );
TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15);
tqlayout->addLayout(dir_opts_layout, 4, 1);
layout->addLayout(dir_opts_layout, 4, 1);
recursive_box = new TQCheckBox(i18n("Rec&ursive"), this);
recursive_box->setChecked(config->readBoolEntry("recursive", true));
@ -170,15 +170,15 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
dir_opts_layout->addWidget(use_project_box);
TQLabel *files_label = new TQLabel(i18n("&Files:"), this);
tqlayout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
files_combo = new KComboBox(true, this);
files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy()));
files_combo->insertStrList(filepatterns);
tqlayout->addWidget(files_combo, 5, 1);
layout->addWidget(files_combo, 5, 1);
TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this);
tqlayout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
TQStringList exclude_list = config->readListEntry("exclude_patterns");
exclude_combo = new KComboBox(true, this);
@ -191,10 +191,10 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
exclude_combo->insertItem("/CVS/,/SCCS/,/\\.svn/,/_darcs/");
exclude_combo->insertItem("");
}
tqlayout->addWidget(exclude_combo, 6, 1);
layout->addWidget(exclude_combo, 6, 1);
TQBoxLayout *other_opts_layout = new TQHBoxLayout(15);
tqlayout->addLayout(other_opts_layout, 7, 1);
layout->addLayout(other_opts_layout, 7, 1);
keep_output_box = new TQCheckBox(i18n("New view"), this);
keep_output_box->setChecked(config->readBoolEntry("new_view", true));
@ -206,7 +206,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
other_opts_layout->addWidget(no_find_err_box);
TQBoxLayout *button_layout = new TQHBoxLayout(4);
tqlayout->addLayout(button_layout, 8, 1);
layout->addLayout(button_layout, 8, 1);
search_button = new KPushButton(KGuiItem(i18n("Sea&rch"),"grep"), this);
search_button->setDefault(true);
KPushButton *done_button = new KPushButton(KStdGuiItem::cancel(), this);

@ -73,7 +73,7 @@ void GrepListBoxItem::paint(TQPainter *p)
{
TQColor base, dim, result, bkground;
if (listBox()) {
const TQColorGroup& group = listBox()->tqpalette().active();
const TQColorGroup& group = listBox()->palette().active();
if (isSelected()) {
bkground = group.button();
base = group.buttonText();
@ -126,7 +126,7 @@ void GrepListBoxItem::paint(TQPainter *p)
GrepViewWidget::GrepViewWidget(GrepViewPart *part) : TQWidget(0, "grepview widget")
{
m_layout = new TQHBoxLayout(this, 0, -1, "greptqlayout");
m_layout = new TQHBoxLayout(this, 0, -1, "greplayout");
m_tabWidget = new KTabWidget(this);

@ -339,7 +339,7 @@ void AppOutputWidget::copySelected()
if (isSelected(i))
buffer += item(i)->text() + "\n";
}
kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
}
void AppOutputWidget::addPartialStderrLine(const TQCString & line)

@ -342,7 +342,7 @@ void MakeWidget::copy()
selection.replace("&quot;","\"");
selection.replace("&amp;","&");
kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard);
kapp->clipboard()->setText(selection, TQClipboard::Clipboard);
}
void MakeWidget::nextError()

@ -121,7 +121,7 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent )
m_resultsList->sizePolicy().hasHeightForWidth() ) );
TQWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") );
m_base->resultsLabel->setBuddy(m_resultsList);
m_base->tqlayout()->add( m_resultsList );
m_base->layout()->add( m_resultsList );
setMainWidget( m_base );
m_base->typeCombo->lineEdit()->setFocus();

@ -72,7 +72,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@ -120,7 +120,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<vbox>
<property name="name">

@ -226,7 +226,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -65,8 +65,8 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
_terminateOperation( false )
{
// setup outputview
TQVBoxLayout * tqlayout = new TQVBoxLayout( this );
TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout );
TQVBoxLayout * layout = new TQVBoxLayout( this );
TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout );
_cancel = new KPushButton( KStdGuiItem::cancel(), this );
_replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this );
@ -74,11 +74,11 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
_cancel->setEnabled( false );
_replace->setEnabled( false );
buttontqlayout->addWidget( _replace );
buttontqlayout->addWidget( _cancel );
buttonlayout->addWidget( _replace );
buttonlayout->addWidget( _cancel );
_listview = new ReplaceView( this );
tqlayout->addWidget( _listview );
layout->addWidget( _listview );
// setup signals
connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) );

@ -93,7 +93,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -200,7 +200,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">

@ -90,7 +90,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
TQFontMetrics fm( lv->fontMetrics() );
int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int r = marg;
@ -116,7 +116,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
else
y = (fm.height() + 2 + marg - boxsize) / 2;
lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
TQRect(x, y, boxsize,
fm.height() + 2 + marg),
cg, styleflags, TQStyleOption(this));

@ -671,7 +671,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
TQDialog dlg(this);
dlg.setCaption(i18n("Enter Values for Variables"));
TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
@ -685,11 +685,11 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
labTop->sizePolicy().hasHeightForWidth() ) );
labTop->setText(i18n("Enter the replacement values for these variables:"));
layoutTop->addWidget(labTop, 0, 0);
tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
int i = 0; //walk through the variable map and add
for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout
for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout
if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
continue;
@ -716,7 +716,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
i++;
}
tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
@ -731,7 +731,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
btn2->sizePolicy().hasHeightForWidth() ) );
layoutBtn->addWidget( btn2, 0, 1 );
tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
// --END-- building a dynamic dialog
//connect the buttons to the TQDialog default slots
@ -780,7 +780,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
delete layoutTop;
delete layoutVar;
delete layoutBtn;
delete tqlayout;
delete layout;
if (i==0) //if nothing happened this means, that there are no variables to translate
return true; //.. so just return OK
@ -800,7 +800,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
TQDialog dlg(this);
dlg.setCaption(i18n("Enter Values for Variables"));
TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
@ -812,7 +812,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
labTop = new TQLabel( &dlg, "label" );
layoutTop->addWidget(labTop, 0, 0);
labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
cb = new TQCheckBox( &dlg, "cbVar" );
@ -832,7 +832,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
"If you use the same variable later, even in another snippet, the value entered to the right "
"will be the default value for that variable.") );
tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
@ -843,7 +843,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
btn2->setDefault( TRUE );
layoutBtn->addWidget( btn2, 0, 1 );
tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
te->setFocus();
// --END-- building a dynamic dialog
@ -875,7 +875,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
delete layoutTop;
delete layoutVar;
delete layoutBtn;
delete tqlayout;
delete layout;
return strReturn;
}

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -64,7 +64,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">

@ -123,7 +123,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -248,7 +248,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
void KDevApplicationTree::resizeEvent( TQResizeEvent * e)
{
setColumnWidth(0, width()-TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent));
setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent));
KListView::resizeEvent(e);
}

@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -107,7 +107,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -103,7 +103,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -149,7 +149,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@ -223,7 +223,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout3_2</cstring>
<cstring>layout3_2</cstring>
</property>
<grid>
<property name="name">

@ -60,13 +60,13 @@ LanguageSelectWidget::LanguageSelectWidget(TQDomDocument &projectDom,
void LanguageSelectWidget::init()
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
TQVBoxLayout *layout = new TQVBoxLayout(this);
TQGroupBox * groupBox1 = new TQGroupBox( i18n("Additional Language Support"), this );
groupBox1->setColumnLayout(0, Qt::Vertical );
groupBox1->tqlayout()->setSpacing( 6 );
groupBox1->tqlayout()->setMargin( 11 );
TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() );
groupBox1->layout()->setSpacing( 6 );
groupBox1->layout()->setMargin( 11 );
TQVBoxLayout * groupBox1Layout = new TQVBoxLayout( groupBox1->layout() );
groupBox1Layout->setAlignment( TQt::AlignTop );
_currentLanguage = new TQLabel( "", groupBox1 );
@ -78,13 +78,13 @@ void LanguageSelectWidget::init()
groupBox1Layout->addWidget(_currentLanguage);
groupBox1Layout->addWidget( _pluginList );
tqlayout->addWidget( groupBox1 );
layout->addWidget( groupBox1 );
TQGroupBox * groupBox2 = new TQGroupBox( i18n("Description"), this );
groupBox2->setColumnLayout(0, Qt::Vertical );
groupBox2->tqlayout()->setSpacing( 6 );
groupBox2->tqlayout()->setMargin( 11 );
TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() );
groupBox2->layout()->setSpacing( 6 );
groupBox2->layout()->setMargin( 11 );
TQVBoxLayout * groupBox2Layout = new TQVBoxLayout( groupBox2->layout() );
groupBox2Layout->setAlignment( TQt::AlignTop );
_pluginDescription = new TQLabel( groupBox2 );
@ -92,7 +92,7 @@ void LanguageSelectWidget::init()
groupBox2Layout->addWidget( _pluginDescription );
tqlayout->addWidget( groupBox2 );
layout->addWidget( groupBox2 );
connect( _pluginList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, TQT_SLOT( itemSelected( TQListViewItem * ) ) );

@ -124,7 +124,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -181,7 +181,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -133,7 +133,7 @@ void Button::drawButton(TQPainter *p)
tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags);
tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this,
TQRect(0,0,pm.width(),pm.height()),
colorGroup(), flags, TQStyleOption());
@ -211,7 +211,7 @@ TQSize Button::sizeHint(const TQString &text) const
h = TQMAX( h, ih );
}
if ( isMenuButton() )
w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap();
w += pm->width();
@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const
h = TQMAX(h, sz.height());
}
return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut()));
}

@ -32,7 +32,7 @@ namespace Ideal {
class Button;
class ButtonBar;
/**@short A tqlayout for a ButtonBar class.
/**@short A layout for a ButtonBar class.
Overrides minimumSize method to allow shrinking button bar buttons.*/
class ButtonLayout: public TQBoxLayout{

@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -106,7 +106,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -53,7 +53,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -85,7 +85,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">

@ -49,7 +49,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@ -192,7 +192,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<vbox>
<property name="name">
@ -221,7 +221,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@ -263,7 +263,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="2" rowspan="4" colspan="1">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@ -303,7 +303,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="2" rowspan="4" colspan="1">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@ -410,7 +410,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="8" colspan="1">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<vbox>
<property name="name">

@ -63,7 +63,7 @@
</widget>
<widget class="TQLayoutWidget" row="5" column="2" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout10</cstring>
<cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
@ -135,7 +135,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="2" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@ -187,7 +187,7 @@
</spacer>
<widget class="TQLayoutWidget" row="4" column="2" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@ -272,7 +272,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">

@ -25,21 +25,21 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
{
setCaption( i18n("Clearcase Comment") );
TQBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
TQBoxLayout *layout = new TQVBoxLayout(this, 10);
TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this);
messagelabel->setMinimumSize(messagelabel->sizeHint());
tqlayout->addWidget(messagelabel, 0);
layout->addWidget(messagelabel, 0);
_edit = new TQMultiLineEdit(this);
TQFontMetrics fm(_edit->fontMetrics());
_edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
tqlayout->addWidget(_edit, 10);
layout->addWidget(_edit, 10);
TQBoxLayout *tqlayout2 = new TQHBoxLayout(tqlayout);
TQBoxLayout *layout2 = new TQHBoxLayout(layout);
if(bCheckin) {
_check = new TQCheckBox(i18n("Reserve"), this);
tqlayout2->addWidget(_check);
layout2->addWidget(_check);
}
KButtonBox *buttonbox = new KButtonBox(this);
@ -49,10 +49,10 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)
connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
ok->setDefault(true);
buttonbox->tqlayout();
tqlayout2->addWidget(buttonbox, 0);
buttonbox->layout();
layout2->addWidget(buttonbox, 0);
tqlayout->activate();
layout->activate();
adjustSize();
}

@ -56,7 +56,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout4</cstring>
<cstring>layout4</cstring>
</property>
<grid>
<property name="name">
@ -106,7 +106,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@ -238,7 +238,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -42,7 +42,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -88,7 +88,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -35,7 +35,7 @@
</property>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -69,7 +69,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@ -171,7 +171,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -186,8 +186,8 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ):
// te->setMinimumSize( 300, 200 );
connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
tqlayout->addWidget( te );
TQVBoxLayout* layout = new TQVBoxLayout( this );
layout->addWidget( te );
}
DiffWidget::~DiffWidget()
@ -226,7 +226,7 @@ void DiffWidget::loadExtPart( const TQString& partName )
if ( !extPart || !extPart->widget() )
return;
tqlayout()->add( extPart->widget() );
layout()->add( extPart->widget() );
setExtPartVisible( true );

@ -29,7 +29,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<grid>
<property name="name">

@ -57,7 +57,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -92,7 +92,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@ -158,7 +158,7 @@
</widget>
<widget class="TQLayoutWidget">
<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>tqlayout3</cstring>
<cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@ -83,7 +83,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<hbox>
<property name="name">

@ -38,11 +38,11 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name )
TQFontMetrics fm(edit->fontMetrics());
edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3);
TQVBoxLayout *tqlayout = new TQVBoxLayout( w, 0, spacingHint() );
TQVBoxLayout *layout = new TQVBoxLayout( w, 0, spacingHint() );
TQLabel *editLabel = new TQLabel(i18n("&Enter description:"), w);
editLabel->setBuddy(edit);
tqlayout->addWidget(editLabel);
tqlayout->addWidget(edit);
layout->addWidget(editLabel);
layout->addWidget(edit);
w = new TQWidget( this, "details widget" );
@ -50,19 +50,19 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name )
userEdit = new KLineEdit( w );
filesBox = new KListBox( w );
tqlayout = new TQVBoxLayout( w, 0, spacingHint() );
layout = new TQVBoxLayout( w, 0, spacingHint() );
TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w);
clientLabel->setBuddy(clientEdit);
tqlayout->addWidget(clientLabel);
tqlayout->addWidget( clientEdit );
layout->addWidget(clientLabel);
layout->addWidget( clientEdit );
TQLabel *userLabel = new TQLabel(i18n("&User:"), w);
userLabel->setBuddy(userEdit);
tqlayout->addWidget( userLabel );
tqlayout->addWidget( userEdit );
layout->addWidget( userLabel );
layout->addWidget( userEdit );
TQLabel *filesLabel = new TQLabel(i18n("&File(s):"), w);
filesLabel->setBuddy(filesBox);
tqlayout->addWidget( filesLabel );
tqlayout->addWidget( filesBox );
layout->addWidget( filesLabel );
layout->addWidget( filesBox );
setDetailsWidget( w );
autoGuess();

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@ -42,7 +42,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -105,7 +105,7 @@ file:///home/user/subversion/mynewproject</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">

@ -48,7 +48,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -82,7 +82,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -139,7 +139,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout11</cstring>
<cstring>layout11</cstring>
</property>
<vbox>
<property name="name">
@ -191,7 +191,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -225,7 +225,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout9</cstring>
<cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@ -253,7 +253,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -278,7 +278,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout5</cstring>
<cstring>layout5</cstring>
</property>
<hbox>
<property name="name">

@ -76,7 +76,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="2">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">

@ -43,7 +43,7 @@
</widget>
<widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>tqlayout2</cstring>
<cstring>layout2</cstring>
</property>
<grid>
<property name="name">

Loading…
Cancel
Save