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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 43 insertions, 43 deletions

diff --git a/kspell2/ui/configui.ui b/kspell2/ui/configui.ui
index 9ab8f8e62..bf645b9c9 100644
--- a/kspell2/ui/configui.ui
+++ b/kspell2/ui/configui.ui
@@ -6,7 +6,7 @@
     <property name="name">
         <cstring>KSpell2ConfigUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -105,7 +105,7 @@
     <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>keditlistbox.h</includehint>
diff --git a/kspell2/ui/configwidget.cpp b/kspell2/ui/configwidget.cpp
index 65db6dd9d..6d98955ae 100644
--- a/kspell2/ui/configwidget.cpp
+++ b/kspell2/ui/configwidget.cpp
@@ -56,7 +56,7 @@ void ConfigWidget::init( Broker *broker )
     d = new Private;
     d->broker = broker;
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0, "KSpell2ConfigUILayout");
+    TQVBoxLayout *layout = new TQVBoxLayout( this, 0, 0, "KSpell2ConfigUILayout");
     d->ui = new KSpell2ConfigUI( this );
 
     TQStringList langs = d->broker->languages();
@@ -73,7 +73,7 @@ void ConfigWidget::init( Broker *broker )
     d->ui->m_bgSpellCB->hide();//hidden by default
     connect( d->ui->m_ignoreListBox, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) );
 
-    tqlayout->addWidget( d->ui );
+    layout->addWidget( d->ui );
 }
 
 void KSpell2::ConfigWidget::save()
diff --git a/kspell2/ui/dialog.cpp b/kspell2/ui/dialog.cpp
index 18641a986..93b81fd94 100644
--- a/kspell2/ui/dialog.cpp
+++ b/kspell2/ui/dialog.cpp
@@ -53,7 +53,7 @@ public:
     BackgroundChecker *checker;
 
     Word   currentWord;
-    TQMap<TQString, TQString> tqreplaceAllMap;
+    TQMap<TQString, TQString> replaceAllMap;
 };
 
 Dialog::Dialog( BackgroundChecker *checker,
@@ -81,9 +81,9 @@ void Dialog::initConnections()
 {
     connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotAddWord()) );
-    connect( d->ui->m_tqreplaceBtn, TQT_SIGNAL(clicked()),
+    connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotReplaceWord()) );
-    connect( d->ui->m_tqreplaceAllBtn, TQT_SIGNAL(clicked()),
+    connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotReplaceAll()) );
     connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotSkip()) );
@@ -105,7 +105,7 @@ void Dialog::initConnections()
              TQT_SLOT( slotReplaceWord() ) );
     connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotFinished()) );
     connect( this, TQT_SIGNAL(cancelClicked()),this, TQT_SLOT(slotCancel()) );
-    connect( d->ui->m_tqreplacement, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReplaceWord()) );
+    connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReplaceWord()) );
     connect( d->ui->m_autoCorrect, TQT_SIGNAL(clicked()),
              TQT_SLOT(slotAutocorrect()) );
     // button use by kword/kpresenter
@@ -139,7 +139,7 @@ void Dialog::activeAutoCorrect( bool _active )
 void Dialog::slotAutocorrect()
 {
     kdDebug()<<"void Dialog::slotAutocorrect()\n";
-    emit autoCorrect(d->currentWord.word, d->ui->m_tqreplacement->text() );
+    emit autoCorrect(d->currentWord.word, d->ui->m_replacement->text() );
     slotReplaceWord();
 }
 
@@ -185,7 +185,7 @@ void Dialog::updateDialog( const TQString& word )
     d->ui->m_unknownWord->setText( word );
     d->ui->m_contextLabel->setText( d->checker->filter()->context() );
     TQStringList suggs = d->checker->suggest( word );
-    d->ui->m_tqreplacement->setText( suggs.first() );
+    d->ui->m_replacement->setText( suggs.first() );
     fillSuggestions( suggs );
 }
 
@@ -206,16 +206,16 @@ void Dialog::slotAddWord()
 
 void Dialog::slotReplaceWord()
 {
-    emit tqreplace( d->currentWord.word, d->currentWord.start,
-                  d->ui->m_tqreplacement->text() );
-    d->checker->filter()->tqreplace( d->currentWord, d->ui->m_tqreplacement->text() );
+    emit replace( d->currentWord.word, d->currentWord.start,
+                  d->ui->m_replacement->text() );
+    d->checker->filter()->replace( d->currentWord, d->ui->m_replacement->text() );
     d->checker->continueChecking();
 }
 
 void Dialog::slotReplaceAll()
 {
-    d->tqreplaceAllMap.insert( d->currentWord.word,
-                             d->ui->m_tqreplacement->text() );
+    d->replaceAllMap.insert( d->currentWord.word,
+                             d->ui->m_replacement->text() );
     slotReplaceWord();
 }
 
@@ -227,13 +227,13 @@ void Dialog::slotSkip()
 void Dialog::slotSkipAll()
 {
     //### do we want that or should we have a d->ignoreAll list?
-    d->checker->broker()->settings()->addWordToIgnore( d->ui->m_tqreplacement->text() );
+    d->checker->broker()->settings()->addWordToIgnore( d->ui->m_replacement->text() );
     d->checker->continueChecking();
 }
 
 void Dialog::slotSuggest()
 {
-    TQStringList suggs = d->checker->suggest( d->ui->m_tqreplacement->text() );
+    TQStringList suggs = d->checker->suggest( d->ui->m_replacement->text() );
     fillSuggestions( suggs );
 }
 
@@ -245,7 +245,7 @@ void Dialog::slotChangeLanguage( const TQString& lang )
 
 void Dialog::slotSelectionChanged( TQListViewItem *item )
 {
-    d->ui->m_tqreplacement->setText( item->text( 0 ) );
+    d->ui->m_replacement->setText( item->text( 0 ) );
 }
 
 void Dialog::fillSuggestions( const TQStringList& suggs )
@@ -261,8 +261,8 @@ void Dialog::slotMisspelling(const TQString& word, int start )
 {
     kdDebug()<<"Dialog misspelling!!"<<endl;
     d->currentWord = Word( word, start );
-    if ( d->tqreplaceAllMap.tqcontains( word ) ) {
-        d->ui->m_tqreplacement->setText( d->tqreplaceAllMap[ word ] );
+    if ( d->replaceAllMap.contains( word ) ) {
+        d->ui->m_replacement->setText( d->replaceAllMap[ word ] );
         slotReplaceWord();
     } else {
         updateDialog( word );
diff --git a/kspell2/ui/dialog.h b/kspell2/ui/dialog.h
index cee715b48..1da714c7c 100644
--- a/kspell2/ui/dialog.h
+++ b/kspell2/ui/dialog.h
@@ -49,12 +49,12 @@ namespace KSpell2
     signals:
         void done( const TQString& newBuffer );
         void misspelling( const TQString& word, int start );
-        void tqreplace( const TQString& oldWord, int start,
+        void replace( const TQString& oldWord, int start,
                       const TQString& newWord );
 
         void stop();
         void cancel();
-        void autoCorrect( const TQString & currentWord, const TQString & tqreplaceWord );
+        void autoCorrect( const TQString & currentWord, const TQString & replaceWord );
     private slots:
         void slotMisspelling(const TQString& word, int start );
         void slotDone();
diff --git a/kspell2/ui/highlighter.cpp b/kspell2/ui/highlighter.cpp
index a3c33d7ae..2d185462d 100644
--- a/kspell2/ui/highlighter.cpp
+++ b/kspell2/ui/highlighter.cpp
@@ -110,7 +110,7 @@ TQString Highlighter::currentLanguage() const
 
 void Highlighter::setCurrentLanguage( const TQString& lang )
 {
-    if ( !d->dictCache.tqfind( lang ) ) {
+    if ( !d->dictCache.find( lang ) ) {
         Dictionary *dict = d->broker->dictionary( lang );
         if ( dict ) {
             d->dictCache.insert( lang, dict );
diff --git a/kspell2/ui/kspell2ui.ui b/kspell2/ui/kspell2ui.ui
index 1822ef4b9..b8870f2f5 100644
--- a/kspell2/ui/kspell2ui.ui
+++ b/kspell2/ui/kspell2ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KSpell2UI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>430</width>
             <height>300</height>
@@ -40,7 +40,7 @@
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;&lt;p&gt;This word was considered to be an "unknown word" because it does not match any entry in the dictionary currently in use. It may also be a word in a foreign language.&lt;/p&gt;
 &lt;p&gt;If the word is not misspelled, you may add it to the dictionary by clicking &lt;b&gt;Add to Dictionary&lt;/b&gt;. If you don't want to add the unknown word to the dictionary, but you want to leave it unchanged, click &lt;b&gt;Ignore&lt;/b&gt; or &lt;b&gt;Ignore All&lt;/b&gt;.&lt;/p&gt;
-&lt;p&gt;However, if the word is misspelled, you can try to tqfind the correct tqreplacement in the list below. If you cannot tqfind a tqreplacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
+&lt;p&gt;However, if the word is misspelled, you can try to find the correct replacement in the list below. If you cannot find a replacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -57,7 +57,7 @@
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;&lt;p&gt;This word was considered to be an "unknown word" because it does not match any entry in the dictionary currently in use. It may also be a word in a foreign language.&lt;/p&gt;
 &lt;p&gt;If the word is not misspelled, you may add it to the dictionary by clicking &lt;b&gt;Add to Dictionary&lt;/b&gt;. If you don't want to add the unknown word to the dictionary, but you want to leave it unchanged, click &lt;b&gt;Ignore&lt;/b&gt; or &lt;b&gt;Ignore All&lt;/b&gt;.&lt;/p&gt;
-&lt;p&gt;However, if the word is misspelled, you can try to tqfind the correct tqreplacement in the list below. If you cannot tqfind a tqreplacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
+&lt;p&gt;However, if the word is misspelled, you can try to find the correct replacement in the list below. If you cannot find a replacement there, you may type it in the text box below, and click &lt;b&gt;Replace&lt;/b&gt; or &lt;b&gt;Replace All&lt;/b&gt;.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -87,7 +87,7 @@
             <property name="text">
                 <string>... the &lt;b&gt;misspelled&lt;/b&gt; word shown in context ...</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property name="toolTip" stdset="0">
@@ -95,7 +95,7 @@
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-&lt;p&gt;Here you can see a text excerpt showing the unknown word in its context. If this information is not sufficient to choose the best tqreplacement for the unknown word, you can click on the document you are proofing, read a larger part of the text and then return here to continue proofing.&lt;/p&gt;
+&lt;p&gt;Here you can see a text excerpt showing the unknown word in its context. If this information is not sufficient to choose the best replacement for the unknown word, you can click on the document you are proofing, read a larger part of the text and then return here to continue proofing.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
         </widget>
@@ -123,7 +123,7 @@ Click here if you consider that the unknown word is not misspelled and you want
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>74</width>
                     <height>20</height>
@@ -153,7 +153,7 @@ Click here if you consider that the unknown word is not misspelled and you want
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
-&lt;p&gt;If the unknown word is misspelled, you should check if the correction for it is available and if it is, click on it. If none of the words in this list is a good tqreplacement you may type the correct word in the edit box above.&lt;/p&gt;
+&lt;p&gt;If the unknown word is misspelled, you should check if the correction for it is available and if it is, click on it. If none of the words in this list is a good replacement you may type the correct word in the edit box above.&lt;/p&gt;
 &lt;p&gt;To correct this word click &lt;b&gt;Replace&lt;/b&gt; if you want to correct only this occurrence or &lt;b&gt;Replace All&lt;/b&gt; if you want to correct all occurrences.&lt;/p&gt;
 &lt;/qt&gt;</string>
             </property>
@@ -166,7 +166,7 @@ Click here if you consider that the unknown word is not misspelled and you want
                 <string>Replace &amp;with:</string>
             </property>
             <property name="buddy" stdset="0">
-                <cstring>m_tqreplacement</cstring>
+                <cstring>m_replacement</cstring>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
@@ -177,7 +177,7 @@ Click here if you consider that the unknown word is not misspelled and you want
         </widget>
         <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>m_tqreplacement</cstring>
+                <cstring>m_replacement</cstring>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>&lt;qt&gt;
@@ -206,7 +206,7 @@ Click here if you consider that the unknown word is not misspelled and you want
         </widget>
         <widget class="QLayoutWidget" row="2" column="5" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -222,27 +222,27 @@ Click here if you consider that the unknown word is not misspelled and you want
                 </widget>
                 <widget class="QPushButton">
                     <property name="name">
-                        <cstring>m_tqreplaceBtn</cstring>
+                        <cstring>m_replaceBtn</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Replace</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>&lt;qt&gt;
-&lt;p&gt;Click here to tqreplace this occurrence of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
+&lt;p&gt;Click here to replace this occurrence of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
                 <widget class="QPushButton">
                     <property name="name">
-                        <cstring>m_tqreplaceAllBtn</cstring>
+                        <cstring>m_replaceAllBtn</cstring>
                     </property>
                     <property name="text">
                         <string>R&amp;eplace All</string>
                     </property>
                     <property name="whatsThis" stdset="0">
                         <string>&lt;qt&gt;
-&lt;p&gt;Click here to tqreplace all occurrences of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
+&lt;p&gt;Click here to replace all occurrences of the unknown text with the text in the edit box above (to the left).&lt;/p&gt;
 &lt;/qt&gt;</string>
                     </property>
                 </widget>
@@ -298,7 +298,7 @@ Click here if you consider that the unknown word is not misspelled and you want
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -311,14 +311,14 @@ Click here if you consider that the unknown word is not misspelled and you want
 </widget>
 <tabstops>
     <tabstop>m_addBtn</tabstop>
-    <tabstop>m_tqreplacement</tabstop>
+    <tabstop>m_replacement</tabstop>
     <tabstop>m_suggestBtn</tabstop>
-    <tabstop>m_tqreplaceBtn</tabstop>
-    <tabstop>m_tqreplaceAllBtn</tabstop>
+    <tabstop>m_replaceBtn</tabstop>
+    <tabstop>m_replaceAllBtn</tabstop>
     <tabstop>m_skipBtn</tabstop>
     <tabstop>m_skipAllBtn</tabstop>
     <tabstop>m_suggestions</tabstop>
     <tabstop>m_language</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>