diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 04766b207afba7961d4d802313e426f5a2fbef63 (patch) | |
tree | c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /filters/kpresenter | |
parent | b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff) | |
download | koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'filters/kpresenter')
19 files changed, 69 insertions, 69 deletions
diff --git a/filters/kpresenter/bmp/bmpexport.h b/filters/kpresenter/bmp/bmpexport.h index f266f636..7d8d3ba1 100644 --- a/filters/kpresenter/bmp/bmpexport.h +++ b/filters/kpresenter/bmp/bmpexport.h @@ -28,7 +28,7 @@ class BmpExport : public ImageExport TQ_OBJECT public: - BmpExport(KoFilter *tqparent, const char *name, const TQStringList&); + BmpExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~BmpExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/jpeg/jpegexport.h b/filters/kpresenter/jpeg/jpegexport.h index 518615df..18cb8dc8 100644 --- a/filters/kpresenter/jpeg/jpegexport.h +++ b/filters/kpresenter/jpeg/jpegexport.h @@ -28,7 +28,7 @@ class JpegExport : public ImageExport TQ_OBJECT public: - JpegExport(KoFilter *tqparent, const char *name, const TQStringList&); + JpegExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~JpegExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/kword/kprkword.h b/filters/kpresenter/kword/kprkword.h index 0ba4efa5..f4141a09 100644 --- a/filters/kpresenter/kword/kprkword.h +++ b/filters/kpresenter/kword/kprkword.h @@ -29,7 +29,7 @@ class KprKword : public KoFilter { TQ_OBJECT public: - KprKword(KoFilter *tqparent, const char *name, const TQStringList&); + KprKword(KoFilter *parent, const char *name, const TQStringList&); virtual ~KprKword() {} diff --git a/filters/kpresenter/libimageexport/imageexport.h b/filters/kpresenter/libimageexport/imageexport.h index 641a9010..23f45e28 100644 --- a/filters/kpresenter/libimageexport/imageexport.h +++ b/filters/kpresenter/libimageexport/imageexport.h @@ -29,7 +29,7 @@ class ImageExport : public KoFilter TQ_OBJECT public: - ImageExport(KoFilter *tqparent, const char *name, const TQStringList&); + ImageExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~ImageExport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kpresenter/magicpoint/mgp2kpr.py b/filters/kpresenter/magicpoint/mgp2kpr.py index e5716989..e2e5b50a 100755 --- a/filters/kpresenter/magicpoint/mgp2kpr.py +++ b/filters/kpresenter/magicpoint/mgp2kpr.py @@ -176,7 +176,7 @@ class MgpImporter: self.tqalignment="1" #left #print self.tqalignment - def __setBackground(self,tqparent): + def __setBackground(self,parent): pageElem=self.document.createElement("PAGE") elem=self.document.createElement("BACKTYPE") #color @@ -200,9 +200,9 @@ class MgpImporter: elem.setAttribute("color", self.color2) pageElem.appendChild(elem) - tqparent.appendChild(pageElem) + parent.appendChild(pageElem) - def __handlePage(self,tqparent,bgParent): + def __handlePage(self,parent,bgParent): if (self.pageCount!=-1): self.__setBackground(bgParent) #set the background for this page @@ -224,7 +224,7 @@ class MgpImporter: ### para comes here objElem.appendChild(self.textElem) - tqparent.appendChild(objElem) + parent.appendChild(objElem) self.useDefaults=1 self.__reset() @@ -314,7 +314,7 @@ class MgpImporter: length=PAGE_WIDTH - def __setPaper(self,tqparent): + def __setPaper(self,parent): paperElem=self.document.createElement("PAPER") paperElem.setAttribute("ptWidth", str(PAGE_WIDTH)) paperElem.setAttribute("ptHeight", str(Y_OFFSET)) @@ -330,7 +330,7 @@ class MgpImporter: paperElem.appendChild(borderElem) - tqparent.appendChild(paperElem) + parent.appendChild(paperElem) def convert(self, fileIn, fileOut=None): """Parses the Magicpoint document and returns a KPresenter XML document. diff --git a/filters/kpresenter/mng/mngexport.h b/filters/kpresenter/mng/mngexport.h index 6e5f9d4a..d19e6284 100644 --- a/filters/kpresenter/mng/mngexport.h +++ b/filters/kpresenter/mng/mngexport.h @@ -28,7 +28,7 @@ class MngExport : public ImageExport TQ_OBJECT public: - MngExport(KoFilter *tqparent, const char *name, const TQStringList&); + MngExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~MngExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/ooimpress/ooimpressexport.h b/filters/kpresenter/ooimpress/ooimpressexport.h index 3b1e7b79..ac369192 100644 --- a/filters/kpresenter/ooimpress/ooimpressexport.h +++ b/filters/kpresenter/ooimpress/ooimpressexport.h @@ -34,7 +34,7 @@ class OoImpressExport : public KoFilter Q_OBJECT TQ_OBJECT public: - OoImpressExport( KoFilter * tqparent, const char * name, const TQStringList & ); + OoImpressExport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressExport(); virtual KoFilter::ConversiontqStatus convert( const TQCString & from, diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc index cf853dea..1dab566d 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.cc +++ b/filters/kpresenter/ooimpress/ooimpressimport.cc @@ -1517,10 +1517,10 @@ TQDomElement OoImpressImport::parseTextBox( TQDomDocument& doc, const TQDomEleme return textObjectElement; } -void OoImpressImport::parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& tqparent ) +void OoImpressImport::parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& parent ) { TQDomElement t; - forEachElement( t, tqparent ) + forEachElement( t, parent ) { m_styleStack.save(); const TQString localName = t.localName(); @@ -1707,12 +1707,12 @@ TQDomElement OoImpressImport::parseParagraph( TQDomDocument& doc, const TQDomEle return p; } -void OoImpressImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent, +void OoImpressImport::parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent, TQDomElement& outputParagraph, uint& pos) { - // Parse every child node of the tqparent + // Parse every child node of the parent // Can't use forEachElement here since we also care about text nodes - for( TQDomNode node = tqparent.firstChild(); !node.isNull(); node = node.nextSibling() ) + for( TQDomNode node = parent.firstChild(); !node.isNull(); node = node.nextSibling() ) { TQDomElement ts = node.toElement(); TQString textData; @@ -2029,11 +2029,11 @@ void OoImpressImport::fillStyleStack( const TQDomElement& object, bool sticky ) void OoImpressImport::addStyles( const TQDomElement* style ) { kdDebug(30518)<<" addStyle :" << style->attributeNS( ooNS::style, "name", TQString() ) <<endl; - // this function is necessary as tqparent styles can have parents themself - if ( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) + // this function is necessary as parent styles can have parents themself + if ( style->hasAttributeNS( ooNS::style, "parent-style-name" ) ) { - //kdDebug(30518)<<"m_styles[style->attribute( style:tqparent-style-name )] :"<<m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )]<<endl; - addStyles( m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )] ); + //kdDebug(30518)<<"m_styles[style->attribute( style:parent-style-name )] :"<<m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )]<<endl; + addStyles( m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )] ); } //kdDebug(30518)<<" void OoImpressImport::addStyles( const TQDomElement* style ) :"<<style<<endl; m_styleStack.push( *style ); diff --git a/filters/kpresenter/ooimpress/ooimpressimport.h b/filters/kpresenter/ooimpress/ooimpressimport.h index 26d49420..596ca703 100644 --- a/filters/kpresenter/ooimpress/ooimpressimport.h +++ b/filters/kpresenter/ooimpress/ooimpressimport.h @@ -43,7 +43,7 @@ class OoImpressImport : public KoFilter Q_OBJECT TQ_OBJECT public: - OoImpressImport( KoFilter * tqparent, const char * name, const TQStringList & ); + OoImpressImport( KoFilter * parent, const char * name, const TQStringList & ); virtual ~OoImpressImport(); virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); @@ -91,7 +91,7 @@ private: void parseList( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& list ); void parseParagraphs( TQDomDocument& doc, TQDomElement& textObjectElement, const TQDomElement& textBox ); TQDomElement parseParagraph( TQDomDocument& doc, const TQDomElement& paragraph ); - void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& tqparent, + void parseSpanOrSimilar( TQDomDocument& doc, const TQDomElement& parent, TQDomElement& outputParagraph, uint& pos); bool parseSettings( TQDomDocument &doc, TQDomElement &helpLineElement, TQDomElement &attributeElement ); void parseHelpLine( TQDomDocument &doc,TQDomElement &helpLineElement, const TQString &text ); diff --git a/filters/kpresenter/ooimpress/stylefactory.cc b/filters/kpresenter/ooimpress/stylefactory.cc index 18ce339b..a25ba52a 100644 --- a/filters/kpresenter/ooimpress/stylefactory.cc +++ b/filters/kpresenter/ooimpress/stylefactory.cc @@ -1208,7 +1208,7 @@ void GraphicStyle::toXML( TQDomDocument & doc, TQDomElement & e ) const style.setAttribute( "style:name", m_name ); style.setAttribute( "style:family", "graphics" ); if ( m_name != "standard" ) - style.setAttribute( "style:tqparent-style-name", "standard" ); + style.setAttribute( "style:parent-style-name", "standard" ); TQDomElement properties = doc.createElement( "style:properties" ); if ( !m_stroke.isNull() ) diff --git a/filters/kpresenter/png/pngexport.h b/filters/kpresenter/png/pngexport.h index 692aa76a..e86ac95f 100644 --- a/filters/kpresenter/png/pngexport.h +++ b/filters/kpresenter/png/pngexport.h @@ -28,7 +28,7 @@ class PngExport : public ImageExport TQ_OBJECT public: - PngExport(KoFilter *tqparent, const char *name, const TQStringList&); + PngExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~PngExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cc index 6afdc659..4f41aac7 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.cc +++ b/filters/kpresenter/powerpoint/import/powerpointimport.cc @@ -1455,7 +1455,7 @@ void PowerPointImport::processDrawingObjectForStyle( DrawObject* drawObject, KoX xmlWriter->startElement( "style:style" ); xmlWriter->addAttribute( "style:name", styleName ); xmlWriter->addAttribute( "style:family", "graphic" ); - xmlWriter->addAttribute( "style:tqparent-style-name", "standard" ); + xmlWriter->addAttribute( "style:parent-style-name", "standard" ); xmlWriter->startElement( "style:graphic-properties" ); /* diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.h b/filters/kpresenter/powerpoint/import/powerpointimport.h index 5c3a73bc..ca3e7365 100644 --- a/filters/kpresenter/powerpoint/import/powerpointimport.h +++ b/filters/kpresenter/powerpoint/import/powerpointimport.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - PowerPointImport ( TQObject *tqparent, const char* name, const TQStringList& ); + PowerPointImport ( TQObject *parent, const char* name, const TQStringList& ); virtual ~PowerPointImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/kpresenter/powerpoint/libppt/pole.cpp b/filters/kpresenter/powerpoint/libppt/pole.cpp index daab8ff9..b905539d 100644 --- a/filters/kpresenter/powerpoint/libppt/pole.cpp +++ b/filters/kpresenter/powerpoint/libppt/pole.cpp @@ -113,7 +113,7 @@ class DirTree DirEntry* entry( unsigned index ); DirEntry* entry( const std::string& name, bool create=false ); int indexOf( DirEntry* e ); - int tqparent( unsigned index ); + int parent( unsigned index ); std::string fullName( unsigned index ); std::vector<unsigned> tqchildren( unsigned index ); void load( unsigned char* buffer, unsigned len ); @@ -503,7 +503,7 @@ int DirTree::indexOf( DirEntry* e ) return -1; } -int DirTree::tqparent( unsigned index ) +int DirTree::parent( unsigned index ) { // brute-force, basically we iterate for each entries, find its tqchildren // and check if one of the tqchildren is 'index' @@ -525,7 +525,7 @@ std::string DirTree::fullName( unsigned index ) std::string result = entry( index )->name; result.insert( 0, "/" ); - int p = tqparent( index ); + int p = parent( index ); DirEntry * _entry = 0; while( p > 0 ) { @@ -593,7 +593,7 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) if( !create ) return (DirEntry*)0; // create a new entry - unsigned tqparent = index; + unsigned parent = index; entries.push_back( DirEntry() ); index = entryCount()-1; DirEntry* e = entry( index ); @@ -604,8 +604,8 @@ DirEntry* DirTree::entry( const std::string& name, bool create ) e->start = 0; e->child = End; e->prev = End; - e->next = entry(tqparent)->child; - entry(tqparent)->child = index; + e->next = entry(parent)->child; + entry(parent)->child = index; } } @@ -1102,7 +1102,7 @@ StreamIO::StreamIO( StorageIO* s, DirEntry* e) updateCache(); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone StreamIO::~StreamIO() { delete[] cache_data; @@ -1248,8 +1248,8 @@ std::list<std::string> Storage::entries( const std::string& path ) DirEntry* e = dt->entry( path, false ); if( e && e->dir ) { - unsigned tqparent = dt->indexOf( e ); - std::vector<unsigned> tqchildren = dt->tqchildren( tqparent ); + unsigned parent = dt->indexOf( e ); + std::vector<unsigned> tqchildren = dt->tqchildren( parent ); for( unsigned i = 0; i < tqchildren.size(); i++ ) result.push_back( dt->entry( tqchildren[i] )->name ); } @@ -1270,7 +1270,7 @@ Stream::Stream( Storage* storage, const std::string& name ) io = storage->io->streamIO( name ); } -// FIXME tell tqparent we're gone +// FIXME tell parent we're gone Stream::~Stream() { delete io; diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp index 04fb4a40..bf3fc51f 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp @@ -394,12 +394,12 @@ Record* Record::create( unsigned type ) return record; } -void Record::setParent( Record* tqparent ) +void Record::setParent( Record* parent ) { - record_parent = tqparent; + record_parent = parent; } -const Record* Record::tqparent() const +const Record* Record::parent() const { return record_parent; } @@ -3088,10 +3088,10 @@ void StyleTextPropAtom::setData( unsigned /*size*/, const unsigned char* data, u atomData.charCount = charCount; atomData.depth = readU16(data+k); k += 2; - unsigned tqmask = readU32(data+6); + unsigned mask = readU32(data+6); k += 4; - if ( tqmask & 0xF ) + if ( mask & 0xF ) { int bulletFlag = readU16(data+k); k += 2; @@ -3100,99 +3100,99 @@ void StyleTextPropAtom::setData( unsigned /*size*/, const unsigned char* data, u atomData.bulletHardColor = ( bulletFlag & 4 ) ? 1 : 0; } - if ( tqmask & 0x0080 ) + if ( mask & 0x0080 ) { atomData.bulletChar = readU16(data+k); k += 2; } - if ( tqmask & 0x0010 ) + if ( mask & 0x0010 ) { atomData.bulletFont = readU16(data+k); k += 2; } - if ( tqmask & 0x0040 ) + if ( mask & 0x0040 ) { atomData.bulletHeight = readU16(data+k); k += 2; } - if ( tqmask & 0x0020 ) + if ( mask & 0x0020 ) { atomData.bulletColor = readU32(data+k); k += 4; } - if ( tqmask & 0x0F00 ) + if ( mask & 0x0F00 ) { - if ( tqmask & 0x800 ) + if ( mask & 0x800 ) { unsigned dummy = readU16(data+k); atomData.align = ( dummy & 3 ); k += 2; } - if ( tqmask & 0x400 ) + if ( mask & 0x400 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } - if ( tqmask & 0x200 ) + if ( mask & 0x200 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } - if ( tqmask & 0x100 ) + if ( mask & 0x100 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } } - if ( tqmask & 0x1000 ) + if ( mask & 0x1000 ) { atomData.lineFeed = readU16(data+k); k += 2; } - if ( tqmask & 0x2000 ) + if ( mask & 0x2000 ) { atomData.upperDist = readU16(data+k); k += 2; } - if ( tqmask & 0x4000 ) + if ( mask & 0x4000 ) { atomData.lowerDist = readU16(data+k); k += 2; } - if ( tqmask & 0x8000 ) + if ( mask & 0x8000 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } - if ( tqmask & 0x10000 ) + if ( mask & 0x10000 ) { /*unsigned dummy =*/ readU16(data+k); k += 2; } - if ( tqmask & 0xe0000 ) + if ( mask & 0xe0000 ) { unsigned dummy = readU16(data+k); - if ( tqmask & 0x20000 ) + if ( mask & 0x20000 ) atomData.asianLB1 = dummy & 1; - if ( tqmask & 0x40000 ) + if ( mask & 0x40000 ) atomData.asianLB2 = (dummy >> 1) & 1; - if ( tqmask & 0x80000 ) + if ( mask & 0x80000 ) atomData.asianLB3 = (dummy >> 2) & 1; k += 2; } - if ( tqmask & 0x200000 ) + if ( mask & 0x200000 ) { atomData.biDi = readU16(data+k); k += 2; @@ -5453,7 +5453,7 @@ int PPTReader::indexPersistence( unsigned long ofs ) return 0; } -void PPTReader::loadRecord( Record* tqparent ) +void PPTReader::loadRecord( Record* parent ) { // FIXME unsigned char buffer[65536]; @@ -5472,7 +5472,7 @@ void PPTReader::loadRecord( Record* tqparent ) Record* record = Record::create( type ); if( record ) { - record->setParent( tqparent ); + record->setParent( parent ); record->setPosition( pos ); record->setInstance( instance ); diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h index 66143a52..6eec1564 100644 --- a/filters/kpresenter/powerpoint/libppt/powerpoint.h +++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h @@ -63,9 +63,9 @@ public: */ virtual bool isContainer() const { return false; } - void setParent( Record* tqparent ); + void setParent( Record* parent ); - const Record* tqparent() const; + const Record* parent() const; /** Sets the data for this record. @@ -2497,7 +2497,7 @@ protected: void loadDocument(); int indexPersistence( unsigned long offset ); - void loadRecord( Record* tqparent ); + void loadRecord( Record* parent ); void handleRecord( Record* record, int type ); void handleContainer( Container* container, int type, unsigned size ); diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h index a11b20c2..eafdd792 100644 --- a/filters/kpresenter/svg/svgexport.h +++ b/filters/kpresenter/svg/svgexport.h @@ -29,7 +29,7 @@ class SvgExport : public KoFilter TQ_OBJECT public: - SvgExport(KoFilter *tqparent, const char *name, const TQStringList&); + SvgExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgExport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/kpresenter/xbm/xbmexport.h b/filters/kpresenter/xbm/xbmexport.h index 9079f950..cb64945f 100644 --- a/filters/kpresenter/xbm/xbmexport.h +++ b/filters/kpresenter/xbm/xbmexport.h @@ -28,7 +28,7 @@ class XbmExport : public ImageExport TQ_OBJECT public: - XbmExport(KoFilter *tqparent, const char *name, const TQStringList&); + XbmExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XbmExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); diff --git a/filters/kpresenter/xpm/xpmexport.h b/filters/kpresenter/xpm/xpmexport.h index 14b14b6c..f7a1c95c 100644 --- a/filters/kpresenter/xpm/xpmexport.h +++ b/filters/kpresenter/xpm/xpmexport.h @@ -28,7 +28,7 @@ class XpmExport : public ImageExport TQ_OBJECT public: - XpmExport(KoFilter *tqparent, const char *name, const TQStringList&); + XpmExport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XpmExport(); virtual bool saveImage( TQString fileName); virtual bool extraImageAttribute(); |