Rename obsolete tq methods to standard names

pull/1/head
Timothy Pearson 13 years ago
parent 84c989c19d
commit b0f531735b

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -84,7 +84,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -92,7 +92,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -118,7 +118,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -155,7 +155,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -180,7 +180,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -348,7 +348,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -384,7 +384,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -389,7 +389,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -397,7 +397,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -499,7 +499,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -27,7 +27,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout28</cstring> <cstring>layout28</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -570,7 +570,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -578,7 +578,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout18</cstring> <cstring>layout18</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -612,7 +612,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout19</cstring> <cstring>layout19</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -742,7 +742,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout32</cstring> <cstring>layout32</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -750,7 +750,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout31</cstring> <cstring>layout31</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -776,7 +776,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout30</cstring> <cstring>layout30</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -808,7 +808,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout31</cstring> <cstring>layout31</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

@ -208,7 +208,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -69,53 +69,53 @@ CoordsEdit::~CoordsEdit()
RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a)
: CoordsEdit(parent,a) : CoordsEdit(parent,a)
{ {
TQGridLayout *tqlayout= new TQGridLayout(this,5,2,5,5); TQGridLayout *layout= new TQGridLayout(this,5,2,5,5);
topXSpin = new TQSpinBox(this); topXSpin = new TQSpinBox(this);
topXSpin->setMaxValue(INT_MAX); topXSpin->setMaxValue(INT_MAX);
topXSpin->setMinValue(0); topXSpin->setMinValue(0);
topXSpin->setValue(a->rect().left()); topXSpin->setValue(a->rect().left());
tqlayout->addWidget(topXSpin,0,1); layout->addWidget(topXSpin,0,1);
connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
TQLabel *lbl= new TQLabel(i18n("Top &X:"),this); TQLabel *lbl= new TQLabel(i18n("Top &X:"),this);
lbl->setBuddy(topXSpin); lbl->setBuddy(topXSpin);
tqlayout->addWidget(lbl,0,0); layout->addWidget(lbl,0,0);
topYSpin = new TQSpinBox(this); topYSpin = new TQSpinBox(this);
topYSpin->setMaxValue(INT_MAX); topYSpin->setMaxValue(INT_MAX);
topYSpin->setMinValue(0); topYSpin->setMinValue(0);
topYSpin->setValue(a->rect().top()); topYSpin->setValue(a->rect().top());
tqlayout->addWidget(topYSpin,1,1); layout->addWidget(topYSpin,1,1);
connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
lbl= new TQLabel(i18n("Top &Y:"),this); lbl= new TQLabel(i18n("Top &Y:"),this);
lbl->setBuddy(topYSpin); lbl->setBuddy(topYSpin);
tqlayout->addWidget(lbl,1,0); layout->addWidget(lbl,1,0);
widthSpin = new TQSpinBox(this); widthSpin = new TQSpinBox(this);
widthSpin->setMaxValue(INT_MAX); widthSpin->setMaxValue(INT_MAX);
widthSpin->setMinValue(0); widthSpin->setMinValue(0);
widthSpin->setValue(a->rect().width()); widthSpin->setValue(a->rect().width());
tqlayout->addWidget(widthSpin,2,1); layout->addWidget(widthSpin,2,1);
connect( widthSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( widthSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
lbl= new TQLabel(i18n("&Width:"),this); lbl= new TQLabel(i18n("&Width:"),this);
lbl->setBuddy(widthSpin); lbl->setBuddy(widthSpin);
tqlayout->addWidget(lbl,2,0); layout->addWidget(lbl,2,0);
heightSpin = new TQSpinBox(this); heightSpin = new TQSpinBox(this);
heightSpin->setMaxValue(INT_MAX); heightSpin->setMaxValue(INT_MAX);
heightSpin->setMinValue(0); heightSpin->setMinValue(0);
heightSpin->setValue(a->rect().height()); heightSpin->setValue(a->rect().height());
tqlayout->addWidget(heightSpin,3,1); layout->addWidget(heightSpin,3,1);
connect( heightSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( heightSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
lbl= new TQLabel(i18n("Hei&ght:"),this); lbl= new TQLabel(i18n("Hei&ght:"),this);
lbl->setBuddy(heightSpin); lbl->setBuddy(heightSpin);
tqlayout->addWidget(lbl,3,0); layout->addWidget(lbl,3,0);
tqlayout->setRowStretch(4,10); layout->setRowStretch(4,10);
} }
void RectCoordsEdit::applyChanges() { void RectCoordsEdit::applyChanges() {
@ -130,44 +130,44 @@ void RectCoordsEdit::applyChanges() {
CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a)
: CoordsEdit(parent,a) : CoordsEdit(parent,a)
{ {
TQGridLayout *tqlayout= new TQGridLayout(this,4,2,5,5); TQGridLayout *layout= new TQGridLayout(this,4,2,5,5);
centerXSpin = new TQSpinBox(this); centerXSpin = new TQSpinBox(this);
centerXSpin->setMaxValue(INT_MAX); centerXSpin->setMaxValue(INT_MAX);
centerXSpin->setMinValue(0); centerXSpin->setMinValue(0);
centerXSpin->setValue(a->rect().center().x()); centerXSpin->setValue(a->rect().center().x());
tqlayout->addWidget(centerXSpin,0,1); layout->addWidget(centerXSpin,0,1);
connect( centerXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( centerXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
TQLabel *lbl= new TQLabel(i18n("Center &X:"),this); TQLabel *lbl= new TQLabel(i18n("Center &X:"),this);
lbl->setBuddy(centerXSpin); lbl->setBuddy(centerXSpin);
tqlayout->addWidget(lbl,0,0); layout->addWidget(lbl,0,0);
centerYSpin = new TQSpinBox(this); centerYSpin = new TQSpinBox(this);
centerYSpin->setMaxValue(INT_MAX); centerYSpin->setMaxValue(INT_MAX);
centerYSpin->setMinValue(0); centerYSpin->setMinValue(0);
centerYSpin->setValue(a->rect().center().y()); centerYSpin->setValue(a->rect().center().y());
tqlayout->addWidget(centerYSpin,1,1); layout->addWidget(centerYSpin,1,1);
connect( centerYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( centerYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
lbl= new TQLabel(i18n("Center &Y:"),this); lbl= new TQLabel(i18n("Center &Y:"),this);
lbl->setBuddy(centerYSpin); lbl->setBuddy(centerYSpin);
tqlayout->addWidget(lbl,1,0); layout->addWidget(lbl,1,0);
radiusSpin = new TQSpinBox(this); radiusSpin = new TQSpinBox(this);
radiusSpin->setMaxValue(INT_MAX); radiusSpin->setMaxValue(INT_MAX);
radiusSpin->setMinValue(0); radiusSpin->setMinValue(0);
radiusSpin->setValue(a->rect().width()/2); radiusSpin->setValue(a->rect().width()/2);
tqlayout->addWidget(radiusSpin,2,1); layout->addWidget(radiusSpin,2,1);
connect( radiusSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( radiusSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
lbl= new TQLabel(i18n("&Radius:"),this); lbl= new TQLabel(i18n("&Radius:"),this);
lbl->setBuddy(radiusSpin); lbl->setBuddy(radiusSpin);
tqlayout->addWidget(lbl,2,0); layout->addWidget(lbl,2,0);
tqlayout->setRowStretch(3,10); layout->setRowStretch(3,10);
} }
@ -184,7 +184,7 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a)
: CoordsEdit(parent,a) : CoordsEdit(parent,a)
{ {
if (!a) return; if (!a) return;
TQVBoxLayout *tqlayout= new TQVBoxLayout(this); TQVBoxLayout *layout= new TQVBoxLayout(this);
int numPoints=a->coords()->count(); int numPoints=a->coords()->count();
coordsTable= new TQTable(numPoints,2,this); coordsTable= new TQTable(numPoints,2,this);
coordsTable->horizontalHeader()->setLabel(0,"X"); coordsTable->horizontalHeader()->setLabel(0,"X");
@ -205,15 +205,15 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a)
// coordsTable->setMaximumHeight(400); // coordsTable->setMaximumHeight(400);
// coordsTable->resizeContents(100,100); // coordsTable->resizeContents(100,100);
coordsTable->resize(coordsTable->width(),100); coordsTable->resize(coordsTable->width(),100);
tqlayout->addWidget(coordsTable); layout->addWidget(coordsTable);
tqlayout->setStretchFactor(coordsTable,-1); layout->setStretchFactor(coordsTable,-1);
TQHBox *hbox= new TQHBox(this); TQHBox *hbox= new TQHBox(this);
TQPushButton *addBtn=new TQPushButton(i18n("Add"),hbox); TQPushButton *addBtn=new TQPushButton(i18n("Add"),hbox);
connect( addBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPoint())); connect( addBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPoint()));
TQPushButton *removeBtn=new TQPushButton(i18n("Remove"),hbox); TQPushButton *removeBtn=new TQPushButton(i18n("Remove"),hbox);
connect( removeBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemovePoint())); connect( removeBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemovePoint()));
tqlayout->addWidget(hbox); layout->addWidget(hbox);
slotHighlightPoint(1); slotHighlightPoint(1);
} }
@ -277,29 +277,29 @@ void PolyCoordsEdit::applyChanges() {
SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a) SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a)
: CoordsEdit(parent,a) : CoordsEdit(parent,a)
{ {
TQGridLayout *tqlayout= new TQGridLayout(this,2,2); TQGridLayout *layout= new TQGridLayout(this,2,2);
topXSpin = new TQSpinBox(this); topXSpin = new TQSpinBox(this);
topXSpin->setMaxValue(INT_MAX); topXSpin->setMaxValue(INT_MAX);
topXSpin->setMinValue(0); topXSpin->setMinValue(0);
topXSpin->setValue(a->rect().left()); topXSpin->setValue(a->rect().left());
tqlayout->addWidget(topXSpin,0,1); layout->addWidget(topXSpin,0,1);
connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
TQLabel *lbl= new TQLabel(i18n("Top &X"),this); TQLabel *lbl= new TQLabel(i18n("Top &X"),this);
lbl->setBuddy(topXSpin); lbl->setBuddy(topXSpin);
tqlayout->addWidget(lbl,0,0); layout->addWidget(lbl,0,0);
topYSpin = new TQSpinBox(this); topYSpin = new TQSpinBox(this);
topYSpin->setMaxValue(INT_MAX); topYSpin->setMaxValue(INT_MAX);
topYSpin->setMinValue(0); topYSpin->setMinValue(0);
topYSpin->setValue(a->rect().top()); topYSpin->setValue(a->rect().top());
tqlayout->addWidget(topYSpin,1,1); layout->addWidget(topYSpin,1,1);
connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate()));
lbl= new TQLabel(i18n("Top &Y"),this); lbl= new TQLabel(i18n("Top &Y"),this);
lbl->setBuddy(topYSpin); lbl->setBuddy(topYSpin);
tqlayout->addWidget(lbl,1,0); layout->addWidget(lbl,1,0);
} }
void SelectionCoordsEdit::applyChanges() { void SelectionCoordsEdit::applyChanges() {
@ -308,13 +308,13 @@ void SelectionCoordsEdit::applyChanges() {
TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name) TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *layout, int y, const TQString & value, const TQString & name)
{ {
TQLineEdit* edit=new TQLineEdit(value,parent); TQLineEdit* edit=new TQLineEdit(value,parent);
tqlayout->addWidget(edit,y,2); layout->addWidget(edit,y,2);
TQLabel* lbl=new TQLabel(name,parent); TQLabel* lbl=new TQLabel(name,parent);
lbl->setBuddy(edit); lbl->setBuddy(edit);
tqlayout->addWidget(lbl,y,1); layout->addWidget(lbl,y,1);
return edit; return edit;
} }
@ -322,7 +322,7 @@ TQLineEdit* AreaDialog::createLineEdit(TQWidget* parent, TQGridLayout *tqlayout,
TQWidget* AreaDialog::createGeneralPage() TQWidget* AreaDialog::createGeneralPage()
{ {
TQFrame* page = new TQFrame(this); TQFrame* page = new TQFrame(this);
TQGridLayout* tqlayout = new TQGridLayout(page,5,2,5,5); TQGridLayout* layout = new TQGridLayout(page,5,2,5,5);
TQHBox *hbox= new TQHBox(page); TQHBox *hbox= new TQHBox(page);
@ -332,25 +332,25 @@ TQWidget* AreaDialog::createGeneralPage()
connect( btn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooseHref())); connect( btn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooseHref()));
hbox->setMinimumHeight(hbox->height()); hbox->setMinimumHeight(hbox->height());
tqlayout->addWidget(hbox,0,2); layout->addWidget(hbox,0,2);
TQLabel *lbl=new TQLabel(i18n( "&HREF:" ),page); TQLabel *lbl=new TQLabel(i18n( "&HREF:" ),page);
lbl->setBuddy(hrefEdit); lbl->setBuddy(hrefEdit);
tqlayout->addWidget(lbl,0,1); layout->addWidget(lbl,0,1);
altEdit = createLineEdit(page,tqlayout,1,area->attribute("alt"),i18n("Alt. &Text:")); altEdit = createLineEdit(page,layout,1,area->attribute("alt"),i18n("Alt. &Text:"));
targetEdit = createLineEdit(page,tqlayout,2,area->attribute("target"),i18n("Tar&get:")); targetEdit = createLineEdit(page,layout,2,area->attribute("target"),i18n("Tar&get:"));
titleEdit = createLineEdit(page,tqlayout,3,area->attribute("title"),i18n("Tit&le:")); titleEdit = createLineEdit(page,layout,3,area->attribute("title"),i18n("Tit&le:"));
if (area->type()==Area::Default) if (area->type()==Area::Default)
{ {
defaultAreaChk = new TQCheckBox(i18n("Enable default map"),page); defaultAreaChk = new TQCheckBox(i18n("Enable default map"),page);
if (area->finished()) if (area->finished())
defaultAreaChk->setChecked(true); defaultAreaChk->setChecked(true);
tqlayout->addWidget(defaultAreaChk,3,2); layout->addWidget(defaultAreaChk,3,2);
} }
tqlayout->setRowStretch(4,10); layout->setRowStretch(4,10);
return page; return page;
} }
@ -358,11 +358,11 @@ TQWidget* AreaDialog::createGeneralPage()
TQWidget* AreaDialog::createCoordsPage() TQWidget* AreaDialog::createCoordsPage()
{ {
TQFrame* page = new TQFrame(this); TQFrame* page = new TQFrame(this);
TQVBoxLayout *tqlayout = new TQVBoxLayout(page); TQVBoxLayout *layout = new TQVBoxLayout(page);
tqlayout->setMargin(5); layout->setMargin(5);
coordsEdit = createCoordsEdit(page,area); coordsEdit = createCoordsEdit(page,area);
tqlayout->addWidget(coordsEdit); layout->addWidget(coordsEdit);
connect( coordsEdit, TQT_SIGNAL(update()), this, TQT_SLOT(slotUpdateArea())); connect( coordsEdit, TQT_SIGNAL(update()), this, TQT_SLOT(slotUpdateArea()));
return page; return page;
@ -371,17 +371,17 @@ TQWidget* AreaDialog::createCoordsPage()
TQWidget* AreaDialog::createJavascriptPage() TQWidget* AreaDialog::createJavascriptPage()
{ {
TQFrame* page = new TQFrame(this); TQFrame* page = new TQFrame(this);
TQGridLayout* tqlayout = new TQGridLayout(page,8,2,5,5); TQGridLayout* layout = new TQGridLayout(page,8,2,5,5);
onClickEdit = createLineEdit(page,tqlayout,0,area->attribute("onClick"),i18n("OnClick:")); onClickEdit = createLineEdit(page,layout,0,area->attribute("onClick"),i18n("OnClick:"));
onDblClickEdit = createLineEdit(page,tqlayout,1,area->attribute("onDblClick"),i18n("OnDblClick:")); onDblClickEdit = createLineEdit(page,layout,1,area->attribute("onDblClick"),i18n("OnDblClick:"));
onMouseDownEdit = createLineEdit(page,tqlayout,2,area->attribute("onMouseDown"),i18n("OnMouseDown:")); onMouseDownEdit = createLineEdit(page,layout,2,area->attribute("onMouseDown"),i18n("OnMouseDown:"));
onMouseUpEdit = createLineEdit(page,tqlayout,3,area->attribute("onMouseUp"),i18n("OnMouseUp:")); onMouseUpEdit = createLineEdit(page,layout,3,area->attribute("onMouseUp"),i18n("OnMouseUp:"));
onMouseOverEdit = createLineEdit(page,tqlayout,4,area->attribute("onMouseOver"),i18n("OnMouseOver:")); onMouseOverEdit = createLineEdit(page,layout,4,area->attribute("onMouseOver"),i18n("OnMouseOver:"));
onMouseMoveEdit = createLineEdit(page,tqlayout,5,area->attribute("onMouseMove"),i18n("OnMouseMove:")); onMouseMoveEdit = createLineEdit(page,layout,5,area->attribute("onMouseMove"),i18n("OnMouseMove:"));
onMouseOutEdit = createLineEdit(page,tqlayout,6,area->attribute("onMouseOut"),i18n("OnMouseOut:")); onMouseOutEdit = createLineEdit(page,layout,6,area->attribute("onMouseOut"),i18n("OnMouseOut:"));
tqlayout->setRowStretch(7,10); layout->setRowStretch(7,10);
return page; return page;
@ -439,22 +439,22 @@ AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a)
// To get a margin around everything // To get a margin around everything
TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQVBoxLayout *layout = new TQVBoxLayout(this);
tqlayout->setMargin(5); layout->setMargin(5);
TQLabel *lbl = new TQLabel("<b>"+shape+"</b>",this); TQLabel *lbl = new TQLabel("<b>"+shape+"</b>",this);
lbl->setTextFormat(TQt::RichText); lbl->setTextFormat(TQt::RichText);
tqlayout->addWidget(lbl); layout->addWidget(lbl);
TQFrame *line = new TQFrame(this); TQFrame *line = new TQFrame(this);
line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
line->setFixedHeight(10); line->setFixedHeight(10);
tqlayout->addWidget(line); layout->addWidget(line);
TQTabWidget *tab = new TQTabWidget(this); TQTabWidget *tab = new TQTabWidget(this);
tqlayout->addWidget(tab); layout->addWidget(tab);
tab->addTab(createGeneralPage(),i18n("&General")); tab->addTab(createGeneralPage(),i18n("&General"));
@ -470,9 +470,9 @@ AreaDialog::AreaDialog(KImageMapEditor* parent,Area * a)
line = new TQFrame(this); line = new TQFrame(this);
line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
line->setFixedHeight(10); line->setFixedHeight(10);
tqlayout->addWidget(line); layout->addWidget(line);
tqlayout->addWidget(createButtonBar()); layout->addWidget(createButtonBar());
setMinimumHeight(360); setMinimumHeight(360);
setMinimumWidth(327); setMinimumWidth(327);
@ -580,17 +580,17 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
TQWidget *page=new TQWidget(this); TQWidget *page=new TQWidget(this);
setMainWidget(page); setMainWidget(page);
setCaption(baseUrl.fileName()); setCaption(baseUrl.fileName());
TQVBoxLayout *tqlayout = new TQVBoxLayout(page,5,5); TQVBoxLayout *layout = new TQVBoxLayout(page,5,5);
TQLabel *lbl= new TQLabel(i18n("Select an image and/or a map that you want to edit"),page); TQLabel *lbl= new TQLabel(i18n("Select an image and/or a map that you want to edit"),page);
lbl->setFont(TQFont("Sans Serif",12, TQFont::Bold)); lbl->setFont(TQFont("Sans Serif",12, TQFont::Bold));
tqlayout->addWidget(lbl); layout->addWidget(lbl);
TQFrame *line= new TQFrame(page); TQFrame *line= new TQFrame(page);
line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
line->setFixedHeight(10); line->setFixedHeight(10);
tqlayout->addWidget(line,0); layout->addWidget(line,0);
TQGridLayout *gridLayout= new TQGridLayout(tqlayout,2,3,5); TQGridLayout *gridLayout= new TQGridLayout(layout,2,3,5);
gridLayout->setRowStretch(0,0); gridLayout->setRowStretch(0,0);
gridLayout->setRowStretch(1,100); gridLayout->setRowStretch(1,100);
lbl=new TQLabel(i18n("&Maps"),page); lbl=new TQLabel(i18n("&Maps"),page);
@ -619,12 +619,12 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_
// lbl= new TQLabel(i18n("&Maps"),page); // lbl= new TQLabel(i18n("&Maps"),page);
// lbl->setBuddy(mapListBox); // lbl->setBuddy(mapListBox);
gridLayout->addWidget(imagePreview,1,2); gridLayout->addWidget(imagePreview,1,2);
// tqlayout->addLayout(gridLayout,1); // layout->addLayout(gridLayout,1);
line= new TQFrame(page); line= new TQFrame(page);
line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); line->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
line->setFixedHeight(10); line->setFixedHeight(10);
tqlayout->addWidget(line,0); layout->addWidget(line,0);
if (maps->isEmpty()) { if (maps->isEmpty()) {
@ -669,8 +669,8 @@ void ImageMapChooseDialog::initImageListTable(TQWidget* parent) {
TQLabel *lbl= new TQLabel(i18n("&Images"),parent); TQLabel *lbl= new TQLabel(i18n("&Images"),parent);
lbl->setBuddy(imageListTable); lbl->setBuddy(imageListTable);
parent->tqlayout()->add(lbl); parent->layout()->add(lbl);
parent->tqlayout()->add(imageListTable); parent->layout()->add(imageListTable);
if (images->isEmpty()) if (images->isEmpty())
return; return;
@ -866,7 +866,7 @@ HTMLPreviewDialog::~HTMLPreviewDialog() {
void HTMLPreviewDialog::show() { void HTMLPreviewDialog::show() {
KDialogBase::show(); KDialogBase::show();
htmlPart->openURL(KURL( tempFile->name() )); htmlPart->openURL(KURL( tempFile->name() ));
// htmlView->tqlayout(); // htmlView->layout();
// htmlView->repaint(); // htmlView->repaint();
resize(800,600); resize(800,600);
} }

@ -137,7 +137,7 @@ class AreaDialog : public KDialog {
void slotChooseHref(); void slotChooseHref();
void slotUpdateArea(); void slotUpdateArea();
TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *tqlayout, int y, const TQString & value, const TQString & name); TQLineEdit* createLineEdit(TQWidget* parent, TQGridLayout *layout, int y, const TQString & value, const TQString & name);
TQWidget* createGeneralPage(); TQWidget* createGeneralPage();
TQWidget* createCoordsPage(); TQWidget* createCoordsPage();
TQWidget* createJavascriptPage(); TQWidget* createJavascriptPage();

@ -45,7 +45,7 @@ KimeShell::KimeShell(const char *name )
KDockWidget* mainDock; KDockWidget* mainDock;
mainDock = createDockWidget( "MainDockWidget", 0L, 0L, "main_dock_widget"); mainDock = createDockWidget( "MainDockWidget", 0L, 0L, "main_dock_widget");
TQWidget *w = new TQHBox( mainDock ); TQWidget *w = new TQHBox( mainDock );
// TQLayout* tqlayout = new TQGridLayout( mainDock ); // TQLayout* layout = new TQGridLayout( mainDock );
mainDock->setWidget( w ); mainDock->setWidget( w );
// allow others to dock to the 4 sides // allow others to dock to the 4 sides

@ -42,12 +42,12 @@ class ResultsSearchBar::ResultsSearchBarPrivate
{ {
public: public:
ResultsSearchBarPrivate() ResultsSearchBarPrivate()
: tqlayout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0) : layout(0), searchLine(0), searchCombo(0), delay(400), m_lastComboIndex(0)
{} {}
TQString searchText; TQString searchText;
TQTimer timer; TQTimer timer;
TQHBoxLayout* tqlayout; TQHBoxLayout* layout;
KLineEdit* searchLine; KLineEdit* searchLine;
KComboBox* searchCombo; KComboBox* searchCombo;
int delay; int delay;
@ -59,29 +59,29 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
{ {
setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
d->tqlayout = new TQHBoxLayout(this); d->layout = new TQHBoxLayout(this);
d->tqlayout->setMargin(2); d->layout->setMargin(2);
d->tqlayout->setSpacing(5); d->layout->setSpacing(5);
TQToolButton* clearButton = new TQToolButton(this); TQToolButton* clearButton = new TQToolButton(this);
clearButton->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); clearButton->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase"));
clearButton->setAutoRaise(true); clearButton->setAutoRaise(true);
d->tqlayout->addWidget(clearButton); d->layout->addWidget(clearButton);
TQLabel* searchLabel = new TQLabel(this); TQLabel* searchLabel = new TQLabel(this);
searchLabel->setText(i18n("S&earch:")); searchLabel->setText(i18n("S&earch:"));
d->tqlayout->addWidget(searchLabel); d->layout->addWidget(searchLabel);
d->searchLine = new KLineEdit(this, "searchline"); d->searchLine = new KLineEdit(this, "searchline");
connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)),
this, TQT_SLOT(slotSearchStringChanged(const TQString &))); this, TQT_SLOT(slotSearchStringChanged(const TQString &)));
searchLabel->setBuddy(d->searchLine); searchLabel->setBuddy(d->searchLine);
d->tqlayout->addWidget(d->searchLine); d->layout->addWidget(d->searchLine);
TQLabel* statusLabel = new TQLabel(this); TQLabel* statusLabel = new TQLabel(this);
statusLabel->setText( i18n("Status:") ); statusLabel->setText( i18n("Status:") );
d->tqlayout->addWidget(statusLabel); d->layout->addWidget(statusLabel);
d->searchCombo = new KComboBox(this, "searchcombo"); d->searchCombo = new KComboBox(this, "searchcombo");
TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small); TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small);
@ -95,7 +95,7 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name)
d->searchCombo->insertItem(iconBroken, i18n("Broken Links")); d->searchCombo->insertItem(iconBroken, i18n("Broken Links"));
d->searchCombo->insertItem(iconMalformed, i18n("Malformed Links")); d->searchCombo->insertItem(iconMalformed, i18n("Malformed Links"));
d->searchCombo->insertItem(iconUndetermined, i18n("Undetermined Links")); d->searchCombo->insertItem(iconUndetermined, i18n("Undetermined Links"));
d->tqlayout->addWidget(d->searchCombo); d->layout->addWidget(d->searchCombo);
TQToolTip::add(clearButton, i18n("Clear filter")); TQToolTip::add(clearButton, i18n("Clear filter"));
TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list")); TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list"));

@ -41,7 +41,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -49,7 +49,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -57,7 +57,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -161,7 +161,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout10</cstring> <cstring>layout10</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -236,7 +236,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -277,7 +277,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -347,7 +347,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout10</cstring> <cstring>layout10</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -385,7 +385,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -432,7 +432,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout12_2</cstring> <cstring>layout12_2</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

@ -184,7 +184,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout21</cstring> <cstring>layout21</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -220,7 +220,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout20</cstring> <cstring>layout20</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -219,7 +219,7 @@ void TreeView::slotCopyUrlToClipboard() const
{ {
TreeViewItem* _item = myItem(currentItem()); TreeViewItem* _item = myItem(currentItem());
TQString content(_item->linkStatus()->absoluteUrl().prettyURL()); TQString content(_item->linkStatus()->absoluteUrl().prettyURL());
TQClipboard* cb = kapp->tqclipboard(); TQClipboard* cb = kapp->clipboard();
cb->setText(content); cb->setText(content);
} }
@ -227,7 +227,7 @@ void TreeView::slotCopyParentUrlToClipboard() const
{ {
TreeViewItem* _item = myItem(currentItem()); TreeViewItem* _item = myItem(currentItem());
TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL()); TQString content(_item->linkStatus()->parent()->absoluteUrl().prettyURL());
TQClipboard* cb = kapp->tqclipboard(); TQClipboard* cb = kapp->clipboard();
cb->setText(content); cb->setText(content);
} }
@ -235,7 +235,7 @@ void TreeView::slotCopyCellTextToClipboard() const
{ {
TreeViewItem* _item = myItem(currentItem()); TreeViewItem* _item = myItem(currentItem());
TQString cell_text(_item->text(current_column_)); TQString cell_text(_item->text(current_column_));
TQClipboard* cb = kapp->tqclipboard(); TQClipboard* cb = kapp->clipboard();
cb->setText(cell_text); cb->setText(cell_text);
} }

@ -16,10 +16,10 @@
\NewEntry 1 Editor \NewEntry 1 Editor
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif"> <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif">
<p><span style="font-weight:600">Layout of Edit Kommander Text dialog<br /><br />Old ideas:</span></p> <p><span style="font-weight:600">Layout of Edit Kommander Text dialog<br /><br />Old ideas:</span></p>
<ul type="disc"><li>better tqlayout</li> <ul type="disc"><li>better layout</li>
<li>replace list of widgets with tree of widgets</li> <li>replace list of widgets with tree of widgets</li>
<li>replace widget class with widget pixmap in combos</li> <li>replace widget class with widget pixmap in combos</li>
<li>redesign tqlayout</li> <li>redesign layout</li>
<li>cleanup Connections, not it is unusable, may be obsolete</li> <li>cleanup Connections, not it is unusable, may be obsolete</li>
<li>find in scripts</li> <li>find in scripts</li>
<li>list of non-empty scripts for current dialog</li> <li>list of non-empty scripts for current dialog</li>
@ -37,7 +37,7 @@
<li>use KDE dialogs, not Qt ones if possible</li> <li>use KDE dialogs, not Qt ones if possible</li>
<li>some widget information on mouseover</li> <li>some widget information on mouseover</li>
<li>review of event model</li> <li>review of event model</li>
<li>add more tqlayout-handling commands (center selected widgets horizontally/vertically, fit to window width/height)</li> <li>add more layout-handling commands (center selected widgets horizontally/vertically, fit to window width/height)</li>
<li>handle middle click</li> <li>handle middle click</li>
<li>carefully check defaults, choose most useful ones</li> <li>carefully check defaults, choose most useful ones</li>
<li>add wizards? (replace current New dialogs with Kommander-based ones?)</li> <li>add wizards? (replace current New dialogs with Kommander-based ones?)</li>
@ -85,7 +85,7 @@
<ul type="disc"><li>Charset is sometimes incorrectly converted from/to local charset</li> <ul type="disc"><li>Charset is sometimes incorrectly converted from/to local charset</li>
<li>SubDialog crashes now</li> <li>SubDialog crashes now</li>
<li>Labels do not show up unless you edit their text</li> <li>Labels do not show up unless you edit their text</li>
<li>toolbox editing is ugly after group tqlayout is applied. Goes back to normal if the dialog is reloaded.</li> <li>toolbox editing is ugly after group layout is applied. Goes back to normal if the dialog is reloaded.</li>
<div></div></ul> <div></div></ul>
</body></html> </body></html>

@ -96,7 +96,7 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& )
TQSize QDesignerToolBarSeparator::sizeHint() const TQSize QDesignerToolBarSeparator::sizeHint() const
{ {
int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this ); this );
if ( orient ==Qt::Horizontal ) if ( orient ==Qt::Horizontal )
return TQSize( extent, 0 ); return TQSize( extent, 0 );
@ -112,7 +112,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
if ( orientation() ==Qt::Horizontal ) if ( orientation() ==Qt::Horizontal )
flags |= TQStyle::Style_Horizontal; flags |= TQStyle::Style_Horizontal;
tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
colorGroup(), flags ); colorGroup(), flags );
} }
@ -746,9 +746,9 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
idAt( itm ), itm, item->text() ); idAt( itm ), itm, item->text() );
formWindow->commandHistory()->addCommand( cmd ); formWindow->commandHistory()->addCommand( cmd );
cmd->execute(); cmd->execute();
// #### need to do a proper invalidate and re-tqlayout // #### need to do a proper invalidate and re-layout
parentWidget()->tqlayout()->invalidate(); parentWidget()->layout()->invalidate();
parentWidget()->tqlayout()->activate(); parentWidget()->layout()->activate();
} else if ( res == 2 ) { } else if ( res == 2 ) {
bool ok; bool ok;
TQString old = text( idAt( itm ) ); TQString old = text( idAt( itm ) );

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

@ -90,9 +90,9 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
} }
doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document"); doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document");
TQGridLayout *tqlayout = new TQGridLayout(editorFrame, 1, 1); TQGridLayout *layout = new TQGridLayout(editorFrame, 1, 1);
view = doc->createView(editorFrame); view = doc->createView(editorFrame);
tqlayout->addWidget(view, 1,1); layout->addWidget(view, 1,1);
partManager->addPart(doc, true); partManager->addPart(doc, true);
//trick to import all the KatePart actions into the dialog //trick to import all the KatePart actions into the dialog

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

@ -630,21 +630,21 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw, LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase, TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl ) const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) : Command( n, fw ), layout( wl, parent, fw, layoutBase )
{ {
} }
void LayoutHorizontalCommand::execute() void LayoutHorizontalCommand::execute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.doLayout(); layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
void LayoutHorizontalCommand::unexecute() void LayoutHorizontalCommand::unexecute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.undoLayout(); layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
@ -653,21 +653,21 @@ void LayoutHorizontalCommand::unexecute()
LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase, TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl ) 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() void LayoutHorizontalSplitCommand::execute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.doLayout(); layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
void LayoutHorizontalSplitCommand::unexecute() void LayoutHorizontalSplitCommand::unexecute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.undoLayout(); layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
@ -676,21 +676,21 @@ void LayoutHorizontalSplitCommand::unexecute()
LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase, TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl ) const TQWidgetList &wl )
: Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) : Command( n, fw ), layout( wl, parent, fw, layoutBase )
{ {
} }
void LayoutVerticalCommand::execute() void LayoutVerticalCommand::execute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.doLayout(); layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
void LayoutVerticalCommand::unexecute() void LayoutVerticalCommand::unexecute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.undoLayout(); layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
@ -699,21 +699,21 @@ void LayoutVerticalCommand::unexecute()
LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase, TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl ) 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() void LayoutVerticalSplitCommand::execute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.doLayout(); layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
void LayoutVerticalSplitCommand::unexecute() void LayoutVerticalSplitCommand::unexecute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.undoLayout(); layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
@ -722,21 +722,21 @@ void LayoutVerticalSplitCommand::unexecute()
LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
TQWidget *parent, TQWidget *layoutBase, TQWidget *parent, TQWidget *layoutBase,
const TQWidgetList &wl, int xres, int yres ) 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() void LayoutGridCommand::execute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.doLayout(); layout.doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
void LayoutGridCommand::unexecute() void LayoutGridCommand::unexecute()
{ {
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout.undoLayout(); layout.undoLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
} }
@ -749,21 +749,21 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) ); spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) );
margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) );
tqlayout = 0; layout = 0;
if ( lay == WidgetFactory::HBox ) if ( lay == WidgetFactory::HBox )
tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
else if ( lay == WidgetFactory::VBox ) else if ( lay == WidgetFactory::VBox )
tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
else if ( lay == WidgetFactory::Grid ) 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() void BreakLayoutCommand::execute()
{ {
if ( !tqlayout ) if ( !layout )
return; return;
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout->breakLayout(); layout->breakLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) ); w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) );
@ -771,10 +771,10 @@ void BreakLayoutCommand::execute()
void BreakLayoutCommand::unexecute() void BreakLayoutCommand::unexecute()
{ {
if ( !tqlayout ) if ( !layout )
return; return;
formWindow()->clearSelection( false ); formWindow()->clearSelection( false );
tqlayout->doLayout(); layout->doLayout();
formWindow()->mainWindow()->objectHierarchy()->rebuild(); formWindow()->mainWindow()->objectHierarchy()->rebuild();
MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing ); MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing );
MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin ); MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin );

@ -263,7 +263,7 @@ public:
Type type() const { return LayoutHorizontal; } Type type() const { return LayoutHorizontal; }
private: private:
HorizontalLayout tqlayout; HorizontalLayout layout;
}; };
@ -279,7 +279,7 @@ public:
Type type() const { return LayoutHorizontalSplitter; } Type type() const { return LayoutHorizontalSplitter; }
private: private:
HorizontalLayout tqlayout; HorizontalLayout layout;
}; };
@ -295,7 +295,7 @@ public:
Type type() const { return LayoutVertical; } Type type() const { return LayoutVertical; }
private: private:
VerticalLayout tqlayout; VerticalLayout layout;
}; };
@ -311,7 +311,7 @@ public:
Type type() const { return LayoutVerticalSplitter; } Type type() const { return LayoutVerticalSplitter; }
private: private:
VerticalLayout tqlayout; VerticalLayout layout;
}; };
@ -327,7 +327,7 @@ public:
Type type() const { return LayoutGrid; } Type type() const { return LayoutGrid; }
private: private:
GridLayout tqlayout; GridLayout layout;
}; };
@ -342,7 +342,7 @@ public:
Type type() const { return BreakLayout; } Type type() const { return BreakLayout; }
private: private:
Layout *tqlayout; Layout *layout;
int spacing; int spacing;
int margin; int margin;
TQWidget *lb; TQWidget *lb;

@ -129,7 +129,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout3</cstring> <cstring>layout3</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -203,7 +203,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -304,7 +304,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

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

@ -502,7 +502,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
case POINTER_TOOL: case POINTER_TOOL:
if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget") != 0) if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget") != 0)
{ // press on a child widget { // 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) if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout)
w->raise(); w->raise();
if ((e->state() & ControlButton)) if ((e->state() & ControlButton))
@ -520,7 +520,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
clearSelection(false); clearSelection(false);
else else
{ // ...widget selected { // ...widget selected
// only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), // only if widget has a layout (it is a layout meta widget or a laid out container!),
// unselect its childs // unselect its childs
if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout) if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout)
{ {
@ -861,16 +861,16 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
if (wa == ((TQWidget *) it.key())->parentWidget()) if (wa == ((TQWidget *) it.key())->parentWidget())
goto make_move_command; goto make_move_command;
// break tqlayout if necessary // break layout if necessary
if (WidgetFactory::layoutType(wa) != WidgetFactory::NoLayout) if (WidgetFactory::layoutType(wa) != WidgetFactory::NoLayout)
{ {
if (KMessageBox::questionYesNo(mainWindow(), if (KMessageBox::questionYesNo(mainWindow(),
i18n("You tried to insert a widget into the " i18n("You tried to insert a widget into the "
"tqlayout Container Widget '%1'.\n" "layout Container Widget '%1'.\n"
"This is not possible. " "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" "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("Inserting Widget"), arg(wa->name()).arg(wa->name()), i18n("Inserting Widget"),
i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::No) i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::No)
goto make_move_command; // cancel goto make_move_command; // cancel
@ -955,11 +955,11 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
{ {
if (KMessageBox::questionYesNo(mainWindow(), if (KMessageBox::questionYesNo(mainWindow(),
i18n("You tried to insert a widget into the " i18n("You tried to insert a widget into the "
"tqlayout Container Widget '%1'.\n" "layout Container Widget '%1'.\n"
"This is not possible. " "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" "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()).
arg(insertParent->name()), i18n("Inserting Widget"), arg(insertParent->name()), i18n("Inserting Widget"),
i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::Yes) i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::Yes)
@ -2502,7 +2502,7 @@ void FormWindow::setMainContainer(TQWidget *w)
delete mContainer; delete mContainer;
mContainer = w; mContainer = w;
insertedWidgets.insert(mContainer, mContainer); insertedWidgets.insert(mContainer, mContainer);
delete tqlayout(); delete layout();
TQHBoxLayout *l = new TQHBoxLayout(this); TQHBoxLayout *l = new TQHBoxLayout(this);
l->addWidget(w); l->addWidget(w);
if (resetPropertyWidget) if (resetPropertyWidget)

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="2"> <widget class="TQLayoutWidget" row="0" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout7_2</cstring> <cstring>layout7_2</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -53,7 +53,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -213,7 +213,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="3" column="0"> <widget class="TQLayoutWidget" row="3" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -265,7 +265,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="5" column="0"> <widget class="TQLayoutWidget" row="5" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -312,7 +312,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="7" column="0"> <widget class="TQLayoutWidget" row="7" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -364,7 +364,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="9" column="0"> <widget class="TQLayoutWidget" row="9" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -408,7 +408,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="11" column="0"> <widget class="TQLayoutWidget" row="11" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -452,7 +452,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="13" column="0"> <widget class="TQLayoutWidget" row="13" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout16</cstring> <cstring>layout16</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -514,7 +514,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -589,7 +589,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -597,7 +597,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -413,7 +413,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
if ( !parent ) if ( !parent )
item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) ); item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) );
else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
item->setPixmap( 0, PixmapChooser::loadPixmap( "tqlayout.xpm", PixmapChooser::Small ) ); item->setPixmap( 0, PixmapChooser::loadPixmap( "layout.xpm", PixmapChooser::Small ) );
else else
item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ). item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ).
pixmap( TQIconSet::Small, TQIconSet::Normal ) ); pixmap( TQIconSet::Small, TQIconSet::Normal ) );

@ -341,8 +341,8 @@
<item> true </item> <item> true </item>
<item> umount </item> <item> umount </item>
<item> uname </item> <item> uname </item>
<item> tqunicode_start </item> <item> unicode_start </item>
<item> tqunicode_stop </item> <item> unicode_stop </item>
<item> unlink </item> <item> unlink </item>
<item> utmpdump </item> <item> utmpdump </item>
<item> uuidgen </item> <item> uuidgen </item>

@ -77,7 +77,7 @@ void Layout::setup()
TQWidget *w = 0; TQWidget *w = 0;
// Go through all widgets of the list we got. As we can only // 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 // sorting which means create a list for each parent containing
// its child here. After that we keep working on the list of // its child here. After that we keep working on the list of
// childs which has the most entries. // childs which has the most entries.
@ -112,7 +112,7 @@ void Layout::setup()
} }
// If we found no list (because no widget did fit at all) or the // 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. // we leave here.
if ( !lastList || ( lastList->count() < 2 && if ( !lastList || ( lastList->count() < 2 &&
( !layoutBase || ( !layoutBase ||
@ -125,11 +125,11 @@ void Layout::setup()
} }
// Now we have a new and clean widget list, which makes sense // Now we have a new and clean widget list, which makes sense
// to tqlayout // to layout
widgets = *lastList; widgets = *lastList;
// Also use the only correct parent later, so store it // Also use the only correct parent later, so store it
parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); 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 // be placed and connect to widgetDestroyed() signals of the
// widgets to get informed if one gets deleted to be able to // widgets to get informed if one gets deleted to be able to
// handle that and do not crash in this case // handle that and do not crash in this case
@ -141,7 +141,7 @@ void Layout::setup()
geometries.insert( w, TQRect( w->pos(), w->size() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) );
// Change the Z-order, as saving/loading uses the Z-order for // Change the Z-order, as saving/loading uses the Z-order for
// writing/creating widgets and this has to be the same as in // 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(); w->raise();
} }
} }
@ -174,7 +174,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
return true; return true;
} }
void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) void Layout::finishLayout( bool needMove, TQLayout *layout )
{ {
if ( needMove ) if ( needMove )
layoutBase->move( startPoint ); layoutBase->move( startPoint );
@ -185,7 +185,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
layoutBase->setGeometry( oldGeometry ); layoutBase->setGeometry( oldGeometry );
oldGeometry = g; oldGeometry = g;
layoutBase->show(); layoutBase->show();
tqlayout->activate(); layout->activate();
formWindow->insertWidget( layoutBase ); formWindow->insertWidget( layoutBase );
formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
TQString n = layoutBase->name(); TQString n = layoutBase->name();
@ -303,16 +303,16 @@ void HorizontalLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) ) if ( !prepareLayout( needMove, needReparent ) )
return; 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() ) { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( !useSplitter ) { if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 ) if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else else
tqlayout->addWidget( w ); layout->addWidget( w );
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
( (TQLayoutWidget*)w )->updateSizePolicy(); ( (TQLayoutWidget*)w )->updateSizePolicy();
} }
@ -322,7 +322,7 @@ void HorizontalLayout::doLayout()
if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
finishLayout( needMove, tqlayout ); finishLayout( needMove, layout );
} }
@ -367,16 +367,16 @@ void VerticalLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) ) if ( !prepareLayout( needMove, needReparent ) )
return; 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() ) { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( !useSplitter ) { if ( !useSplitter ) {
if ( qstrcmp( w->className(), "Spacer" ) == 0 ) if ( qstrcmp( w->className(), "Spacer" ) == 0 )
tqlayout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
else else
tqlayout->addWidget( w ); layout->addWidget( w );
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
( (TQLayoutWidget*)w )->updateSizePolicy(); ( (TQLayoutWidget*)w )->updateSizePolicy();
} }
@ -386,7 +386,7 @@ void VerticalLayout::doLayout()
if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
finishLayout( needMove, tqlayout ); finishLayout( needMove, layout );
} }
@ -733,7 +733,7 @@ void GridLayout::doLayout()
if ( !prepareLayout( needMove, needReparent ) ) if ( !prepareLayout( needMove, needReparent ) )
return; return;
QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
if ( !grid ) if ( !grid )
buildGrid(); buildGrid();
@ -745,18 +745,18 @@ void GridLayout::doLayout()
if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
if ( rs * cs == 1 ) { if ( rs * cs == 1 ) {
tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); layout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
} else { } else {
tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 );
} }
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
( (TQLayoutWidget*)w )->updateSizePolicy(); ( (TQLayoutWidget*)w )->updateSizePolicy();
w->show(); w->show();
} else { } 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() void GridLayout::setup()

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

@ -848,7 +848,7 @@ void MainWindow::insertFormWindow(FormWindow *fw)
{ {
if (fw) if (fw)
TQWhatsThis::add(fw, i18n("<b>The Form Window</b>" 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 " "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 " "widgets to move them or lay them out. If a single widget is chosen it can "
"be resized using the resize handles.</p>" "be resized using the resize handles.</p>"

@ -207,13 +207,13 @@ void MainWindow::setupLayoutActions()
actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size")); actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size"));
actionEditAdjustSize->setEnabled(false); actionEditAdjustSize->setEnabled(false);
actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithtqlayout.xpm"), actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithlayout.xpm"),
CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h");
actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally")); actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally"));
actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally")); actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally"));
actionEditHLayout->setEnabled(false); actionEditHLayout->setEnabled(false);
actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvtqlayout.xpm"), actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvlayout.xpm"),
CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v");
actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically")); actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically"));
actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically")); actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically"));
@ -241,7 +241,7 @@ void MainWindow::setupLayoutActions()
actionEditBreakLayout = new KAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"), actionEditBreakLayout = new KAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"),
CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout");
actionEditBreakLayout->setToolTip(i18n("Breaks the selected tqlayout")); actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout"));
actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout")); actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout"));
int id = WidgetDatabase::idFromClassName("Spacer"); int id = WidgetDatabase::idFromClassName("Spacer");
@ -907,7 +907,7 @@ void MainWindow::editPaste()
} else } else
{ {
KMessageBox::information(this, i18n("Cannot paste widgets. Designer could not find a container\n" KMessageBox::information(this, 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" "of the container you want to paste into and select this container\n"
"and then paste again."), i18n("Paste Error")); "and then paste again."), i18n("Paste Error"));
} }

@ -108,12 +108,12 @@ void MessageLog::clearContent()
void MessageLog::copyLine() void MessageLog::copyLine()
{ {
if (m_lists[currentPageIndex()]->count()) if (m_lists[currentPageIndex()]->count())
kapp->tqclipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard); kapp->clipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard);
} }
void MessageLog::copyContent() void MessageLog::copyContent()
{ {
kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard); kapp->clipboard()->setText(content(), TQClipboard::Clipboard);
} }
void MessageLog::saveToFile() void MessageLog::saveToFile()

@ -269,10 +269,10 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
} }
r->spacing = spacing; r->spacing = spacing;
TQLayout * tqlayout = 0; TQLayout * layout = 0;
WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); WidgetFactory::layoutType( (TQWidget*)o, layout );
if ( tqlayout ) if ( layout )
tqlayout->setSpacing( spacing ); layout->setSpacing( spacing );
} }
int MetaDataBase::spacing( TQObject *o ) int MetaDataBase::spacing( TQObject *o )
@ -305,12 +305,12 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
} }
r->margin = margin; r->margin = margin;
TQLayout * tqlayout = 0; TQLayout * layout = 0;
WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); WidgetFactory::layoutType( (TQWidget*)o, layout );
if ( margin < 1 ) if ( margin < 1 )
margin = 1; margin = 1;
if ( tqlayout ) if ( layout )
tqlayout->setMargin( margin ); layout->setMargin( margin );
} }
int MetaDataBase::margin( TQObject *o ) int MetaDataBase::margin( TQObject *o )

@ -244,15 +244,15 @@ void PaletteEditorAdvanced::onCentral( int item )
case 0: case 0:
default: default:
c = editPalette.active().color( centralFromItem(item) ); c = editPalette.active().color( centralFromItem(item) );
p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap(); p = editPalette.active().brush( centralFromItem(item) ).pixmap();
break; break;
case 1: case 1:
c = editPalette.inactive().color( centralFromItem(item) ); c = editPalette.inactive().color( centralFromItem(item) );
p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap(); p = editPalette.inactive().brush( centralFromItem(item) ).pixmap();
break; break;
case 2: case 2:
c = editPalette.disabled().color( centralFromItem(item) ); c = editPalette.disabled().color( centralFromItem(item) );
p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap(); p = editPalette.disabled().brush( centralFromItem(item) ).pixmap();
break; break;
} }
@ -508,17 +508,17 @@ void PaletteEditorAdvanced::updateStyledButtons()
default: default:
central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) ); central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.active().color( effectFromItem( comboEffect->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; break;
case 1: case 1:
central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) ); central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.inactive().color( effectFromItem( comboEffect->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; break;
case 2: case 2:
central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) ); central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) );
effect = editPalette.disabled().color( effectFromItem( comboEffect->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; break;
} }

@ -10857,7 +10857,7 @@ static struct Embed {
{ 1483, small_form_xpm_data, "small/form.xpm" }, { 1483, small_form_xpm_data, "small/form.xpm" },
{ 3981, small_home_xpm_data, "small/home.xpm" }, { 3981, small_home_xpm_data, "small/home.xpm" },
{ 5406, small_image_xpm_data, "small/image.xpm" }, { 5406, small_image_xpm_data, "small/image.xpm" },
{ 3179, small_layout_xpm_data, "small/tqlayout.xpm" }, { 3179, small_layout_xpm_data, "small/layout.xpm" },
{ 3621, small_left_xpm_data, "small/left.xpm" }, { 3621, small_left_xpm_data, "small/left.xpm" },
{ 1131, small_newform_xpm_data, "small/newform.xpm" }, { 1131, small_newform_xpm_data, "small/newform.xpm" },
{ 2434, small_print_xpm_data, "small/print.xpm" }, { 2434, small_print_xpm_data, "small/print.xpm" },
@ -10877,11 +10877,11 @@ static struct Embed {
{ 485, small_editcopy_png_data, "small/editcopy.png" }, { 485, small_editcopy_png_data, "small/editcopy.png" },
{ 649, small_editcut_png_data, "small/editcut.png" }, { 649, small_editcut_png_data, "small/editcut.png" },
{ 520, small_editgrid_png_data, "small/editgrid.png" }, { 520, small_editgrid_png_data, "small/editgrid.png" },
{ 706, small_edithlayout_png_data, "small/edithtqlayout.png" }, { 706, small_edithlayout_png_data, "small/edithlayout.png" },
{ 809, small_edithlayoutsplit_png_data, "small/edithlayoutsplit.png" }, { 809, small_edithlayoutsplit_png_data, "small/edithlayoutsplit.png" },
{ 902, small_editpaste_png_data, "small/editpaste.png" }, { 902, small_editpaste_png_data, "small/editpaste.png" },
{ 690, small_editslots_png_data, "small/editslots.png" }, { 690, small_editslots_png_data, "small/editslots.png" },
{ 289, small_editvlayout_png_data, "small/editvtqlayout.png" }, { 289, small_editvlayout_png_data, "small/editvlayout.png" },
{ 355, small_editvlayoutsplit_png_data, "small/editvlayoutsplit.png" }, { 355, small_editvlayoutsplit_png_data, "small/editvlayoutsplit.png" },
{ 1408, small_exec_png_data, "small/exec.png" }, { 1408, small_exec_png_data, "small/exec.png" },
{ 313, small_filenew_png_data, "small/filenew.png" }, { 313, small_filenew_png_data, "small/filenew.png" },
@ -10925,7 +10925,7 @@ static struct Embed {
{ 572, small_undo_png_data, "small/undo.png" }, { 572, small_undo_png_data, "small/undo.png" },
{ 733, small_disabled_editcut_xpm_data, "small/disabled/editcut.xpm" }, { 733, small_disabled_editcut_xpm_data, "small/disabled/editcut.xpm" },
{ 899, small_disabled_editslots_xpm_data, "small/disabled/editslots.xpm" }, { 899, small_disabled_editslots_xpm_data, "small/disabled/editslots.xpm" },
{ 931, small_disabled_layout_xpm_data, "small/disabled/tqlayout.xpm" }, { 931, small_disabled_layout_xpm_data, "small/disabled/layout.xpm" },
{ 733, small_disabled_left_xpm_data, "small/disabled/left.xpm" }, { 733, small_disabled_left_xpm_data, "small/disabled/left.xpm" },
{ 733, small_disabled_right_xpm_data, "small/disabled/right.xpm" }, { 733, small_disabled_right_xpm_data, "small/disabled/right.xpm" },
{ 659, small_disabled_adjustsize_png_data, "small/disabled/adjustsize.png" }, { 659, small_disabled_adjustsize_png_data, "small/disabled/adjustsize.png" },
@ -10933,10 +10933,10 @@ static struct Embed {
{ 1126, small_disabled_editbreaklayout_png_data, "small/disabled/editbreaklayout.png" }, { 1126, small_disabled_editbreaklayout_png_data, "small/disabled/editbreaklayout.png" },
{ 931, small_disabled_editcopy_png_data, "small/disabled/editcopy.png" }, { 931, small_disabled_editcopy_png_data, "small/disabled/editcopy.png" },
{ 735, small_disabled_editgrid_png_data, "small/disabled/editgrid.png" }, { 735, small_disabled_editgrid_png_data, "small/disabled/editgrid.png" },
{ 601, small_disabled_edithlayout_png_data, "small/disabled/edithtqlayout.png" }, { 601, small_disabled_edithlayout_png_data, "small/disabled/edithlayout.png" },
{ 754, small_disabled_edithlayoutsplit_png_data, "small/disabled/edithlayoutsplit.png" }, { 754, small_disabled_edithlayoutsplit_png_data, "small/disabled/edithlayoutsplit.png" },
{ 901, small_disabled_editpaste_png_data, "small/disabled/editpaste.png" }, { 901, small_disabled_editpaste_png_data, "small/disabled/editpaste.png" },
{ 617, small_disabled_editvlayout_png_data, "small/disabled/editvtqlayout.png" }, { 617, small_disabled_editvlayout_png_data, "small/disabled/editvlayout.png" },
{ 752, small_disabled_editvlayoutsplit_png_data, "small/disabled/editvlayoutsplit.png" }, { 752, small_disabled_editvlayoutsplit_png_data, "small/disabled/editvlayoutsplit.png" },
{ 587, small_disabled_filesave_png_data, "small/disabled/filesave.png" }, { 587, small_disabled_filesave_png_data, "small/disabled/filesave.png" },
{ 531, small_disabled_redo_png_data, "small/disabled/redo.png" }, { 531, small_disabled_redo_png_data, "small/disabled/redo.png" },

@ -282,7 +282,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg,
void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r ) void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r )
{ {
p->save(); 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) ); TQStyle::Style_Sunken, TQStyleOption(1,1) );
p->restore(); p->restore();
} }
@ -398,7 +398,7 @@ void PropertyItem::createResetButton()
resetButton = new TQPushButton( hbox ); resetButton = new TQPushButton( hbox );
resetButton->setPixmap( PixmapChooser::loadPixmap( "resetproperty.xpm", PixmapChooser::Mini ) ); resetButton->setPixmap( PixmapChooser::loadPixmap( "resetproperty.xpm", PixmapChooser::Mini ) );
resetButton->setFixedWidth( resetButton->sizeHint().width() ); resetButton->setFixedWidth( resetButton->sizeHint().width() );
hbox->tqlayout()->setAlignment( TQt::AlignRight ); hbox->layout()->setAlignment( TQt::AlignRight );
listview->addChild( hbox ); listview->addChild( hbox );
hbox->hide(); hbox->hide();
TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),

@ -401,8 +401,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
if ( formwindow ) { if ( formwindow ) {
formwindow->killAccels( TQT_TQOBJECT(formwindow) ); formwindow->killAccels( TQT_TQOBJECT(formwindow) );
if ( formwindow->tqlayout() ) if ( formwindow->layout() )
formwindow->tqlayout()->activate(); formwindow->layout()->activate();
if ( hadGeometry ) if ( hadGeometry )
formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize(). formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
expandedTo( formwindow->minimumSizeHint() ) ) ); expandedTo( formwindow->minimumSizeHint() ) ) );
@ -934,14 +934,14 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
return; // no children to save return; // no children to save
TQString closeTag; TQString closeTag;
// if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer
TQLayout *tqlayout = 0; TQLayout *layout = 0;
QDesignerGridLayout* grid = 0; QDesignerGridLayout* grid = 0;
if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) &&
WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
obj->isWidgetType() && obj->isWidgetType() &&
WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) { WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) {
WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ); WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout );
switch ( lay ) { switch ( lay ) {
case WidgetFactory::HBox: case WidgetFactory::HBox:
closeTag = makeIndent( indent ) + "</hbox>"; closeTag = makeIndent( indent ) + "</hbox>";
@ -957,15 +957,15 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
closeTag = makeIndent( indent ) + "</grid>"; closeTag = makeIndent( indent ) + "</grid>";
ts << makeIndent( indent ) << "<grid>" << endl; ts << makeIndent( indent ) << "<grid>" << endl;
++indent; ++indent;
grid = (QDesignerGridLayout*) tqlayout; grid = (QDesignerGridLayout*) layout;
break; break;
default: default:
break; break;
} }
// save properties of tqlayout // save properties of layout
if ( lay != WidgetFactory::NoLayout ) if ( lay != WidgetFactory::NoLayout )
saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent ); saveObjectProperties( TQT_TQOBJECT(layout), ts, indent );
} }
@ -1303,7 +1303,7 @@ void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup
saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) ); saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) );
indent--; indent--;
ts << makeIndent( indent ) << "</color>" << endl; 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() ) if ( pm && !pm->isNull() )
savePixmap( *pm, ts, indent ); savePixmap( *pm, ts, indent );
} }
@ -1316,7 +1316,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c )
ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl; 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; lastItem = 0;
TQDomElement n = e.firstChild().toElement(); TQDomElement n = e.firstChild().toElement();
@ -1346,16 +1346,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
w = (TQWidget*)obj; w = (TQWidget*)obj;
if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
w = ( (TQMainWindow*)w )->centralWidget(); w = ( (TQMainWindow*)w )->centralWidget();
if ( tqlayout ) { if ( layout ) {
switch ( WidgetFactory::layoutType( tqlayout ) ) { switch ( WidgetFactory::layoutType( layout ) ) {
case WidgetFactory::HBox: case WidgetFactory::HBox:
( (TQHBoxLayout*)tqlayout )->addWidget( w ); ( (TQHBoxLayout*)layout )->addWidget( w );
break; break;
case WidgetFactory::VBox: case WidgetFactory::VBox:
( (TQVBoxLayout*)tqlayout )->addWidget( w ); ( (TQVBoxLayout*)layout )->addWidget( w );
break; break;
case WidgetFactory::Grid: case WidgetFactory::Grid:
( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1, ( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
col, col + colspan - 1 ); col, col + colspan - 1 );
break; break;
default: default:
@ -1365,7 +1365,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
if ( !toplevel ) if ( !toplevel )
toplevel = w; toplevel = w;
tqlayout = 0; layout = 0;
if ( w && formwindow ) { if ( w && formwindow ) {
if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) )
@ -1379,22 +1379,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
while ( !n.isNull() ) { while ( !n.isNull() ) {
if ( n.tagName() == "spacer" ) { if ( n.tagName() == "spacer" ) {
createSpacer( n, w, tqlayout, Qt::Horizontal ); createSpacer( n, w, layout, Qt::Horizontal );
} else if ( n.tagName() == "widget" ) { } else if ( n.tagName() == "widget" ) {
createObject( n, w, tqlayout ); createObject( n, w, layout );
} else if ( n.tagName() == "hbox" ) { } else if ( n.tagName() == "hbox" ) {
tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox ); layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox );
obj = TQT_TQOBJECT(tqlayout); obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement(); n = n.firstChild().toElement();
continue; continue;
} else if ( n.tagName() == "grid" ) { } else if ( n.tagName() == "grid" ) {
tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid ); layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid );
obj = TQT_TQOBJECT(tqlayout); obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement(); n = n.firstChild().toElement();
continue; continue;
} else if ( n.tagName() == "vbox" ) { } else if ( n.tagName() == "vbox" ) {
tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox ); layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox );
obj = TQT_TQOBJECT(tqlayout); obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement(); n = n.firstChild().toElement();
continue; continue;
} else if ( n.tagName() == "property" && obj ) { } else if ( n.tagName() == "property" && obj ) {
@ -1605,7 +1605,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(); TQDomElement n = e.firstChild().toElement();
int row = e.attribute( "row" ).toInt(); int row = e.attribute( "row" ).toInt();
@ -1629,11 +1629,11 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
spacer->setInteraciveMode( true ); spacer->setInteraciveMode( true );
if ( formwindow ) if ( formwindow )
formwindow->insertWidget( spacer, pasting ); formwindow->insertWidget( spacer, pasting );
if ( tqlayout ) { if ( layout ) {
if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->alignment() ); ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() );
else 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() ); spacer->alignment() );
} }
return spacer; return spacer;

@ -103,8 +103,8 @@ private:
// void saveFormCode(); // void saveFormCode();
#endif #endif
TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 ); TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 );
TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ); TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o );
void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
void createColumn( const TQDomElement &e, TQWidget *widget ); void createColumn( const TQDomElement &e, TQWidget *widget );
void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e);

@ -145,21 +145,21 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
void StyledButton::drawButton( TQPainter *paint ) 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); isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
drawButtonLabel(paint); drawButtonLabel(paint);
if (hasFocus()) if (hasFocus())
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint, style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this), style().subRect(TQStyle::SR_PushButtonFocusRect, this),
colorGroup(), TQStyle::Style_Default); colorGroup(), TQStyle::Style_Default);
} }
void StyledButton::drawButtonLabel( TQPainter *paint ) void StyledButton::drawButtonLabel( TQPainter *paint )
{ {
TQColor pen = isEnabled() ? TQColor pen = isEnabled() ?
hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText() hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText()
: tqpalette().disabled().buttonText(); : palette().disabled().buttonText();
paint->setPen( pen ); paint->setPen( pen );
if(!isEnabled()) { if(!isEnabled()) {
@ -178,7 +178,7 @@ void StyledButton::onEditor()
{ {
switch (edit) { switch (edit) {
case ColorEditor: { case ColorEditor: {
TQColor c = tqpalette().active().background(); TQColor c = palette().active().background();
if ( KColorDialog::getColor( c, this ) == TQDialog::Accepted ) { if ( KColorDialog::getColor( c, this ) == TQDialog::Accepted ) {
setColor( c ); setColor( c );
emit changed(); emit changed();

@ -668,11 +668,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo
return w; 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. 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 spacing = MainWindow::self->currentLayoutDefaultSpacing();
int margin = 0; int margin = 0;
@ -682,46 +682,46 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) ) widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) )
margin = MainWindow::self->currentLayoutDefaultMargin(); margin = MainWindow::self->currentLayoutDefaultMargin();
if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
widget = ((TQTabWidget*)widget)->currentPage(); widget = ((TQTabWidget*)widget)->currentPage();
if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
widget = ((TQToolBox*)widget)->currentItem(); widget = ((TQToolBox*)widget)->currentItem();
if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
widget = ((TQWizard*)widget)->currentPage(); widget = ((TQWizard*)widget)->currentPage();
if ( !tqlayout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) if ( !layout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
widget = ((TQMainWindow*)widget)->centralWidget(); widget = ((TQMainWindow*)widget)->centralWidget();
if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
widget = ((TQWidgetStack*)widget)->visibleWidget(); widget = ((TQWidgetStack*)widget)->visibleWidget();
MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); MetaDataBase::addEntry( TQT_TQOBJECT(widget) );
if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
TQGroupBox *gb = (TQGroupBox*)widget; TQGroupBox *gb = (TQGroupBox*)widget;
gb->setColumnLayout( 0, Qt::Vertical ); gb->setColumnLayout( 0, Qt::Vertical );
gb->tqlayout()->setMargin( 0 ); gb->layout()->setMargin( 0 );
gb->tqlayout()->setSpacing( 0 ); gb->layout()->setSpacing( 0 );
TQLayout *l; TQLayout *l;
switch ( type ) { switch ( type ) {
case HBox: case HBox:
l = new TQHBoxLayout( gb->tqlayout() ); l = new TQHBoxLayout( gb->layout() );
MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
l->setAlignment( AlignTop ); l->setAlignment( AlignTop );
MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l; return l;
case VBox: case VBox:
l = new TQVBoxLayout( gb->tqlayout(), spacing ); l = new TQVBoxLayout( gb->layout(), spacing );
MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
l->setAlignment( AlignTop ); l->setAlignment( AlignTop );
MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l; return l;
case Grid: case Grid:
l = new QDesignerGridLayout( gb->tqlayout() ); l = new QDesignerGridLayout( gb->layout() );
MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin );
MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing );
l->setAlignment( AlignTop ); l->setAlignment( AlignTop );
@ -731,25 +731,25 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
return 0; return 0;
} }
} else { } else {
if ( tqlayout ) { if ( layout ) {
TQLayout *l; TQLayout *l;
switch ( type ) { switch ( type ) {
case HBox: case HBox:
l = new TQHBoxLayout( tqlayout ); l = new TQHBoxLayout( layout );
MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) );
l->setSpacing( spacing ); l->setSpacing( spacing );
l->setMargin( margin ); l->setMargin( margin );
MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l; return l;
case VBox: case VBox:
l = new TQVBoxLayout( tqlayout ); l = new TQVBoxLayout( layout );
MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) );
l->setSpacing( spacing ); l->setSpacing( spacing );
l->setMargin( margin ); l->setMargin( margin );
MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) );
return l; return l;
case Grid: { case Grid: {
l = new QDesignerGridLayout( tqlayout ); l = new QDesignerGridLayout( layout );
MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::addEntry( TQT_TQOBJECT(l) );
l->setSpacing( spacing ); l->setSpacing( spacing );
l->setMargin( margin ); l->setMargin( margin );
@ -819,7 +819,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
widget = ((TQMainWindow*)widget)->centralWidget(); widget = ((TQMainWindow*)widget)->centralWidget();
if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
widget = ((TQWidgetStack*)widget)->visibleWidget(); widget = ((TQWidgetStack*)widget)->visibleWidget();
delete widget->tqlayout(); delete widget->layout();
} }
/*! Factory functions for creating a widget of the type \a className /*! Factory functions for creating a widget of the type \a className
@ -1257,14 +1257,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
/*! Find out which type the tqlayout of the widget is. Returns \c HBox, /*! Find out which type the layout of the widget is. Returns \c HBox,
\c VBox, \c Grid or \c NoLayout. \a tqlayout points to this \c VBox, \c Grid or \c NoLayout. \a layout points to this
TQWidget::tqlayout() of \a w or to 0 after the function call. 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 ( w && w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) if ( w && w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
w = ((TQTabWidget*)w)->currentPage(); w = ((TQTabWidget*)w)->currentPage();
@ -1280,9 +1280,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox;
if ( !w || !w->tqlayout() ) if ( !w || !w->layout() )
return NoLayout; return NoLayout;
TQLayout *lay = w->tqlayout(); TQLayout *lay = w->layout();
if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING ); TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING );
@ -1290,7 +1290,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
lay = (TQLayout*)l->first(); lay = (TQLayout*)l->first();
delete l; delete l;
} }
tqlayout = lay; layout = lay;
if ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) if ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox; return HBox;
@ -1304,13 +1304,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql
/*! /*!
\overload \overload
*/ */
WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout ) WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
{ {
if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox; return HBox;
else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
return VBox; return VBox;
else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
return Grid; return Grid;
return NoLayout; return NoLayout;
} }
@ -1325,9 +1325,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 ) { while ( o ) {
if ( o->isWidgetType() ) if ( o->isWidgetType() )
return (TQWidget*)o; return (TQWidget*)o;
@ -1793,7 +1793,7 @@ bool TQLayoutWidget::event( TQEvent *e )
/* /*
This function must be called on TQLayoutWidget creation and whenever 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. to a TQVBoxLayout), because of the (illogical) way layouting works.
*/ */
void TQLayoutWidget::updateSizePolicy() void TQLayoutWidget::updateSizePolicy()
@ -1817,14 +1817,14 @@ void TQLayoutWidget::updateSizePolicy()
int ht = (int) TQSizePolicy::Preferred; int ht = (int) TQSizePolicy::Preferred;
int vt = (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. top level, in which case layouting is illogical.
*/ */
TQLayout *parentLayout = 0; TQLayout *parentLayout = 0;
if ( parent() && parent()->isWidgetType() ) { if ( parent() && parent()->isWidgetType() ) {
parentLayout = ((TQWidget *)parent())->tqlayout(); parentLayout = ((TQWidget *)parent())->layout();
if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
parentLayout = 0; parentLayout = 0;
} }
@ -1832,7 +1832,7 @@ void TQLayoutWidget::updateSizePolicy()
TQObjectListIt it( childrenListObject() ); TQObjectListIt it( childrenListObject() );
TQObject *o; TQObject *o;
if ( tqlayout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) { if ( layout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) {
if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
vt = TQSizePolicy::Minimum; vt = TQSizePolicy::Minimum;
else else
@ -1853,7 +1853,7 @@ void TQLayoutWidget::updateSizePolicy()
if ( w->sizePolicy().mayShrinkVertically() ) if ( w->sizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum; vt |= TQSizePolicy::Maximum;
} }
} else if ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) { } else if ( layout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
ht = TQSizePolicy::Minimum; ht = TQSizePolicy::Minimum;
else else
@ -1874,7 +1874,7 @@ void TQLayoutWidget::updateSizePolicy()
if ( !w->sizePolicy().mayShrinkVertically() ) if ( !w->sizePolicy().mayShrinkVertically() )
vt &= ~TQSizePolicy::Maximum; vt &= ~TQSizePolicy::Maximum;
} }
} else if ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { } else if ( layout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
ht = TQSizePolicy::Fixed; ht = TQSizePolicy::Fixed;
vt = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed;
if ( parentLayout ) { if ( parentLayout ) {
@ -1901,18 +1901,18 @@ void TQLayoutWidget::updateSizePolicy()
} }
} }
#ifdef USE_QT4 #ifdef USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Horizontally ) if ( layout()->expanding() & TQSizePolicy::Horizontally )
ht = TQSizePolicy::Expanding; ht = TQSizePolicy::Expanding;
if ( tqlayout()->expanding() & TQSizePolicy::Vertically ) if ( layout()->expanding() & TQSizePolicy::Vertically )
vt = TQSizePolicy::Expanding; vt = TQSizePolicy::Expanding;
#else // USE_QT4 #else // USE_QT4
if ( tqlayout()->expanding() & TQSizePolicy::Horizontally ) if ( layout()->expanding() & TQSizePolicy::Horizontally )
ht = TQSizePolicy::Expanding; ht = TQSizePolicy::Expanding;
if ( tqlayout()->expanding() & TQSizePolicy::Vertically ) if ( layout()->expanding() & TQSizePolicy::Vertically )
vt = TQSizePolicy::Expanding; vt = TQSizePolicy::Expanding;
#endif // USE_QT4 #endif // USE_QT4
tqlayout()->invalidate(); layout()->invalidate();
} }
sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt ); sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );

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

@ -497,7 +497,7 @@ FeatureList KommanderFactory::featureList()
//iterate through widgetPlugins, appending KommanderPlugin::widgets() to features //iterate through widgetPlugins, appending KommanderPlugin::widgets() to features
} }
TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ) TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg )
{ {
lastItem = 0; lastItem = 0;
TQDomElement n = e.firstChild().toElement(); TQDomElement n = e.firstChild().toElement();
@ -515,10 +515,10 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
if ( colspan < 1 ) if ( colspan < 1 )
colspan = 1; colspan = 1;
if ( !className.isEmpty() ) { if ( !className.isEmpty() ) {
if ( !tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
className = TQWIDGET_OBJECT_NAME_STRING; className = TQWIDGET_OBJECT_NAME_STRING;
if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) { if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
// hide tqlayout widgets // hide layout widgets
w = parent; w = parent;
} else { } else {
obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 )); obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 ));
@ -531,16 +531,16 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
toplevel = w; toplevel = w;
if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
w = ( (TQMainWindow*)w )->centralWidget(); w = ( (TQMainWindow*)w )->centralWidget();
if ( tqlayout ) { if ( layout ) {
switch( layoutType( tqlayout ) ) { switch( layoutType( layout ) ) {
case HBox: case HBox:
( (TQHBoxLayout*)tqlayout )->addWidget( w ); ( (TQHBoxLayout*)layout )->addWidget( w );
break; break;
case VBox: case VBox:
( (TQVBoxLayout*)tqlayout )->addWidget( w ); ( (TQVBoxLayout*)layout )->addWidget( w );
break; break;
case Grid: case Grid:
( (TQGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1, ( (TQGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
col, col + colspan - 1 ); col, col + colspan - 1 );
break; break;
default: default:
@ -548,7 +548,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
} }
} }
tqlayout = 0; layout = 0;
} }
} }
if (className == "Dialog") if (className == "Dialog")
@ -556,43 +556,43 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
while ( !n.isNull() ) { while ( !n.isNull() ) {
if ( n.tagName() == "spacer" ) { if ( n.tagName() == "spacer" ) {
createSpacer( n, tqlayout ); createSpacer( n, layout );
} else if ( n.tagName() == "widget" ) { } else if ( n.tagName() == "widget" ) {
TQMap< TQString, TQString> *oldDbControls = dbControls; 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; dbControls = oldDbControls;
} else if ( n.tagName() == "hbox" ) { } else if ( n.tagName() == "hbox" ) {
TQLayout *parentLayout = tqlayout; TQLayout *parentLayout = layout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, KommanderFactory::HBox ); layout = createLayout( 0, 0, KommanderFactory::HBox );
else else
tqlayout = createLayout( w, tqlayout, KommanderFactory::HBox ); layout = createLayout( w, layout, KommanderFactory::HBox );
obj = TQT_TQOBJECT(tqlayout); obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement(); n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
continue; continue;
} else if ( n.tagName() == "grid" ) { } else if ( n.tagName() == "grid" ) {
TQLayout *parentLayout = tqlayout; TQLayout *parentLayout = layout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, KommanderFactory::Grid ); layout = createLayout( 0, 0, KommanderFactory::Grid );
else else
tqlayout = createLayout( w, tqlayout, KommanderFactory::Grid ); layout = createLayout( w, layout, KommanderFactory::Grid );
obj = TQT_TQOBJECT(tqlayout); obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement(); n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
continue; continue;
} else if ( n.tagName() == "vbox" ) { } else if ( n.tagName() == "vbox" ) {
TQLayout *parentLayout = tqlayout; TQLayout *parentLayout = layout;
if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
tqlayout = createLayout( 0, 0, KommanderFactory::VBox ); layout = createLayout( 0, 0, KommanderFactory::VBox );
else else
tqlayout = createLayout( w, tqlayout, KommanderFactory::VBox ); layout = createLayout( w, layout, KommanderFactory::VBox );
obj = TQT_TQOBJECT(tqlayout); obj = TQT_TQOBJECT(layout);
n = n.firstChild().toElement(); n = n.firstChild().toElement();
if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
continue; continue;
} else if ( n.tagName() == "property" && obj ) { } else if ( n.tagName() == "property" && obj ) {
setProperty( obj, n.attribute( "name" ), n.firstChild().toElement() ); setProperty( obj, n.attribute( "name" ), n.firstChild().toElement() );
@ -622,60 +622,60 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
return w; return w;
} }
TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ) TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, LayoutType type )
{ {
int spacing = defSpacing; int spacing = defSpacing;
int margin = defMargin; int margin = defMargin;
if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
widget = ((TQTabWidget*)widget)->currentPage(); widget = ((TQTabWidget*)widget)->currentPage();
if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
widget = ((TQToolBox*)widget)->currentItem(); widget = ((TQToolBox*)widget)->currentItem();
if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
widget = ((TQWizard*)widget)->currentPage(); 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(); widget = ((TQWidgetStack*)widget)->visibleWidget();
if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
TQGroupBox *gb = (TQGroupBox*)widget; TQGroupBox *gb = (TQGroupBox*)widget;
gb->setColumnLayout( 0, Qt::Vertical ); gb->setColumnLayout( 0, Qt::Vertical );
gb->tqlayout()->setMargin( 0 ); gb->layout()->setMargin( 0 );
gb->tqlayout()->setSpacing( 0 ); gb->layout()->setSpacing( 0 );
TQLayout *l; TQLayout *l;
switch ( type ) { switch ( type ) {
case HBox: case HBox:
l = new TQHBoxLayout( gb->tqlayout() ); l = new TQHBoxLayout( gb->layout() );
l->setAlignment( TQt::AlignTop ); l->setAlignment( TQt::AlignTop );
return l; return l;
case VBox: case VBox:
l = new TQVBoxLayout( gb->tqlayout(), spacing ); l = new TQVBoxLayout( gb->layout(), spacing );
l->setAlignment( TQt::AlignTop ); l->setAlignment( TQt::AlignTop );
return l; return l;
case Grid: case Grid:
l = new TQGridLayout( gb->tqlayout() ); l = new TQGridLayout( gb->layout() );
l->setAlignment( TQt::AlignTop ); l->setAlignment( TQt::AlignTop );
return l; return l;
default: default:
return 0; return 0;
} }
} else { } else {
if ( tqlayout ) { if ( layout ) {
TQLayout *l; TQLayout *l;
switch ( type ) { switch ( type ) {
case HBox: case HBox:
l = new TQHBoxLayout( tqlayout ); l = new TQHBoxLayout( layout );
l->setSpacing( spacing ); l->setSpacing( spacing );
l->setMargin( margin ); l->setMargin( margin );
return l; return l;
case VBox: case VBox:
l = new TQVBoxLayout( tqlayout ); l = new TQVBoxLayout( layout );
l->setSpacing( spacing ); l->setSpacing( spacing );
l->setMargin( margin ); l->setMargin( margin );
return l; return l;
case Grid: { case Grid: {
l = new TQGridLayout( tqlayout ); l = new TQGridLayout( layout );
l->setSpacing( spacing ); l->setSpacing( spacing );
l->setMargin( margin ); l->setMargin( margin );
return l; return l;
@ -715,13 +715,13 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
} }
} }
KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *tqlayout ) const KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) const
{ {
if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox; return HBox;
else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
return VBox; return VBox;
else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
return Grid; return Grid;
return NoLayout; return NoLayout;
} }
@ -840,7 +840,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
obj->setProperty( prop, v ); obj->setProperty( prop, v );
} }
void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout ) void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
{ {
TQDomElement n = e.firstChild().toElement(); TQDomElement n = e.firstChild().toElement();
int row = e.attribute( "row" ).toInt(); int row = e.attribute( "row" ).toInt();
@ -886,11 +886,11 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
colspan = 1; colspan = 1;
TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum,
orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum );
if ( tqlayout ) { if ( layout ) {
if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
( (TQBoxLayout*)tqlayout )->addItem( item ); ( (TQBoxLayout*)layout )->addItem( item );
else 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 ); orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter );
} }
} }

@ -74,11 +74,11 @@ private:
void loadImageCollection( const TQDomElement &e ); void loadImageCollection( const TQDomElement &e );
void loadConnections( const TQDomElement &e, TQObject *connector ); void loadConnections( const TQDomElement &e, TQObject *connector );
void loadTabOrder( const TQDomElement &e ); void loadTabOrder( const TQDomElement &e );
TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg ); TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg );
TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type );
LayoutType layoutType( TQLayout *l ) const; LayoutType layoutType( TQLayout *l ) const;
void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e ); 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 ); TQImage loadFromCollection( const TQString &name );
TQPixmap loadPixmap( const TQDomElement &e ); TQPixmap loadPixmap( const TQDomElement &e );
TQColorGroup loadColorGroup( const TQDomElement &e ); TQColorGroup loadColorGroup( const TQDomElement &e );

@ -61,11 +61,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name)
m_textedit = new TQTextEdit(this, "editor"); m_textedit = new TQTextEdit(this, "editor");
m_textedit->setTextFormat(RichText); m_textedit->setTextFormat(RichText);
// tqlayout the widgets // layout the widgets
TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQVBoxLayout *layout = new TQVBoxLayout(this);
tqlayout->addWidget(m_toolbar); layout->addWidget(m_toolbar);
tqlayout->addWidget(m_textedit); layout->addWidget(m_textedit);
tqlayout->setSpacing(1); layout->setSpacing(1);
// setup buttons // setup buttons
TQHBoxLayout *tbLayout = new TQHBoxLayout(m_toolbar); TQHBoxLayout *tbLayout = new TQHBoxLayout(m_toolbar);

@ -358,7 +358,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout18</cstring> <cstring>layout18</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

@ -36,7 +36,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -80,7 +80,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

@ -214,7 +214,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -251,7 +251,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="2" column="1"> <widget class="TQLayoutWidget" row="2" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout8</cstring> <cstring>layout8</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -172,7 +172,7 @@
* *
* \note The added functions must be added to the header at the same location * \note The added functions must be added to the header at the same location
* as the macro; changing the order of virtual functions in a header is also * as the macro; changing the order of virtual functions in a header is also
* binary incompatible as it breaks the tqlayout of the vtable. * binary incompatible as it breaks the layout of the vtable.
*/ */
#define RESERVE_VIRTUAL_1 \ #define RESERVE_VIRTUAL_1 \

@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
paint.begin( this ); paint.begin( this );
tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end(); paint.end();
} }
@ -221,14 +221,14 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
#endif #endif
d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) );
tqlayout = new TQHBoxLayout( this ); layout = new TQHBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum ); layout->setResizeMode( TQLayout::Minimum );
drag = new KDockWidgetHeaderDrag( this, parent ); drag = new KDockWidgetHeaderDrag( this, parent );
closeButton = new KDockButton_Private( this, "DockCloseButton" ); closeButton = new KDockButton_Private( this, "DockCloseButton" );
TQToolTip::add( closeButton, i18n("Close") ); TQToolTip::add( closeButton, i18n("Close") );
closeButton->setPixmap( tqstyle().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this));
closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked()));
connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
@ -258,13 +258,13 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
d->dummy->setFixedSize( 1,closeButton->pixmap()->height() ); d->dummy->setFixedSize( 1,closeButton->pixmap()->height() );
tqlayout->addWidget( drag ); layout->addWidget( drag );
tqlayout->addWidget( dockbackButton ); layout->addWidget( dockbackButton );
tqlayout->addWidget( d->toDesktopButton ); layout->addWidget( d->toDesktopButton );
tqlayout->addWidget( d->dummy); layout->addWidget( d->dummy);
tqlayout->addWidget( stayButton ); layout->addWidget( stayButton );
tqlayout->addWidget( closeButton ); layout->addWidget( closeButton );
tqlayout->activate(); layout->activate();
d->dummy->hide(); d->dummy->hide();
drag->setFixedHeight( tqlayout->minimumSize().height() ); drag->setFixedHeight( tqlayout->minimumSize().height() );
} }
@ -291,7 +291,7 @@ void KDockWidgetHeader::setTopLevel( bool isTopLevel )
if( d->showToDesktopButton ) if( d->showToDesktopButton )
d->toDesktopButton->show(); d->toDesktopButton->show();
} }
tqlayout->activate(); layout->activate();
bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
@ -318,9 +318,9 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
{ {
if ( !nd ) return; if ( !nd ) return;
delete tqlayout; delete layout;
tqlayout = new TQHBoxLayout( this ); layout = new TQHBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum ); layout->setResizeMode( TQLayout::Minimum );
delete drag; delete drag;
drag = nd; drag = nd;
@ -329,21 +329,21 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
} }
tqlayout->addWidget( drag ); layout->addWidget( drag );
tqlayout->addWidget( dockbackButton ); layout->addWidget( dockbackButton );
tqlayout->addWidget( d->dummy ); layout->addWidget( d->dummy );
tqlayout->addWidget( d->toDesktopButton ); layout->addWidget( d->toDesktopButton );
tqlayout->addWidget( stayButton ); layout->addWidget( stayButton );
bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
closeButton->isVisibleTo(this); closeButton->isVisibleTo(this);
for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) { for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) {
tqlayout->addWidget(it.current()); layout->addWidget(it.current());
dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this)); dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this));
} }
if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
tqlayout->addWidget( closeButton ); layout->addWidget( closeButton );
tqlayout->activate(); layout->activate();
kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->minimumSize().height()<<endl; kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<tqlayout->minimumSize().height()<<endl;
#ifdef __GNUC__ #ifdef __GNUC__
#warning FIXME #warning FIXME
@ -362,25 +362,25 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) {
btn->show(); btn->show();
delete tqlayout; delete layout;
tqlayout = new TQHBoxLayout( this ); layout = new TQHBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum ); layout->setResizeMode( TQLayout::Minimum );
tqlayout->addWidget( drag ); layout->addWidget( drag );
tqlayout->addWidget( dockbackButton ); layout->addWidget( dockbackButton );
tqlayout->addWidget( d->toDesktopButton ); layout->addWidget( d->toDesktopButton );
tqlayout->addWidget( d->dummy); layout->addWidget( d->dummy);
tqlayout->addWidget( stayButton ); layout->addWidget( stayButton );
bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) || bool dontShowDummy=drag->isVisibleTo(this) || dockbackButton->isVisibleTo(this) ||
d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) || d->toDesktopButton->isVisibleTo(this) || stayButton->isVisibleTo(this) ||
closeButton->isVisibleTo(this); closeButton->isVisibleTo(this);
for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) { for (TQPtrListIterator<KDockButton_Private> it( d->btns );it.current();++it) {
tqlayout->addWidget(it.current()); layout->addWidget(it.current());
dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this)); dontShowDummy=dontShowDummy || (it.current()->isVisibleTo(this));
} }
if (dontShowDummy) d->dummy->hide(); else d->dummy->show(); if (dontShowDummy) d->dummy->hide(); else d->dummy->show();
tqlayout->addWidget( closeButton ); layout->addWidget( closeButton );
tqlayout->activate(); layout->activate();
drag->setFixedHeight( tqlayout->minimumSize().height() ); drag->setFixedHeight( tqlayout->minimumSize().height() );
} }
@ -497,8 +497,8 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
d->_parent = parent; d->_parent = parent;
tqlayout = new TQVBoxLayout( this ); layout = new TQVBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum ); layout->setResizeMode( TQLayout::Minimum );
manager = dockManager; manager = dockManager;
manager->childDock->append( TQT_TQOBJECT(this) ); manager->childDock->append( TQT_TQOBJECT(this) );
@ -577,7 +577,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
TQWidget::paintEvent(pe); TQWidget::paintEvent(pe);
TQPainter paint; TQPainter paint;
paint.begin( this ); paint.begin( this );
tqstyle().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
paint.end(); paint.end();
} }
@ -604,7 +604,7 @@ void KDockWidget::mousePressEvent(TQMouseEvent* mme)
int styleheight; int styleheight;
TQPoint mp; TQPoint mp;
mp=mme->pos(); mp=mme->pos();
styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight; bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight; btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight; bleft=mp.x()<=styleheight;
@ -692,7 +692,7 @@ void KDockWidget::mouseMoveEvent(TQMouseEvent* mme)
int styleheight; int styleheight;
TQPoint mp; TQPoint mp;
mp=mme->pos(); mp=mme->pos();
styleheight=2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this); styleheight=2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this);
bbottom=mp.y()>=height()-styleheight; bbottom=mp.y()>=height()-styleheight;
btop=mp.y()<=styleheight; btop=mp.y()<=styleheight;
bleft=mp.x()<=styleheight; bleft=mp.x()<=styleheight;
@ -748,15 +748,15 @@ void KDockWidget::setHeader( KDockWidgetAbstractHeader* h )
if ( header ){ if ( header ){
delete header; delete header;
delete tqlayout; delete layout;
header = h; header = h;
tqlayout = new TQVBoxLayout( this ); layout = new TQVBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum ); layout->setResizeMode( TQLayout::Minimum );
tqlayout->addWidget( header ); layout->addWidget( header );
setWidget( widget ); setWidget( widget );
} else { } else {
header = h; header = h;
tqlayout->addWidget( header ); layout->addWidget( header );
} }
kdDebug(282)<<caption()<<": KDockWidget::setHeader"<<endl; kdDebug(282)<<caption()<<": KDockWidget::setHeader"<<endl;
setEnableDocking(eDocking); setEnableDocking(eDocking);
@ -774,7 +774,7 @@ void KDockWidget::updateHeader()
{ {
if ( parent() ){ if ( parent() ){
#ifdef BORDERLESS_WINDOWS #ifdef BORDERLESS_WINDOWS
tqlayout->setMargin(0); layout->setMargin(0);
setMouseTracking(false); setMouseTracking(false);
setCursor(TQCursor(ArrowCursor)); setCursor(TQCursor(ArrowCursor));
#endif #endif
@ -792,7 +792,7 @@ void KDockWidget::updateHeader()
header->setTopLevel( true ); header->setTopLevel( true );
header->show(); header->show();
#ifdef BORDERLESS_WINDOWS #ifdef BORDERLESS_WINDOWS
tqlayout->setMargin(2*tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth,this)); layout->setMargin(2*style().pixelMetric(TQStyle::PM_DefaultFrameWidth,this));
setMouseTracking(true); setMouseTracking(true);
#endif #endif
} }
@ -1438,10 +1438,10 @@ void KDockWidget::setWidget( TQWidget* mw )
if (!mw->ownCursor()) mw->setCursor(TQCursor(ArrowCursor)); if (!mw->ownCursor()) mw->setCursor(TQCursor(ArrowCursor));
#endif #endif
widget = mw; widget = mw;
delete tqlayout; delete layout;
tqlayout = new TQVBoxLayout( this ); layout = new TQVBoxLayout( this );
tqlayout->setResizeMode( TQLayout::Minimum ); layout->setResizeMode( TQLayout::Minimum );
KDockContainer* dc = dynamic_cast<KDockContainer*>(widget); KDockContainer* dc = dynamic_cast<KDockContainer*>(widget);
if (dc) if (dc)
@ -1456,8 +1456,8 @@ void KDockWidget::setWidget( TQWidget* mw )
{ {
header->show(); header->show();
tqlayout->addWidget( header ); layout->addWidget( header );
tqlayout->addWidget( widget,1 ); layout->addWidget( widget,1 );
} }
updateHeader(); updateHeader();
emit widgetSet(mw); emit widgetSet(mw);

@ -328,9 +328,9 @@ protected slots:
protected: protected:
/** /**
* A tqlayout manager for placing the embedded buttons (close and stay) * A layout manager for placing the embedded buttons (close and stay)
*/ */
TQHBoxLayout* tqlayout; TQHBoxLayout* layout;
/** /**
* a little button for closing (undocking and hiding) the dockwidget * a little button for closing (undocking and hiding) the dockwidget
@ -856,9 +856,9 @@ private:
TQWidget* widget; TQWidget* widget;
/** /**
* the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header * the layout manager that takes care about proper resizing and moving the embedded widget and the header
*/ */
TQVBoxLayout* tqlayout; TQVBoxLayout* layout;
/** /**
* the responsible dockmanager * the responsible dockmanager
@ -963,7 +963,7 @@ public:
* (TQObject::name) in the childDock variable of * (TQObject::name) in the childDock variable of
* KDockManager. This list in turn contains all * KDockManager. This list in turn contains all
* KDockWidgets (according to the KDockWidget constructor). * KDockWidgets (according to the KDockWidget constructor).
* So in principle, in order to restore a window tqlayout, * So in principle, in order to restore a window layout,
* one must first construct all widgets, put each of them in a * one must first construct all widgets, put each of them in a
* KDockWidget and then call readConfig(). And for all that * KDockWidget and then call readConfig(). And for all that
* to work, each widget must have a unique name. * to work, each widget must have a unique name.
@ -978,11 +978,11 @@ public:
void setMainDockWidget2(KDockWidget *); void setMainDockWidget2(KDockWidget *);
/** /**
* Saves the current dock window tqlayout into a DOM tree below the given element. * Saves the current dock window layout into a DOM tree below the given element.
*/ */
void writeConfig(TQDomElement &base); void writeConfig(TQDomElement &base);
/** /**
* Reads the current dock window tqlayout from a DOM tree below the given element. * Reads the current dock window layout from a DOM tree below the given element.
*/ */
void readConfig(TQDomElement &base); void readConfig(TQDomElement &base);
@ -1371,11 +1371,11 @@ public:
const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) ); const TQString& strCaption = TQString(), const TQString& strTabPageLabel = TQString::fromLatin1( " " ) );
/** /**
* Saves the current dock window tqlayout into a DOM tree below the given element. * Saves the current dock window layout into a DOM tree below the given element.
*/ */
void writeDockConfig(TQDomElement &base); void writeDockConfig(TQDomElement &base);
/** /**
* Reads the current dock window tqlayout from a DOM tree below the given element. * Reads the current dock window layout from a DOM tree below the given element.
*/ */
void readDockConfig(TQDomElement &base); void readDockConfig(TQDomElement &base);

@ -611,7 +611,7 @@ void KMdiChildArea::tileAnodine()
return ; return ;
int numCols = int( sqrt( ( double ) numVisible ) ); // set columns to square root of visible count int numCols = int( sqrt( ( double ) numVisible ) ); // set columns to square root of visible count
// create an array to form grid tqlayout // create an array to form grid layout
int *numRows = new int[ numCols ]; int *numRows = new int[ numCols ];
int numCurCol = 0; int numCurCol = 0;

@ -157,31 +157,31 @@ public:
/** /**
* Sets the MDI childframe window caption font * Sets the MDI childframe window caption font
* A retqlayout does not occur when using this function * A relayout does not occur when using this function
*/ */
void setMdiCaptionFont( const TQFont &fnt ); void setMdiCaptionFont( const TQFont &fnt );
/** /**
* Sets the foreground color of the active MDI childframe window caption * Sets the foreground color of the active MDI childframe window caption
* A retqlayout does not occur when using this function * A relayout does not occur when using this function
*/ */
void setMdiCaptionActiveForeColor( const TQColor &clr ); void setMdiCaptionActiveForeColor( const TQColor &clr );
/** /**
* Sets the background color of the active MDI childframe window captions * Sets the background color of the active MDI childframe window captions
* A retqlayout does not occur when using this function * A relayout does not occur when using this function
*/ */
void setMdiCaptionActiveBackColor( const TQColor &clr ); void setMdiCaptionActiveBackColor( const TQColor &clr );
/** /**
* Sets the foreground color of inactive MDI childframe window captions * Sets the foreground color of inactive MDI childframe window captions
* A retqlayout does not occur when using this function * A relayout does not occur when using this function
*/ */
void setMdiCaptionInactiveForeColor( const TQColor &clr ); void setMdiCaptionInactiveForeColor( const TQColor &clr );
/** /**
* Sets the background color of inactive MDI childframe window captions * Sets the background color of inactive MDI childframe window captions
* A retqlayout does not occur when using this function * A relayout does not occur when using this function
*/ */
void setMdiCaptionInactiveBackColor( const TQColor &clr ); void setMdiCaptionInactiveBackColor( const TQColor &clr );
@ -240,7 +240,7 @@ public slots:
void tileVertically(); void tileVertically();
/** /**
* Position and tqlayout the minimized child frames * Position and layout the minimized child frames
*/ */
void layoutMinimizedChildren(); void layoutMinimizedChildren();

@ -521,7 +521,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
case Maximized: case Maximized:
m_pClient->m_stateChanged = true; m_pClient->m_stateChanged = true;
m_state = state; m_state = state;
// client min / max size / tqlayout behavior don't change // client min / max size / layout behavior don't change
// set frame max size indirectly by setting the clients max size to // set frame max size indirectly by setting the clients max size to
// it's current value (calls setMaxSize() of frame) // it's current value (calls setMaxSize() of frame)
m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() ); m_pClient->setMaximumSize( m_pClient->maximumSize().width(), m_pClient->maximumSize().height() );
@ -531,12 +531,12 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
case Minimized: case Minimized:
m_pClient->m_stateChanged = true; m_pClient->m_stateChanged = true;
m_state = state; m_state = state;
// restore client min / max size / tqlayout behavior // restore client min / max size / layout behavior
m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
if ( m_pClient->tqlayout() != 0L ) if ( m_pClient->layout() != 0L )
{ {
m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode ); m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
} }
m_pMinimize->setPixmap( *m_pMinButtonPixmap ); m_pMinimize->setPixmap( *m_pMinButtonPixmap );
m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
@ -555,12 +555,12 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
{ {
m_pClient->m_stateChanged = true; m_pClient->m_stateChanged = true;
m_state = state; m_state = state;
// restore client min / max size / tqlayout behavior // restore client min / max size / layout behavior
m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() ); m_pClient->setMinimumSize( m_oldClientMinSize.width(), m_oldClientMinSize.height() );
m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() ); m_pClient->setMaximumSize( m_oldClientMaxSize.width(), m_oldClientMaxSize.height() );
if ( m_pClient->tqlayout() != 0L ) if ( m_pClient->layout() != 0L )
{ {
m_pClient->tqlayout() ->setResizeMode( m_oldLayoutResizeMode ); m_pClient->layout() ->setResizeMode( m_oldLayoutResizeMode );
} }
setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
// reset to maximize-captionbar // reset to maximize-captionbar
@ -581,7 +581,7 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
{ {
m_pClient->m_stateChanged = true; m_pClient->m_stateChanged = true;
m_state = state; m_state = state;
// client min / max size / tqlayout behavior don't change // client min / max size / layout behavior don't change
setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX );
m_pMaximize->setPixmap( *m_pRestoreButtonPixmap ); m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER; int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER;
@ -607,18 +607,18 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
case Maximized: case Maximized:
m_pClient->m_stateChanged = true; m_pClient->m_stateChanged = true;
m_state = state; m_state = state;
// save client min / max size / tqlayout behavior // save client min / max size / layout behavior
m_oldClientMinSize = m_pClient->minimumSize(); m_oldClientMinSize = m_pClient->minimumSize();
m_oldClientMaxSize = m_pClient->maximumSize(); m_oldClientMaxSize = m_pClient->maximumSize();
if ( m_pClient->tqlayout() != 0L ) if ( m_pClient->layout() != 0L )
{ {
m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode(); m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
} }
m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMinimumSize( 0, 0 );
m_pClient->setMaximumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 );
if ( m_pClient->tqlayout() != 0L ) if ( m_pClient->layout() != 0L )
{ {
m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize ); m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
} }
switchToMinimizeLayout(); switchToMinimizeLayout();
m_pManager->childMinimized( this, true ); m_pManager->childMinimized( this, true );
@ -626,19 +626,19 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
case Normal: case Normal:
m_pClient->m_stateChanged = true; m_pClient->m_stateChanged = true;
m_state = state; m_state = state;
// save client min / max size / tqlayout behavior // save client min / max size / layout behavior
m_oldClientMinSize = m_pClient->minimumSize(); m_oldClientMinSize = m_pClient->minimumSize();
m_oldClientMaxSize = m_pClient->maximumSize(); m_oldClientMaxSize = m_pClient->maximumSize();
if ( m_pClient->tqlayout() != 0L ) if ( m_pClient->layout() != 0L )
{ {
m_oldLayoutResizeMode = m_pClient->tqlayout() ->resizeMode(); m_oldLayoutResizeMode = m_pClient->layout() ->resizeMode();
} }
m_restoredRect = geometry(); m_restoredRect = geometry();
m_pClient->setMinimumSize( 0, 0 ); m_pClient->setMinimumSize( 0, 0 );
m_pClient->setMaximumSize( 0, 0 ); m_pClient->setMaximumSize( 0, 0 );
if ( m_pClient->tqlayout() != 0L ) if ( m_pClient->layout() != 0L )
{ {
m_pClient->tqlayout() ->setResizeMode( TQLayout::FreeResize ); m_pClient->layout() ->setResizeMode( TQLayout::FreeResize );
} }
switchToMinimizeLayout(); switchToMinimizeLayout();
m_pManager->childMinimized( this, false ); m_pManager->childMinimized( this, false );

@ -71,7 +71,7 @@ class KMdiChildViewPrivate;
* KMdiChildView* pMDICover = new KMdiChildView( pNewView->caption()); * KMdiChildView* pMDICover = new KMdiChildView( pNewView->caption());
* pMDICover->setIcon(icon); * pMDICover->setIcon(icon);
* m_MDICoverList.append( pMDICover); * m_MDICoverList.append( pMDICover);
* TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout"); * TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout");
* pNewView->reparent( pMDICover, TQPoint(0,0)); * pNewView->reparent( pMDICover, TQPoint(0,0));
* pLayout->addWidget( pNewView); * pLayout->addWidget( pNewView);
* pMDICover->setName( pNewView->name()); * pMDICover->setName( pNewView->name());

@ -70,9 +70,9 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit
if ( m_horizontal ) if ( m_horizontal )
l = new TQVBoxLayout( this ); //vertical tqlayout for top and bottom docks l = new TQVBoxLayout( this ); //vertical layout for top and bottom docks
else else
l = new TQHBoxLayout( this ); //horizontal tqlayout for left and right docks l = new TQHBoxLayout( this ); //horizontal layout for left and right docks
l->setAutoAdd( false ); l->setAutoAdd( false );
@ -106,7 +106,7 @@ KMdiDockContainer::KMdiDockContainer( TQWidget *parent, TQWidget *win, int posit
m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); m_ws->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
//tqlayout the tabbar //layout the tabbar
if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop ) if ( position == KDockWidget::DockLeft || position == KDockWidget::DockTop )
{ {
//add the tabbar then the widget stack //add the tabbar then the widget stack

@ -307,7 +307,7 @@ KMdiMainFrm::~KMdiMainFrm()
TQValueListIterator<KMdiChildView*> childIt; TQValueListIterator<KMdiChildView*> childIt;
for ( childIt = children.begin(); childIt != children.end(); ++childIt ) for ( childIt = children.begin(); childIt != children.end(); ++childIt )
{ {
closeWindow( *childIt, false ); // without re-tqlayout taskbar! closeWindow( *childIt, false ); // without re-layout taskbar!
} }
emit lastChildViewClosed(); emit lastChildViewClosed();
@ -423,7 +423,7 @@ KMdiChildView* KMdiMainFrm::createWrapper( TQWidget *view, const TQString& name,
KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/, KMdiChildView* pMDICover = new KMdiChildView( name /*caption*/, 0L /*parent*/,
name.latin1() ); name.latin1() );
TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "tqlayout" ); TQBoxLayout* pLayout = new TQHBoxLayout( pMDICover, 0, -1, "layout" );
view->reparent( pMDICover, TQPoint( 0, 0 ) ); view->reparent( pMDICover, TQPoint( 0, 0 ) );
pLayout->addWidget( view ); pLayout->addWidget( view );
// pMDICover->setName(name); // pMDICover->setName(name);

@ -337,8 +337,8 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
// if there's enough space, use actual width // if there's enough space, use actual width
int buttonCount = m_pButtonList->count(); int buttonCount = m_pButtonList->count();
int tbHandlePixel; int tbHandlePixel;
tbHandlePixel = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); tbHandlePixel = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this );
int buttonAreaWidth = taskBarWidth - tbHandlePixel - tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5; int buttonAreaWidth = taskBarWidth - tbHandlePixel - style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) - 5;
if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) ) if ( ( ( allButtonsWidthHint ) <= buttonAreaWidth ) || ( width() < parentWidget() ->width() ) )
{ {
for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )

@ -473,7 +473,7 @@ TQSize KMultiTabBarButton::sizeHint() const
} }
#endif #endif
if ( isMenuButton() ) if ( isMenuButton() )
w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) { if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap(); TQPixmap *pm = (TQPixmap *)pixmap();
@ -492,7 +492,7 @@ TQSize KMultiTabBarButton::sizeHint() const
h = TQMAX(h, sz.height()); 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())); expandedTo(TQApplication::globalStrut()));
} }

@ -172,8 +172,8 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
int xoff = 0, yoff = 0; int xoff = 0, yoff = 0;
// The additional offsets were found by try and error, TODO: find the rational behind them // The additional offsets were found by try and error, TODO: find the rational behind them
if ( t == tab( currentTab() ) ) { if ( t == tab( currentTab() ) ) {
xoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3; xoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ) + 3;
yoff = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4; yoff = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ) - 4;
} }
else { else {
xoff = 7; xoff = 7;
@ -340,8 +340,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
r.setLeft( r.left() + pixw + 4 ); r.setLeft( r.left() + pixw + 4 );
r.setRight( r.right() + 2 ); r.setRight( r.right() + 2 );
int inactiveXShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this ); int inactiveXShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftHorizontal, this );
int inactiveYShift = tqstyle().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this ); int inactiveYShift = style().pixelMetric( TQStyle::PM_TabBarTabShiftVertical, this );
int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2; int right = t->text().isEmpty() ? br.right() - pixw : br.left() + 2;
@ -361,8 +361,8 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
if ( mTabColors.contains( t->identifier() ) ) if ( mTabColors.contains( t->identifier() ) )
cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] ); cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, r, style().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
t->isEnabled() ? cg : tqpalette().disabled(), t->isEnabled() ? cg : palette().disabled(),
flags, TQStyleOption(t) ); flags, TQStyleOption(t) );
} }

@ -160,8 +160,8 @@ bool KTabWidget::tabCloseActivatePrevious() const
unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
{ {
int hframe, overlap; int hframe, overlap;
hframe = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() ); hframe = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabHSpace, tabBar() );
overlap = tabBar()->tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() ); overlap = tabBar()->style().pixelMetric( TQStyle::PM_TabBarTabOverlap, tabBar() );
TQFontMetrics fm = tabBar()->fontMetrics(); TQFontMetrics fm = tabBar()->fontMetrics();
int x = 0; int x = 0;
@ -174,7 +174,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
int iw = 0; int iw = 0;
if ( tab->iconSet() ) if ( tab->iconSet() )
iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this, x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
TQStyleOption( tab ) ) ).width(); TQStyleOption( tab ) ) ).width();
} }

@ -22,24 +22,24 @@
\NewEntry 1 Toolbars \NewEntry 1 Toolbars
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
<p>Toolbars need serious attention!<br />Phase 1:<br />1) Clean up for current usage<br />2) Create quick &quot;add this tag to a toolbar&quot; RMB function<br />3) Make toolbars abide by tag relationships like auto complete<br /><br />Phase 2:<br />1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags<br />2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, tqlayout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings. <br /><br />The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static tqlayout the tqlayout and presentation become dynamic. This will require balance and good icons to be more productive.</p> <p>Toolbars need serious attention!<br />Phase 1:<br />1) Clean up for current usage<br />2) Create quick &quot;add this tag to a toolbar&quot; RMB function<br />3) Make toolbars abide by tag relationships like auto complete<br /><br />Phase 2:<br />1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags<br />2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, layout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings. <br /><br />The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static layout the layout and presentation become dynamic. This will require balance and good icons to be more productive.</p>
</body></html> </body></html>
\NewEntry 2 Phase 2 explanation \NewEntry 2 Phase 2 explanation
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
<p><span style="font-style:italic;color:#3300ff">&gt; - Phase 2/2 sounds a little complicated to me and I'm also not sure that I understood it completely.</span></p> <p><span style="font-style:italic;color:#3300ff">&gt; - Phase 2/2 sounds a little complicated to me and I'm also not sure that I understood it completely.</span></p>
<p>Think of it as personalities. The idea is that Quanta could interpret some aspects of what I am doing and offer toolbar presentations based on that. How to best go about it is not totally clear. Initially I had thought to have Quanta offer the relevent toolbar so the user didn't have to select it, but this is not completely effective it you think about it. Another possibility is to construct a toolbar on the fly from relevent tags... intriguing but probably not very fast or fluid. The advantage to the toolbars we have is that you know where the icons are. The disadvantage is you could end up switching between 3-4 of them building a formatted data form, which is not intuitive.</p> <p>Think of it as personalities. The idea is that Quanta could interpret some aspects of what I am doing and offer toolbar presentations based on that. How to best go about it is not totally clear. Initially I had thought to have Quanta offer the relevent toolbar so the user didn't have to select it, but this is not completely effective it you think about it. Another possibility is to construct a toolbar on the fly from relevent tags... intriguing but probably not very fast or fluid. The advantage to the toolbars we have is that you know where the icons are. The disadvantage is you could end up switching between 3-4 of them building a formatted data form, which is not intuitive.</p>
<p>In balancing these several concepts seem to offer counterpoints.<br />familiar tqlayout &lt;-&gt; specifically applicable actions<br />pre-made toolbars &lt;-&gt; dynamicly created toolbars<br />feature oriented toolbars &lt;-&gt; task oriented toolbars</p> <p>In balancing these several concepts seem to offer counterpoints.<br />familiar layout &lt;-&gt; specifically applicable actions<br />pre-made toolbars &lt;-&gt; dynamicly created toolbars<br />feature oriented toolbars &lt;-&gt; task oriented toolbars</p>
<p>Currently Quanta is solidly to the left and only to the left on all three of these points. I began considering adding task oriented toolbars. Which is better? If you could be certain that the toolbar would do the following you would have perfection:</p> <p>Currently Quanta is solidly to the left and only to the left on all three of these points. I began considering adding task oriented toolbars. Which is better? If you could be certain that the toolbar would do the following you would have perfection:</p>
<p>1) orient correctly to every task<br />2) retain familiarity of tqlayout for variations and segue to next task<br />3) offer only proper tag relationships</p> <p>1) orient correctly to every task<br />2) retain familiarity of layout for variations and segue to next task<br />3) offer only proper tag relationships</p>
<p>Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard tqlayout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).</p> <p>Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard layout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).</p>
<p>So we can say this about the ultimate solution:</p> <p>So we can say this about the ultimate solution:</p>
<p>1) I don't think anybody is really anal enough to already be doing it.</p> <p>1) I don't think anybody is really anal enough to already be doing it.</p>
<p>2) If it could be accomplished it would be very very cool and get a lot of press.</p> <p>2) If it could be accomplished it would be very very cool and get a lot of press.</p>
<p>3) It cannot be a single solution, thus it's multiple &quot;personalities&quot;</p> <p>3) It cannot be a single solution, thus it's multiple &quot;personalities&quot;</p>
<p>4) Basic structure and tqlayout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</p> <p>4) Basic structure and layout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</p>
<p>5) No single solution is possible so it must allow for easy user extensibility</p> <p>5) No single solution is possible so it must allow for easy user extensibility</p>
<p>Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar tqlayout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.</p> <p>Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar layout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.</p>
<p>My vision is not just someone saving a toolbar for a task, but saving a whole personality. Imagine these as dowloadable resources. ;-)</p> <p>My vision is not just someone saving a toolbar for a task, but saving a whole personality. Imagine these as dowloadable resources. ;-)</p>
<p></p> <p></p>
</body></html> </body></html>
@ -56,7 +56,7 @@
\NewEntry 1 VPL \NewEntry 1 VPL
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
<p>Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.<br /><br />1) Visual Table editor<br />2) Integration of visual CSS using our dialogs and tools<br />3) XSLT translation layer for XML<br />4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the tqlayout or CSS visually in data tqlayout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.</p> <p>Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.<br /><br />1) Visual Table editor<br />2) Integration of visual CSS using our dialogs and tools<br />3) XSLT translation layer for XML<br />4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the layout or CSS visually in data layout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.</p>
</body></html> </body></html>
\NewEntry 0 New Features \NewEntry 0 New Features
@ -94,7 +94,7 @@
\NewEntry 1 RAD Site \NewEntry 1 RAD Site
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif">
<p>This has largely been under wraps except a few teasers. It's going to be my baby.<br /><br />RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.<br /><br />1) Based on templates - this allows the user to develop the framework in layers<br />2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it<br />3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning<br />4) New abstract interface - the key to integrate this is an interface that uses &quot;set&quot;definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or tqlayout which assist in painting an even interface. <br />5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as<br />- physical tqlayout<br />- conceptual group<br />- style grouping<br />- tqlayout grouping<br />Level views would include<br />- overview<br />- concept/style/tqlayout group<br />- page elements/relationships<br />- element definitions<br />- various configuration dialogs<br /><br />The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.<br /><br />Some aspects:<br />* moving files automatically manages links<br />* Minimal application speeds development and manages framework<br />* Page component templates function dynamically<br />* Would use comment system and or generated file to manage elements<br />* would be able to offer limited functionaliy directly importing existing sites<br />* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)</p> <p>This has largely been under wraps except a few teasers. It's going to be my baby.<br /><br />RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.<br /><br />1) Based on templates - this allows the user to develop the framework in layers<br />2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it<br />3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning<br />4) New abstract interface - the key to integrate this is an interface that uses &quot;set&quot;definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or layout which assist in painting an even interface. <br />5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as<br />- physical layout<br />- conceptual group<br />- style grouping<br />- layout grouping<br />Level views would include<br />- overview<br />- concept/style/layout group<br />- page elements/relationships<br />- element definitions<br />- various configuration dialogs<br /><br />The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.<br /><br />Some aspects:<br />* moving files automatically manages links<br />* Minimal application speeds development and manages framework<br />* Page component templates function dynamically<br />* Would use comment system and or generated file to manage elements<br />* would be able to offer limited functionaliy directly importing existing sites<br />* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)</p>
</body></html> </body></html>
\NewEntry 0 Plug Ins \NewEntry 0 Plug Ins

@ -41,7 +41,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="2" column="2"> <widget class="TQLayoutWidget" row="2" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -24,7 +24,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -70,7 +70,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="3" column="2"> <widget class="TQLayoutWidget" row="3" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout1</cstring> <cstring>layout1</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -111,7 +111,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="2"> <widget class="TQLayoutWidget" row="0" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -412,7 +412,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="2"> <widget class="TQLayoutWidget" row="0" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout14</cstring> <cstring>layout14</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -606,7 +606,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="2"> <widget class="TQLayoutWidget" row="0" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout13</cstring> <cstring>layout13</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -800,7 +800,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="2"> <widget class="TQLayoutWidget" row="0" column="2">
<property name="name"> <property name="name">
<cstring>tqlayout17</cstring> <cstring>layout17</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">

@ -469,9 +469,9 @@
<freeedit/> <freeedit/>
</right> </right>
<table-tqlayout> <table-layout>
<list value="auto,fixed,inherit"/> <list value="auto,fixed,inherit"/>
</table-tqlayout> </table-layout>
<text-align> <text-align>
<list value="center,justify,right,left,inherit"/> <list value="center,justify,right,left,inherit"/>
@ -503,9 +503,9 @@
<freeedit/> <freeedit/>
</top> </top>
<tqunicode-bidi> <unicode-bidi>
<list value="normal,embed,bidi-override,inherit"/> <list value="normal,embed,bidi-override,inherit"/>
</tqunicode-bidi> </unicode-bidi>
<vertical-align> <vertical-align>
<list value="baseline,inherit,sub,super,top,text-top,middle,bottom,text-bottom"/> <list value="baseline,inherit,sub,super,top,text-top,middle,bottom,text-bottom"/>

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

@ -32,7 +32,7 @@
</property> </property>
<widget class="TQLayoutWidget" row="0" column="0"> <widget class="TQLayoutWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout42</cstring> <cstring>layout42</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -40,7 +40,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout40</cstring> <cstring>layout40</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -48,7 +48,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout39</cstring> <cstring>layout39</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -56,7 +56,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout36</cstring> <cstring>layout36</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -64,7 +64,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout20</cstring> <cstring>layout20</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -87,7 +87,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout15</cstring> <cstring>layout15</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -145,7 +145,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout38</cstring> <cstring>layout38</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -318,7 +318,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<vbox> <vbox>
<property name="name"> <property name="name">
@ -358,7 +358,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout41</cstring> <cstring>layout41</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">
@ -383,7 +383,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -115,7 +115,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0"> <widget class="TQLayoutWidget" row="1" column="0">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

@ -284,7 +284,7 @@ void VariablesListView::slotVariableCopyToClipboard( )
DebuggerVariable *v = selected(true); DebuggerVariable *v = selected(true);
if(!v) if(!v)
return; return;
TQApplication::tqclipboard()->setText(v->value()); TQApplication::clipboard()->setText(v->value());
} }
#include "variableslistview.moc" #include "variableslistview.moc"

@ -39,7 +39,7 @@
</property> </property>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout17</cstring> <cstring>layout17</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -160,7 +160,7 @@
</widget> </widget>
<widget class="TQLayoutWidget"> <widget class="TQLayoutWidget">
<property name="name"> <property name="name">
<cstring>tqlayout9</cstring> <cstring>layout9</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

@ -35,7 +35,7 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
baseURL = a_baseURL; baseURL = a_baseURL;
m_absolutePath = false; m_absolutePath = false;
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
combo = new TQComboBox(true,this); combo = new TQComboBox(true,this);
combo->setEditable(true); combo->setEditable(true);
@ -44,8 +44,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name )
button ->setFixedSize(35,25); button ->setFixedSize(35,25);
button ->setText(i18n("...")); button ->setText(i18n("..."));
tqlayout ->addWidget( combo ); layout ->addWidget( combo );
tqlayout ->addWidget( button ); layout ->addWidget( button );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) );
connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));
@ -58,7 +58,7 @@ FileCombo::FileCombo( TQWidget *parent, const char *name )
{ {
baseURL.setPath("."); baseURL.setPath(".");
TQHBoxLayout *tqlayout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);
combo = new TQComboBox(true,this); combo = new TQComboBox(true,this);
button = new TQPushButton(this); button = new TQPushButton(this);
@ -66,8 +66,8 @@ FileCombo::FileCombo( TQWidget *parent, const char *name )
button ->setFixedSize(35,25); button ->setFixedSize(35,25);
button ->setText(i18n("...")); button ->setText(i18n("..."));
tqlayout ->addWidget( combo ); layout ->addWidget( combo );
tqlayout ->addWidget( button ); layout ->addWidget( button );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) );
connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&)));

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

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

@ -31,9 +31,9 @@ PreviewOptions::PreviewOptions(TQWidget *parent, const char *name)
PreviewOptions::~PreviewOptions(){ PreviewOptions::~PreviewOptions(){
} }
void PreviewOptions::setWindowLayout(const TQString& tqlayout ) void PreviewOptions::setWindowLayout(const TQString& layout )
{ {
if ( tqlayout == "Default") resetLayout->setChecked(true); if ( layout == "Default") resetLayout->setChecked(true);
else resetLayout->setChecked(false); else resetLayout->setChecked(false);
} }
@ -64,12 +64,12 @@ TQString PreviewOptions::docPosition()
return position; return position;
} }
TQString PreviewOptions::tqlayout() TQString PreviewOptions::layout()
{ {
TQString tqlayout = "Custom"; TQString layout = "Custom";
if ( resetLayout->isChecked() ) if ( resetLayout->isChecked() )
tqlayout = "Default"; layout = "Default";
return tqlayout; return layout;
} }
TQString PreviewOptions::closeButtons() TQString PreviewOptions::closeButtons()

@ -30,7 +30,7 @@ public:
~PreviewOptions(); ~PreviewOptions();
TQString position(); TQString position();
TQString tqlayout(); TQString layout();
TQString closeButtons(); TQString closeButtons();
TQString docPosition(); TQString docPosition();
uint toolviewTabs(); uint toolviewTabs();

@ -36,7 +36,7 @@
<cstring>resetLayout</cstring> <cstring>resetLayout</cstring>
</property> </property>
<property name="text"> <property name="text">
<string>Reset window tqlayout to the default on the next startup</string> <string>Reset window layout to the default on the next startup</string>
</property> </property>
</widget> </widget>
<widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">

@ -183,8 +183,8 @@
<string>Automatic &amp;replacement of the accented characters</string> <string>Automatic &amp;replacement of the accented characters</string>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>If this option is turned on the accented characters, like &lt;b&gt;&amp;#225;&lt;/b&gt;, will be automatically replaced by their tqunicode style notation, for the above case with &lt;b&gt;&amp;#038;#225;&lt;/b&gt;.&lt;br&gt; <string>If this option is turned on the accented characters, like &lt;b&gt;&amp;#225;&lt;/b&gt;, will be automatically replaced by their unicode style notation, for the above case with &lt;b&gt;&amp;#038;#225;&lt;/b&gt;.&lt;br&gt;
We suggest to leave this option off and use an tqunicode or locale encoding for your documents.</string> We suggest to leave this option off and use an unicode or locale encoding for your documents.</string>
</property> </property>
</widget> </widget>
</grid> </grid>

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

@ -24,7 +24,7 @@
// KColorDialog::getColor() so that in contains a parent argument. This // KColorDialog::getColor() so that in contains a parent argument. This
// improves centering capability. // improves centering capability.
// //
// tqlayout management added Oct 1997 by Mario Weilguni // layout management added Oct 1997 by Mario Weilguni
// <mweilguni@sime.com> // <mweilguni@sime.com>
// //

@ -19,7 +19,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// KDE color selection combo box // KDE color selection combo box
// tqlayout management added Oct 1997 by Mario Weilguni // layout management added Oct 1997 by Mario Weilguni
// <mweilguni@sime.com> // <mweilguni@sime.com>

@ -146,7 +146,7 @@ TQString MessageOutput::content()
void MessageOutput::copyContent() void MessageOutput::copyContent()
{ {
kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard); kapp->clipboard()->setText(content(), TQClipboard::Clipboard);
} }
void MessageOutput::saveContent() void MessageOutput::saveContent()

@ -2328,7 +2328,7 @@ void KafkaDocument::slotCut(Node* startNode, int startOffset, Node* endNode, int
drag_object->addDragObject(node_drag); drag_object->addDragObject(node_drag);
drag_object->addDragObject(text_drag); drag_object->addDragObject(text_drag);
TQApplication::tqclipboard()->setData(drag_object); TQApplication::clipboard()->setData(drag_object);
#ifdef LIGHT_DEBUG #ifdef LIGHT_DEBUG
kafkaCommon::coutTree(subtree_root, 3); kafkaCommon::coutTree(subtree_root, 3);
#endif #endif
@ -2365,7 +2365,7 @@ void KafkaDocument::slotCopy(Node* startNode, int startOffset, Node* endNode, in
drag_object->addDragObject(node_drag); drag_object->addDragObject(node_drag);
drag_object->addDragObject(text_drag); drag_object->addDragObject(text_drag);
TQApplication::tqclipboard()->setData(drag_object); TQApplication::clipboard()->setData(drag_object);
// FIXME delete the subtree // FIXME delete the subtree
#ifdef LIGHT_DEBUG #ifdef LIGHT_DEBUG
kafkaCommon::coutTree(subtree_root, 3); kafkaCommon::coutTree(subtree_root, 3);
@ -2375,7 +2375,7 @@ void KafkaDocument::slotCopy(Node* startNode, int startOffset, Node* endNode, in
void KafkaDocument::slotPaste() void KafkaDocument::slotPaste()
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
TQMimeSource* e = cb->data(); TQMimeSource* e = cb->data();
Node* node = new Node(0); Node* node = new Node(0);

@ -37,6 +37,6 @@ ProjectNewFinal::~ProjectNewFinal(){
void ProjectNewFinal::setMargin(int i) void ProjectNewFinal::setMargin(int i)
{ {
tqlayout()->setMargin(i); layout()->setMargin(i);
} }

@ -104,7 +104,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout11</cstring> <cstring>layout11</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

@ -164,7 +164,7 @@ TQString ProjectNewGeneral::type()
void ProjectNewGeneral::setMargin(int i) void ProjectNewGeneral::setMargin(int i)
{ {
tqlayout()->setMargin(i); layout()->setMargin(i);
} }
void ProjectNewGeneral::slotButtonTmpl() void ProjectNewGeneral::slotButtonTmpl()

@ -107,7 +107,7 @@
</spacer> </spacer>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout12</cstring> <cstring>layout12</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

@ -93,7 +93,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout2</cstring> <cstring>layout2</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -184,7 +184,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -205,7 +205,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout5</cstring> <cstring>layout5</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -87,7 +87,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="1" column="1"> <widget class="TQLayoutWidget" row="1" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout7</cstring> <cstring>layout7</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">
@ -178,7 +178,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="0" column="1"> <widget class="TQLayoutWidget" row="0" column="1">
<property name="name"> <property name="name">
<cstring>tqlayout6</cstring> <cstring>layout6</cstring>
</property> </property>
<grid> <grid>
<property name="name"> <property name="name">

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

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

@ -858,7 +858,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri
{ {
m_replaceLine = line; m_replaceLine = line;
m_replaceCol = column; m_replaceCol = column;
m_replaceStr = QuantaCommon::encodedChar(string[0].tqunicode()); m_replaceStr = QuantaCommon::encodedChar(string[0].unicode());
TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar()));
return; return;
} }
@ -866,7 +866,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri
} }
if (qConfig.replaceAccented) if (qConfig.replaceAccented)
{ {
uint c = string[0].tqunicode(); uint c = string[0].unicode();
if (c > 191) if (c > 191)
{ {
m_replaceLine = line; m_replaceLine = line;

@ -80,12 +80,12 @@ KQApplication::KQApplication()
KConfig *config = kapp->config(); KConfig *config = kapp->config();
config->setGroup("General Options"); config->setGroup("General Options");
int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode);
TQString tqlayout = config->readEntry("Window tqlayout", "Default"); TQString layout = config->readEntry("Window layout", "Default");
if (tqlayout == "Default" || args->isSet("resettqlayout")) if (layout == "Default" || args->isSet("resetlayout"))
{ {
mdiMode = KMdi::IDEAlMode; mdiMode = KMdi::IDEAlMode;
config->writeEntry("MDI mode", KMdi::IDEAlMode); config->writeEntry("MDI mode", KMdi::IDEAlMode);
config->writeEntry("Window tqlayout", "Default"); config->writeEntry("Window layout", "Default");
} }
quantaApp = new QuantaApp(mdiMode); quantaApp = new QuantaApp(mdiMode);
config->setGroup("General Options"); config->setGroup("General Options");
@ -151,11 +151,11 @@ int KQUniqueApplication::newInstance()
KConfig *config = kapp->config(); KConfig *config = kapp->config();
config->setGroup("General Options"); config->setGroup("General Options");
int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode);
TQString tqlayout = config->readEntry("Window tqlayout", "Default"); TQString layout = config->readEntry("Window layout", "Default");
if (tqlayout == "Default" || args->isSet("resettqlayout")) if (layout == "Default" || args->isSet("resetlayout"))
{ {
mdiMode = KMdi::IDEAlMode; mdiMode = KMdi::IDEAlMode;
config->writeEntry("Window tqlayout", "Default"); config->writeEntry("Window layout", "Default");
config->writeEntry("MDI mode", KMdi::IDEAlMode); config->writeEntry("MDI mode", KMdi::IDEAlMode);
} }
quantaApp = new QuantaApp(mdiMode); quantaApp = new QuantaApp(mdiMode);

@ -56,7 +56,7 @@ static KCmdLineOptions options[] =
{ "+[File]", I18N_NOOP("File to open"), 0 }, { "+[File]", I18N_NOOP("File to open"), 0 },
{ "unique", I18N_NOOP("Whether we start as a one-instance application"), 0 }, { "unique", I18N_NOOP("Whether we start as a one-instance application"), 0 },
{ "nologo", I18N_NOOP("Do not show the nice logo during startup"), 0 }, { "nologo", I18N_NOOP("Do not show the nice logo during startup"), 0 },
{ "resettqlayout", I18N_NOOP("Reset the tqlayout of the user interface to the default"), 0}, { "resetlayout", I18N_NOOP("Reset the layout of the user interface to the default"), 0},
KCmdLineLastOption KCmdLineLastOption
// INSERT YOUR COMMANDLINE OPTIONS HERE // INSERT YOUR COMMANDLINE OPTIONS HERE
}; };

@ -1348,7 +1348,7 @@ void QuantaApp::slotOptions()
if (previewSettingsChanged) if (previewSettingsChanged)
slotShowPreviewWidget(true); slotShowPreviewWidget(true);
qConfig.docPosition = uiOptions->docPosition(); qConfig.docPosition = uiOptions->docPosition();
qConfig.windowLayout = uiOptions->tqlayout(); qConfig.windowLayout = uiOptions->layout();
m_htmlPart->closeURL(); m_htmlPart->closeURL();
m_htmlPart->begin( Project::ref()->projectBaseURL()); m_htmlPart->begin( Project::ref()->projectBaseURL());
@ -4200,7 +4200,7 @@ void QuantaApp::saveOptions()
m_config->writeEntry("Smart Tag Insertion", qConfig.smartTagInsertion); m_config->writeEntry("Smart Tag Insertion", qConfig.smartTagInsertion);
m_config->writeEntry("Window tqlayout", qConfig.windowLayout); m_config->writeEntry("Window layout", qConfig.windowLayout);
m_config->writeEntry("Follow Cursor", StructTreeView::ref()->followCursor() ); m_config->writeEntry("Follow Cursor", StructTreeView::ref()->followCursor() );
//If user choose the timer interval, it needs to restart the timer too //If user choose the timer interval, it needs to restart the timer too
m_config->writeEntry("Autosave interval", qConfig.autosaveInterval); m_config->writeEntry("Autosave interval", qConfig.autosaveInterval);
@ -4840,7 +4840,7 @@ void QuantaApp::slotPasteHTMLQuoted()
Document *w = ViewManager::ref()->activeDocument(); Document *w = ViewManager::ref()->activeDocument();
if (w) if (w)
{ {
TQClipboard *cb = tqApp->tqclipboard(); TQClipboard *cb = tqApp->clipboard();
TQString text = cb->text(); TQString text = cb->text();
if ( ( !text.isNull() ) && (!text.isEmpty() ) ) if ( ( !text.isNull() ) && (!text.isEmpty() ) )
@ -4885,7 +4885,7 @@ void QuantaApp::slotPasteURLEncoded()
Document *w = ViewManager::ref()->activeDocument(); Document *w = ViewManager::ref()->activeDocument();
if (w) if (w)
{ {
TQClipboard *cb = tqApp->tqclipboard(); TQClipboard *cb = tqApp->clipboard();
TQString text = cb->text(); TQString text = cb->text();
if ( ( !text.isNull() ) && (!text.isEmpty() ) ) if ( ( !text.isNull() ) && (!text.isEmpty() ) )
@ -5004,14 +5004,14 @@ void QuantaApp::slotCopy()
if (m_htmlPart->view()->hasFocus()) if (m_htmlPart->view()->hasFocus())
{ {
TQString selection = m_htmlPart->selectedText(); TQString selection = m_htmlPart->selectedText();
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
cb->setText(selection, TQClipboard::Clipboard); cb->setText(selection, TQClipboard::Clipboard);
} }
else else
if (m_htmlPartDoc->view()->hasFocus()) if (m_htmlPartDoc->view()->hasFocus())
{ {
TQString selection = m_htmlPartDoc->selectedText(); TQString selection = m_htmlPartDoc->selectedText();
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
cb->setText(selection, TQClipboard::Clipboard); cb->setText(selection, TQClipboard::Clipboard);
} }

@ -191,13 +191,13 @@ void QuantaInit::initQuanta()
m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom); m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom);
m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom); m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom);
// Restore the dock tqlayout // Restore the dock layout
m_config->setGroup ("General Options"); m_config->setGroup ("General Options");
TQString tqlayout = m_config->readEntry("Window tqlayout", "Default"); TQString layout = m_config->readEntry("Window layout", "Default");
int mdiMode = m_config->readNumEntry("MDI mode", -1); int mdiMode = m_config->readNumEntry("MDI mode", -1);
if (mdiMode != -1 && tqlayout != "Default") if (mdiMode != -1 && layout != "Default")
{ {
m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window tqlayout... m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window layout...
if (mdiMode != KMdi::IDEAlMode) if (mdiMode != KMdi::IDEAlMode)
m_quanta->setToolviewStyle(qConfig.toolviewTabs); m_quanta->setToolviewStyle(qConfig.toolviewTabs);
} }
@ -301,7 +301,7 @@ void QuantaInit::initQuanta()
continue; continue;
int length = s.find(";)") - begin + 1; int length = s.find(";)") - begin + 1;
TQString s2 = s.mid(begin, length - 1); TQString s2 = s.mid(begin, length - 1);
replacementMap[s[0].tqunicode()] = s2; replacementMap[s[0].unicode()] = s2;
} }
file.close(); file.close();
} }

@ -208,7 +208,7 @@ void QuantaView::addDocument(Document *document)
reloadUpdateTimers(); reloadUpdateTimers();
m_currentViewsLayout = -1; //force loading of this tqlayout m_currentViewsLayout = -1; //force loading of this layout
slotSetSourceLayout(); slotSetSourceLayout();
} }
@ -263,7 +263,7 @@ void QuantaView::addCustomWidget(TQWidget *widget, const TQString &label)
void QuantaView::reloadLayout() void QuantaView::reloadLayout()
{ {
int currentViewsLayout = m_currentViewsLayout; int currentViewsLayout = m_currentViewsLayout;
m_currentViewsLayout = -1; //force loading of this tqlayout m_currentViewsLayout = -1; //force loading of this layout
switch (currentViewsLayout) switch (currentViewsLayout)
{ {
case SourceOnly: case SourceOnly:

@ -105,7 +105,7 @@ public:
void reloadVPLView(bool force = false); void reloadVPLView(bool force = false);
/** reload the Quanta view from the Node Tree. Set force to true if you want to reload even if not necessary. */ /** reload the Quanta view from the Node Tree. Set force to true if you want to reload even if not necessary. */
void reloadSourceView(bool force = false); void reloadSourceView(bool force = false);
/** Return the curren views tqlayout*/ /** Return the curren views layout*/
int currentViewsLayout() {return m_currentViewsLayout;} int currentViewsLayout() {return m_currentViewsLayout;}
void reloadLayout(); void reloadLayout();
@ -221,7 +221,7 @@ private:
TQGuardedPtr<KafkaDocument> m_kafkaDocument; TQGuardedPtr<KafkaDocument> m_kafkaDocument;
TQSplitter *m_splitter; TQSplitter *m_splitter;
TQGridLayout *m_viewLayout; TQGridLayout *m_viewLayout;
int m_currentViewsLayout; ///< holds the current tqlayout, which can be SourceOnly, VPLOnly or SourceAndVPL int m_currentViewsLayout; ///< holds the current layout, which can be SourceOnly, VPLOnly or SourceAndVPL
int m_currentFocus; int m_currentFocus;
bool m_saveResult; bool m_saveResult;
bool m_eventLoopStarted; bool m_eventLoopStarted;

@ -648,7 +648,7 @@ void BaseTreeView::slotCopy()
{ {
if (currentItem()) if (currentItem())
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
cb->setText( currentURL().prettyURL() ); cb->setText( currentURL().prettyURL() );
} }
} }
@ -658,7 +658,7 @@ void BaseTreeView::slotPaste()
{ {
if (currentItem()) if (currentItem())
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) );
KURL url = currentURL(); KURL url = currentURL();
@ -952,7 +952,7 @@ bool BaseTreeView::isFileOpen(const KURL &url)
bool BaseTreeView::isPathInClipboard() bool BaseTreeView::isPathInClipboard()
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) );
for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it ) for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it )
{ {

@ -141,7 +141,7 @@ public:
virtual ~BaseTreeView(); virtual ~BaseTreeView();
/** /**
* Saves the list view's tqlayout (column widtsh, column order, sort column) * Saves the list view's layout (column widtsh, column order, sort column)
* to a KConfig group. Reimplemented to save the open folders. * to a KConfig group. Reimplemented to save the open folders.
* *
* @param config the KConfig object to write to * @param config the KConfig object to write to
@ -150,7 +150,7 @@ public:
void saveLayout(KConfig *config, const TQString &group); void saveLayout(KConfig *config, const TQString &group);
/** /**
* Reads the list view's tqlayout from a KConfig group as stored with * Reads the list view's layout from a KConfig group as stored with
* saveLayout. Reimplemented to load the open folders. * saveLayout. Reimplemented to load the open folders.
* *
* @param config the KConfig object to read from * @param config the KConfig object to read from

@ -65,7 +65,7 @@
</widget> </widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>tqlayout4</cstring> <cstring>layout4</cstring>
</property> </property>
<hbox> <hbox>
<property name="name"> <property name="name">

@ -846,7 +846,7 @@ void TemplatesTreeView::slotPaste()
{ {
if (currentItem()) if (currentItem())
{ {
TQClipboard *cb = TQApplication::tqclipboard(); TQClipboard *cb = TQApplication::clipboard();
KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) );
KURL url; KURL url;

Loading…
Cancel
Save