summaryrefslogtreecommitdiffstats
path: root/kmahjongg
diff options
context:
space:
mode:
Diffstat (limited to 'kmahjongg')
-rw-r--r--kmahjongg/Editor.cpp4
-rw-r--r--kmahjongg/Editor.h2
-rw-r--r--kmahjongg/GameTimer.cpp6
-rw-r--r--kmahjongg/GameTimer.h2
-rw-r--r--kmahjongg/HighScore.cpp4
-rw-r--r--kmahjongg/HighScore.h2
-rw-r--r--kmahjongg/Preview.cpp6
-rw-r--r--kmahjongg/Preview.h4
-rw-r--r--kmahjongg/Tileset.cpp2
-rw-r--r--kmahjongg/Tileset.h4
-rw-r--r--kmahjongg/boardwidget.cpp12
-rw-r--r--kmahjongg/boardwidget.h2
-rw-r--r--kmahjongg/kmahjongg.cpp4
-rw-r--r--kmahjongg/kmahjongg.h2
14 files changed, 28 insertions, 28 deletions
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 833718c3..cc80831c 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -41,11 +41,11 @@
Editor::Editor
(
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
:
- TQDialog( tqparent, name, true, 0 ), tiles(false)
+ TQDialog( parent, name, true, 0 ), tiles(false)
{
clean= true;
diff --git a/kmahjongg/Editor.h b/kmahjongg/Editor.h
index a42f237d..1cd06853 100644
--- a/kmahjongg/Editor.h
+++ b/kmahjongg/Editor.h
@@ -23,7 +23,7 @@ public:
Editor
(
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/kmahjongg/GameTimer.cpp b/kmahjongg/GameTimer.cpp
index d4fc4009..f3ce4f52 100644
--- a/kmahjongg/GameTimer.cpp
+++ b/kmahjongg/GameTimer.cpp
@@ -8,11 +8,11 @@
//
-// Constructs a GameTimer widget with a tqparent and a name.
+// Constructs a GameTimer widget with a parent and a name.
//
-GameTimer::GameTimer( TQWidget *tqparent, const char *name )
- : TQLCDNumber( tqparent, name )
+GameTimer::GameTimer( TQWidget *parent, const char *name )
+ : TQLCDNumber( parent, name )
{
showingColon = false;
setNumDigits(7);
diff --git a/kmahjongg/GameTimer.h b/kmahjongg/GameTimer.h
index cae1961e..e9bdb4c6 100644
--- a/kmahjongg/GameTimer.h
+++ b/kmahjongg/GameTimer.h
@@ -26,7 +26,7 @@ class GameTimer: public TQLCDNumber
Q_OBJECT
TQ_OBJECT
public:
- GameTimer( TQWidget *tqparent=0, const char *name=0 );
+ GameTimer( TQWidget *parent=0, const char *name=0 );
int toInt();
TQString toString() {return theTimer.toString();}
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index 856ed7fb..c38e53b1 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -43,11 +43,11 @@ int defTimes[numScores] = {ages, ages-1, ages-2, ages-3,
HighScore::HighScore
(
- TQWidget* tqparent,
+ TQWidget* parent,
const char* name
)
:
- TQDialog( tqparent, name, true, 0 )
+ TQDialog( parent, name, true, 0 )
{
// form the target name
diff --git a/kmahjongg/HighScore.h b/kmahjongg/HighScore.h
index bd593c09..a154b3e1 100644
--- a/kmahjongg/HighScore.h
+++ b/kmahjongg/HighScore.h
@@ -35,7 +35,7 @@ public:
HighScore
(
- TQWidget* tqparent = NULL,
+ TQWidget* parent = NULL,
const char* name = NULL
);
diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp
index 0904c750..ff635e5c 100644
--- a/kmahjongg/Preview.cpp
+++ b/kmahjongg/Preview.cpp
@@ -19,7 +19,7 @@
static const char * themeMagicV1_0= "kmahjongg-theme-v1.0";
-Preview::Preview(TQWidget* tqparent) : KDialogBase(tqparent), m_tiles(true)
+Preview::Preview(TQWidget* parent) : KDialogBase(parent), m_tiles(true)
{
KPushButton *loadButton;
TQGroupBox *group;
@@ -421,8 +421,8 @@ void Preview::saveTheme() {
fclose(outFile);
}
-FrameImage::FrameImage (TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name)
+FrameImage::FrameImage (TQWidget *parent, const char *name)
+ : TQFrame(parent, name)
{
rx = -1;
thePixmap = new TQPixmap();
diff --git a/kmahjongg/Preview.h b/kmahjongg/Preview.h
index a987b7d2..2b0adb54 100644
--- a/kmahjongg/Preview.h
+++ b/kmahjongg/Preview.h
@@ -17,7 +17,7 @@ class FrameImage: public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- FrameImage(TQWidget *tqparent=NULL, const char *name = NULL);
+ FrameImage(TQWidget *parent=NULL, const char *name = NULL);
~FrameImage();
void setGeometry(int x, int y, int w, int h);
TQPixmap *getPreviewPixmap() {return thePixmap;}
@@ -49,7 +49,7 @@ class Preview: public KDialogBase
public:
enum PreviewType {background, tileset, board, theme};
- Preview(TQWidget* tqparent);
+ Preview(TQWidget* parent);
~Preview();
void initialise(const PreviewType type);
diff --git a/kmahjongg/Tileset.cpp b/kmahjongg/Tileset.cpp
index b8c6ec2f..bec2d959 100644
--- a/kmahjongg/Tileset.cpp
+++ b/kmahjongg/Tileset.cpp
@@ -195,7 +195,7 @@ void Tileset::createPixmap(TQRgb *src, TQPixmap &dest, bool scale, bool shadow)
}
- // create the pixmap and initialise the drawing tqmask
+ // create the pixmap and initialise the drawing mask
if (!scale) {
dest.convertFromImage(buff);
dest.setMask(maskBits);
diff --git a/kmahjongg/Tileset.h b/kmahjongg/Tileset.h
index c93cf102..93fc0832 100644
--- a/kmahjongg/Tileset.h
+++ b/kmahjongg/Tileset.h
@@ -61,8 +61,8 @@ class Tileset {
private:
- TQBitmap maskBits; // xbm tqmask for the tile
- TQBitmap maskBitsMini; // xbm tqmask for the tile
+ TQBitmap maskBits; // xbm mask for the tile
+ TQBitmap maskBitsMini; // xbm mask for the tile
TQRgb* tiles; // Buffer containing all tiles (unselected glyphs)
TQRgb* selectedTiles; // Buffer containing all tiles (selected glyphs)
diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp
index 615091ab..aca8c302 100644
--- a/kmahjongg/boardwidget.cpp
+++ b/kmahjongg/boardwidget.cpp
@@ -14,8 +14,8 @@
* Constructor.
* Loads tileset and background bitmaps.
*/
-BoardWidget::BoardWidget( TQWidget* tqparent, const char *name )
- : TQWidget( tqparent, name ), theTiles(false)
+BoardWidget::BoardWidget( TQWidget* parent, const char *name )
+ : TQWidget( parent, name ), theTiles(false)
{
setBackgroundColor( TQColor( 0,0,0 ) );
@@ -882,7 +882,7 @@ int BoardWidget::tileAt(int x, int y, int z) {
bool BoardWidget::generateSolvableGame() {
// Initially we want to mark positions on layer 0 so that we have only
- // one free position per aptqparent horizontal line.
+ // one free position per apparent horizontal line.
for (int i = 0; i < numTiles; i++) {
// Pick a random tile on layer 0
@@ -894,7 +894,7 @@ bool BoardWidget::generateSolvableGame() {
}
} while (tilePositions[position].e != 0);
- // If there are no other free positions on the same aptqparent
+ // If there are no other free positions on the same apparent
// horizontal line, we can mark that position as free.
if (onlyFreeInLine(position)) {
positionDepends[position].free = true;
@@ -965,7 +965,7 @@ bool BoardWidget::generateSolvableGame() {
// ---------------------------------------------------------
// Determines whether it is ok to mark this position as "free" because
-// there are no other positions marked "free" in its aptqparent horizontal
+// there are no other positions marked "free" in its apparent horizontal
// line.
bool BoardWidget::onlyFreeInLine(int position) {
@@ -1104,7 +1104,7 @@ void BoardWidget::updateDepend(int position) {
}
}
- // If position is first free on aptqparent horizontal, it is
+ // If position is first free on apparent horizontal, it is
// now free to be filled.
if (onlyFreeInLine(position)) {
positionDepends[position].free = true;
diff --git a/kmahjongg/boardwidget.h b/kmahjongg/boardwidget.h
index 749f5452..bee14b49 100644
--- a/kmahjongg/boardwidget.h
+++ b/kmahjongg/boardwidget.h
@@ -92,7 +92,7 @@ class BoardWidget : public TQWidget
TQ_OBJECT
public:
- BoardWidget( TQWidget* tqparent = 0, const char *name = 0 );
+ BoardWidget( TQWidget* parent = 0, const char *name = 0 );
~BoardWidget();
void calculateNewGame(int num = -1 );
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index 49246f92..8bd9b107 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -57,8 +57,8 @@ int is_paused = 0;
/**
Constructor.
*/
-KMahjongg::KMahjongg( TQWidget* tqparent, const char *name)
- : KMainWindow(tqparent, name)
+KMahjongg::KMahjongg( TQWidget* parent, const char *name)
+ : KMainWindow(parent, name)
{
boardEditor = 0;
diff --git a/kmahjongg/kmahjongg.h b/kmahjongg/kmahjongg.h
index 54c5ca92..e7b9492b 100644
--- a/kmahjongg/kmahjongg.h
+++ b/kmahjongg/kmahjongg.h
@@ -54,7 +54,7 @@ class KMahjongg : public KMainWindow
TQ_OBJECT
public:
- KMahjongg( TQWidget* tqparent = 0, const char *name = 0);
+ KMahjongg( TQWidget* parent = 0, const char *name = 0);
~KMahjongg();
public slots:
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 15:15:12 +0000