summaryrefslogtreecommitdiffstats
path: root/kmahjongg
diff options
context:
space:
mode:
Diffstat (limited to 'kmahjongg')
-rw-r--r--kmahjongg/BoardLayout.h2
-rw-r--r--kmahjongg/Editor.cpp16
-rw-r--r--kmahjongg/HighScore.cpp4
-rw-r--r--kmahjongg/HighScore.h2
-rw-r--r--kmahjongg/Preview.cpp46
-rw-r--r--kmahjongg/Preview.h2
-rw-r--r--kmahjongg/boardwidget.cpp12
-rw-r--r--kmahjongg/kmahjongg.cpp2
-rw-r--r--kmahjongg/pics/cross.layout2
-rw-r--r--kmahjongg/pics/default.layout2
-rw-r--r--kmahjongg/pics/default.theme2
-rw-r--r--kmahjongg/pics/pirates.layout2
-rw-r--r--kmahjongg/pics/pirates.theme2
-rw-r--r--kmahjongg/pics/pyramid.layout2
-rw-r--r--kmahjongg/pics/stax.layout2
-rw-r--r--kmahjongg/pics/test.layout2
-rw-r--r--kmahjongg/pics/test2.layout2
-rw-r--r--kmahjongg/pics/tower.layout2
-rw-r--r--kmahjongg/pics/triangle.layout2
19 files changed, 54 insertions, 54 deletions
diff --git a/kmahjongg/BoardLayout.h b/kmahjongg/BoardLayout.h
index a9a809c7..468bf5bc 100644
--- a/kmahjongg/BoardLayout.h
+++ b/kmahjongg/BoardLayout.h
@@ -4,7 +4,7 @@
#include <tqstring.h>
#include "KmTypes.h"
-const TQString layoutMagic1_0 = "kmahjongg-tqlayout-v1.0";
+const TQString layoutMagic1_0 = "kmahjongg-layout-v1.0";
class BoardLayout {
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 0c6333c5..b1da62b0 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -35,7 +35,7 @@
// When we assign a tile to draw in a slot we do it in order from te following
-// table, wrapping on the tile number. It makes the tile tqlayout look more
+// table, wrapping on the tile number. It makes the tile layout look more
// random.
@@ -69,10 +69,10 @@ Editor::Editor
// setup the tool bar
setupToolbar();
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 1);
- tqlayout->addWidget(topToolbar,0);
- tqlayout->addWidget(drawFrame,1);
- tqlayout->activate();
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 1);
+ layout->addWidget(topToolbar,0);
+ layout->addWidget(drawFrame,1);
+ layout->activate();
resize( sWidth+60, sHeight+60);
setMinimumSize( sWidth+60, sHeight+60);
@@ -272,7 +272,7 @@ void Editor::loadBoard() {
KURL url = KFileDialog::getOpenURL(
NULL,
- i18n("*.tqlayout|Board Layout (*.tqlayout)\n"
+ i18n("*.layout|Board Layout (*.layout)\n"
"*|All Files"),
this,
i18n("Open Board Layout" ));
@@ -309,7 +309,7 @@ bool Editor::saveBoard() {
// get a save file name
KURL url = KFileDialog::getSaveURL(
NULL,
- i18n("*.tqlayout|Board Layout (*.tqlayout)\n"
+ i18n("*.layout|Board Layout (*.layout)\n"
"*|All Files"),
this,
i18n("Save Board Layout" ));
@@ -373,7 +373,7 @@ bool Editor::testSave()
// The main paint event, draw in the grid and blit in
-// the tiles as specified by the tqlayout.
+// the tiles as specified by the layout.
void Editor::paintEvent( TQPaintEvent* ) {
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index 33d0d096..637fdf25 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -399,8 +399,8 @@ void HighScore::copyTableToScreen(const TQString &name) {
repaint(false);
}
-int HighScore::exec(TQString &tqlayout) {
- copyTableToScreen(tqlayout);
+int HighScore::exec(TQString &layout) {
+ copyTableToScreen(layout);
return(TQDialog::exec());
}
diff --git a/kmahjongg/HighScore.h b/kmahjongg/HighScore.h
index a154b3e1..d5513508 100644
--- a/kmahjongg/HighScore.h
+++ b/kmahjongg/HighScore.h
@@ -41,7 +41,7 @@ public:
virtual ~HighScore();
- int exec(TQString &tqlayout);
+ int exec(TQString &layout);
void checkHighScore(int score, int elapsed, long game, TQString &board);
diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp
index f6ff021a..9c6ac478 100644
--- a/kmahjongg/Preview.cpp
+++ b/kmahjongg/Preview.cpp
@@ -76,7 +76,7 @@ void Preview::initialise(const PreviewType type)
TQString extension;
TQString tile = Prefs::tileSet();
TQString back = Prefs::background();
- TQString tqlayout = Prefs::layout();
+ TQString layout = Prefs::layout();
// set up the concept of the current file. Initialised to the preferences
// value initially. Set the caption to indicate what we are doing
@@ -98,10 +98,10 @@ void Preview::initialise(const PreviewType type)
break;
case board:
- m_fileSelector = i18n("*.tqlayout|Board Layout File (*.tqlayout)\n");
+ m_fileSelector = i18n("*.layout|Board Layout File (*.layout)\n");
setCaption(i18n("Change Board Layout"));
- m_selectedFile = tqlayout;
- extension = "*.tqlayout";
+ m_selectedFile = layout;
+ extension = "*.layout";
break;
case theme:
@@ -167,7 +167,7 @@ void Preview::load() {
}
}
-// Top level preview drawing method. Background, tileset and tqlayout
+// Top level preview drawing method. Background, tileset and layout
// are initialised from the preferences. Depending on the type
// of preview dialog we pick up the selected file for one of these
// chaps.
@@ -176,7 +176,7 @@ void Preview::drawPreview()
{
TQString tile = Prefs::tileSet();
TQString back = Prefs::background();
- TQString tqlayout = Prefs::layout();
+ TQString layout = Prefs::layout();
switch (m_previewType)
{
@@ -189,12 +189,12 @@ void Preview::drawPreview()
break;
case board:
- tqlayout = m_selectedFile;
+ layout = m_selectedFile;
break;
case theme:
// a theme is quite a bit of work. We load the
- // specified bits in (tqlayout, background and tileset
+ // specified bits in (layout, background and tileset
if (!m_selectedFile.isEmpty())
{
TQString backRaw, layoutRaw, tilesetRaw, magic;
@@ -233,17 +233,17 @@ void Preview::drawPreview()
back = locate("appdata", back);
}
- tqlayout = layoutRaw;
- tqlayout.replace(":", "/kmahjongg/pics/");
- if (!TQFile::exists(tqlayout))
+ layout = layoutRaw;
+ layout.replace(":", "/kmahjongg/pics/");
+ if (!TQFile::exists(layout))
{
- tqlayout = layoutRaw;
- tqlayout = "pics/" + tqlayout.right(tqlayout.length() - tqlayout.find(":") - 1);
- tqlayout = locate("appdata", tqlayout);
+ layout = layoutRaw;
+ layout = "pics/" + layout.right(layout.length() - layout.find(":") - 1);
+ layout = locate("appdata", layout);
}
m_themeBack=back;
- m_themeLayout=tqlayout;
+ m_themeLayout=layout;
m_themeTileset=tile;
}
}
@@ -251,7 +251,7 @@ void Preview::drawPreview()
}
renderBackground(back);
- renderTiles(tile, tqlayout);
+ renderTiles(tile, layout);
}
void Preview::paintEvent( TQPaintEvent* ){
@@ -260,7 +260,7 @@ void Preview::paintEvent( TQPaintEvent* ){
// the user selected ok, or apply. This method passes the changes
// across to the game widget and if necessary forces a board redraw
-// (unnecessary on tqlayout changes since it only effects the next game)
+// (unnecessary on layout changes since it only effects the next game)
void Preview::applyChange()
{
switch (m_previewType)
@@ -287,7 +287,7 @@ void Preview::applyChange()
break;
}
- // don't redraw for a tqlayout change
+ // don't redraw for a layout change
if (m_previewType == board || m_previewType == theme) layoutChange();
else boardRedraw(true);
@@ -310,9 +310,9 @@ void Preview::renderBackground(const TQString &bg) {
// This method draws a mini-tiled board with no tiles missing.
-void Preview::renderTiles(const TQString &file, const TQString &tqlayout) {
+void Preview::renderTiles(const TQString &file, const TQString &layout) {
m_tiles.loadTileset(file, true);
- m_boardLayout.loadBoardLayout(tqlayout);
+ m_boardLayout.loadBoardLayout(layout);
TQPixmap *dest = m_drawFrame->getPreviewPixmap();
int xOffset = m_tiles.width()/2;
@@ -366,7 +366,7 @@ void Preview::renderTiles(const TQString &file, const TQString &tqlayout) {
void Preview::saveTheme() {
TQString tile = Prefs::tileSet();
TQString back = Prefs::background();
- TQString tqlayout = Prefs::layout();
+ TQString layout = Prefs::layout();
TQString with = ":";
// we want to replace any path in the default store
@@ -375,7 +375,7 @@ void Preview::saveTheme() {
back.replace(p,with);
tile.replace(p,with);
- tqlayout.replace(p,with);
+ layout.replace(p,with);
// Get the name of the file to save
@@ -417,7 +417,7 @@ void Preview::saveTheme() {
themeMagicV1_0,
tile.utf8().data(),
back.utf8().data(),
- tqlayout.utf8().data());
+ layout.utf8().data());
fclose(outFile);
}
diff --git a/kmahjongg/Preview.h b/kmahjongg/Preview.h
index 2b0adb54..f77aaf09 100644
--- a/kmahjongg/Preview.h
+++ b/kmahjongg/Preview.h
@@ -63,7 +63,7 @@ protected:
virtual void drawPreview();
void applyChange() ;
void renderBackground(const TQString &bg);
- void renderTiles(const TQString &file, const TQString &tqlayout);
+ void renderTiles(const TQString &file, const TQString &layout);
void paintEvent( TQPaintEvent* pa );
signals:
diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp
index 7b4d8270..23d183ab 100644
--- a/kmahjongg/boardwidget.cpp
+++ b/kmahjongg/boardwidget.cpp
@@ -60,11 +60,11 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name )
kapp->quit();
}
- getFileOrDefault(Prefs::layout(), "tqlayout", tFile);
+ getFileOrDefault(Prefs::layout(), "layout", tFile);
if( ! loadBoardLayout(tFile) )
{
KMessageBox::error(this,
- i18n("An error occurred when loading the board tqlayout %1\n"
+ i18n("An error occurred when loading the board layout %1\n"
"KMahjongg will now terminate.").arg(tFile));
kapp->quit();
}
@@ -92,7 +92,7 @@ void BoardWidget::saveSettings(){
//config->writePathEntry("Tileset_file", tileFile);
//config->writePathEntry("Background_file", backgroundFile);
- //config->writePathEntry("Layout_file", tqlayout);
+ //config->writePathEntry("Layout_file", layout);
}
void BoardWidget::getFileOrDefault(TQString filename, TQString type, TQString &res)
@@ -766,7 +766,7 @@ void BoardWidget::calculateNewGame( int gNumber)
}
// ---------------------------------------------------------
-// Generate the position data for the tqlayout from contents of Game.Map.
+// Generate the position data for the layout from contents of Game.Map.
void BoardWidget::generateTilePositions() {
numTiles = 0;
@@ -788,7 +788,7 @@ void BoardWidget::generateTilePositions() {
}
// ---------------------------------------------------------
-// Generate the dependency data for the tqlayout from the position data.
+// Generate the dependency data for the layout from the position data.
// Note that the coordinates of each tile in tilePositions are those of
// the upper left quarter of the tile.
void BoardWidget::generatePositionDepends() {
@@ -1393,7 +1393,7 @@ bool BoardWidget::findMove( POSITION& posA, POSITION& posB )
iPosCount = 0; // Hier Anzahl der gefunden Paare merken
- // The new tile tqlayout with non-contiguos horizantle spans
+ // The new tile layout with non-contiguos horizantle spans
// can lead to huge numbers of matching pairs being exposed.
// we alter the loop to bail out when BoardLayout::maxTiles/2 pairs are found
// (or less);
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index 536fa99b..e065b848 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -151,7 +151,7 @@ void KMahjongg::setupKAction()
pauseAction = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pause()), actionCollection());
// TODO: store the background ; open on startup
- // TODO: same about tqlayout
+ // TODO: same about layout
// TODO: same about theme
// move
diff --git a/kmahjongg/pics/cross.layout b/kmahjongg/pics/cross.layout
index de71a115..39c58f1e 100644
--- a/kmahjongg/pics/cross.layout
+++ b/kmahjongg/pics/cross.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
12....12121212121212121212....12
4312..43434343434343434343..1243
124312........1212........124312
diff --git a/kmahjongg/pics/default.layout b/kmahjongg/pics/default.layout
index 005254ed..f72ed794 100644
--- a/kmahjongg/pics/default.layout
+++ b/kmahjongg/pics/default.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
# Level 0 -------------------------
...121212121212121212121212.....
...434343434343434343434343.....
diff --git a/kmahjongg/pics/default.theme b/kmahjongg/pics/default.theme
index 49502e04..9ba994bc 100644
--- a/kmahjongg/pics/default.theme
+++ b/kmahjongg/pics/default.theme
@@ -1,4 +1,4 @@
kmahjongg-theme-v1.0
:default.tileset
:default.bgnd
-:default.tqlayout
+:default.layout
diff --git a/kmahjongg/pics/pirates.layout b/kmahjongg/pics/pirates.layout
index 3cce44e3..c5bb895c 100644
--- a/kmahjongg/pics/pirates.layout
+++ b/kmahjongg/pics/pirates.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
.............121212.......12..12
.............434343.......43..43
.............12.............12..
diff --git a/kmahjongg/pics/pirates.theme b/kmahjongg/pics/pirates.theme
index 51b6ec88..748b3ffa 100644
--- a/kmahjongg/pics/pirates.theme
+++ b/kmahjongg/pics/pirates.theme
@@ -1,5 +1,5 @@
kmahjongg-theme-v1.0
:pirates.tileset
:pirates.bgnd
-:pirates.tqlayout
+:pirates.layout
diff --git a/kmahjongg/pics/pyramid.layout b/kmahjongg/pics/pyramid.layout
index 0239212b..edd634dc 100644
--- a/kmahjongg/pics/pyramid.layout
+++ b/kmahjongg/pics/pyramid.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
# Level 0 -------------------------
....121212121212121212121212....
....434343434343434343434343....
diff --git a/kmahjongg/pics/stax.layout b/kmahjongg/pics/stax.layout
index abc7e969..f5595dca 100644
--- a/kmahjongg/pics/stax.layout
+++ b/kmahjongg/pics/stax.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
................................
12121212..121212121212..12121212
43434343..434343434343..43434343
diff --git a/kmahjongg/pics/test.layout b/kmahjongg/pics/test.layout
index 2c76ddec..d46a4e21 100644
--- a/kmahjongg/pics/test.layout
+++ b/kmahjongg/pics/test.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
.1212121212121212121212121212...
.4343434343434343434343434343...
.1212121212121212121212121212...
diff --git a/kmahjongg/pics/test2.layout b/kmahjongg/pics/test2.layout
index 9ab29fdf..aedc6290 100644
--- a/kmahjongg/pics/test2.layout
+++ b/kmahjongg/pics/test2.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
................................
................................
.121212121212121212.............
diff --git a/kmahjongg/pics/tower.layout b/kmahjongg/pics/tower.layout
index 3ca7bfc6..76fe96a0 100644
--- a/kmahjongg/pics/tower.layout
+++ b/kmahjongg/pics/tower.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
# Level 0 -------------------------
....121212121212121212121212....
....434343434343434343434343....
diff --git a/kmahjongg/pics/triangle.layout b/kmahjongg/pics/triangle.layout
index e04c405a..e1dd4891 100644
--- a/kmahjongg/pics/triangle.layout
+++ b/kmahjongg/pics/triangle.layout
@@ -1,4 +1,4 @@
-kmahjongg-tqlayout-v1.0
+kmahjongg-layout-v1.0
# Level 0 -------------------------
.121212121212121212121212121212.
.434343434343434343434343434343.