diff options
Diffstat (limited to 'kwin4')
| -rw-r--r-- | kwin4/kwin4/kspritecache.cpp | 8 | ||||
| -rw-r--r-- | kwin4/kwin4/kwin4doc.cpp | 2 | ||||
| -rw-r--r-- | kwin4/kwin4/settings.ui | 2 | ||||
| -rw-r--r-- | kwin4/kwin4/statistics.ui | 2 | ||||
| -rw-r--r-- | kwin4/kwin4/statuswidget.ui | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/kwin4/kwin4/kspritecache.cpp b/kwin4/kwin4/kspritecache.cpp index 342369c9..c49332f7 100644 --- a/kwin4/kwin4/kspritecache.cpp +++ b/kwin4/kwin4/kspritecache.cpp @@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na //kdDebug(11002) << " Reading " << number << " frames " << endl; TQString pixfile=config->readPathEntry(name+"file"); - TQString tqmaskfile=config->readPathEntry(name+"tqmask"); + TQString maskfile=config->readPathEntry(name+"tqmask"); // Load a given set of images or replace a %d by a sequence if there are // less image names than number given @@ -232,7 +232,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na { TQString tmpfile,tmptqmask; tmpfile.sprintf(pixfile.latin1(),i); - tmptqmask.sprintf(tqmaskfile.latin1(),i); + tmptqmask.sprintf(maskfile.latin1(),i); pixmap=loadPixmap(tmpfile,tmptqmask); if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with tqmask " << tmptqmask << endl; @@ -255,9 +255,9 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na double step; if (number>1) step=(100.0-finalscale)/100.0/(double)(number-1); else step=1.0; - //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " tqmask="<<tqmaskfile<<endl; + //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " tqmask="<<maskfile<<endl; - pixmap=loadPixmap(pixfile,tqmaskfile); + pixmap=loadPixmap(pixfile,maskfile); for (unsigned int j=0;j<(unsigned int)number;j++) { TQWMatrix matrix; diff --git a/kwin4/kwin4/kwin4doc.cpp b/kwin4/kwin4/kwin4doc.cpp index 73ea8520..a4c2c622 100644 --- a/kwin4/kwin4/kwin4doc.cpp +++ b/kwin4/kwin4/kwin4doc.cpp @@ -932,7 +932,7 @@ void Kwin4Doc::createIO(KPlayer *player,KGameIO::IOMode io) if (global_debug>1) kdDebug(12010) << "Creating KEYBOARD IO " << endl; // We want the player to work over keyboard KGameKeyIO *input; - input=new KGameKeyIO(pView->tqparentWidget()); + input=new KGameKeyIO(pView->parentWidget()); // Connect keys input to a function to process the actual input connect((KGameKeyIO *)input,TQT_SIGNAL(signalKeyEvent(KGameIO *,TQDataStream &,TQKeyEvent *,bool *)), pView,TQT_SLOT(slotKeyInput(KGameIO *,TQDataStream &,TQKeyEvent *,bool *))); diff --git a/kwin4/kwin4/settings.ui b/kwin4/kwin4/settings.ui index 1cb6f11d..c64677c6 100644 --- a/kwin4/kwin4/settings.ui +++ b/kwin4/kwin4/settings.ui @@ -244,5 +244,5 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwin4/kwin4/statistics.ui b/kwin4/kwin4/statistics.ui index 457d7dae..b02e8be6 100644 --- a/kwin4/kwin4/statistics.ui +++ b/kwin4/kwin4/statistics.ui @@ -245,5 +245,5 @@ <tabstop>pushButton2</tabstop> <tabstop>pushButton1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwin4/kwin4/statuswidget.ui b/kwin4/kwin4/statuswidget.ui index ee131828..41d6bef5 100644 --- a/kwin4/kwin4/statuswidget.ui +++ b/kwin4/kwin4/statuswidget.ui @@ -259,5 +259,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> |