summaryrefslogtreecommitdiffstats
path: root/atlantikdesigner
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:22:56 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:22:56 +0000
commit7346aee26bf190a7e70333c40fab4caca847cd27 (patch)
tree4b019b434f88dcc3eeaafe1d3f26240b4c4718e8 /atlantikdesigner
parent23a3d3aa5b44cbdf305495919866d9dbf4f6da54 (diff)
downloadtdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.tar.gz
tdeaddons-7346aee26bf190a7e70333c40fab4caca847cd27.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'atlantikdesigner')
-rw-r--r--atlantikdesigner/designer/boardinfo.cpp72
-rw-r--r--atlantikdesigner/designer/boardinfo.h34
-rw-r--r--atlantikdesigner/designer/designer.cpp178
-rw-r--r--atlantikdesigner/designer/designer.h36
-rw-r--r--atlantikdesigner/designer/editor.cpp218
-rw-r--r--atlantikdesigner/designer/editor.h110
-rw-r--r--atlantikdesigner/designer/group.cpp100
-rw-r--r--atlantikdesigner/designer/group.h56
8 files changed, 402 insertions, 402 deletions
diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp
index 9bc6dbb..56b561a 100644
--- a/atlantikdesigner/designer/boardinfo.cpp
+++ b/atlantikdesigner/designer/boardinfo.cpp
@@ -1,9 +1,9 @@
-#include <qstring.h>
-#include <qlayout.h>
-#include <qstringlist.h>
-#include <qframe.h>
-#include <qptrlist.h>
-#include <qlabel.h>
+#include <tqstring.h>
+#include <tqlayout.h>
+#include <tqstringlist.h>
+#include <tqframe.h>
+#include <tqptrlist.h>
+#include <tqlabel.h>
#include <kcolorbutton.h>
#include <kdialogbase.h>
@@ -15,7 +15,7 @@
#include "boardinfo.h"
-BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, const char *_name, bool modal)
+BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, TQWidget *parent, const char *_name, bool modal)
: KDialogBase(KDialogBase::Tabbed, i18n("Gameboard Information"), (editable? Ok|Apply|Cancel : Close), (editable? Ok : Close), parent, _name, modal)
{
if (!info)
@@ -24,8 +24,8 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, cons
setWFlags(WDestructiveClose);
- QFrame *about = addPage(i18n("Information"));
- QVBoxLayout *aboutLayout = new QVBoxLayout(about, spacingHint());
+ TQFrame *about = addPage(i18n("Information"));
+ TQVBoxLayout *aboutLayout = new TQVBoxLayout(about, spacingHint());
if (editable)
{
@@ -34,22 +34,22 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, cons
}
else
{
- aboutLayout->addWidget(new QLabel(info->name, about));
+ aboutLayout->addWidget(new TQLabel(info->name, about));
name = 0;
}
- QHBoxLayout *versionLayout = new QHBoxLayout(aboutLayout, spacingHint());
- versionLayout->addWidget(new QLabel(i18n("Version:"), about));
+ TQHBoxLayout *versionLayout = new TQHBoxLayout(aboutLayout, spacingHint());
+ versionLayout->addWidget(new TQLabel(i18n("Version:"), about));
if (editable)
{
versionLayout->addWidget(version = new KLineEdit(about));
version->setText(info->version);
}
else
- versionLayout->addWidget(new QLabel(info->version, about));
+ versionLayout->addWidget(new TQLabel(info->version, about));
- QHBoxLayout *urlLayout = new QHBoxLayout(aboutLayout, spacingHint());
- urlLayout->addWidget(new QLabel(i18n("URL:"), about));
+ TQHBoxLayout *urlLayout = new TQHBoxLayout(aboutLayout, spacingHint());
+ urlLayout->addWidget(new TQLabel(i18n("URL:"), about));
if (editable)
urlLayout->addWidget(url = new KLineEdit(info->url, about));
else
@@ -57,7 +57,7 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, cons
aboutLayout->addStretch(3);
- aboutLayout->addWidget(new QLabel(i18n("Description:"), about));
+ aboutLayout->addWidget(new TQLabel(i18n("Description:"), about));
aboutLayout->addStretch();
aboutLayout->addWidget(description = new KLineEdit(about));
description->setText(info->description);
@@ -68,20 +68,20 @@ BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, QWidget *parent, cons
if (editable)
{
- QHBoxLayout *bgLayout = new QHBoxLayout(aboutLayout, spacingHint());
- bgLayout->addWidget(new QLabel(i18n("Background color:"), about));
+ TQHBoxLayout *bgLayout = new TQHBoxLayout(aboutLayout, spacingHint());
+ bgLayout->addWidget(new TQLabel(i18n("Background color:"), about));
bgColor = new KColorButton(info->bgColor, about);
bgLayout->addWidget(bgColor);
}
else
bgColor = 0;
- QFrame *authorsFrame = addPage(i18n("&Authors"));
- QVBoxLayout *authorsLayout = new QVBoxLayout(authorsFrame, spacingHint());
+ TQFrame *authorsFrame = addPage(i18n("&Authors"));
+ TQVBoxLayout *authorsLayout = new TQVBoxLayout(authorsFrame, spacingHint());
authorsLayout->addWidget(authors = new LotsaEdits(editable, info->authors, authorsFrame));
- QFrame *creditsFrame = addPage(i18n("&Thanks To"));
- QVBoxLayout *creditsLayout = new QVBoxLayout(creditsFrame, spacingHint());
+ TQFrame *creditsFrame = addPage(i18n("&Thanks To"));
+ TQVBoxLayout *creditsLayout = new TQVBoxLayout(creditsFrame, spacingHint());
creditsLayout->addWidget(credits = new LotsaEdits(editable, info->credits, creditsFrame));
}
@@ -110,44 +110,44 @@ void BoardInfoDlg::slotOk()
///////////////////////////////////
-LotsaEdits::LotsaEdits(bool editable, QStringList defaults, QWidget *parent, const char *name) : QWidget(parent, name)
+LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, const char *name) : TQWidget(parent, name)
{
list.setAutoDelete(true);
this->editable = editable;
- layout = new QVBoxLayout(this, KDialogBase::spacingHint());
- QHBoxLayout *hlayout = new QHBoxLayout(layout, 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);
hlayout->addWidget(more);
- connect(more, SIGNAL(clicked()), this, SLOT(more()));
+ connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
hlayout->addStretch();
KPushButton *less= new KPushButton(i18n("&Delete Name"), this);
hlayout->addWidget(less);
- connect(less, SIGNAL(clicked()), this, SLOT(less()));
+ connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
}
layout->addStretch();
- for (QStringList::Iterator it = defaults.begin(); it != defaults.end(); ++it)
+ for (TQStringList::Iterator it = defaults.begin(); it != defaults.end(); ++it)
{
more();
if (editable)
static_cast<KLineEdit *>(list.last())->setText(*it);
else
- static_cast<QLabel *>(list.last())->setText(*it);
+ static_cast<TQLabel *>(list.last())->setText(*it);
}
}
void LotsaEdits::more()
{
- QWidget *edit;
+ TQWidget *edit;
if (editable)
edit = new KLineEdit(this);
else
- edit = new QLabel(this);
+ edit = new TQLabel(this);
layout->addWidget(edit);
list.append(edit);
edit->show();
@@ -157,7 +157,7 @@ void LotsaEdits::less()
{
list.removeLast();
/*
- QWidget *edit = 0;
+ TQWidget *edit = 0;
for (edit = list.first(); edit; edit = list.next())
{
if (edit->hasFocus())
@@ -169,16 +169,16 @@ void LotsaEdits::less()
*/
}
-QStringList LotsaEdits::save()
+TQStringList LotsaEdits::save()
{
- QStringList ret;
+ TQStringList ret;
- QWidget *edit = 0;
+ TQWidget *edit = 0;
for (edit = list.first(); edit; edit = list.next())
if (editable)
ret.append(static_cast<KLineEdit *>(edit)->text());
else
- ret.append(static_cast<QLabel *>(edit)->text());
+ ret.append(static_cast<TQLabel *>(edit)->text());
return ret;
}
diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h
index 00825a5..ac2ae00 100644
--- a/atlantikdesigner/designer/boardinfo.h
+++ b/atlantikdesigner/designer/boardinfo.h
@@ -1,11 +1,11 @@
#ifndef ATLANTIK_BOARDINFO_H
#define ATLANTIK_BOARDINFO_H
-#include <qcolor.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qptrlist.h>
-#include <qwidget.h>
+#include <tqcolor.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqptrlist.h>
+#include <tqwidget.h>
#include <kdialogbase.h>
@@ -18,13 +18,13 @@ class QVBoxLayout;
struct BoardInfo
{
BoardInfo() { bgColor = Qt::lightGray; }
- QString name;
- QStringList authors;
- QStringList credits;
- QString description;
- QString url;
- QString version;
- QColor bgColor;
+ TQString name;
+ TQStringList authors;
+ TQStringList credits;
+ TQString description;
+ TQString url;
+ TQString version;
+ TQColor bgColor;
};
class LotsaEdits : public QWidget
@@ -32,10 +32,10 @@ class LotsaEdits : public QWidget
Q_OBJECT
public:
- LotsaEdits(bool, QStringList=QStringList(), QWidget *parent=0, const char *name=0);
+ LotsaEdits(bool, QStringList=TQStringList(), TQWidget *parent=0, const char *name=0);
public slots:
- QStringList save();
+ TQStringList save();
private slots:
void more();
@@ -43,8 +43,8 @@ class LotsaEdits : public QWidget
private:
bool editable;
- QPtrList<QWidget> list;
- QVBoxLayout *layout;
+ TQPtrList<TQWidget> list;
+ TQVBoxLayout *layout;
};
class BoardInfoDlg : public KDialogBase
@@ -52,7 +52,7 @@ class BoardInfoDlg : public KDialogBase
Q_OBJECT
public:
- BoardInfoDlg(bool editable, BoardInfo *, QWidget *parent=0, const char *_name=0, bool = true);
+ BoardInfoDlg(bool editable, BoardInfo *, TQWidget *parent=0, const char *_name=0, bool = true);
protected slots:
void slotOk();
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 11da0e3..87b548d 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -1,17 +1,17 @@
-#include <qcolor.h>
-#include <qpalette.h>
-#include <qevent.h>
-#include <qfile.h>
-#include <qguardedptr.h>
-#include <qlayout.h>
-#include <qpoint.h>
-#include <qpopupmenu.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qtextcodec.h>
-#include <qtextstream.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <tqcolor.h>
+#include <tqpalette.h>
+#include <tqevent.h>
+#include <tqfile.h>
+#include <tqguardedptr.h>
+#include <tqlayout.h>
+#include <tqpoint.h>
+#include <tqpopupmenu.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
+#include <tqtimer.h>
+#include <tqwidget.h>
#include <kaction.h>
#include <kapplication.h>
@@ -35,7 +35,7 @@
#include "editor.h"
#include "designer.h"
-AtlanticDesigner::AtlanticDesigner(QWidget *parent, const char *name)
+AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
: KMainWindow(parent, name)
{
firstBoard = true;
@@ -48,35 +48,35 @@ AtlanticDesigner::AtlanticDesigner(QWidget *parent, const char *name)
board = 0;
layout = 0;
- (void) KStdAction::quit(this, SLOT(close()), actionCollection());
- (void) KStdAction::open(this, SLOT(open()), actionCollection());
- (void) KStdAction::openNew(this, SLOT(openNew()), actionCollection());
- (void) KStdAction::save(this, SLOT(save()), actionCollection());
- (void) KStdAction::saveAs(this, SLOT(saveAs()), actionCollection());
- (void) new KAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, SLOT(info()), actionCollection(), "boardinfo");
- (void) new KAction(i18n("&Edit Groups..."), CTRL+Key_G, this, SLOT(editGroups()), actionCollection(), "groupeditor");
-
- (void) new KAction(i18n("&Add 4 Squares"), "viewmag+", 0, this, SLOT(larger()), actionCollection(), "larger");
- (void) new KAction(i18n("&Remove 4 Squares"), "viewmag-", 0, this, SLOT(smaller()), actionCollection(), "smaller");
- (void) KStdAction::copy(this, SLOT(copy()), actionCollection());
- (void) KStdAction::paste(this, SLOT(paste()), actionCollection());
- (void) new KAction(i18n("&Up"), Key_Up, this, SLOT(up()), actionCollection(), "up");
- (void) new KAction(i18n("&Down"), Key_Down, this, SLOT(down()), actionCollection(), "down");
- (void) new KAction(i18n("&Left"), Key_Left, this, SLOT(left()), actionCollection(), "left");
- (void) new KAction(i18n("&Right"), Key_Right, this, SLOT(right()), actionCollection(), "right");
+ (void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
+ (void) KStdAction::open(this, TQT_SLOT(open()), actionCollection());
+ (void) KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection());
+ (void) KStdAction::save(this, TQT_SLOT(save()), actionCollection());
+ (void) KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
+ (void) new KAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, TQT_SLOT(info()), actionCollection(), "boardinfo");
+ (void) new KAction(i18n("&Edit Groups..."), CTRL+Key_G, this, TQT_SLOT(editGroups()), actionCollection(), "groupeditor");
+
+ (void) new KAction(i18n("&Add 4 Squares"), "viewmag+", 0, this, TQT_SLOT(larger()), actionCollection(), "larger");
+ (void) new KAction(i18n("&Remove 4 Squares"), "viewmag-", 0, this, TQT_SLOT(smaller()), actionCollection(), "smaller");
+ (void) KStdAction::copy(this, TQT_SLOT(copy()), actionCollection());
+ (void) KStdAction::paste(this, TQT_SLOT(paste()), actionCollection());
+ (void) new KAction(i18n("&Up"), Key_Up, this, TQT_SLOT(up()), actionCollection(), "up");
+ (void) new KAction(i18n("&Down"), Key_Down, this, TQT_SLOT(down()), actionCollection(), "down");
+ (void) new KAction(i18n("&Left"), Key_Left, this, TQT_SLOT(left()), actionCollection(), "left");
+ (void) new KAction(i18n("&Right"), Key_Right, this, TQT_SLOT(right()), actionCollection(), "right");
recentAct = KStdAction::openRecent(0, 0, actionCollection());
- connect(recentAct, SIGNAL(urlSelected(const KURL &)), this, SLOT(openRecent(const KURL &)));
+ connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), this, TQT_SLOT(openRecent(const KURL &)));
recentAct->loadEntries(KGlobal::config(), "Designer recent files");
estateAct = new KListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num");
- connect(estateAct, SIGNAL(activated(int)), SLOT(changeEstate(int)));
+ connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int)));
createGUI("atlantikdesignerui.rc");
KConfig *config = kapp->config();
config->setGroup("General");
- QColor defaultColor = colorGroup().background();
+ TQColor defaultColor = colorGroup().background();
defaultBg = config->readColorEntry("alternateBackground", &defaultColor);
config->setGroup("WM");
defaultColor = colorGroup().dark();
@@ -135,11 +135,11 @@ void AtlanticDesigner::initBoard()
board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board");
setCentralWidget(board);
- layout = new QVBoxLayout(board->centerWidget());
+ layout = new TQVBoxLayout(board->centerWidget());
editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor");
- connect(editor, SIGNAL(goChecked(int)), this, SLOT(goChanged(int)));
- connect(editor, SIGNAL(updateBackground()), this, SLOT(updateBackground()));
- connect(editor, SIGNAL(resized()), board, SLOT(slotResizeAftermath()));
+ connect(editor, TQT_SIGNAL(goChecked(int)), this, TQT_SLOT(goChanged(int)));
+ connect(editor, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(updateBackground()));
+ connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath()));
layout->addWidget(editor);
editor->setReady(false);
@@ -159,14 +159,14 @@ void AtlanticDesigner::initToken()
board->addToken(m_player);
- connect(m_player, SIGNAL(changed(Player *)), board, SLOT(playerChanged(Player *)));
+ connect(m_player, TQT_SIGNAL(changed(Player *)), board, TQT_SLOT(playerChanged(Player *)));
}
void AtlanticDesigner::openNew()
{
if (warnClose())
return;
- filename = QString::null;
+ filename = TQString::null;
max = 40;
@@ -184,7 +184,7 @@ void AtlanticDesigner::openNew()
groupsChanged();
updateBackground();
- QTimer::singleShot(500, this, SLOT(setPlayerAtBeginning()));
+ TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
doCaption(false);
}
@@ -198,8 +198,8 @@ ConfigEstate *AtlanticDesigner::newEstate(int i)
estate->setChanged(false);
estates.insert(i, estate);
- connect(estate, SIGNAL(LMBClicked(Estate *)), this, SLOT(changeEstate(Estate *)));
- connect(estate, SIGNAL(changed()), this, SLOT(modified()));
+ connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *)));
+ connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
board->addEstateView(estate);
@@ -254,19 +254,19 @@ void AtlanticDesigner::openRecent(const KURL &url)
}
}
-void AtlanticDesigner::openFile(const QString &filename)
+void AtlanticDesigner::openFile(const TQString &filename)
{
enum ParseMode { Parse_Nothing, Parse_General, Parse_Board, Parse_Cards, Parse_EstateGroups, Parse_Estates };
- QFile f(filename);
+ TQFile f(filename);
if (!f.open(IO_ReadOnly))
return;
initMembers();
- QTextStream t(&f);
- t.setCodec(QTextCodec::codecForName("utf8"));
+ TQTextStream t(&f);
+ t.setCodec(TQTextCodec::codecForName("utf8"));
- QString s = t.readLine();
+ TQString s = t.readLine();
int parseMode = Parse_Nothing;
CardStack *curCardStack = 0;
@@ -283,7 +283,7 @@ void AtlanticDesigner::openFile(const QString &filename)
continue;
}
- QString name;
+ TQString name;
if (s.left(1) == "<")
{
@@ -306,8 +306,8 @@ void AtlanticDesigner::openFile(const QString &filename)
int eqSign = s.find("=");
if (eqSign >= 0)
{
- QString key = s.left(eqSign);
- QString value = s.right(s.length() - eqSign - 1);
+ TQString key = s.left(eqSign);
+ TQString value = s.right(s.length() - eqSign - 1);
if (parseMode == Parse_Cards)
{
@@ -328,9 +328,9 @@ void AtlanticDesigner::openFile(const QString &filename)
else if (key == "url")
boardInfo.url = value;
else if (key == "authors")
- boardInfo.authors = QStringList::split(",", value);
+ boardInfo.authors = TQStringList::split(",", value);
else if (key == "credits")
- boardInfo.credits = QStringList::split(",", value);
+ boardInfo.credits = TQStringList::split(",", value);
}
else if (parseMode == Parse_Board)
{
@@ -352,23 +352,23 @@ void AtlanticDesigner::openFile(const QString &filename)
// for estates
int type = FreeParking;
- QString group, takeCard;
+ TQString group, takeCard;
int price = -1;
int rent[6] = {-1, -1, -1, -1, -1, -1};
int tax = -1;
int taxPercentage = -1;
int passMoney = -1;
- QColor forceBg;
+ TQColor forceBg;
// for groups
- QColor color, bgColor;
- QString rentMath;
+ TQColor color, bgColor;
+ TQString rentMath;
int housePrice = -1;
int globalPrice = -1;
// for cards
- QStringList keys;
- QValueList<int> values;
+ TQStringList keys;
+ TQValueList<int> values;
while (true)
{
@@ -384,8 +384,8 @@ void AtlanticDesigner::openFile(const QString &filename)
if (eqSign < 0)
continue;
- QString key = s.left(eqSign);
- QString value = s.right(s.length() - eqSign - 1);
+ TQString key = s.left(eqSign);
+ TQString value = s.right(s.length() - eqSign - 1);
//////////////////////////////// ESTATES
if (parseMode == Parse_Estates)
@@ -424,7 +424,7 @@ void AtlanticDesigner::openFile(const QString &filename)
type = Cards;
}
else if (key == "bgcolor")
- forceBg = QColor(value);
+ forceBg = TQColor(value);
else if (key == "passmoney")
passMoney = value.toInt();
}
@@ -486,8 +486,8 @@ void AtlanticDesigner::openFile(const QString &filename)
estate->setPassMoney(passMoney);
estates.append(estate);
- connect(estate, SIGNAL(LMBClicked(Estate *)), this, SLOT(changeEstate(Estate *)));
- connect(estate, SIGNAL(changed()), this, SLOT(modified()));
+ connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *)));
+ connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
i++;
}
else if (parseMode == Parse_Cards)
@@ -545,15 +545,15 @@ void AtlanticDesigner::openFile(const QString &filename)
updateBackground();
updateJumpMenu();
- QTimer::singleShot(500, this, SLOT(setPlayerAtBeginning()));
+ TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
doCaption(false);
}
void AtlanticDesigner::updateJumpMenu()
{
- QStringList estates;
+ TQStringList estates;
for (int i = 1; i <= max; i++)
- estates.append(i18n("Jump to Estate %1").arg(QString::number(i)));
+ estates.append(i18n("Jump to Estate %1").arg(TQString::number(i)));
estateAct->setItems(estates);
}
@@ -573,8 +573,8 @@ void AtlanticDesigner::setPlayerAtBeginning()
void AtlanticDesigner::saveAs()
{
- QString oldfilename = filename;
- filename = QString::null;
+ TQString oldfilename = filename;
+ filename = TQString::null;
save();
@@ -590,7 +590,7 @@ void AtlanticDesigner::saveAs()
void AtlanticDesigner::save()
{
(void) editor->saveEstate();
- QString oldfilename = filename;
+ TQString oldfilename = filename;
if (filename.isNull())
filename = KFileDialog::getOpenFileName();
@@ -600,12 +600,12 @@ void AtlanticDesigner::save()
return;
}
- QFile f(filename);
+ TQFile f(filename);
if (!f.open(IO_WriteOnly))
return;
- QTextStream t(&f);
- t.setCodec(QTextCodec::codecForName("utf8"));
+ TQTextStream t(&f);
+ t.setCodec(TQTextCodec::codecForName("utf8"));
t << "<General>" << endl << endl;
if (!boardInfo.name.isEmpty())
@@ -654,7 +654,7 @@ void AtlanticDesigner::save()
t << "<EstateGroups>" << endl;
// double-prevent duplicates
- QStringList writtenGroups;
+ TQStringList writtenGroups;
for (ConfigEstateGroupList::Iterator it = groups.begin(); it != groups.end(); ++it)
{
@@ -679,7 +679,7 @@ void AtlanticDesigner::save()
writtenGroups.append((*it).name());
- t << endl << QString("[%1]").arg((*it).name()) << endl;
+ t << endl << TQString("[%1]").arg((*it).name()) << endl;
if ((*it).globalPrice() > 0)
t << "price=" << (*it).globalPrice() << endl;
@@ -698,7 +698,7 @@ void AtlanticDesigner::save()
// now do the cards
- for (QValueList<CardStack>::Iterator it = cards.begin(); it != cards.end(); ++it)
+ for (TQValueList<CardStack>::Iterator it = cards.begin(); it != cards.end(); ++it)
{
t << endl << endl;
t << "<Cards>" << endl << endl;
@@ -707,10 +707,10 @@ void AtlanticDesigner::save()
for (CardStack::Iterator cit = (*it).begin(); cit != (*it).end(); ++cit)
{
t << endl << "[" << (*cit).name << "]" << endl;
- QValueList<int>::Iterator vit = (*cit).values.begin();
- for (QStringList::Iterator it = (*cit).keys.begin(); it != (*cit).keys.end(); ++it, ++vit)
+ TQValueList<int>::Iterator vit = (*cit).values.begin();
+ for (TQStringList::Iterator it = (*cit).keys.begin(); it != (*cit).keys.end(); ++it, ++vit)
{
- QString key = (*it);
+ TQString key = (*it);
int value = (*vit);
if (key == "collect")
@@ -748,7 +748,7 @@ void AtlanticDesigner::save()
for (estate = estates.first(); estate; estate = estates.next())
{
- t << endl << QString("[%1]").arg(estate->name()) << endl;
+ t << endl << TQString("[%1]").arg(estate->name()) << endl;
switch (estate->type())
{
@@ -828,7 +828,7 @@ void AtlanticDesigner::paste()
groupsChanged();
}
-void AtlanticDesigner::closeEvent(QCloseEvent *e)
+void AtlanticDesigner::closeEvent(TQCloseEvent *e)
{
if (warnClose())
return;
@@ -895,7 +895,7 @@ void AtlanticDesigner::larger()
groupsChanged();
updateBackground();
- QTimer::singleShot(500, this, SLOT(setPlayerAtBeginning()));
+ TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
doCaption(true);
}
@@ -934,7 +934,7 @@ void AtlanticDesigner::smaller()
updateJumpMenu();
groupsChanged();
updateBackground();
- QTimer::singleShot(500, this, SLOT(setPlayerAtBeginning()));
+ TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
doCaption(true);
}
@@ -957,9 +957,9 @@ void AtlanticDesigner::editGroups()
groupEditor = new GroupEditor(&groups, this);
groupEditor->show();
- connect(groupEditor, SIGNAL(changed()), this, SLOT(modified()));
- connect(groupEditor, SIGNAL(update()), this, SLOT(groupsChanged()));
- connect(groupEditor, SIGNAL(update()), editor, SLOT(groupsChanged()));
+ connect(groupEditor, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
+ connect(groupEditor, TQT_SIGNAL(update()), this, TQT_SLOT(groupsChanged()));
+ connect(groupEditor, TQT_SIGNAL(update()), editor, TQT_SLOT(groupsChanged()));
}
else
groupEditor->raise();
@@ -998,7 +998,7 @@ void AtlanticDesigner::updateBackground()
{
if (curEstate->type() != Street || (curEstate->type() == Street && curEstate->group().isNull()))
{
- curEstate->setColor(QColor());
+ curEstate->setColor(TQColor());
curEstate->setBgColor(boardInfo.bgColor);
}
@@ -1019,8 +1019,8 @@ void AtlanticDesigner::info()
boardInfoDlg = new BoardInfoDlg(true, &boardInfo, this, "Board Information", false);
boardInfoDlg->show();
- connect(boardInfoDlg, SIGNAL(okClicked()), this, SLOT(updateBackground()));
- connect(boardInfoDlg, SIGNAL(okClicked()), this, SLOT(modified()));
+ connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateBackground()));
+ connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(modified()));
}
else
boardInfoDlg->raise();
diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h
index 91dd7b4..c66008b 100644
--- a/atlantikdesigner/designer/designer.h
+++ b/atlantikdesigner/designer/designer.h
@@ -1,11 +1,11 @@
#ifndef ATLANTK_DESIGNER_H
#define ATLANTK_DESIGNER_H
-#include <qcolor.h>
-#include <qguardedptr.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqcolor.h>
+#include <tqguardedptr.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
#include <kmainwindow.h>
@@ -27,11 +27,11 @@ class AtlanticDesigner : public KMainWindow
Q_OBJECT
public:
- AtlanticDesigner(QWidget *parent = 0, const char *name = 0);
+ AtlanticDesigner(TQWidget *parent = 0, const char *name = 0);
~AtlanticDesigner();
protected:
- void closeEvent(QCloseEvent *);
+ void closeEvent(TQCloseEvent *);
public slots:
void modified();
@@ -65,7 +65,7 @@ class AtlanticDesigner : public KMainWindow
void updateJumpMenu();
private:
- void openFile(const QString &);
+ void openFile(const TQString &);
bool warnClose();
void initBoard();
void initMembers();
@@ -73,34 +73,34 @@ class AtlanticDesigner : public KMainWindow
bool firstBoard;
ConfigEstate *newEstate(int);
- QGuardedPtr<EstateEdit> editor;
- QGuardedPtr<QVBoxLayout> layout;
- QGuardedPtr<AtlantikBoard> board;
- QGuardedPtr<GroupEditor> groupEditor;
- QGuardedPtr<BoardInfoDlg> boardInfoDlg;
+ TQGuardedPtr<EstateEdit> editor;
+ TQGuardedPtr<TQVBoxLayout> layout;
+ TQGuardedPtr<AtlantikBoard> board;
+ TQGuardedPtr<GroupEditor> groupEditor;
+ TQGuardedPtr<BoardInfoDlg> boardInfoDlg;
EstateList estates;
KListAction *estateAct;
KRecentFilesAction *recentAct;
- QValueList<CardStack> cards;
+ TQValueList<CardStack> cards;
BoardInfo boardInfo;
ConfigEstateGroupList groups;
- QString filename;
+ TQString filename;
ConfigEstate *copiedEstate;
void doCaption(bool);
int max;
- QStringList types;
+ TQStringList types;
Player *m_player;
bool isMod;
- QColor defaultFg;
- QColor defaultBg;
+ TQColor defaultFg;
+ TQColor defaultBg;
};
#endif
diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp
index f092254..fd978d2 100644
--- a/atlantikdesigner/designer/editor.cpp
+++ b/atlantikdesigner/designer/editor.cpp
@@ -1,15 +1,15 @@
-#include <qcheckbox.h>
-#include <qevent.h>
-#include <qframe.h>
-#include <qhgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qvbox.h>
-#include <qvgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqevent.h>
+#include <tqframe.h>
+#include <tqhgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqvbox.h>
+#include <tqvgroupbox.h>
#include <kcolorbutton.h>
#include <kcombobox.h>
@@ -59,7 +59,7 @@ void ConfigEstate::setType(const int type)
}
}
-void ConfigEstate::setGroup(const QString &group)
+void ConfigEstate::setGroup(const TQString &group)
{
if (m_group != group)
{
@@ -104,7 +104,7 @@ void ConfigEstate::setTaxPercentage(const int taxPercentage)
}
}
-void ConfigEstate::setTakeCard(const QString &takeCard)
+void ConfigEstate::setTakeCard(const TQString &takeCard)
{
if (m_takeCard != takeCard)
{
@@ -113,7 +113,7 @@ void ConfigEstate::setTakeCard(const QString &takeCard)
}
}
-void ConfigEstate::setForceBg(const QColor &forceBg)
+void ConfigEstate::setForceBg(const TQColor &forceBg)
{
if (m_forceBg != forceBg)
{
@@ -142,10 +142,10 @@ void ConfigEstate::setPassMoney(const int passMoney)
///////////////////////////
-QStringList types;
+TQStringList types;
-EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QValueList<CardStack> *cards, QWidget *parent, const char *name)
- : QWidget(parent, name)
+EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
groups = newGroups;
@@ -170,12 +170,12 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QV
ready = false;
locked = false;
- connect(this, SIGNAL(somethingChanged()), this, SLOT(saveEstate()));
+ connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate()));
- layout = new QGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
- nameEdit = new QLineEdit(this, "Name Edit");
+ layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
+ nameEdit = new TQLineEdit(this, "Name Edit");
layout->addWidget(nameEdit, 0, 0);
- connect(nameEdit, SIGNAL(returnPressed()), this, SIGNAL(somethingChanged()));
+ connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged()));
confDlg = 0;
@@ -183,31 +183,31 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QV
layout->addWidget(new KSeparator(this), 3, 0);
- QHBoxLayout *typeLayout = new QHBoxLayout(KDialog::spacingHint());
+ TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint());
layout->addLayout(typeLayout, 4, 0);
- QLabel *typeLabel = new QLabel(i18n("Type:"), this);
+ TQLabel *typeLabel = new TQLabel(i18n("Type:"), this);
typeLayout->addWidget(typeLabel);
typeCombo = new KComboBox(false, this, "Type Combo");
typeLayout->addWidget(typeCombo);
- connect(typeCombo, SIGNAL(activated(int)), this, SIGNAL(somethingChanged()));
- connect(typeCombo, SIGNAL(activated(int)), this, SIGNAL(updateBackground()));
+ connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(somethingChanged()));
+ connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(updateBackground()));
- goCheck = new QCheckBox(i18n("This estate is 'Go'"), this);
- connect(goCheck, SIGNAL(toggled(bool)), this, SIGNAL(somethingChanged()));
- connect(goCheck, SIGNAL(toggled(bool)), this, SLOT(goToggled(bool)));
+ 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);
- QHBoxLayout *passMoneyLayout = new QHBoxLayout(KDialog::spacingHint());
+ TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint());
layout->addLayout(passMoneyLayout, 6, 0);
- QLabel *passMoneyLabel = new QLabel(i18n("Pass money:"), this);
+ TQLabel *passMoneyLabel = new TQLabel(i18n("Pass money:"), this);
passMoneyLayout->addWidget(passMoneyLabel);
- passMoney = new QSpinBox(0, 3000, 10, this);
+ passMoney = new TQSpinBox(0, 3000, 10, this);
passMoney->setSpecialValueText(i18n("None"));
passMoney->setSuffix("$");
passMoneyLayout->addWidget(passMoney);
- QStringList estateTypes(i18n("Street"));
+ TQStringList estateTypes(i18n("Street"));
estateTypes.append(i18n("Cards"));
estateTypes.append(i18n("Free Parking"));
estateTypes.append(i18n("Go to Jail"));
@@ -227,7 +227,7 @@ void EstateEdit::setReady(bool ready)
this->ready = ready;
}
-void EstateEdit::resizeEvent(QResizeEvent *)
+void EstateEdit::resizeEvent(TQResizeEvent *)
{
emit resized();
}
@@ -325,7 +325,7 @@ void EstateEdit::configure()
confDlg->slotUpdate(estate);
- connect(confDlg, SIGNAL(updateBackground()), this, SIGNAL(updateBackground()));
+ connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground()));
layout->addWidget(confDlg, 1, 0);
confDlg->show();
@@ -378,16 +378,16 @@ bool EstateEdit::rightArrow()const
/////////////////////////////////
-TaxDlg::TaxDlg(QWidget *parent, char *name)
+TaxDlg::TaxDlg(TQWidget *parent, char *name)
: EstateDlg(parent, name)
{
- QGridLayout *taxBox = new QGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
- taxBox->addWidget(new QLabel(i18n("Fixed tax:"), this), 0, 0);
- taxBox->addWidget(tax = new QSpinBox(0, 3000, 1, this), 0, 1);
+ TQGridLayout *taxBox = new TQGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
+ taxBox->addWidget(new TQLabel(i18n("Fixed tax:"), this), 0, 0);
+ taxBox->addWidget(tax = new TQSpinBox(0, 3000, 1, this), 0, 1);
tax->setSpecialValueText(i18n("None"));
tax->setSuffix("$");
- taxBox->addWidget(new QLabel(i18n("Percentage tax:"), this), 1, 0);
- taxBox->addWidget(taxPercentage = new QSpinBox(0, 100, 1, this), 1, 1);
+ taxBox->addWidget(new TQLabel(i18n("Percentage tax:"), this), 1, 0);
+ taxBox->addWidget(taxPercentage = new TQSpinBox(0, 100, 1, this), 1, 1);
taxPercentage->setSpecialValueText(i18n("None"));
taxPercentage->setSuffix("%");
}
@@ -406,11 +406,11 @@ void TaxDlg::update()
/////////////////////////////////
-GenericDlg::GenericDlg(QWidget *parent, char *name)
+GenericDlg::GenericDlg(TQWidget *parent, char *name)
: EstateDlg(parent, name)
{
- QHBoxLayout *layout = new QHBoxLayout(this, KDialog::spacingHint());
- layout->addWidget(new QLabel(i18n("Background:"), this));
+ TQHBoxLayout *layout = new TQHBoxLayout(this, KDialog::spacingHint());
+ layout->addWidget(new TQLabel(i18n("Background:"), this));
col = new KColorButton(this);
layout->addWidget(col);
@@ -429,7 +429,7 @@ void GenericDlg::update()
/////////////////////////////////
-CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWidget *parent, char *name)
+CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *parent, char *name)
: EstateDlg(parent, name)
{
estates = newEstates;
@@ -437,24 +437,24 @@ CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWid
view = 0;
- vlayout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- QHBoxLayout *layout = new QHBoxLayout(vlayout, KDialog::spacingHint());
+ TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
KPushButton *addB = new KPushButton(i18n("&New Stack"), this);
- connect(addB, SIGNAL(clicked()), this, SLOT(addStack()));
+ connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack()));
layout->addWidget(addB);
layout->addStretch();
- layout->addWidget(new QLabel(i18n("Cards from"), this));
- QStringList cardNames;
- for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
+ 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 QComboBox(this);
+ cards = new TQComboBox(this);
cards->insertStringList(cardNames);
layout->addWidget(cards);
- connect(cards, SIGNAL(activated(const QString &)), this, SLOT(updateView(const QString &)));
+ connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &)));
vlayout->addWidget(new KSeparator(this));
}
@@ -462,10 +462,10 @@ CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWid
void CardsDlg::addStack()
{
bool ok;
- QString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), QString::null, &ok, this);
+ TQString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), TQString::null, &ok, this);
if (ok)
{
- for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
+ for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
{
if ((*it).name() == name)
{
@@ -481,10 +481,10 @@ void CardsDlg::addStack()
}
}
-void CardsDlg::updateView(const QString &curName)
+void CardsDlg::updateView(const TQString &curName)
{
CardStack *curStack = 0;
- for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
+ for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
if ((*it).name() == curName)
curStack = &(*it);
@@ -515,8 +515,8 @@ void CardsDlg::update()
/////////////////////////////////
-ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *parent, char *name)
- : QWidget (parent, name)
+ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *parent, char *name)
+ : TQWidget (parent, name)
{
this->id = id;
this->card = card;
@@ -530,9 +530,9 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *par
value = 0;
- hlayout = new QHBoxLayout(this, KDialog::spacingHint());
+ hlayout = new TQHBoxLayout(this, KDialog::spacingHint());
typeCombo = new KComboBox(this);
- QStringList _types(i18n("Pay"));
+ TQStringList _types(i18n("Pay"));
_types.append(i18n("Pay Each Player"));
_types.append(i18n("Collect"));
_types.append(i18n("Collect From Each Player"));
@@ -547,7 +547,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *par
_types.append(i18n("Pay for Each Hotel"));
typeCombo->insertStringList(_types);
hlayout->addWidget(typeCombo);
- connect(typeCombo, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
+ connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int)));
hlayout->addStretch();
}
@@ -571,7 +571,7 @@ void ChooseWidget::estateChanged(int i)
void ChooseWidget::typeChanged(int i)
{
- QString key = (*types.at(i));
+ TQString key = (*types.at(i));
(*card->keys.at(id)) = key;
typeCombo->setCurrentItem(i);
@@ -586,10 +586,10 @@ void ChooseWidget::typeChanged(int i)
delete estate;
estate = 0;
- value = new QSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this);
+ value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this);
hlayout->addWidget(value);
- connect(value, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int)));
+ connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
value->show();
}
@@ -599,11 +599,11 @@ void ChooseWidget::typeChanged(int i)
value = 0;
estate = new KComboBox(this);
ConfigEstate *curestate = 0;
- QStringList estateStrings;
+ TQStringList estateStrings;
for (curestate = estates->first(); curestate; curestate = estates->next())
estateStrings.append(curestate->name());
estate->insertStringList(estateStrings);
- connect(estate, SIGNAL(activated(int)), this, SLOT(estateChanged(int)));
+ connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int)));
hlayout->addWidget(estate);
estate->show();
@@ -625,8 +625,8 @@ Skipped:
}
value->setEnabled(!boolean);
- QString suffix = "";
- QString prefix = "";
+ TQString suffix = "";
+ TQString prefix = "";
// first four types are money, pay, payeach, collect, collecteach
if (i < 4 || key == "payhouse" || key == "payhotel")
@@ -640,7 +640,7 @@ Skipped:
/////////////////////////////////
-CardView::CardView(EstateList *estates, CardStack *stack, QWidget *parent, char *name) : QWidget(parent, name)
+CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char *name) : TQWidget(parent, name)
{
card = 0;
@@ -649,35 +649,35 @@ CardView::CardView(EstateList *estates, CardStack *stack, QWidget *parent, char
choosies.setAutoDelete(true);
- layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- QHBoxLayout *hlayout = new QHBoxLayout(layout, 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, SIGNAL(clicked()), this, SLOT(add()));
+ connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
hlayout->addWidget(addButton);
hlayout->addStretch();
renameButton = new KPushButton(i18n("&Rename..."), this);
- connect(renameButton, SIGNAL(clicked()), this, SLOT(rename()));
+ connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename()));
hlayout->addWidget(renameButton);
hlayout->addStretch();
delButton = new KPushButton(i18n("&Delete"), this);
- connect(delButton, SIGNAL(clicked()), this, SLOT(del()));
+ connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del()));
hlayout->addWidget(delButton);
List = new KListBox(this);
layout->addWidget(List);
- connect(List, SIGNAL(highlighted(int)), this, SLOT(selected(int)));
+ 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 QHBoxLayout(layout, KDialog::spacingHint());
+ hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
moreButton = new KPushButton(i18n("&More Properties"), this);
- connect(moreButton, SIGNAL(clicked()), this, SLOT(more()));
+ connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
hlayout->addWidget(moreButton);
hlayout->addStretch();
lessButton = new KPushButton(i18n("&Fewer Properties"), this);
- connect(lessButton, SIGNAL(clicked()), this, SLOT(less()));
+ connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
hlayout->addWidget(lessButton);
for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it)
@@ -720,7 +720,7 @@ void CardView::less()
void CardView::add()
{
bool ok = false;
- QString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), QString::null, &ok, this);
+ TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), TQString::null, &ok, this);
if (ok)
List->insertItem(name, 0);
@@ -742,7 +742,7 @@ void CardView::rename()
return;
bool ok = false;;
- QString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), (*stack->at(curItem)).name, &ok, this);
+ TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), (*stack->at(curItem)).name, &ok, this);
if (ok)
{
(*stack->at(curItem)).name = name;
@@ -774,8 +774,8 @@ void CardView::selected(int i)
card = &(*stack->at(i));
unsigned int num = card->keys.count();
- QValueList<int>::Iterator vit = card->values.begin();
- for (QStringList::Iterator it = card->keys.begin(); it != card->keys.end(); ++it)
+ TQValueList<int>::Iterator vit = card->values.begin();
+ for (TQStringList::Iterator it = card->keys.begin(); it != card->keys.end(); ++it)
{
ChooseWidget *newChooseWidget = new ChooseWidget(estates, choosies.count(), card, this);
@@ -812,32 +812,32 @@ void CardView::updateButtonsEnabled()
/////////////////////////////////
-StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, QWidget *parent, char *name)
+StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *parent, char *name)
: EstateDlg(parent, name)
{
groups = newGroups;
- QVBoxLayout *bigbox = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *bigbox = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
- QVGroupBox *RentPage = new QVGroupBox(i18n("&Rent by Number of Houses"), this);
+ TQVGroupBox *RentPage = new TQVGroupBox(i18n("&Rent by Number of Houses"), this);
RentPage->setInsideSpacing(KDialog::spacingHint());
RentPage->setInsideMargin(KDialog::marginHint());
bigbox->addWidget(RentPage);
- QWidget *topRent = new QWidget(RentPage);
- QGridLayout *rentBox = new QGridLayout(topRent, 3, 3, KDialog::spacingHint());
- rentBox->addWidget(new QLabel(i18n("None:"), topRent), 0, 0);
- rentBox->addWidget(new QLabel(i18n("One:"), topRent), 0, 1);
- rentBox->addWidget(new QLabel(i18n("Two:"), topRent), 0, 2);
- rentBox->addWidget(new QLabel(i18n("Three:"), topRent), 2, 0);
- rentBox->addWidget(new QLabel(i18n("Four:"), topRent), 2, 1);
- rentBox->addWidget(new QLabel(i18n("Hotel:"), topRent), 2, 2);
-
- rentBox->addWidget(houses0 = new QSpinBox(0, 3000, 1, topRent), 1, 0);
- rentBox->addWidget(houses1 = new QSpinBox(0, 3000, 1, topRent), 1, 1);
- rentBox->addWidget(houses2 = new QSpinBox(0, 3000, 1, topRent), 1, 2);
- rentBox->addWidget(houses3 = new QSpinBox(0, 3000, 1, topRent), 3, 0);
- rentBox->addWidget(houses4 = new QSpinBox(0, 3000, 1, topRent), 3, 1);
- rentBox->addWidget(houses5 = new QSpinBox(0, 3000, 1, topRent), 3, 2);
+ TQWidget *topRent = new TQWidget(RentPage);
+ TQGridLayout *rentBox = new TQGridLayout(topRent, 3, 3, KDialog::spacingHint());
+ rentBox->addWidget(new TQLabel(i18n("None:"), topRent), 0, 0);
+ rentBox->addWidget(new TQLabel(i18n("One:"), topRent), 0, 1);
+ rentBox->addWidget(new TQLabel(i18n("Two:"), topRent), 0, 2);
+ rentBox->addWidget(new TQLabel(i18n("Three:"), topRent), 2, 0);
+ rentBox->addWidget(new TQLabel(i18n("Four:"), topRent), 2, 1);
+ rentBox->addWidget(new TQLabel(i18n("Hotel:"), topRent), 2, 2);
+
+ rentBox->addWidget(houses0 = new TQSpinBox(0, 3000, 1, topRent), 1, 0);
+ rentBox->addWidget(houses1 = new TQSpinBox(0, 3000, 1, topRent), 1, 1);
+ rentBox->addWidget(houses2 = new TQSpinBox(0, 3000, 1, topRent), 1, 2);
+ rentBox->addWidget(houses3 = new TQSpinBox(0, 3000, 1, topRent), 3, 0);
+ rentBox->addWidget(houses4 = new TQSpinBox(0, 3000, 1, topRent), 3, 1);
+ rentBox->addWidget(houses5 = new TQSpinBox(0, 3000, 1, topRent), 3, 2);
houses0->setSuffix(i18n("$"));
houses0->setSpecialValueText(i18n("None"));
houses1->setSuffix(i18n("$"));
@@ -851,22 +851,22 @@ StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, QWidget *parent, char *na
houses5->setSuffix(i18n("$"));
houses5->setSpecialValueText(i18n("None"));
- QGridLayout *pricesBox = new QGridLayout(bigbox, 2, 2, KDialog::spacingHint());
- pricesBox->addWidget(new QLabel(i18n("Price:"), this), 0, 0);
- pricesBox->addWidget(price = new QSpinBox(0, 3000, 25, this), 0, 1);
+ TQGridLayout *pricesBox = new TQGridLayout(bigbox, 2, 2, KDialog::spacingHint());
+ pricesBox->addWidget(new TQLabel(i18n("Price:"), this), 0, 0);
+ pricesBox->addWidget(price = new TQSpinBox(0, 3000, 25, this), 0, 1);
price->setSpecialValueText(i18n("None"));
price->setSuffix(i18n("$"));
- QLabel *groupLabel = new QLabel(i18n("Group:"), this);
+ TQLabel *groupLabel = new TQLabel(i18n("Group:"), this);
pricesBox->addWidget(groupLabel, 1, 0);
groupCombo = new KComboBox(this, "Group Combo");
groupUpdate();
- connect(groupCombo, SIGNAL(activated(const QString &)), this, SLOT(groupChanged(const QString &)));
+ connect(groupCombo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(groupChanged(const TQString &)));
pricesBox->addWidget(groupCombo, 1, 1);
}
-void StreetDlg::groupChanged(const QString &groupName)
+void StreetDlg::groupChanged(const TQString &groupName)
{
for (ConfigEstateGroupList::Iterator it = groups->begin(); it != groups->end(); ++it)
{
@@ -885,9 +885,9 @@ void StreetDlg::groupChanged(const QString &groupName)
void StreetDlg::groupUpdate()
{
- QString curGroupName = groupCombo->currentText();
+ TQString curGroupName = groupCombo->currentText();
- QStringList newGroups;
+ TQStringList newGroups;
for (ConfigEstateGroupList::Iterator it = groups->begin(); it != groups->end(); ++it)
newGroups.append((*it).name());
diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h
index be6d63a..da6fa6d 100644
--- a/atlantikdesigner/designer/editor.h
+++ b/atlantikdesigner/designer/editor.h
@@ -2,9 +2,9 @@
#define ATLANTIK_EDITOR_H
#include <kmainwindow.h>
-#include <qstring.h>
-#include <qcolor.h>
-#include <qstringlist.h>
+#include <tqstring.h>
+#include <tqcolor.h>
+#include <tqstringlist.h>
#include <atlantic/estate.h>
@@ -29,8 +29,8 @@ class ConfigEstate : public Estate
void setEstateId(const int estateId);
int type()const { return m_type; }
void setType(const int type);
- const QString &group() { return m_group; }
- void setGroup(const QString &group);
+ const TQString &group() { return m_group; }
+ void setGroup(const TQString &group);
int price()const { return m_price; }
void setPrice(int);
int rent(int _h)const { return m_rent[_h]; }
@@ -39,10 +39,10 @@ class ConfigEstate : public Estate
void setTax(const int);
int taxPercentage() { return m_taxPercentage; }
void setTaxPercentage(const int);
- const QString &takeCard() { return m_takeCard; }
- void setTakeCard(const QString &);
- const QColor &forceBg() { return m_forceBg; }
- void setForceBg(const QColor &);
+ const TQString &takeCard() { return m_takeCard; }
+ void setTakeCard(const TQString &);
+ const TQColor &forceBg() { return m_forceBg; }
+ void setForceBg(const TQColor &);
bool go()const { return m_go; }
void setGo(const bool);
int passMoney()const { return m_passMoney; }
@@ -52,36 +52,36 @@ class ConfigEstate : public Estate
private:
int m_type;
- QString m_group;
+ TQString m_group;
int m_rent[6];
int m_price;
int m_tax;
int m_taxPercentage;
- QString m_takeCard;
- QColor m_forceBg;
+ TQString m_takeCard;
+ TQColor m_forceBg;
bool m_go;
int m_passMoney;
};
-typedef QPtrList<ConfigEstate> EstateList;
+typedef TQPtrList<ConfigEstate> EstateList;
struct Card
{
Card() {}
- Card(const QString &newName) { name = newName; }
- QString name;
- QStringList keys;
- QValueList<int> values;
+ Card(const TQString &newName) { name = newName; }
+ TQString name;
+ TQStringList keys;
+ TQValueList<int> values;
};
-class CardStack : public QValueList<Card>
+class CardStack : public TQValueList<Card>
{
public:
CardStack() {}
- CardStack(const QString &newName) { setName(newName); }
- const QString &name() { return m_name; }
- void setName(const QString &newName) { m_name = newName; }
+ CardStack(const TQString &newName) { setName(newName); }
+ const TQString &name() { return m_name; }
+ void setName(const TQString &newName) { m_name = newName; }
private:
- QString m_name;
+ TQString m_name;
};
class EstateDlg : public QWidget
@@ -89,7 +89,7 @@ class EstateDlg : public QWidget
Q_OBJECT
public:
- EstateDlg(QWidget *parent = 0, char *name = 0) : QWidget(parent, name) { estate = 0; }
+ EstateDlg(TQWidget *parent = 0, char *name = 0) : TQWidget(parent, name) { estate = 0; }
signals:
void updateBackground();
@@ -111,7 +111,7 @@ class EstateEdit : public QWidget
Q_OBJECT
public:
- EstateEdit(ConfigEstateGroupList *, EstateList *, QValueList<CardStack> *, QWidget *parent = 0, const char *name = 0);
+ EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, const char *name = 0);
ConfigEstate *theEstate() { return estate; }
bool upArrow()const;
bool downArrow()const;
@@ -133,7 +133,7 @@ class EstateEdit : public QWidget
void resized();
protected:
- void resizeEvent(QResizeEvent *);
+ void resizeEvent(TQResizeEvent *);
private slots:
void configure();
@@ -141,14 +141,14 @@ class EstateEdit : public QWidget
private:
KComboBox *typeCombo;
- QLineEdit *nameEdit;
- QCheckBox *goCheck;
- QSpinBox *passMoney;
- QWidget *centerWidget;
- QGridLayout *layout;
+ TQLineEdit *nameEdit;
+ TQCheckBox *goCheck;
+ TQSpinBox *passMoney;
+ TQWidget *centerWidget;
+ TQGridLayout *layout;
EstateList *estates;
- QValueList<CardStack> *cards;
+ TQValueList<CardStack> *cards;
ConfigEstateGroupList *groups;
ConfigEstate *estate;
@@ -166,7 +166,7 @@ class ChooseWidget : public QWidget
Q_OBJECT
public:
- ChooseWidget(EstateList *, int id, Card *, QWidget *parent = 0, char *name = 0);
+ ChooseWidget(EstateList *, int id, Card *, TQWidget *parent = 0, char *name = 0);
public slots:
void typeChanged(int);
@@ -176,12 +176,12 @@ class ChooseWidget : public QWidget
private:
Card *card;
KComboBox *typeCombo;
- QSpinBox *value;
+ TQSpinBox *value;
KComboBox *estate;
bool number;
bool prevNumber;
bool init;
- QHBoxLayout *hlayout;
+ TQHBoxLayout *hlayout;
EstateList *estates;
@@ -193,7 +193,7 @@ class CardView : public QWidget
Q_OBJECT
public:
- CardView(EstateList *, CardStack *, QWidget *parent = 0, char *name = 0);
+ CardView(EstateList *, CardStack *, TQWidget *parent = 0, char *name = 0);
private slots:
void selected(int);
@@ -214,12 +214,12 @@ class CardView : public QWidget
EstateList *estates;
- QVBoxLayout *layout;
+ TQVBoxLayout *layout;
Card *card;
CardStack *stack;
- QPtrList<ChooseWidget> choosies;
+ TQPtrList<ChooseWidget> choosies;
};
class TaxDlg : public EstateDlg
@@ -227,15 +227,15 @@ class TaxDlg : public EstateDlg
Q_OBJECT
public:
- TaxDlg(QWidget *parent = 0, char *name = 0);
+ TaxDlg(TQWidget *parent = 0, char *name = 0);
protected:
virtual void save();
virtual void update();
private:
- QSpinBox *tax;
- QSpinBox *taxPercentage;
+ TQSpinBox *tax;
+ TQSpinBox *taxPercentage;
};
class GenericDlg : public EstateDlg
@@ -243,7 +243,7 @@ class GenericDlg : public EstateDlg
Q_OBJECT
public:
- GenericDlg(QWidget *parent = 0, char *name = 0);
+ GenericDlg(TQWidget *parent = 0, char *name = 0);
protected:
virtual void save();
@@ -258,7 +258,7 @@ class CardsDlg : public EstateDlg
Q_OBJECT
public:
- CardsDlg(EstateList *, QValueList<CardStack> *, QWidget *parent = 0, char *name = 0);
+ CardsDlg(EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, char *name = 0);
protected:
virtual void save();
@@ -266,15 +266,15 @@ class CardsDlg : public EstateDlg
private slots:
void addStack();
- void updateView(const QString &);
+ void updateView(const TQString &);
private:
- QValueList<CardStack> *stacks;
+ TQValueList<CardStack> *stacks;
EstateList *estates;
- QComboBox *cards;
+ TQComboBox *cards;
CardView *view;
- QVBoxLayout *vlayout;
+ TQVBoxLayout *vlayout;
};
class StreetDlg : public EstateDlg
@@ -282,7 +282,7 @@ class StreetDlg : public EstateDlg
Q_OBJECT
public:
- StreetDlg(ConfigEstateGroupList *, QWidget *parent = 0, char *name = 0);
+ StreetDlg(ConfigEstateGroupList *, TQWidget *parent = 0, char *name = 0);
protected:
virtual void save();
@@ -290,16 +290,16 @@ class StreetDlg : public EstateDlg
virtual void groupUpdate();
private slots:
- void groupChanged(const QString &);
+ void groupChanged(const TQString &);
private:
- QSpinBox *houses0;
- QSpinBox *houses1;
- QSpinBox *houses2;
- QSpinBox *houses3;
- QSpinBox *houses4;
- QSpinBox *houses5;
- QSpinBox *price;
+ TQSpinBox *houses0;
+ TQSpinBox *houses1;
+ TQSpinBox *houses2;
+ TQSpinBox *houses3;
+ TQSpinBox *houses4;
+ TQSpinBox *houses5;
+ TQSpinBox *price;
KComboBox *groupCombo;
ConfigEstateGroupList *groups;
diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp
index 41f7c6f..8f4d513 100644
--- a/atlantikdesigner/designer/group.cpp
+++ b/atlantikdesigner/designer/group.cpp
@@ -1,11 +1,11 @@
-#include <qcombobox.h>
-#include <qframe.h>
-#include <qvgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <tqcombobox.h>
+#include <tqframe.h>
+#include <tqvgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqspinbox.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
#include <kcolorbutton.h>
#include <kdebug.h>
@@ -19,65 +19,65 @@
#include "group.h"
-GroupEditor::GroupEditor(ConfigEstateGroupList *newList, QWidget *parent)
+GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
: KDialogBase(KDialogBase::Plain, i18n("Group Editor"), Ok|Apply|Cancel, Ok, parent, "Group Editor", false, true), mylist(*newList)
{
setWFlags(WDestructiveClose);
list = newList;
- QFrame *page = plainPage();
- QHBoxLayout *hlayout = new QHBoxLayout(page, marginHint(), spacingHint());
+ TQFrame *page = plainPage();
+ TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint());
groups = new KListBox(page);
hlayout->addWidget(groups);
- connect(groups, SIGNAL(highlighted(QListBoxItem *)), this, SLOT(updateSettings(QListBoxItem *)));
- QStringList newgroups;
+ connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *)));
+ TQStringList newgroups;
for (ConfigEstateGroupList::Iterator it = list->begin(); it != list->end(); ++it)
newgroups.append((*it).name());
groups->insertStringList(newgroups);
- connect(groups, SIGNAL(selectionChanged()), this, SLOT(selectionChanged()));
+ connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
- QVBoxLayout *vlayout = new QVBoxLayout(hlayout, spacingHint());
- colorGroupBox = new QVGroupBox(i18n("&Colors"), page);
+ TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, spacingHint());
+ colorGroupBox = new TQVGroupBox(i18n("&Colors"), page);
vlayout->addWidget(colorGroupBox);
- (void) new QLabel(i18n("Foreground:"), colorGroupBox);
+ (void) new TQLabel(i18n("Foreground:"), colorGroupBox);
fgButton = new KColorButton(colorGroupBox, "Foreground Button");
- connect(fgButton, SIGNAL(changed(const QColor &)), this, SLOT(fgChanged(const QColor &)));
- connect(fgButton, SIGNAL(changed(const QColor &)), this, SIGNAL(changed()));
+ 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 QLabel(i18n("Background:"), colorGroupBox);
+ (void) new TQLabel(i18n("Background:"), colorGroupBox);
bgButton = new KColorButton(colorGroupBox, "Background Button");
- connect(bgButton, SIGNAL(changed(const QColor &)), this, SLOT(bgChanged(const QColor &)));
- connect(bgButton, SIGNAL(changed(const QColor &)), this, SIGNAL(changed()));
+ 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 QVGroupBox(i18n("&Prices"), page);
+ pricesGroupBox = new TQVGroupBox(i18n("&Prices"), page);
vlayout->addWidget(pricesGroupBox);
- pricesWidget = new QWidget(pricesGroupBox);
- QGridLayout *pricesLayout = new QGridLayout(pricesWidget, 2, 2, 0, spacingHint());
- pricesLayout->addWidget(new QLabel(i18n("House price:"), pricesWidget), 0, 0);
- pricesLayout->addWidget(housePrice = new QSpinBox(0, 3000, 25, pricesWidget), 0, 1);
+ pricesWidget = new TQWidget(pricesGroupBox);
+ TQGridLayout *pricesLayout = new TQGridLayout(pricesWidget, 2, 2, 0, spacingHint());
+ pricesLayout->addWidget(new TQLabel(i18n("House price:"), pricesWidget), 0, 0);
+ pricesLayout->addWidget(housePrice = new TQSpinBox(0, 3000, 25, pricesWidget), 0, 1);
housePrice->setSpecialValueText(i18n("None"));
housePrice->setSuffix(i18n("$"));
- connect(housePrice, SIGNAL(valueChanged(int)), this, SLOT(housePriceChanged(int)));
+ connect(housePrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(housePriceChanged(int)));
- pricesLayout->addWidget(new QLabel(i18n("Global price:"), pricesWidget), 1, 0);
- pricesLayout->addWidget(globalPrice = new QSpinBox(0, 3000, 25, pricesWidget), 1, 1);
+ pricesLayout->addWidget(new TQLabel(i18n("Global price:"), pricesWidget), 1, 0);
+ pricesLayout->addWidget(globalPrice = new TQSpinBox(0, 3000, 25, pricesWidget), 1, 1);
globalPrice->setSpecialValueText(i18n("None"));
globalPrice->setSuffix(i18n("$"));
- connect(globalPrice, SIGNAL(valueChanged(int)), this, SLOT(globalPriceChanged(int)));
+ connect(globalPrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(globalPriceChanged(int)));
- dynamicGroupBox = new QVGroupBox(i18n("&Dynamic Rent"), page);
+ dynamicGroupBox = new TQVGroupBox(i18n("&Dynamic Rent"), page);
vlayout->addWidget(dynamicGroupBox);
- mathWidget = new QWidget(dynamicGroupBox);
- QGridLayout *mathLayout = new QGridLayout(mathWidget, 2, 2, 0, spacingHint());
- mathLayout->addWidget(new QLabel(i18n("Add rent variable:"), mathWidget), 0, 0);
- mathLayout->addWidget(new QLabel(i18n("Expression:"), mathWidget), 1, 0);
+ mathWidget = new TQWidget(dynamicGroupBox);
+ TQGridLayout *mathLayout = new TQGridLayout(mathWidget, 2, 2, 0, spacingHint());
+ mathLayout->addWidget(new TQLabel(i18n("Add rent variable:"), mathWidget), 0, 0);
+ mathLayout->addWidget(new TQLabel(i18n("Expression:"), mathWidget), 1, 0);
- QComboBox *rentVarCombo = new QComboBox(mathWidget);
- QStringList vars;
+ TQComboBox *rentVarCombo = new TQComboBox(mathWidget);
+ TQStringList vars;
vars << "DICE";
vars << "HOUSES";
vars << "GROUPOWNED";
@@ -85,18 +85,18 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, QWidget *parent)
mathLayout->addWidget(rentVarCombo, 0, 1);
rentMathEdit = new KLineEdit(mathWidget);
- connect(rentMathEdit, SIGNAL(textChanged(const QString &)), this, SLOT(rentMathChanged(const QString &)));
- connect(rentVarCombo, SIGNAL(activated(const QString &)), rentMathEdit, SLOT(insert(const QString &)));
+ connect(rentMathEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(rentMathChanged(const TQString &)));
+ connect(rentVarCombo, TQT_SIGNAL(activated(const TQString &)), rentMathEdit, TQT_SLOT(insert(const TQString &)));
mathLayout->addWidget(rentMathEdit, 1, 1);
- QHBoxLayout *buttonlayout = new QHBoxLayout(vlayout, spacingHint());
+ TQHBoxLayout *buttonlayout = new TQHBoxLayout(vlayout, spacingHint());
KPushButton *addB = new KPushButton(i18n("&Add..."), page);
buttonlayout->addWidget(addB);
- connect(addB, SIGNAL(clicked()), this, SLOT(add()));
+ connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
removeB = new KPushButton(i18n("&Remove"), page);
buttonlayout->addWidget(removeB);
- connect(removeB, SIGNAL(clicked()), this, SLOT(remove()));
+ connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove()));
selectionChanged();
}
@@ -104,7 +104,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, QWidget *parent)
void GroupEditor::add()
{
bool ok;
- QString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group:"), QString::null, &ok, this);
+ TQString name = KLineEditDlg::getText(i18n("Add Group"), i18n("Enter the name of the new group:"), TQString::null, &ok, this);
if (ok)
{
for (ConfigEstateGroupList::Iterator it = mylist.begin(); it != mylist.end(); ++it)
@@ -125,7 +125,7 @@ void GroupEditor::add()
void GroupEditor::remove()
{
- QString curText = groups->currentText();
+ TQString curText = groups->currentText();
if (!curText.isNull())
{
groups->removeItem(groups->currentItem());
@@ -142,7 +142,7 @@ void GroupEditor::remove()
}
}
-void GroupEditor::updateSettings(QListBoxItem *item)
+void GroupEditor::updateSettings(TQListBoxItem *item)
{
if (!mylist.size())
return;
@@ -166,7 +166,7 @@ void GroupEditor::updateSettings(QListBoxItem *item)
ConfigEstateGroup *GroupEditor::currentGroup()
{
- QListBoxItem *item = groups->item(groups->currentItem());
+ TQListBoxItem *item = groups->item(groups->currentItem());
if (!item)
return 0;
@@ -177,14 +177,14 @@ ConfigEstateGroup *GroupEditor::currentGroup()
return 0;
}
-void GroupEditor::fgChanged(const QColor &color)
+void GroupEditor::fgChanged(const TQColor &color)
{
ConfigEstateGroup *group = currentGroup();
if (group)
group->setFgColor(color);
}
-void GroupEditor::bgChanged(const QColor &color)
+void GroupEditor::bgChanged(const TQColor &color)
{
ConfigEstateGroup *group = currentGroup();
if (group)
@@ -205,7 +205,7 @@ void GroupEditor::globalPriceChanged(int newValue)
group->setGlobalPrice(newValue);
}
-void GroupEditor::rentMathChanged(const QString &newValue)
+void GroupEditor::rentMathChanged(const TQString &newValue)
{
ConfigEstateGroup *group = currentGroup();
if (group)
diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h
index b1ebf99..ece7638 100644
--- a/atlantikdesigner/designer/group.h
+++ b/atlantikdesigner/designer/group.h
@@ -1,8 +1,8 @@
#ifndef GROUP_H
#define GROUP_H
-#include <qcolor.h>
-#include <qptrlist.h>
+#include <tqcolor.h>
+#include <tqptrlist.h>
#include <kdialogbase.h>
@@ -22,40 +22,40 @@ class ConfigEstateGroup
{
public:
ConfigEstateGroup() { init(); }
- ConfigEstateGroup(const QString &name) { setName(name); init(); }
+ ConfigEstateGroup(const TQString &name) { setName(name); init(); }
void init() { setHousePrice(0); setGlobalPrice(0); }
void setHousePrice(int newPrice) { m_housePrice = newPrice; }
int housePrice()const { return m_housePrice; }
void setGlobalPrice(int newGlobalPrice) { m_globalPrice = newGlobalPrice; }
int globalPrice()const { return m_globalPrice; }
- const QString &rentMath() { return m_rentMath; }
- void setRentMath(const QString &newMath) { m_rentMath = newMath; }
+ const TQString &rentMath() { return m_rentMath; }
+ void setRentMath(const TQString &newMath) { m_rentMath = newMath; }
bool dynamicRent()const { return !m_rentMath.isEmpty(); }
- void setName(const QString &name) { m_name = name; }
- const QString &name() { return m_name; }
+ void setName(const TQString &name) { m_name = name; }
+ const TQString &name() { return m_name; }
- const QColor &fgColor() { return m_fgColor; }
- void setFgColor(const QColor &color) { m_fgColor = color; }
- const QColor &bgColor() { return m_bgColor; }
- void setBgColor(const QColor &color) { m_bgColor = color; }
+ const TQColor &fgColor() { return m_fgColor; }
+ void setFgColor(const TQColor &color) { m_fgColor = color; }
+ const TQColor &bgColor() { return m_bgColor; }
+ void setBgColor(const TQColor &color) { m_bgColor = color; }
private:
- QColor m_fgColor;
- QColor m_bgColor;
- QString m_rentMath;
+ TQColor m_fgColor;
+ TQColor m_bgColor;
+ TQString m_rentMath;
int m_housePrice;
int m_globalPrice;
- QString m_name;
+ TQString m_name;
};
-typedef QValueList<ConfigEstateGroup> ConfigEstateGroupList;
+typedef TQValueList<ConfigEstateGroup> ConfigEstateGroupList;
class GroupEditor : public KDialogBase
{
Q_OBJECT
public:
- GroupEditor(ConfigEstateGroupList *, QWidget *parent=0);
+ GroupEditor(ConfigEstateGroupList *, TQWidget *parent=0);
signals:
void changed();
@@ -66,12 +66,12 @@ class GroupEditor : public KDialogBase
virtual void slotApply();
private slots:
- void updateSettings(QListBoxItem *item);
- void fgChanged(const QColor &);
- void bgChanged(const QColor &);
+ void updateSettings(TQListBoxItem *item);
+ void fgChanged(const TQColor &);
+ void bgChanged(const TQColor &);
void housePriceChanged(int);
void globalPriceChanged(int);
- void rentMathChanged(const QString &);
+ void rentMathChanged(const TQString &);
void add();
void remove();
void selectionChanged();
@@ -81,13 +81,13 @@ class GroupEditor : public KDialogBase
KLineEdit *rentMathEdit;
KColorButton *fgButton;
KColorButton *bgButton;
- QWidget *pricesWidget;
- QWidget *mathWidget;
- QSpinBox *housePrice;
- QSpinBox *globalPrice;
- QVGroupBox *colorGroupBox;
- QVGroupBox *pricesGroupBox;
- QVGroupBox *dynamicGroupBox;
+ TQWidget *pricesWidget;
+ TQWidget *mathWidget;
+ TQSpinBox *housePrice;
+ TQSpinBox *globalPrice;
+ TQVGroupBox *colorGroupBox;
+ TQVGroupBox *pricesGroupBox;
+ TQVGroupBox *dynamicGroupBox;
KPushButton *removeB;
ConfigEstateGroupList *list;