diff options
Diffstat (limited to 'kwin4/kwin4/kspritecache.cpp')
-rw-r--r-- | kwin4/kwin4/kspritecache.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/kwin4/kwin4/kspritecache.cpp b/kwin4/kwin4/kspritecache.cpp index c49332f7..bd55c418 100644 --- a/kwin4/kwin4/kspritecache.cpp +++ b/kwin4/kwin4/kspritecache.cpp @@ -27,8 +27,8 @@ // KSprite #include <math.h> -KSpriteCache::KSpriteCache(TQString grafixdir, TQObject* tqparent,const char * name) - : TQObject(tqparent,name) +KSpriteCache::KSpriteCache(TQString grafixdir, TQObject* parent,const char * name) + : TQObject(parent,name) { kdDebug(11002) << "KSpriteCache:: grafixdir=" << grafixdir << endl; mConfig=0; @@ -155,7 +155,7 @@ TQCanvasItem *KSpriteCache::getItem(TQString name,int no) return item; } -TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString tqmask,TQString dir) +TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString mask,TQString dir) { TQPixmap *newP=new TQPixmap; bool result1=false; @@ -165,21 +165,21 @@ TQPixmap * KSpriteCache::loadPixmap(TQString file,TQString tqmask,TQString dir) { result1=newP->load(dir+file); } - if (result1 && !tqmask.isNull()) + if (result1 && !mask.isNull()) { - TQBitmap bittqmask; - if (tqmask==TQString("auto")) // self tqmask..slow but quick to create + TQBitmap bitmask; + if (mask==TQString("auto")) // self mask..slow but quick to create { newP->setMask( newP->createHeuristicMask() ); result2=true; } else { - result2=bittqmask.load(dir+tqmask); - if (result2) newP->setMask(bittqmask); + result2=bitmask.load(dir+mask); + if (result2) newP->setMask(bitmask); } } - //kdDebug(11002) << "KSpriteCache::loadPixmap: file="<<file<<" tqmask="<<tqmask<<" result1="<<result1<<" result2="<<result2<<endl; + //kdDebug(11002) << "KSpriteCache::loadPixmap: file="<<file<<" mask="<<mask<<" result1="<<result1<<" result2="<<result2<<endl; return newP; } @@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na //kdDebug(11002) << " Reading " << number << " frames " << endl; TQString pixfile=config->readPathEntry(name+"file"); - TQString maskfile=config->readPathEntry(name+"tqmask"); + TQString maskfile=config->readPathEntry(name+"mask"); // Load a given set of images or replace a %d by a sequence if there are // less image names than number given @@ -230,12 +230,12 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(KConfig *config,TQString na // Read images for (unsigned int i=0;i<number;i++) { - TQString tmpfile,tmptqmask; + TQString tmpfile,tmpmask; tmpfile.sprintf(pixfile.latin1(),i); - tmptqmask.sprintf(maskfile.latin1(),i); + tmpmask.sprintf(maskfile.latin1(),i); - pixmap=loadPixmap(tmpfile,tmptqmask); - if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with tqmask " << tmptqmask << endl; + pixmap=loadPixmap(tmpfile,tmpmask); + if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with mask " << tmpmask << endl; else { applyFilter(pixmap,config,name); @@ -255,7 +255,7 @@ 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="<<maskfile<<endl; + //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<maskfile<<endl; pixmap=loadPixmap(pixfile,maskfile); for (unsigned int j=0;j<(unsigned int)number;j++) |