TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 18 insertions, 18 deletions

diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp
index 8f4d513..cd804e6 100644
--- a/atlantikdesigner/designer/group.cpp
+++ b/atlantikdesigner/designer/group.cpp
@@ -19,17 +19,17 @@
 
 #include "group.h"
 
-GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
-	: KDialogBase(KDialogBase::Plain, i18n("Group Editor"), Ok|Apply|Cancel, Ok, parent, "Group Editor", false, true), mylist(*newList)
+GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *tqparent)
+	: KDialogBase(KDialogBase::Plain, i18n("Group Editor"), Ok|Apply|Cancel, Ok, tqparent, "Group Editor", false, true), mylist(*newList)
 {
 	setWFlags(WDestructiveClose);
 	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();
@@ -104,7 +104,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 void GroupEditor::add()
 {
 	bool ok;
-	TQString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group:"), TQString::null, &ok, this);
+	TQString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group:"), TQString(), &ok, this);
 	if (ok)
 	{
 		for (ConfigEstateGroupList::Iterator it =  mylist.begin(); it != mylist.end(); ++it)
@@ -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);