summaryrefslogtreecommitdiffstats
path: root/kolf
diff options
context:
space:
mode:
Diffstat (limited to 'kolf')
-rw-r--r--kolf/canvasitem.h2
-rw-r--r--kolf/config.cpp12
-rw-r--r--kolf/config.h6
-rw-r--r--kolf/editor.cpp4
-rw-r--r--kolf/floater.cpp8
-rw-r--r--kolf/floater.h6
-rw-r--r--kolf/game.cpp42
-rw-r--r--kolf/game.h26
-rw-r--r--kolf/kcomboboxdialog.cpp16
-rw-r--r--kolf/kcomboboxdialog.h10
-rw-r--r--kolf/kvolumecontrol.cpp12
-rw-r--r--kolf/kvolumecontrol.h4
-rw-r--r--kolf/newgame.cpp8
-rw-r--r--kolf/newgame.h4
-rw-r--r--kolf/object.h2
-rw-r--r--kolf/objects/poolball/poolball.cpp8
-rw-r--r--kolf/objects/poolball/poolball.h4
-rw-r--r--kolf/objects/test/test.cpp10
-rw-r--r--kolf/objects/test/test.h4
-rw-r--r--kolf/printdialogpage.cpp4
-rw-r--r--kolf/printdialogpage.h2
-rw-r--r--kolf/scoreboard.cpp4
-rw-r--r--kolf/scoreboard.h2
-rw-r--r--kolf/slope.cpp6
-rw-r--r--kolf/slope.h4
25 files changed, 105 insertions, 105 deletions
diff --git a/kolf/canvasitem.h b/kolf/canvasitem.h
index 277fb15d..276e1dce 100644
--- a/kolf/canvasitem.h
+++ b/kolf/canvasitem.h
@@ -125,7 +125,7 @@ public:
* returns a Config that can be used to configure this item by the user.
* The default implementation returns one that says 'No configuration options'.
*/
- virtual Config *config(TQWidget *tqparent) { return new DefaultConfig(tqparent); }
+ virtual Config *config(TQWidget *parent) { return new DefaultConfig(parent); }
/**
* returns other items that should be moveable (besides this one of course).
*/
diff --git a/kolf/config.cpp b/kolf/config.cpp
index 54618a45..0d9aafae 100644
--- a/kolf/config.cpp
+++ b/kolf/config.cpp
@@ -6,8 +6,8 @@
#include "config.h"
-Config::Config(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name)
+Config::Config(TQWidget *parent, const char *name)
+ : TQFrame(parent, name)
{
startedUp = false;
}
@@ -33,15 +33,15 @@ void Config::changed()
emit modified();
}
-MessageConfig::MessageConfig(TQString text, TQWidget *tqparent, const char *name)
- : Config(tqparent, name)
+MessageConfig::MessageConfig(TQString text, TQWidget *parent, const char *name)
+ : Config(parent, name)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
tqlayout->addWidget(new TQLabel(text, this));
}
-DefaultConfig::DefaultConfig(TQWidget *tqparent, const char *name)
- : MessageConfig(i18n("No configuration options"), tqparent, name)
+DefaultConfig::DefaultConfig(TQWidget *parent, const char *name)
+ : MessageConfig(i18n("No configuration options"), parent, name)
{
}
diff --git a/kolf/config.h b/kolf/config.h
index 5ca9892f..c53428a7 100644
--- a/kolf/config.h
+++ b/kolf/config.h
@@ -9,7 +9,7 @@ class Config : public TQFrame
TQ_OBJECT
public:
- Config(TQWidget *tqparent, const char *name = 0);
+ Config(TQWidget *parent, const char *name = 0);
void ctorDone();
signals:
@@ -29,7 +29,7 @@ class MessageConfig : public Config
TQ_OBJECT
public:
- MessageConfig(TQString text, TQWidget *tqparent, const char *name = 0);
+ MessageConfig(TQString text, TQWidget *parent, const char *name = 0);
};
// internal
@@ -39,7 +39,7 @@ class DefaultConfig : public MessageConfig
TQ_OBJECT
public:
- DefaultConfig(TQWidget *tqparent, const char *name = 0);
+ DefaultConfig(TQWidget *parent, const char *name = 0);
};
#endif
diff --git a/kolf/editor.cpp b/kolf/editor.cpp
index 88e3c375..ab8b1d0c 100644
--- a/kolf/editor.cpp
+++ b/kolf/editor.cpp
@@ -9,8 +9,8 @@
#include "editor.h"
#include "game.h"
-Editor::Editor(ObjectList *list, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+Editor::Editor(ObjectList *list, TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
{
this->list = list;
config = 0;
diff --git a/kolf/floater.cpp b/kolf/floater.cpp
index 1d33a2ca..fe6e6344 100644
--- a/kolf/floater.cpp
+++ b/kolf/floater.cpp
@@ -39,9 +39,9 @@ void FloaterGuide::setPoints(int xa, int ya, int xb, int yb)
}
}
-Config *FloaterGuide::config(TQWidget *tqparent)
+Config *FloaterGuide::config(TQWidget *parent)
{
- return floater->config(tqparent);
+ return floater->config(parent);
}
/////////////////////////
@@ -253,8 +253,8 @@ void Floater::firstMove(int x, int y)
/////////////////////////
-FloaterConfig::FloaterConfig(Floater *floater, TQWidget *tqparent)
- : BridgeConfig(floater, tqparent)
+FloaterConfig::FloaterConfig(Floater *floater, TQWidget *parent)
+ : BridgeConfig(floater, parent)
{
this->floater = floater;
m_vtqlayout->addStretch();
diff --git a/kolf/floater.h b/kolf/floater.h
index fbbe10ec..e5b174ed 100644
--- a/kolf/floater.h
+++ b/kolf/floater.h
@@ -10,7 +10,7 @@ class FloaterConfig : public BridgeConfig
TQ_OBJECT
public:
- FloaterConfig(Floater *floater, TQWidget *tqparent);
+ FloaterConfig(Floater *floater, TQWidget *parent);
private slots:
void speedChanged(int news);
@@ -25,7 +25,7 @@ public:
FloaterGuide(Floater *floater, TQCanvas *canvas) : Wall(canvas) { this->floater = floater; almostDead = false; }
virtual void setPoints(int xa, int ya, int xb, int yb);
virtual void moveBy(double dx, double dy);
- virtual Config *config(TQWidget *tqparent);
+ virtual Config *config(TQWidget *parent);
virtual void aboutToDelete();
virtual void aboutToDie();
@@ -52,7 +52,7 @@ public:
virtual void editModeChanged(bool changed);
virtual bool moveable() const { return false; }
virtual void moveBy(double dx, double dy);
- virtual Config *config(TQWidget *tqparent) { return new FloaterConfig(this, tqparent); }
+ virtual Config *config(TQWidget *parent) { return new FloaterConfig(this, parent); }
virtual TQPtrList<TQCanvasItem> moveableItems() const;
virtual void advance(int phase);
void setSpeed(int news);
diff --git a/kolf/game.cpp b/kolf/game.cpp
index 32ebb9be..9ff1ed73 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -101,13 +101,13 @@ void RectPoint::moveBy(double dx, double dy)
rect->newSize(nw, nh);
}
-Config *RectPoint::config(TQWidget *tqparent)
+Config *RectPoint::config(TQWidget *parent)
{
CanvasItem *citem = dynamic_cast<CanvasItem *>(rect);
if (citem)
- return citem->config(tqparent);
+ return citem->config(parent);
else
- return CanvasItem::config(tqparent);
+ return CanvasItem::config(parent);
}
/////////////////////////
@@ -192,8 +192,8 @@ void Arrow::updateSelf()
/////////////////////////
-BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *tqparent)
- : Config(tqparent)
+BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent)
+ : Config(parent)
{
this->bridge = bridge;
@@ -401,8 +401,8 @@ void Bridge::setSize(int width, int height)
/////////////////////////
-WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *tqparent)
- : BridgeConfig(windmill, tqparent)
+WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent)
+ : BridgeConfig(windmill, parent)
{
this->windmill = windmill;
m_vtqlayout->addStretch();
@@ -639,8 +639,8 @@ void Sign::draw(TQPainter &painter)
/////////////////////////
-SignConfig::SignConfig(Sign *sign, TQWidget *tqparent)
- : BridgeConfig(sign, tqparent)
+SignConfig::SignConfig(Sign *sign, TQWidget *parent)
+ : BridgeConfig(sign, parent)
{
this->sign = sign;
m_vtqlayout->addStretch();
@@ -658,8 +658,8 @@ void SignConfig::textChanged(const TQString &text)
/////////////////////////
-EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *tqparent)
- : Config(tqparent), slow1(0), fast1(0), slow2(0), fast2(0), slider1(0), slider2(0)
+EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent)
+ : Config(parent), slow1(0), fast1(0), slow2(0), fast2(0), slider1(0), slider2(0)
{
this->ellipse = ellipse;
@@ -812,9 +812,9 @@ void Ellipse::save(KConfig *cfg)
cfg->writeEntry("height", height());
}
-Config *Ellipse::config(TQWidget *tqparent)
+Config *Ellipse::config(TQWidget *parent)
{
- return new EllipseConfig(this, tqparent);
+ return new EllipseConfig(this, parent);
}
void Ellipse::aboutToSave()
@@ -1492,15 +1492,15 @@ void BlackHoleExit::hideInfo()
arrow->tqsetVisible(false);
}
-Config *BlackHoleExit::config(TQWidget *tqparent)
+Config *BlackHoleExit::config(TQWidget *parent)
{
- return blackHole->config(tqparent);
+ return blackHole->config(parent);
}
/////////////////////////
-BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *tqparent)
- : Config(tqparent)
+BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent)
+ : Config(parent)
{
this->blackHole = blackHole;
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
@@ -1954,8 +1954,8 @@ void Wall::save(KConfig *cfg)
/////////////////////////
-HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *tqparent)
- : Config(tqparent)
+HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent)
+ : Config(parent)
{
this->holeInfo = holeInfo;
@@ -2139,8 +2139,8 @@ void StrokeCircle::draw(TQPainter &p)
/////////////////////////////////////////
-KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *tqparent, const char *name )
- : TQCanvasView(tqparent, name)
+KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *parent, const char *name )
+ : TQCanvasView(parent, name)
{
// for mouse control
setMouseTracking(true);
diff --git a/kolf/game.h b/kolf/game.h
index ec986c52..e1766802 100644
--- a/kolf/game.h
+++ b/kolf/game.h
@@ -142,7 +142,7 @@ public:
RectPoint(TQColor color, RectItem *, TQCanvas *canvas);
void dontMove() { dontmove = true; }
virtual void moveBy(double dx, double dy);
- virtual Config *config(TQWidget *tqparent);
+ virtual Config *config(TQWidget *parent);
virtual bool deleteable() const { return false; }
virtual bool cornerResize() const { return true; }
virtual CanvasItem *itemToDelete() { return dynamic_cast<CanvasItem *>(rect); }
@@ -181,7 +181,7 @@ public:
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
- virtual Config *config(TQWidget *tqparent);
+ virtual Config *config(TQWidget *parent);
protected:
RectPoint *point;
@@ -321,7 +321,7 @@ class BlackHoleConfig : public Config
TQ_OBJECT
public:
- BlackHoleConfig(BlackHole *blackHole, TQWidget *tqparent);
+ BlackHoleConfig(BlackHole *blackHole, TQWidget *parent);
private slots:
void degChanged(int);
@@ -346,7 +346,7 @@ public:
virtual void hideInfo();
void updateArrowAngle();
void updateArrowLength();
- virtual Config *config(TQWidget *tqparent);
+ virtual Config *config(TQWidget *parent);
BlackHole *blackHole;
protected:
@@ -386,7 +386,7 @@ public:
virtual bool place(Ball *ball, bool wasCenter);
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
- virtual Config *config(TQWidget *tqparent) { return new BlackHoleConfig(this, tqparent); }
+ virtual Config *config(TQWidget *parent) { return new BlackHoleConfig(this, parent); }
virtual TQPtrList<TQCanvasItem> moveableItems() const;
double minSpeed() const { return m_minSpeed; }
double maxSpeed() const { return m_maxSpeed; }
@@ -479,7 +479,7 @@ public:
virtual bool collision(Ball *ball, long int id);
virtual CanvasItem *itemToDelete() { return wall; }
virtual void clean();
- virtual Config *config(TQWidget *tqparent) { return wall->config(tqparent); }
+ virtual Config *config(TQWidget *parent) { return wall->config(parent); }
void dontMove() { dontmove = true; };
void updateVisible();
@@ -581,7 +581,7 @@ public:
void doSave(KConfig *cfg);
virtual void newSize(int width, int height);
virtual void setGame(KolfGame *game);
- virtual Config *config(TQWidget *tqparent) { return new BridgeConfig(this, tqparent); }
+ virtual Config *config(TQWidget *parent) { return new BridgeConfig(this, parent); }
void setSize(int width, int height);
virtual TQPtrList<TQCanvasItem> moveableItems() const;
@@ -621,7 +621,7 @@ class SignConfig : public BridgeConfig
TQ_OBJECT
public:
- SignConfig(Sign *sign, TQWidget *tqparent);
+ SignConfig(Sign *sign, TQWidget *parent);
private slots:
void textChanged(const TQString &);
@@ -637,7 +637,7 @@ public:
TQString text() const { return m_text; }
virtual void draw(TQPainter &painter);
virtual bool vStrut() const { return false; }
- virtual Config *config(TQWidget *tqparent) { return new SignConfig(this, tqparent); }
+ virtual Config *config(TQWidget *parent) { return new SignConfig(this, parent); }
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
@@ -670,7 +670,7 @@ class WindmillConfig : public BridgeConfig
TQ_OBJECT
public:
- WindmillConfig(Windmill *windmill, TQWidget *tqparent);
+ WindmillConfig(Windmill *windmill, TQWidget *parent);
private slots:
void speedChanged(int news);
@@ -688,7 +688,7 @@ public:
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
virtual void setGame(KolfGame *game);
- virtual Config *config(TQWidget *tqparent) { return new WindmillConfig(this, tqparent); }
+ virtual Config *config(TQWidget *parent) { return new WindmillConfig(this, parent); }
void setSize(int width, int height);
virtual void moveBy(double dx, double dy);
void setSpeed(int news);
@@ -749,7 +749,7 @@ public:
TQString name() const { return m_name; }
TQString untranslatedName() const { return m_untranslatedName; }
- virtual Config *config(TQWidget *tqparent) { return new HoleConfig(this, tqparent); }
+ virtual Config *config(TQWidget *parent) { return new HoleConfig(this, parent); }
void borderWallsChanged(bool yes);
bool borderWalls() const { return m_borderWalls; }
@@ -804,7 +804,7 @@ class KDE_EXPORT KolfGame : public TQCanvasView
TQ_OBJECT
public:
- KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *tqparent=0, const char *name=0 );
+ KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *parent=0, const char *name=0 );
~KolfGame();
void setObjects(ObjectList *obj) { this->obj = obj; }
void setFilename(const TQString &filename);
diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp
index 1dfe8a79..99d86cf8 100644
--- a/kolf/kcomboboxdialog.cpp
+++ b/kolf/kcomboboxdialog.cpp
@@ -34,8 +34,8 @@
#include "kcomboboxdialog.h"
-KComboBoxDialog::KComboBoxDialog( const TQString &_text, const TQStringList &_items, const TQString& _value, bool showDontAskAgain, TQWidget *tqparent )
- : KDialogBase( Plain, TQString(), Ok, Ok, tqparent, 0L, true, true )
+KComboBoxDialog::KComboBoxDialog( const TQString &_text, const TQStringList &_items, const TQString& _value, bool showDontAskAgain, TQWidget *parent )
+ : KDialogBase( Plain, TQString(), Ok, Ok, parent, 0L, true, true )
{
TQVBoxLayout *topLayout = new TQVBoxLayout( plainPage(), marginHint(), spacingHint() );
TQLabel *label = new TQLabel(_text, plainPage() );
@@ -76,12 +76,12 @@ bool KComboBoxDialog::dontAskAgainChecked()
return false;
}
-TQString KComboBoxDialog::getItem( const TQString &_text, const TQStringList &_items, const TQString& _value, const TQString &dontAskAgainName, TQWidget *tqparent )
+TQString KComboBoxDialog::getItem( const TQString &_text, const TQStringList &_items, const TQString& _value, const TQString &dontAskAgainName, TQWidget *parent )
{
- return getItem( _text, TQString(), _items, _value, dontAskAgainName, tqparent );
+ return getItem( _text, TQString(), _items, _value, dontAskAgainName, parent );
}
-TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_caption, const TQStringList &_items, const TQString& _value, const TQString &dontAskAgainName, TQWidget *tqparent )
+TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_caption, const TQStringList &_items, const TQString& _value, const TQString &dontAskAgainName, TQWidget *parent )
{
TQString prevAnswer;
if ( !dontAskAgainName.isEmpty() )
@@ -94,7 +94,7 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti
return prevAnswer;
}
- KComboBoxDialog dlg( _text, _items, _value, !dontAskAgainName.isNull(), tqparent );
+ KComboBoxDialog dlg( _text, _items, _value, !dontAskAgainName.isNull(), parent );
if ( !_caption.isNull() )
dlg.setCaption( _caption );
@@ -115,9 +115,9 @@ TQString KComboBoxDialog::getItem( const TQString &_text, const TQString &_capti
return text;
}
-TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_text, const TQString &_value, bool *ok, TQWidget *tqparent, const TQString &configName, KConfig *config)
+TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_text, const TQString &_value, bool *ok, TQWidget *parent, const TQString &configName, KConfig *config)
{
- KComboBoxDialog dlg(_text, TQStringList(), _value, false, tqparent);
+ KComboBoxDialog dlg(_text, TQStringList(), _value, false, parent);
if ( !_caption.isNull() )
dlg.setCaption( _caption );
diff --git a/kolf/kcomboboxdialog.h b/kolf/kcomboboxdialog.h
index 91097f16..8db79122 100644
--- a/kolf/kcomboboxdialog.h
+++ b/kolf/kcomboboxdialog.h
@@ -52,7 +52,7 @@ public:
* @param _text Text of the label
* @param _value Initial value of the combobox
*/
- KComboBoxDialog( const TQString &_text, const TQStringList& _items, const TQString& _value = TQString(), bool showDontAskAgain = false, TQWidget *tqparent = 0 );
+ KComboBoxDialog( const TQString &_text, const TQStringList& _items, const TQString& _value = TQString(), bool showDontAskAgain = false, TQWidget *parent = 0 );
virtual ~KComboBoxDialog();
/**
@@ -73,7 +73,7 @@ public:
* @param _value Initial value of the inputline
* @param dontAskAgainName Name for saving whether the user doesn't want to be asked again; use TQString() to disable
*/
- static TQString getItem( const TQString &_text, const TQStringList &_items, const TQString& _value = TQString(), const TQString &dontAskAgainName = TQString(), TQWidget *tqparent = 0 );
+ static TQString getItem( const TQString &_text, const TQStringList &_items, const TQString& _value = TQString(), const TQString &dontAskAgainName = TQString(), TQWidget *parent = 0 );
/**
* Static convenience function to get input from the user.
@@ -85,7 +85,7 @@ public:
* @param _value Initial value of the inputline
* @param dontAskAgainName Name for saving whether the user doesn't want to be asked again; use TQString() to disable
*/
- static TQString getItem( const TQString &_text, const TQString &_caption, const TQStringList &_items, const TQString& _value = TQString(), const TQString &dontAskAgainName = TQString(), TQWidget *tqparent = 0 );
+ static TQString getItem( const TQString &_text, const TQString &_caption, const TQStringList &_items, const TQString& _value = TQString(), const TQString &dontAskAgainName = TQString(), TQWidget *parent = 0 );
/**
* Static convenience method.
@@ -96,13 +96,13 @@ public:
* @param _text Text of the label
* @param _value Initial value of the inputline
* @param ok Variable to store whether the user hit OK
- * @param tqparent Parent widget for the dialog
+ * @param parent Parent widget for the dialog
* @param configName Name of the dialog for saving the completion and history
* @parma config KConfig for saving the completion and history
*/
static TQString getText(const TQString &_caption, const TQString &_text,
const TQString &_value = TQString(),
- bool *ok = 0, TQWidget *tqparent = 0,
+ bool *ok = 0, TQWidget *parent = 0,
const TQString &configName = TQString(),
KConfig *config = KGlobal::config());
diff --git a/kolf/kvolumecontrol.cpp b/kolf/kvolumecontrol.cpp
index b2028b77..e2aaa464 100644
--- a/kolf/kvolumecontrol.cpp
+++ b/kolf/kvolumecontrol.cpp
@@ -5,14 +5,14 @@
#include "kvolumecontrol.h"
-KVolumeControl::KVolumeControl(Arts::SoundServerV2 server, KPlayObject *tqparent)
- : TQObject(tqparent)
+KVolumeControl::KVolumeControl(Arts::SoundServerV2 server, KPlayObject *parent)
+ : TQObject(parent)
{
init(server);
}
-KVolumeControl::KVolumeControl(double vol, Arts::SoundServerV2 server, KPlayObject *tqparent)
- : TQObject(tqparent)
+KVolumeControl::KVolumeControl(double vol, Arts::SoundServerV2 server, KPlayObject *parent)
+ : TQObject(parent)
{
init(server);
setVolume(vol);
@@ -42,8 +42,8 @@ void KVolumeControl::init(Arts::SoundServerV2 server)
}
volumeControl.start();
- Arts::connect((static_cast<KPlayObject *>(tqparent()))->object(), "left", volumeControl, "inleft");
- Arts::connect((static_cast<KPlayObject *>(tqparent()))->object(), "right", volumeControl, "inright");
+ Arts::connect((static_cast<KPlayObject *>(parent()))->object(), "left", volumeControl, "inleft");
+ Arts::connect((static_cast<KPlayObject *>(parent()))->object(), "right", volumeControl, "inright");
Arts::connect(volumeControl, manager);
}
diff --git a/kolf/kvolumecontrol.h b/kolf/kvolumecontrol.h
index 190b3beb..82e70e90 100644
--- a/kolf/kvolumecontrol.h
+++ b/kolf/kvolumecontrol.h
@@ -12,8 +12,8 @@ Q_OBJECT
TQ_OBJECT
public:
- KVolumeControl(Arts::SoundServerV2 server, KPlayObject *tqparent);
- KVolumeControl(double vol, Arts::SoundServerV2 server, KPlayObject *tqparent);
+ KVolumeControl(Arts::SoundServerV2 server, KPlayObject *parent);
+ KVolumeControl(double vol, Arts::SoundServerV2 server, KPlayObject *parent);
~KVolumeControl();
void setVolume(double);
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 5badc856..8ee1f7c7 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -35,8 +35,8 @@
#include "newgame.h"
#include "game.h"
-NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *tqparent, const char *_name)
- : KDialogBase(KDialogBase::TreeList, i18n("New Game"), Ok | Cancel, Ok, tqparent, _name)
+NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_name)
+ : KDialogBase(KDialogBase::TreeList, i18n("New Game"), Ok | Cancel, Ok, parent, _name)
{
this->enableCourses = enableCourses;
@@ -311,8 +311,8 @@ void NewGameDialog::enableButtons()
/////////////////////////
-PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *tqparent, const char *_name)
- : TQWidget(tqparent, _name)
+PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *parent, const char *_name)
+ : TQWidget(parent, _name)
{
TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialogBase::spacingHint());
diff --git a/kolf/newgame.h b/kolf/newgame.h
index ce5b8060..4d0d1af5 100644
--- a/kolf/newgame.h
+++ b/kolf/newgame.h
@@ -30,7 +30,7 @@ class PlayerEditor : public TQWidget
TQ_OBJECT
public:
- PlayerEditor(TQString name = TQString(), TQColor = red, TQWidget *tqparent = 0, const char *_name = 0);
+ PlayerEditor(TQString name = TQString(), TQColor = red, TQWidget *parent = 0, const char *_name = 0);
TQColor color() { return colorButton->color(); }
TQString name() { return editor->text(); }
void setColor(TQColor col) { colorButton->setColor(col); }
@@ -54,7 +54,7 @@ class NewGameDialog : public KDialogBase
TQ_OBJECT
public:
- NewGameDialog(bool enableCourses, TQWidget *tqparent, const char *_name = 0);
+ NewGameDialog(bool enableCourses, TQWidget *parent, const char *_name = 0);
TQPtrList<PlayerEditor> *players() { return &editors; }
bool competition() { return mode->isChecked(); }
TQString course() { return currentCourse; }
diff --git a/kolf/object.h b/kolf/object.h
index 74464bb6..b04822a8 100644
--- a/kolf/object.h
+++ b/kolf/object.h
@@ -13,7 +13,7 @@ class Object : public TQObject
TQ_OBJECT
public:
- Object(TQObject *tqparent = 0, const char *name = 0) : TQObject(tqparent, name) { m_addOnNewHole = false; }
+ Object(TQObject *parent = 0, const char *name = 0) : TQObject(parent, name) { m_addOnNewHole = false; }
virtual TQCanvasItem *newObject(TQCanvas * /*canvas*/) { return 0; }
TQString name() { return m_name; }
TQString _name() { return m__name; }
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index 18d3ca5b..10a26b9c 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -54,8 +54,8 @@ void PoolBall::draw(TQPainter &p)
Ball::draw(p);
}
-PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *tqparent)
- : Config(tqparent), m_poolBall(poolBall)
+PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent)
+ : Config(parent), m_poolBall(poolBall)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
@@ -78,9 +78,9 @@ void PoolBallConfig::numberChanged(int newNumber)
changed();
}
-Config *PoolBall::config(TQWidget *tqparent)
+Config *PoolBall::config(TQWidget *parent)
{
- return new PoolBallConfig(this, tqparent);
+ return new PoolBallConfig(this, parent);
}
#include "poolball.moc"
diff --git a/kolf/objects/poolball/poolball.h b/kolf/objects/poolball/poolball.h
index fac2ef11..db09f7bd 100644
--- a/kolf/objects/poolball/poolball.h
+++ b/kolf/objects/poolball/poolball.h
@@ -30,7 +30,7 @@ public:
virtual bool deleteable() const { return true; }
- virtual Config *config(TQWidget *tqparent);
+ virtual Config *config(TQWidget *parent);
virtual void saveState(StateDB *);
virtual void save(KConfig *cfg);
virtual void loadState(StateDB *);
@@ -51,7 +51,7 @@ class PoolBallConfig : public Config
TQ_OBJECT
public:
- PoolBallConfig(PoolBall *poolBall, TQWidget *tqparent);
+ PoolBallConfig(PoolBall *poolBall, TQWidget *parent);
private slots:
void numberChanged(int);
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index 38a40f22..bb3af320 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -14,7 +14,7 @@
#include "test.h"
K_EXPORT_COMPONENT_FACTORY(libkolftest, TestFactory)
-TQObject *TestFactory::createObject (TQObject * /*tqparent*/, const char * /*name*/, const char * /*classname*/, const TQStringList & /*args*/)
+TQObject *TestFactory::createObject (TQObject * /*parent*/, const char * /*name*/, const char * /*classname*/, const TQStringList & /*args*/)
{ return new TestObj; }
Test::Test(TQCanvas *canvas)
@@ -65,8 +65,8 @@ void Test::load(KConfig *cfg)
setSwitchEvery(cfg->readNumEntry("switchEvery", 50));
}
-TestConfig::TestConfig(Test *test, TQWidget *tqparent)
- : Config(tqparent), m_test(test)
+TestConfig::TestConfig(Test *test, TQWidget *parent)
+ : Config(parent), m_test(test)
{
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
@@ -96,9 +96,9 @@ void TestConfig::switchEveryChanged(int news)
changed();
}
-Config *Test::config(TQWidget *tqparent)
+Config *Test::config(TQWidget *parent)
{
- return new TestConfig(this, tqparent);
+ return new TestConfig(this, parent);
}
#include "test.moc"
diff --git a/kolf/objects/test/test.h b/kolf/objects/test/test.h
index c8fa6838..d4f00f41 100644
--- a/kolf/objects/test/test.h
+++ b/kolf/objects/test/test.h
@@ -24,7 +24,7 @@ class Test : public TQCanvasEllipse, public CanvasItem
public:
Test(TQCanvas *canvas);
- virtual Config *config(TQWidget *tqparent);
+ virtual Config *config(TQWidget *parent);
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
@@ -44,7 +44,7 @@ class TestConfig : public Config
TQ_OBJECT
public:
- TestConfig(Test *test, TQWidget *tqparent);
+ TestConfig(Test *test, TQWidget *parent);
private slots:
void switchEveryChanged(int news);
diff --git a/kolf/printdialogpage.cpp b/kolf/printdialogpage.cpp
index dfec9c96..e60de7ea 100644
--- a/kolf/printdialogpage.cpp
+++ b/kolf/printdialogpage.cpp
@@ -8,8 +8,8 @@
#include "printdialogpage.h"
-PrintDialogPage::PrintDialogPage(TQWidget *tqparent, const char *name)
- : KPrintDialogPage( tqparent, name )
+PrintDialogPage::PrintDialogPage(TQWidget *parent, const char *name)
+ : KPrintDialogPage( parent, name )
{
setTitle(i18n("Kolf Options"));
diff --git a/kolf/printdialogpage.h b/kolf/printdialogpage.h
index 4869ea53..ea2fe9f8 100644
--- a/kolf/printdialogpage.h
+++ b/kolf/printdialogpage.h
@@ -14,7 +14,7 @@ class PrintDialogPage : public KPrintDialogPage
TQ_OBJECT
public:
- PrintDialogPage(TQWidget *tqparent = 0, const char *name = 0);
+ PrintDialogPage(TQWidget *parent = 0, const char *name = 0);
//reimplement virtual functions
void getOptions(TQMap<TQString, TQString> &opts, bool incldef = false);
diff --git a/kolf/scoreboard.cpp b/kolf/scoreboard.cpp
index cdd5759b..717dbc36 100644
--- a/kolf/scoreboard.cpp
+++ b/kolf/scoreboard.cpp
@@ -9,8 +9,8 @@
#include "scoreboard.h"
-ScoreBoard::ScoreBoard(TQWidget *tqparent, const char *name)
- : TQTable(1, 1, tqparent, name)
+ScoreBoard::ScoreBoard(TQWidget *parent, const char *name)
+ : TQTable(1, 1, parent, name)
{
vh = verticalHeader();
hh = horizontalHeader();
diff --git a/kolf/scoreboard.h b/kolf/scoreboard.h
index f15a323a..8f558e0e 100644
--- a/kolf/scoreboard.h
+++ b/kolf/scoreboard.h
@@ -12,7 +12,7 @@ class ScoreBoard : public TQTable
TQ_OBJECT
public:
- ScoreBoard(TQWidget *tqparent = 0, const char *name = 0);
+ ScoreBoard(TQWidget *parent = 0, const char *name = 0);
int total(int id, TQString &name);
public slots:
diff --git a/kolf/slope.cpp b/kolf/slope.cpp
index 7d9db148..db79cff8 100644
--- a/kolf/slope.cpp
+++ b/kolf/slope.cpp
@@ -507,7 +507,7 @@ void Slope::updatePixmap()
}
bpainter.drawPolygon(r);
- // tqmask is drawn
+ // mask is drawn
pixmap.setMask(bitmap);
}
@@ -517,8 +517,8 @@ void Slope::updatePixmap()
/////////////////////////
-SlopeConfig::SlopeConfig(Slope *slope, TQWidget *tqparent)
- : Config(tqparent)
+SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent)
+ : Config(parent)
{
this->slope = slope;
TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
diff --git a/kolf/slope.h b/kolf/slope.h
index c829ad36..5b025edb 100644
--- a/kolf/slope.h
+++ b/kolf/slope.h
@@ -12,7 +12,7 @@ class SlopeConfig : public Config
TQ_OBJECT
public:
- SlopeConfig(Slope *slope, TQWidget *tqparent);
+ SlopeConfig(Slope *slope, TQWidget *parent);
private slots:
void setGradient(const TQString &text);
@@ -36,7 +36,7 @@ public:
virtual void editModeChanged(bool changed);
virtual bool canBeMovedByOthers() const { return !stuckOnGround; }
virtual TQPtrList<TQCanvasItem> moveableItems() const;
- virtual Config *config(TQWidget *tqparent) { return new SlopeConfig(this, tqparent); }
+ virtual Config *config(TQWidget *parent) { return new SlopeConfig(this, parent); }
void setSize(int, int);
virtual void newSize(int width, int height);