diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:17:23 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-04 03:25:50 +0200 |
commit | 75e37fa7ac968680c553ae1d8a175527a731a3aa (patch) | |
tree | 814b5f558f75806a2a922cb31f13e0d4b7b4e3c3 /atlantikdesigner | |
parent | 19e67aed27e50319d00a06ae6287236db13f82f4 (diff) | |
download | tdeaddons-75e37fa7ac968680c553ae1d8a175527a731a3aa.tar.gz tdeaddons-75e37fa7ac968680c553ae1d8a175527a731a3aa.zip |
Rename obsolete tq methods to standard names
(cherry picked from commit ff5b07d9659291ac8172cd35f0821bcd30ce25c9)
Diffstat (limited to 'atlantikdesigner')
-rw-r--r-- | atlantikdesigner/designer/boardinfo.cpp | 14 | ||||
-rw-r--r-- | atlantikdesigner/designer/boardinfo.h | 2 | ||||
-rw-r--r-- | atlantikdesigner/designer/designer.cpp | 8 | ||||
-rw-r--r-- | atlantikdesigner/designer/designer.h | 2 | ||||
-rw-r--r-- | atlantikdesigner/designer/editor.cpp | 76 | ||||
-rw-r--r-- | atlantikdesigner/designer/editor.h | 8 | ||||
-rw-r--r-- | atlantikdesigner/designer/group.cpp | 18 |
7 files changed, 64 insertions, 64 deletions
diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp index 77b00a8..56b561a 100644 --- a/atlantikdesigner/designer/boardinfo.cpp +++ b/atlantikdesigner/designer/boardinfo.cpp @@ -115,21 +115,21 @@ LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, c list.setAutoDelete(true); this->editable = editable; - tqlayout = new TQVBoxLayout(this, KDialogBase::spacingHint()); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + layout = new TQVBoxLayout(this, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); if (editable) { KPushButton *more = new KPushButton(i18n("&Add Name"), this); - htqlayout->addWidget(more); + hlayout->addWidget(more); connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); - htqlayout->addStretch(); + hlayout->addStretch(); KPushButton *less= new KPushButton(i18n("&Delete Name"), this); - htqlayout->addWidget(less); + hlayout->addWidget(less); connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); } - tqlayout->addStretch(); + layout->addStretch(); for (TQStringList::Iterator it = defaults.begin(); it != defaults.end(); ++it) { @@ -148,7 +148,7 @@ void LotsaEdits::more() edit = new KLineEdit(this); else edit = new TQLabel(this); - tqlayout->addWidget(edit); + layout->addWidget(edit); list.append(edit); edit->show(); } diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h index 25d6e71..8ada643 100644 --- a/atlantikdesigner/designer/boardinfo.h +++ b/atlantikdesigner/designer/boardinfo.h @@ -45,7 +45,7 @@ class LotsaEdits : public TQWidget private: bool editable; TQPtrList<TQWidget> list; - TQVBoxLayout *tqlayout; + TQVBoxLayout *layout; }; class BoardInfoDlg : public KDialogBase diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 26e618c..f3bfa35 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -46,7 +46,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) copiedEstate = 0; editor = 0; board = 0; - tqlayout = 0; + layout = 0; (void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); (void) KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); @@ -130,17 +130,17 @@ void AtlanticDesigner::initBoard() delete editor; delete board; - delete tqlayout; + delete layout; board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board"); setCentralWidget(board); - tqlayout = new TQVBoxLayout(board->centerWidget()); + layout = new TQVBoxLayout(board->centerWidget()); editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor"); connect(editor, TQT_SIGNAL(goChecked(int)), TQT_TQOBJECT(this), TQT_SLOT(goChanged(int))); connect(editor, TQT_SIGNAL(updateBackground()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground())); connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath())); - tqlayout->addWidget(editor); + layout->addWidget(editor); editor->setReady(false); diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h index 553a921..3d807a8 100644 --- a/atlantikdesigner/designer/designer.h +++ b/atlantikdesigner/designer/designer.h @@ -75,7 +75,7 @@ class AtlanticDesigner : public KMainWindow ConfigEstate *newEstate(int); TQGuardedPtr<EstateEdit> editor; - TQGuardedPtr<TQVBoxLayout> tqlayout; + TQGuardedPtr<TQVBoxLayout> layout; TQGuardedPtr<AtlantikBoard> board; TQGuardedPtr<GroupEditor> groupEditor; TQGuardedPtr<BoardInfoDlg> boardInfoDlg; diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 81e2135..5687a02 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -172,19 +172,19 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate())); - tqlayout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); + layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint()); nameEdit = new TQLineEdit(this, "Name Edit"); - tqlayout->addWidget(nameEdit, 0, 0); + layout->addWidget(nameEdit, 0, 0); connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged())); confDlg = 0; - tqlayout->setRowStretch(2, 2); + layout->setRowStretch(2, 2); - tqlayout->addWidget(new KSeparator(this), 3, 0); + layout->addWidget(new KSeparator(this), 3, 0); TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint()); - tqlayout->addLayout(typeLayout, 4, 0); + layout->addLayout(typeLayout, 4, 0); TQLabel *typeLabel = new TQLabel(i18n("Type:"), this); typeLayout->addWidget(typeLabel); @@ -196,10 +196,10 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ goCheck = new TQCheckBox(i18n("This estate is 'Go'"), this); connect(goCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(somethingChanged())); connect(goCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(goToggled(bool))); - tqlayout->addWidget(goCheck, 5, 0); + layout->addWidget(goCheck, 5, 0); TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint()); - tqlayout->addLayout(passMoneyLayout, 6, 0); + layout->addLayout(passMoneyLayout, 6, 0); TQLabel *passMoneyLabel = new TQLabel(i18n("Pass money:"), this); passMoneyLayout->addWidget(passMoneyLabel); passMoney = new TQSpinBox(0, 3000, 10, this); @@ -327,7 +327,7 @@ void EstateEdit::configure() connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground())); - tqlayout->addWidget(confDlg, 1, 0); + layout->addWidget(confDlg, 1, 0); confDlg->show(); oldType = typeCombo->currentItem(); @@ -409,11 +409,11 @@ void TaxDlg::update() GenericDlg::GenericDlg(TQWidget *parent, char *name) : EstateDlg(parent, name) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialog::spacingHint()); - tqlayout->addWidget(new TQLabel(i18n("Background:"), this)); + TQHBoxLayout *layout = new TQHBoxLayout(this, KDialog::spacingHint()); + layout->addWidget(new TQLabel(i18n("Background:"), this)); col = new KColorButton(this); - tqlayout->addWidget(col); + layout->addWidget(col); } void GenericDlg::save() @@ -437,26 +437,26 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQW view = 0; - vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQHBoxLayout *tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); KPushButton *addB = new KPushButton(i18n("&New Stack"), this); connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack())); - tqlayout->addWidget(addB); - tqlayout->addStretch(); + layout->addWidget(addB); + layout->addStretch(); - tqlayout->addWidget(new TQLabel(i18n("Cards from"), this)); + layout->addWidget(new TQLabel(i18n("Cards from"), this)); TQStringList cardNames; for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it) cardNames.append((*it).name()); cards = new TQComboBox(this); cards->insertStringList(cardNames); - tqlayout->addWidget(cards); + layout->addWidget(cards); connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &))); - vtqlayout->addWidget(new KSeparator(this)); + vlayout->addWidget(new KSeparator(this)); } void CardsDlg::addStack() @@ -493,7 +493,7 @@ void CardsDlg::updateView(const TQString &curName) delete view; view = new CardView(estates, curStack, this); - vtqlayout->addWidget(view); + vlayout->addWidget(view); view->show(); } @@ -530,7 +530,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa value = 0; - htqlayout = new TQHBoxLayout(this, KDialog::spacingHint()); + hlayout = new TQHBoxLayout(this, KDialog::spacingHint()); typeCombo = new KComboBox(this); TQStringList _types(i18n("Pay")); _types.append(i18n("Pay Each Player")); @@ -546,10 +546,10 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa _types.append(i18n("Pay for Each House")); _types.append(i18n("Pay for Each Hotel")); typeCombo->insertStringList(_types); - htqlayout->addWidget(typeCombo); + hlayout->addWidget(typeCombo); connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int))); - htqlayout->addStretch(); + hlayout->addStretch(); } void ChooseWidget::valueChanged(int i) @@ -588,7 +588,7 @@ void ChooseWidget::typeChanged(int i) value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this); - htqlayout->addWidget(value); + hlayout->addWidget(value); connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int))); value->show(); @@ -605,7 +605,7 @@ void ChooseWidget::typeChanged(int i) estate->insertStringList(estateStrings); connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int))); - htqlayout->addWidget(estate); + hlayout->addWidget(estate); estate->show(); } @@ -649,36 +649,36 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char choosies.setAutoDelete(true); - tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); addButton = new KPushButton(i18n("&Add Card..."), this); connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - htqlayout->addWidget(addButton); - htqlayout->addStretch(); + hlayout->addWidget(addButton); + hlayout->addStretch(); renameButton = new KPushButton(i18n("&Rename..."), this); connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename())); - htqlayout->addWidget(renameButton); - htqlayout->addStretch(); + hlayout->addWidget(renameButton); + hlayout->addStretch(); delButton = new KPushButton(i18n("&Delete"), this); connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); - htqlayout->addWidget(delButton); + hlayout->addWidget(delButton); List = new KListBox(this); - tqlayout->addWidget(List); + layout->addWidget(List); connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int))); // it gets very big (and won't shrink) otherwise List->setMaximumHeight(90); - htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + hlayout = new TQHBoxLayout(layout, KDialog::spacingHint()); moreButton = new KPushButton(i18n("&More Properties"), this); connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more())); - htqlayout->addWidget(moreButton); - htqlayout->addStretch(); + hlayout->addWidget(moreButton); + hlayout->addStretch(); lessButton = new KPushButton(i18n("&Fewer Properties"), this); connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less())); - htqlayout->addWidget(lessButton); + hlayout->addWidget(lessButton); for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it) List->insertItem((*it).name); @@ -698,7 +698,7 @@ void CardView::more() newChooseWidget->valueChanged(0); choosies.append(newChooseWidget); - tqlayout->addWidget(newChooseWidget); + layout->addWidget(newChooseWidget); newChooseWidget->show(); @@ -780,7 +780,7 @@ void CardView::selected(int i) ChooseWidget *newChooseWidget = new ChooseWidget(estates, choosies.count(), card, this); choosies.append(newChooseWidget); - tqlayout->addWidget(newChooseWidget); + layout->addWidget(newChooseWidget); newChooseWidget->show(); diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h index 051df1f..34c6fa1 100644 --- a/atlantikdesigner/designer/editor.h +++ b/atlantikdesigner/designer/editor.h @@ -147,7 +147,7 @@ class EstateEdit : public TQWidget TQCheckBox *goCheck; TQSpinBox *passMoney; TQWidget *centerWidget; - TQGridLayout *tqlayout; + TQGridLayout *layout; EstateList *estates; TQValueList<CardStack> *cards; @@ -184,7 +184,7 @@ class ChooseWidget : public TQWidget bool number; bool prevNumber; bool init; - TQHBoxLayout *htqlayout; + TQHBoxLayout *hlayout; EstateList *estates; @@ -218,7 +218,7 @@ class CardView : public TQWidget EstateList *estates; - TQVBoxLayout *tqlayout; + TQVBoxLayout *layout; Card *card; @@ -281,7 +281,7 @@ class CardsDlg : public EstateDlg TQComboBox *cards; CardView *view; - TQVBoxLayout *vtqlayout; + TQVBoxLayout *vlayout; }; class StreetDlg : public EstateDlg diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index 679a4ac..79b0205 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -26,10 +26,10 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) list = newList; TQFrame *page = plainPage(); - TQHBoxLayout *htqlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); groups = new KListBox(page); - htqlayout->addWidget(groups); + hlayout->addWidget(groups); connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *))); TQStringList newgroups; for (ConfigEstateGroupList::Iterator it = list->begin(); it != list->end(); ++it) @@ -37,9 +37,9 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) groups->insertStringList(newgroups); connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, spacingHint()); + TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, spacingHint()); colorGroupBox = new TQVGroupBox(i18n("&Colors"), page); - vtqlayout->addWidget(colorGroupBox); + vlayout->addWidget(colorGroupBox); (void) new TQLabel(i18n("Foreground:"), colorGroupBox); fgButton = new KColorButton(colorGroupBox, "Foreground Button"); @@ -52,7 +52,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed())); pricesGroupBox = new TQVGroupBox(i18n("&Prices"), page); - vtqlayout->addWidget(pricesGroupBox); + vlayout->addWidget(pricesGroupBox); pricesWidget = new TQWidget(pricesGroupBox); TQGridLayout *pricesLayout = new TQGridLayout(pricesWidget, 2, 2, 0, spacingHint()); @@ -69,7 +69,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) connect(globalPrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(globalPriceChanged(int))); dynamicGroupBox = new TQVGroupBox(i18n("&Dynamic Rent"), page); - vtqlayout->addWidget(dynamicGroupBox); + vlayout->addWidget(dynamicGroupBox); mathWidget = new TQWidget(dynamicGroupBox); TQGridLayout *mathLayout = new TQGridLayout(mathWidget, 2, 2, 0, spacingHint()); @@ -89,13 +89,13 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) connect(rentVarCombo, TQT_SIGNAL(activated(const TQString &)), rentMathEdit, TQT_SLOT(insert(const TQString &))); mathLayout->addWidget(rentMathEdit, 1, 1); - TQHBoxLayout *buttontqlayout = new TQHBoxLayout(vtqlayout, spacingHint()); + TQHBoxLayout *buttonlayout = new TQHBoxLayout(vlayout, spacingHint()); KPushButton *addB = new KPushButton(i18n("&Add..."), page); - buttontqlayout->addWidget(addB); + buttonlayout->addWidget(addB); connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); removeB = new KPushButton(i18n("&Remove"), page); - buttontqlayout->addWidget(removeB); + buttonlayout->addWidget(removeB); connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); selectionChanged(); |