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

3 files changed, 28 insertions, 28 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++ )
diff --git a/libkdeedu/kdeeduui/kdeeduglossary.h b/libkdeedu/kdeeduui/kdeeduglossary.h
index bc9113cc..44b0cf85 100644
--- a/libkdeedu/kdeeduui/kdeeduglossary.h
+++ b/libkdeedu/kdeeduui/kdeeduglossary.h
@@ -137,7 +137,7 @@ class Glossary
 		TQString m_backgroundpicture;
 
 		/**
-		 * tqreplaces the [img]-pseudocode with valid html. The path where
+		 * replaces the [img]-pseudocode with valid html. The path where
 		 * the pictures are stored will be used for pictures
 		 */
 		void fixImagePath();
@@ -148,7 +148,7 @@ class Glossary
 		TQString m_picturepath;
 		
 		/**
-		 * Load the tqlayout from an XML file.
+		 * Load the layout from an XML file.
 		 *
 		 * @param doc The TQDomDocument which will contain the read XML
 		 *            contents.
diff --git a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui
index da44ab8c..32fa6b68 100644
--- a/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui
+++ b/libkdeedu/kdeeduui/kedusimpleentrydlgForm.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Simple_entry_dialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>e_original</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>40</x>
                 <y>80</y>
@@ -32,7 +32,7 @@
         <property name="name">
             <cstring>e_translation</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>40</x>
                 <y>180</y>
@@ -45,7 +45,7 @@
         <property name="name">
             <cstring>PushButton1</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>50</x>
                 <y>360</y>
@@ -61,7 +61,7 @@
         <property name="name">
             <cstring>PushButton1_2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>460</x>
                 <y>360</y>
@@ -77,7 +77,7 @@
         <property name="name">
             <cstring>TextLabel1</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>40</x>
                 <y>50</y>
@@ -93,7 +93,7 @@
         <property name="name">
             <cstring>TextLabel1_2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>40</x>
                 <y>150</y>
@@ -106,5 +106,5 @@
         </property>
     </widget>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>