diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:18:52 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:18:52 +0000 |
commit | 648ba4a456d3aad2825193ff8f3bd52a875783b5 (patch) | |
tree | 0b50d2253a0c85238cc4dcba5c4f949de3f0eb15 /libkdeedu/kdeeduui/kdeeduglossary.cpp | |
parent | 98a12d05a48814bec3870b9a6d5865475cfa1c95 (diff) | |
download | tdeedu-648ba4a456d3aad2825193ff8f3bd52a875783b5.tar.gz tdeedu-648ba4a456d3aad2825193ff8f3bd52a875783b5.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1212481 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdeedu/kdeeduui/kdeeduglossary.cpp')
-rw-r--r-- | libkdeedu/kdeeduui/kdeeduglossary.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libkdeedu/kdeeduui/kdeeduglossary.cpp b/libkdeedu/kdeeduui/kdeeduglossary.cpp index 2b6dab8f..1b0902b1 100644 --- a/libkdeedu/kdeeduui/kdeeduglossary.cpp +++ b/libkdeedu/kdeeduui/kdeeduglossary.cpp @@ -41,25 +41,25 @@ Glossary::~Glossary() bool Glossary::loadLayout( TQDomDocument &Document, const KURL& url ) { - TQFile tqlayoutFile( url.path() ); + TQFile layoutFile( url.path() ); - if (!tqlayoutFile.exists()) + if (!layoutFile.exists()) { - kdDebug() << "no such file: " << tqlayoutFile.name() << endl; + kdDebug() << "no such file: " << layoutFile.name() << endl; return false; } - if (!tqlayoutFile.open(IO_ReadOnly)) + if (!layoutFile.open(IO_ReadOnly)) return false; ///Check if document is well-formed - if (!Document.setContent(&tqlayoutFile)) + if (!Document.setContent(&layoutFile)) { kdDebug() << "wrong xml" << endl; - tqlayoutFile.close(); + layoutFile.close(); return false; } - tqlayoutFile.close(); + layoutFile.close(); return true; } @@ -100,8 +100,8 @@ void Glossary::fixImagePath() for ( ; it != itEnd ; ++it ) { - ( *it )->setDesc( ( *it )->desc().tqreplace("[img]", firstpart ) ); - ( *it )->setDesc( ( *it )->desc().tqreplace("[/img]", "\" />" ) ); + ( *it )->setDesc( ( *it )->desc().replace("[img]", firstpart ) ); + ( *it )->setDesc( ( *it )->desc().replace("[/img]", "\" />" ) ); } } @@ -136,15 +136,15 @@ TQValueList<GlossaryItem*> Glossary::readItems( TQDomDocument &itemDocument ) item->setName( i18n( nameNode.toElement( ).text().utf8() ) ); - item->setDesc( desc.tqreplace("[b]", "<b>" ) ); - item->setDesc( item->desc().tqreplace("[/b]", "</b>" ) ); - item->setDesc( item->desc().tqreplace("[i]", "<i>" ) ); - item->setDesc( item->desc().tqreplace("[/i]", "</i>" ) ); - item->setDesc( item->desc().tqreplace("[sub]", "<sub>" ) ); - item->setDesc( item->desc().tqreplace("[/sub]", "</sub>" ) ); - item->setDesc( item->desc().tqreplace("[sup]", "<sup>" ) ); - item->setDesc( item->desc().tqreplace("[/sup]", "</sup>" ) ); - item->setDesc( item->desc().tqreplace("[br]", "<br />" ) ); + item->setDesc( desc.replace("[b]", "<b>" ) ); + item->setDesc( item->desc().replace("[/b]", "</b>" ) ); + item->setDesc( item->desc().replace("[i]", "<i>" ) ); + item->setDesc( item->desc().replace("[/i]", "</i>" ) ); + item->setDesc( item->desc().replace("[sub]", "<sub>" ) ); + item->setDesc( item->desc().replace("[/sub]", "</sub>" ) ); + item->setDesc( item->desc().replace("[sup]", "<sup>" ) ); + item->setDesc( item->desc().replace("[/sup]", "</sup>" ) ); + item->setDesc( item->desc().replace("[br]", "<br />" ) ); refNodeList = refNode.elementsByTagName( "refitem" ); for ( uint it = 0; it < refNodeList.count(); it++ ) |