summaryrefslogtreecommitdiffstats
path: root/atlantikdesigner
diff options
context:
space:
mode:
Diffstat (limited to 'atlantikdesigner')
-rw-r--r--atlantikdesigner/designer/boardinfo.cpp16
-rw-r--r--atlantikdesigner/designer/boardinfo.h2
-rw-r--r--atlantikdesigner/designer/designer.cpp28
-rw-r--r--atlantikdesigner/designer/designer.h2
-rw-r--r--atlantikdesigner/designer/editor.cpp78
-rw-r--r--atlantikdesigner/designer/editor.h8
-rw-r--r--atlantikdesigner/designer/group.cpp32
-rw-r--r--atlantikdesigner/designer/group.h2
8 files changed, 84 insertions, 84 deletions
diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp
index f7d2e48..77b00a8 100644
--- a/atlantikdesigner/designer/boardinfo.cpp
+++ b/atlantikdesigner/designer/boardinfo.cpp
@@ -1,5 +1,5 @@
#include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqstringlist.h>
#include <tqframe.h>
#include <tqptrlist.h>
@@ -115,21 +115,21 @@ LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, c
list.setAutoDelete(true);
this->editable = editable;
- layout = new TQVBoxLayout(this, KDialogBase::spacingHint());
- TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint());
+ tqlayout = new TQVBoxLayout(this, KDialogBase::spacingHint());
+ TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint());
if (editable)
{
KPushButton *more = new KPushButton(i18n("&Add Name"), this);
- hlayout->addWidget(more);
+ htqlayout->addWidget(more);
connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
- hlayout->addStretch();
+ htqlayout->addStretch();
KPushButton *less= new KPushButton(i18n("&Delete Name"), this);
- hlayout->addWidget(less);
+ htqlayout->addWidget(less);
connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
}
- layout->addStretch();
+ tqlayout->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);
- layout->addWidget(edit);
+ tqlayout->addWidget(edit);
list.append(edit);
edit->show();
}
diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h
index 8ada643..25d6e71 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 *layout;
+ TQVBoxLayout *tqlayout;
};
class BoardInfoDlg : public KDialogBase
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 1bc9fdc..3f39fb6 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -1,15 +1,15 @@
#include <tqcolor.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqevent.h>
#include <tqfile.h>
#include <tqguardedptr.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpoint.h>
#include <tqpopupmenu.h>
#include <tqptrlist.h>
#include <tqstring.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
#include <tqtimer.h>
#include <tqwidget.h>
@@ -46,7 +46,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
copiedEstate = 0;
editor = 0;
board = 0;
- layout = 0;
+ tqlayout = 0;
(void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
(void) KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
@@ -76,10 +76,10 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
KConfig *config = kapp->config();
config->setGroup("General");
- TQColor defaultColor = colorGroup().background();
+ TQColor defaultColor = tqcolorGroup().background();
defaultBg = config->readColorEntry("alternateBackground", &defaultColor);
config->setGroup("WM");
- defaultColor = colorGroup().dark();
+ defaultColor = tqcolorGroup().dark();
defaultFg = config->readColorEntry("activeBackground", &defaultColor);
// these must match up to the ones in editor.cpp!
@@ -130,17 +130,17 @@ void AtlanticDesigner::initBoard()
delete editor;
delete board;
- delete layout;
+ delete tqlayout;
board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board");
setCentralWidget(board);
- layout = new TQVBoxLayout(board->centerWidget());
+ tqlayout = 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()));
- layout->addWidget(editor);
+ tqlayout->addWidget(editor);
editor->setReady(false);
@@ -526,7 +526,7 @@ void AtlanticDesigner::openFile(const TQString &filename)
if (i < 8)
{
- KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").arg(i));
+ KMessageBox::detailedSorry(this, i18n("This board file is invalid; cannot open."), i18n("There are only %1 estates specified in this file.").tqarg(i));
if (this->filename.isNull())
close();
return;
@@ -553,7 +553,7 @@ void AtlanticDesigner::updateJumpMenu()
{
TQStringList estates;
for (int i = 1; i <= max; i++)
- estates.append(i18n("Jump to Estate %1").arg(TQString::number(i)));
+ estates.append(i18n("Jump to Estate %1").tqarg(TQString::number(i)));
estateAct->setItems(estates);
}
@@ -679,7 +679,7 @@ void AtlanticDesigner::save()
writtenGroups.append((*it).name());
- t << endl << TQString("[%1]").arg((*it).name()) << endl;
+ t << endl << TQString("[%1]").tqarg((*it).name()) << endl;
if ((*it).globalPrice() > 0)
t << "price=" << (*it).globalPrice() << endl;
@@ -748,7 +748,7 @@ void AtlanticDesigner::save()
for (estate = estates.first(); estate; estate = estates.next())
{
- t << endl << TQString("[%1]").arg(estate->name()) << endl;
+ t << endl << TQString("[%1]").tqarg(estate->name()) << endl;
switch (estate->type())
{
diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h
index 3d807a8..553a921 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> layout;
+ TQGuardedPtr<TQVBoxLayout> tqlayout;
TQGuardedPtr<AtlantikBoard> board;
TQGuardedPtr<GroupEditor> groupEditor;
TQGuardedPtr<BoardInfoDlg> boardInfoDlg;
diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp
index cb51572..81e2135 100644
--- a/atlantikdesigner/designer/editor.cpp
+++ b/atlantikdesigner/designer/editor.cpp
@@ -3,7 +3,7 @@
#include <tqframe.h>
#include <tqhgroupbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqspinbox.h>
#include <tqstringlist.h>
@@ -172,19 +172,19 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ
connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate()));
- layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
+ tqlayout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
nameEdit = new TQLineEdit(this, "Name Edit");
- layout->addWidget(nameEdit, 0, 0);
+ tqlayout->addWidget(nameEdit, 0, 0);
connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged()));
confDlg = 0;
- layout->setRowStretch(2, 2);
+ tqlayout->setRowStretch(2, 2);
- layout->addWidget(new KSeparator(this), 3, 0);
+ tqlayout->addWidget(new KSeparator(this), 3, 0);
TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint());
- layout->addLayout(typeLayout, 4, 0);
+ tqlayout->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)));
- layout->addWidget(goCheck, 5, 0);
+ tqlayout->addWidget(goCheck, 5, 0);
TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint());
- layout->addLayout(passMoneyLayout, 6, 0);
+ tqlayout->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()));
- layout->addWidget(confDlg, 1, 0);
+ tqlayout->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 *layout = new TQHBoxLayout(this, KDialog::spacingHint());
- layout->addWidget(new TQLabel(i18n("Background:"), this));
+ TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialog::spacingHint());
+ tqlayout->addWidget(new TQLabel(i18n("Background:"), this));
col = new KColorButton(this);
- layout->addWidget(col);
+ tqlayout->addWidget(col);
}
void GenericDlg::save()
@@ -437,26 +437,26 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQW
view = 0;
- vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+ TQHBoxLayout *tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
KPushButton *addB = new KPushButton(i18n("&New Stack"), this);
connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack()));
- layout->addWidget(addB);
- layout->addStretch();
+ tqlayout->addWidget(addB);
+ tqlayout->addStretch();
- layout->addWidget(new TQLabel(i18n("Cards from"), this));
+ tqlayout->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);
- layout->addWidget(cards);
+ tqlayout->addWidget(cards);
connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &)));
- vlayout->addWidget(new KSeparator(this));
+ vtqlayout->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);
- vlayout->addWidget(view);
+ vtqlayout->addWidget(view);
view->show();
}
@@ -530,7 +530,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa
value = 0;
- hlayout = new TQHBoxLayout(this, KDialog::spacingHint());
+ htqlayout = 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);
- hlayout->addWidget(typeCombo);
+ htqlayout->addWidget(typeCombo);
connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int)));
- hlayout->addStretch();
+ htqlayout->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);
- hlayout->addWidget(value);
+ htqlayout->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)));
- hlayout->addWidget(estate);
+ htqlayout->addWidget(estate);
estate->show();
}
@@ -649,36 +649,36 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char
choosies.setAutoDelete(true);
- layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
+ tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
addButton = new KPushButton(i18n("&Add Card..."), this);
connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
- hlayout->addWidget(addButton);
- hlayout->addStretch();
+ htqlayout->addWidget(addButton);
+ htqlayout->addStretch();
renameButton = new KPushButton(i18n("&Rename..."), this);
connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename()));
- hlayout->addWidget(renameButton);
- hlayout->addStretch();
+ htqlayout->addWidget(renameButton);
+ htqlayout->addStretch();
delButton = new KPushButton(i18n("&Delete"), this);
connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del()));
- hlayout->addWidget(delButton);
+ htqlayout->addWidget(delButton);
List = new KListBox(this);
- layout->addWidget(List);
+ tqlayout->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);
- hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
+ htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
moreButton = new KPushButton(i18n("&More Properties"), this);
connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
- hlayout->addWidget(moreButton);
- hlayout->addStretch();
+ htqlayout->addWidget(moreButton);
+ htqlayout->addStretch();
lessButton = new KPushButton(i18n("&Fewer Properties"), this);
connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
- hlayout->addWidget(lessButton);
+ htqlayout->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);
- layout->addWidget(newChooseWidget);
+ tqlayout->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);
- layout->addWidget(newChooseWidget);
+ tqlayout->addWidget(newChooseWidget);
newChooseWidget->show();
diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h
index 34c6fa1..051df1f 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 *layout;
+ TQGridLayout *tqlayout;
EstateList *estates;
TQValueList<CardStack> *cards;
@@ -184,7 +184,7 @@ class ChooseWidget : public TQWidget
bool number;
bool prevNumber;
bool init;
- TQHBoxLayout *hlayout;
+ TQHBoxLayout *htqlayout;
EstateList *estates;
@@ -218,7 +218,7 @@ class CardView : public TQWidget
EstateList *estates;
- TQVBoxLayout *layout;
+ TQVBoxLayout *tqlayout;
Card *card;
@@ -281,7 +281,7 @@ class CardsDlg : public EstateDlg
TQComboBox *cards;
CardView *view;
- TQVBoxLayout *vlayout;
+ TQVBoxLayout *vtqlayout;
};
class StreetDlg : public EstateDlg
diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp
index 3ba8a86..b3da81f 100644
--- a/atlantikdesigner/designer/group.cpp
+++ b/atlantikdesigner/designer/group.cpp
@@ -2,7 +2,7 @@
#include <tqframe.h>
#include <tqvgroupbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqspinbox.h>
#include <tqstring.h>
#include <tqstringlist.h>
@@ -26,10 +26,10 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
list = newList;
TQFrame *page = plainPage();
- TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint());
+ TQHBoxLayout *htqlayout = new TQHBoxLayout(page, marginHint(), spacingHint());
groups = new KListBox(page);
- hlayout->addWidget(groups);
+ htqlayout->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,22 +37,22 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
groups->insertStringList(newgroups);
connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
- TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, spacingHint());
- colorGroupBox = new TQVGroupBox(i18n("&Colors"), page);
- vlayout->addWidget(colorGroupBox);
+ TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, spacingHint());
+ tqcolorGroupBox = new TQVGroupBox(i18n("&Colors"), page);
+ vtqlayout->addWidget(tqcolorGroupBox);
- (void) new TQLabel(i18n("Foreground:"), colorGroupBox);
- fgButton = new KColorButton(colorGroupBox, "Foreground Button");
+ (void) new TQLabel(i18n("Foreground:"), tqcolorGroupBox);
+ fgButton = new KColorButton(tqcolorGroupBox, "Foreground Button");
connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(fgChanged(const TQColor &)));
connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed()));
- (void) new TQLabel(i18n("Background:"), colorGroupBox);
- bgButton = new KColorButton(colorGroupBox, "Background Button");
+ (void) new TQLabel(i18n("Background:"), tqcolorGroupBox);
+ bgButton = new KColorButton(tqcolorGroupBox, "Background Button");
connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(bgChanged(const TQColor &)));
connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed()));
pricesGroupBox = new TQVGroupBox(i18n("&Prices"), page);
- vlayout->addWidget(pricesGroupBox);
+ vtqlayout->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);
- vlayout->addWidget(dynamicGroupBox);
+ vtqlayout->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 *buttonlayout = new TQHBoxLayout(vlayout, spacingHint());
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout(vtqlayout, spacingHint());
KPushButton *addB = new KPushButton(i18n("&Add..."), page);
- buttonlayout->addWidget(addB);
+ buttontqlayout->addWidget(addB);
connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
removeB = new KPushButton(i18n("&Remove"), page);
- buttonlayout->addWidget(removeB);
+ buttontqlayout->addWidget(removeB);
connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove()));
selectionChanged();
@@ -233,7 +233,7 @@ void GroupEditor::slotOk()
void GroupEditor::selectionChanged()
{
bool issel = groups->currentItem() >= 0;
- colorGroupBox->setEnabled(issel);
+ tqcolorGroupBox->setEnabled(issel);
pricesGroupBox->setEnabled(issel);
dynamicGroupBox->setEnabled(issel);
removeB->setEnabled(issel);
diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h
index 87086f0..606189b 100644
--- a/atlantikdesigner/designer/group.h
+++ b/atlantikdesigner/designer/group.h
@@ -86,7 +86,7 @@ class GroupEditor : public KDialogBase
TQWidget *mathWidget;
TQSpinBox *housePrice;
TQSpinBox *globalPrice;
- TQVGroupBox *colorGroupBox;
+ TQVGroupBox *tqcolorGroupBox;
TQVGroupBox *pricesGroupBox;
TQVGroupBox *dynamicGroupBox;
KPushButton *removeB;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-30 15:09:05 +0000