summaryrefslogtreecommitdiffstats
path: root/kmines
diff options
context:
space:
mode:
Diffstat (limited to 'kmines')
-rw-r--r--kmines/dialogs.cpp4
-rw-r--r--kmines/dialogs.h6
-rw-r--r--kmines/field.cpp4
-rw-r--r--kmines/field.h2
-rw-r--r--kmines/frame.cpp44
-rw-r--r--kmines/frame.h8
-rw-r--r--kmines/solver/advFastRules.cpp26
-rw-r--r--kmines/solver/headerP.h2
-rw-r--r--kmines/solver/solver.cpp8
-rw-r--r--kmines/solver/solver.h4
-rw-r--r--kmines/status.cpp4
-rw-r--r--kmines/status.h2
12 files changed, 57 insertions, 57 deletions
diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp
index a81c8d91..7fb5dec9 100644
--- a/kmines/dialogs.cpp
+++ b/kmines/dialogs.cpp
@@ -61,8 +61,8 @@ void Smiley::setMood(Mood mood)
}
//-----------------------------------------------------------------------------
-DigitalClock::DigitalClock(TQWidget *tqparent)
-: KGameLCDClock(tqparent, "digital_clock")
+DigitalClock::DigitalClock(TQWidget *parent)
+: KGameLCDClock(parent, "digital_clock")
{
setFrameStyle(Panel | Sunken);
setDefaultBackgroundColor(black);
diff --git a/kmines/dialogs.h b/kmines/dialogs.h
index f900f7e6..799074f6 100644
--- a/kmines/dialogs.h
+++ b/kmines/dialogs.h
@@ -36,8 +36,8 @@ class Smiley : public TQPushButton, public KMines
Q_OBJECT
TQ_OBJECT
public:
- Smiley(TQWidget *tqparent, const char *name = 0)
- : TQPushButton(TQString(), tqparent, name) {}
+ Smiley(TQWidget *parent, const char *name = 0)
+ : TQPushButton(TQString(), parent, name) {}
public slots:
void setMood(Mood);
@@ -52,7 +52,7 @@ class DigitalClock : public KGameLCDClock
Q_OBJECT
TQ_OBJECT
public:
- DigitalClock(TQWidget *tqparent);
+ DigitalClock(TQWidget *parent);
void reset(bool customGame);
diff --git a/kmines/field.cpp b/kmines/field.cpp
index 582e6663..035b3708 100644
--- a/kmines/field.cpp
+++ b/kmines/field.cpp
@@ -44,8 +44,8 @@ const Field::ActionData Field::ACTION_DATA[Nb_Actions] = {
{ "UnsetUncertain", "unset_uncertain", I18N_NOOP("Question mark unset") }
};
-Field::Field(TQWidget *tqparent)
- : FieldFrame(tqparent), _state(Init), _solvingState(Regular), _level(Level::Easy)
+Field::Field(TQWidget *parent)
+ : FieldFrame(parent), _state(Init), _solvingState(Regular), _level(Level::Easy)
{}
void Field::readSettings()
diff --git a/kmines/field.h b/kmines/field.h
index 4d17358f..2c21348b 100644
--- a/kmines/field.h
+++ b/kmines/field.h
@@ -37,7 +37,7 @@ class Field : public FieldFrame, public BaseField
static const ActionData ACTION_DATA[Nb_Actions];
public:
- Field(TQWidget *tqparent);
+ Field(TQWidget *parent);
virtual TQSize tqsizeHint() const;
diff --git a/kmines/frame.cpp b/kmines/frame.cpp
index b5c154b0..5eee07ba 100644
--- a/kmines/frame.cpp
+++ b/kmines/frame.cpp
@@ -26,8 +26,8 @@
#include "settings.h"
-FieldFrame::FieldFrame(TQWidget *tqparent)
- : TQFrame(tqparent, "field"), _button(0)
+FieldFrame::FieldFrame(TQWidget *parent)
+ : TQFrame(parent, "field"), _button(0)
{
setFrameStyle( TQFrame::Box | TQFrame::Raised );
setLineWidth(2);
@@ -39,18 +39,18 @@ void FieldFrame::adjustSize()
setFixedSize(tqsizeHint());
_button.resize(Settings::caseSize(), Settings::caseSize());
- TQBitmap tqmask;
+ TQBitmap mask;
for (uint i=0; i<Nb_Pixmap_Types; i++) {
- TQPixmap mask_pm = tqmask;
+ TQPixmap mask_pm = mask;
drawPixmap(mask_pm, (PixmapType)i, true);
drawPixmap(_pixmaps[i], (PixmapType)i, false);
- _pixmaps[i].setMask(tqmask);
+ _pixmaps[i].setMask(mask);
}
for (uint i=0; i<Nb_Advised; i++) {
- TQPixmap mask_pm = tqmask;
+ TQPixmap mask_pm = mask;
drawAdvised(mask_pm, i, true);
drawAdvised(_advised[i], i, false);
- _advised[i].setMask(tqmask);
+ _advised[i].setMask(mask);
}
TQFont f = font();
@@ -59,44 +59,44 @@ void FieldFrame::adjustSize()
setFont(f);
}
-void FieldFrame::initPixmap(TQPixmap &pix, bool tqmask) const
+void FieldFrame::initPixmap(TQPixmap &pix, bool mask) const
{
pix.resize(Settings::caseSize(), Settings::caseSize());
- if (tqmask) pix.fill(color0);
+ if (mask) pix.fill(color0);
}
-void FieldFrame::drawPixmap(TQPixmap &pix, PixmapType type, bool tqmask) const
+void FieldFrame::drawPixmap(TQPixmap &pix, PixmapType type, bool mask) const
{
- initPixmap(pix, tqmask);
+ initPixmap(pix, mask);
TQPainter p(&pix);
if ( type==FlagPixmap ) {
p.setWindow(0, 0, 16, 16);
- p.setPen( (tqmask ? color1 : black) );
+ p.setPen( (mask ? color1 : black) );
p.drawLine(6, 13, 14, 13);
p.drawLine(8, 12, 12, 12);
p.drawLine(9, 11, 11, 11);
p.drawLine(10, 2, 10, 10);
- if (!tqmask) p.setPen(black);
- p.setBrush( (tqmask ? color1 : Settings::color(Settings::EnumType::flag)) );
+ if (!mask) p.setPen(black);
+ p.setBrush( (mask ? color1 : Settings::color(Settings::EnumType::flag)) );
p.drawRect(4, 3, 6, 5);
return;
}
p.setWindow(0, 0, 20, 20);
if ( type==ExplodedPixmap )
- p.fillRect(2, 2, 16, 16, (tqmask ? color1 : Settings::color(Settings::EnumType::explosion)));
- TQPen pen(tqmask ? color1 : black, 1);
+ p.fillRect(2, 2, 16, 16, (mask ? color1 : Settings::color(Settings::EnumType::explosion)));
+ TQPen pen(mask ? color1 : black, 1);
p.setPen(pen);
- p.setBrush(tqmask ? color1 : black);
+ p.setBrush(mask ? color1 : black);
p.drawLine(10,3,10,18);
p.drawLine(3,10,18,10);
p.drawLine(5, 5, 16, 16);
p.drawLine(5, 15, 15, 5);
p.drawEllipse(5, 5, 11, 11);
- p.fillRect(8, 8, 2, 2, (tqmask ? color1 : white));
+ p.fillRect(8, 8, 2, 2, (mask ? color1 : white));
if ( type==ErrorPixmap ) {
- if (!tqmask) {
+ if (!mask) {
pen.setColor(Settings::color(Settings::EnumType::error));
p.setPen(pen);
}
@@ -109,12 +109,12 @@ void FieldFrame::drawPixmap(TQPixmap &pix, PixmapType type, bool tqmask) const
}
}
-void FieldFrame::drawAdvised(TQPixmap &pix, uint i, bool tqmask) const
+void FieldFrame::drawAdvised(TQPixmap &pix, uint i, bool mask) const
{
- initPixmap(pix, tqmask);
+ initPixmap(pix, mask);
TQPainter p(&pix);
p.setWindow(0, 0, 16, 16);
- p.setPen( TQPen(tqmask ? color1 : Settings::mineColor(i), 2) );
+ p.setPen( TQPen(mask ? color1 : Settings::mineColor(i), 2) );
p.drawRect(3, 3, 11, 11);
}
diff --git a/kmines/frame.h b/kmines/frame.h
index a271eb90..18efb76b 100644
--- a/kmines/frame.h
+++ b/kmines/frame.h
@@ -30,7 +30,7 @@ class TQPainter;
class FieldFrame : public TQFrame, public KMines
{
public:
- FieldFrame(TQWidget *tqparent);
+ FieldFrame(TQWidget *parent);
protected:
enum PixmapType { FlagPixmap = 0, MinePixmap, ExplodedPixmap,
@@ -48,9 +48,9 @@ class FieldFrame : public TQFrame, public KMines
TQPixmap _pixmaps[Nb_Pixmap_Types];
TQPixmap _advised[Nb_Advised];
- void drawPixmap(TQPixmap &, PixmapType, bool tqmask) const;
- void drawAdvised(TQPixmap &, uint i, bool tqmask) const;
- void initPixmap(TQPixmap &, bool tqmask) const;
+ void drawPixmap(TQPixmap &, PixmapType, bool mask) const;
+ void drawAdvised(TQPixmap &, uint i, bool mask) const;
+ void initPixmap(TQPixmap &, bool mask) const;
};
#endif
diff --git a/kmines/solver/advFastRules.cpp b/kmines/solver/advFastRules.cpp
index 56b97b72..79c42bba 100644
--- a/kmines/solver/advFastRules.cpp
+++ b/kmines/solver/advFastRules.cpp
@@ -159,9 +159,9 @@ void AdviseFast::RuleSet::addGeneral(Coord p){
int AdviseFast::Rule::leaks = 0;
#endif
-AdviseFast::Rule::Rule(RuleSet *tqparent) :
- _parent(tqparent),
- _facts(tqparent->facts)
+AdviseFast::Rule::Rule(RuleSet *parent) :
+ _parent(parent),
+ _facts(parent->facts)
{
#if defined(DEBUG) && DEBUG >= 2
cout << "Rule::Rule, leaks = " << ++leaks << endl;
@@ -177,8 +177,8 @@ AdviseFast::Rule::~Rule()
AdviseFast::GeneralRule::GeneralRule(
Coord fact,
- RuleSet *tqparent) :
- Rule(tqparent),
+ RuleSet *parent) :
+ Rule(parent),
_fact(fact)
{}
@@ -242,8 +242,8 @@ bool AdviseFast::GeneralRule::apply(CoordSet *)
AdviseFast::EmptyRule::EmptyRule(
Coord fact,
- RuleSet *tqparent) :
- Rule(tqparent),
+ RuleSet *parent) :
+ Rule(parent),
_fact(fact)
{}
@@ -285,8 +285,8 @@ bool AdviseFast::EmptyRule::apply(
AdviseFast::FullRule::FullRule(
Coord fact,
- RuleSet *tqparent) :
- Rule(tqparent),
+ RuleSet *parent) :
+ Rule(parent),
_fact(fact)
{}
@@ -336,8 +336,8 @@ bool AdviseFast::FullRule::apply(
AdviseFast::InclusionRule::InclusionRule(
Coord bigger, Coord smaller,
- RuleSet *tqparent) :
- Rule(tqparent),
+ RuleSet *parent) :
+ Rule(parent),
_bigger(bigger), _smaller(smaller)
{}
@@ -402,8 +402,8 @@ bool AdviseFast::InclusionRule::apply(
AdviseFast::IntersectionRule::IntersectionRule(
Coord bigger, Coord smaller,
- RuleSet *tqparent) :
- Rule(tqparent),
+ RuleSet *parent) :
+ Rule(parent),
_bigger(bigger), _smaller(smaller)
{}
diff --git a/kmines/solver/headerP.h b/kmines/solver/headerP.h
index 6cecd458..984e3113 100644
--- a/kmines/solver/headerP.h
+++ b/kmines/solver/headerP.h
@@ -107,7 +107,7 @@ namespace AdviseFast {
*/
class RuleSet;
struct Rule {
- Rule(RuleSet *tqparent);
+ Rule(RuleSet *parent);
virtual ~Rule();
virtual bool apply(CoordSet *surePoints) = 0;
diff --git a/kmines/solver/solver.cpp b/kmines/solver/solver.cpp
index 36519043..0c90b747 100644
--- a/kmines/solver/solver.cpp
+++ b/kmines/solver/solver.cpp
@@ -50,8 +50,8 @@ class SolverPrivate
#endif
};
-Solver::Solver(TQObject *tqparent)
- : TQObject(tqparent)
+Solver::Solver(TQObject *parent)
+ : TQObject(parent)
{
d = new SolverPrivate;
@@ -186,9 +186,9 @@ bool Solver::solveOneStep(BaseField &field)
//-----------------------------------------------------------------------------
-SolvingRateDialog::SolvingRateDialog(const BaseField &field, TQWidget *tqparent)
+SolvingRateDialog::SolvingRateDialog(const BaseField &field, TQWidget *parent)
: KDialogBase(Plain, i18n("Compute Solving Rate"), Ok|Close,
- Close, tqparent, "compute_solving_rate", true, true),
+ Close, parent, "compute_solving_rate", true, true),
_refField(field)
{
connect(&_solver, TQT_SIGNAL(solvingDone(bool)), TQT_SLOT(solvingDone(bool)));
diff --git a/kmines/solver/solver.h b/kmines/solver/solver.h
index 07b8881a..a5305aa3 100644
--- a/kmines/solver/solver.h
+++ b/kmines/solver/solver.h
@@ -34,7 +34,7 @@ class Solver : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- Solver(TQObject *tqparent = 0);
+ Solver(TQObject *parent = 0);
~Solver();
/** A method to advice a point placement */
@@ -65,7 +65,7 @@ class SolvingRateDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- SolvingRateDialog(const BaseField &field, TQWidget *tqparent);
+ SolvingRateDialog(const BaseField &field, TQWidget *parent);
private slots:
void step();
diff --git a/kmines/status.cpp b/kmines/status.cpp
index 6d20bf97..31fd7b36 100644
--- a/kmines/status.cpp
+++ b/kmines/status.cpp
@@ -45,8 +45,8 @@
#include "version.h"
-tqStatus::tqStatus(TQWidget *tqparent)
- : TQWidget(tqparent, "status"), _oldLevel(Level::Easy)
+tqStatus::tqStatus(TQWidget *parent)
+ : TQWidget(parent, "status"), _oldLevel(Level::Easy)
{
_timer = new TQTimer(this);
connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(replayStep()));
diff --git a/kmines/status.h b/kmines/status.h
index 3626473a..a91fcda9 100644
--- a/kmines/status.h
+++ b/kmines/status.h
@@ -35,7 +35,7 @@ class tqStatus : public TQWidget, public KMines
Q_OBJECT
TQ_OBJECT
public :
- tqStatus(TQWidget *tqparent);
+ tqStatus(TQWidget *parent);
const Level &currentLevel() const { return _field->level(); }
bool isPlaying() const { return _field->gameState()==Playing; }
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 10:48:06 +0000