diff options
Diffstat (limited to 'kmahjongg/boardwidget.cpp')
-rw-r--r-- | kmahjongg/boardwidget.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp index aca8c302..23d183ab 100644 --- a/kmahjongg/boardwidget.cpp +++ b/kmahjongg/boardwidget.cpp @@ -45,7 +45,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) if (!loadTileset(tFile)){ KMessageBox::error(this, i18n("An error occurred when loading the tileset file %1\n" - "KMahjongg will now terminate.").tqarg(tFile)); + "KMahjongg will now terminate.").arg(tFile)); kapp->quit(); } @@ -55,17 +55,17 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) if( ! loadBackground(tFile, false ) ) { KMessageBox::error(this, - i18n("An error occurred when loading the background image\n%1").tqarg(tFile)+ + i18n("An error occurred when loading the background image\n%1").arg(tFile)+ i18n("KMahjongg will now terminate.")); 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" - "KMahjongg will now terminate.").tqarg(tFile)); + i18n("An error occurred when loading the board layout %1\n" + "KMahjongg will now terminate.").arg(tFile)); kapp->quit(); } setDisplayedWidth(); @@ -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) @@ -111,7 +111,7 @@ void BoardWidget::getFileOrDefault(TQString filename, TQString type, TQString &r if (res.isEmpty()) { KMessageBox::error(this, i18n("KMahjongg could not locate the file: %1\n" "or the default file of type: %2\n" - "KMahjongg will now terminate").tqarg(filename).tqarg(type) ); + "KMahjongg will now terminate").arg(filename).arg(type) ); kapp->quit(); } } @@ -264,7 +264,7 @@ void BoardWidget::paintEvent( TQPaintEvent* pa ) return; } - // if the tqrepaint is because of a window redraw after a move + // if the repaint is because of a window redraw after a move // or a menu roll up, then just blit in the last rendered image if (!updateBackBuffer) { bitBlt(this, xx,pa->rect().top(), @@ -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); @@ -1804,7 +1804,7 @@ bool BoardWidget::loadBackground( if( ! theBackground.load( pszFileName, requiredWidth(), requiredHeight()) ) { if( bShowError ) - KMessageBox::sorry(this, i18n("Failed to load image:\n%1").tqarg(pszFileName) ); + KMessageBox::sorry(this, i18n("Failed to load image:\n%1").arg(pszFileName) ); return( false ); } Prefs::setBackground(pszFileName); @@ -2010,7 +2010,7 @@ void BoardWidget::shuffle() { // force a redraw updateBackBuffer=true; - tqrepaint(false); + repaint(false); // I consider this s very bad cheat so, I punish the user |