From e16d333ec2e8509fc665921ca106c25325bae9e0 Mon Sep 17 00:00:00 2001 From: kergoth Date: Sat, 09 Aug 2003 16:24:58 +0000 Subject: Merge from BRANCH_1_0 --- (limited to 'noncore/games/wordgame/wordgame.cpp') diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp index d3160f4..d46e824 100644 --- a/noncore/games/wordgame/wordgame.cpp +++ b/noncore/games/wordgame/wordgame.cpp @@ -290,7 +290,7 @@ bool WordGame::loadRules(const QString &name) QString title = name; title.truncate( title.length() - 6 ); - setCaption( title ); + //setCaption( title ); QString shapepixmap; ts >> shapepixmap; @@ -314,7 +314,7 @@ bool WordGame::loadRules(const QString &name) if ( re++ < 10 ) ts >> e; } - QImage shim = Resource::loadImage("wordgame/wordgame_shapes.xpm"); + QImage shim = Resource::loadImage("wordgame/wordgame_shapes"); shim = shim.smoothScale((re-1)*TileItem::smallWidth(),TileItem::smallHeight()); QPixmap bgshapes; bgshapes.convertFromImage(shim); -- cgit v0.9.0.2