diff options
Diffstat (limited to 'kspaceduel')
| -rw-r--r-- | kspaceduel/general.ui | 2 | ||||
| -rw-r--r-- | kspaceduel/mainview.cpp | 8 | ||||
| -rw-r--r-- | kspaceduel/mainview.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kspaceduel/general.ui b/kspaceduel/general.ui index 71b74f1f..05d5ba83 100644 --- a/kspaceduel/general.ui +++ b/kspaceduel/general.ui @@ -333,5 +333,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index ea17594d..8204ffd0 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -1002,12 +1002,12 @@ void MyMainView::closeSettings(){ } TQCanvasPixmapArray* MyMainView::loadOldPixmapSequence(const TQString& datapattern, - const TQString& tqmaskpattern, int framecount) + const TQString& maskpattern, int framecount) { int image; TQPtrList<TQPixmap> pixmaplist; TQPtrList<TQPoint> pointlist; - TQString dataname, tqmaskname; + TQString dataname, maskname; TQPixmap *pix; TQBitmap *bitmap; int hotx=0, hoty=0; @@ -1017,7 +1017,7 @@ TQCanvasPixmapArray* MyMainView::loadOldPixmapSequence(const TQString& datapatte { // #### Why is this a TQString?? dataname.sprintf( datapattern.ascii(), image ); - tqmaskname.sprintf( tqmaskpattern.ascii(), image ); + maskname.sprintf( maskpattern.ascii(), image ); TQFile file(dataname); if( file.open( IO_ReadOnly ) ) @@ -1039,7 +1039,7 @@ TQCanvasPixmapArray* MyMainView::loadOldPixmapSequence(const TQString& datapatte } pix = new TQPixmap( dataname ); - bitmap = new TQBitmap( tqmaskname ); + bitmap = new TQBitmap( maskname ); pix->setMask( *bitmap ); pixmaplist.append( pix ); diff --git a/kspaceduel/mainview.h b/kspaceduel/mainview.h index ab4a4fcc..ec182408 100644 --- a/kspaceduel/mainview.h +++ b/kspaceduel/mainview.h @@ -52,7 +52,7 @@ protected: virtual void keyReleaseEvent(TQKeyEvent *event); SConfig modifyConfig(SConfig conf); TQCanvasPixmapArray* loadOldPixmapSequence(const TQString& datapattern, - const TQString& tqmaskpattern, int framecount=1); + const TQString& maskpattern, int framecount=1); void moveShips(); void moveBullets(); void moveMines(); |