Rename obsolete tq methods to standard names

6 files changed, 66 insertions, 66 deletions

diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 56a0dc8..43e4a18 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -687,7 +687,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
   rb = new TQRadioButton( i18n("Use an existing file:"), page );
   bgOrigin->insert( rb, 2 );
   glo->addMultiCellWidget( rb, 3, 3, 1, 2 );
-  int marg = rb->tqstyle().subRect( TQStyle::SR_RadioButtonIndicator, rb ).width();
+  int marg = rb->style().subRect( TQStyle::SR_RadioButtonIndicator, rb ).width();
   glo->addItem( new TQSpacerItem( marg, 1, TQSizePolicy::Fixed ), 4, 1 );
   urOrigin = new KURLRequester( page );
   glo->addWidget( urOrigin, 4, 2 );
diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui
index 19d0170..18a99c5 100644
--- a/kate/snippets/CWidgetSnippetsBase.ui
+++ b/kate/snippets/CWidgetSnippetsBase.ui
@@ -93,7 +93,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout24</cstring>
+                    <cstring>layout24</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -104,7 +104,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 8fcf398..3c92236 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -248,7 +248,7 @@ class KateTabBarExtension : public TQWidget
 
   private:
     KateTabBarButton* pCurrentTab;         ///< pointer to the current tab
-    TQBoxLayout* top;                       ///< tqlayout that contains all tabs
+    TQBoxLayout* top;                       ///< layout that contains all tabs
     Kate::MainWindow* m_win;               ///< pointer to the main window
     Kate::DocumentManager* m_docManager;   ///< pointer to the document manager
 //    TQPtrList <KateTabBarButton> m_tabs;    ///< list containing all tabs
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 4d10a26..11282d5 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -4451,7 +4451,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -4881,7 +4881,7 @@
 <attribute name="align" type="#IMPLIED" enumeration="yes" value="left right center" default=""/>
 <attribute name="role" type="#IMPLIED" value="CDATA" default=""/>
 </attlist>
-<element name="literaltqlayout">
+<element name="literallayout">
 <content-model-expanded>
   
 <or-group occurrence="*">
@@ -4989,7 +4989,7 @@
 </or-group>
 </content-model-expanded>
 </element>
-<attlist name="literaltqlayout">
+<attlist name="literallayout">
 <attribute name="lang" type="#IMPLIED" enumeration="yes" value="af az bg bo br bs ca cs cy da de el en en-GB en-US eo es et eu fa fi fo fr ga gl he hi hr hu id is it ja kn ko lt lv mi mk mt nl no nb nn nso oc pl pt pt-BR pt-PT ro ru si sk sl sr st sv ta te tg th tr uk vi x-wa xh zh zh-CN zh-TW zu" default=""/>
 <attribute name="width" type="#IMPLIED" value="CDATA" default=""/>
 <attribute name="format" type="" enumeration="notation" value="linespecific" default="linespecific"/>
@@ -5048,7 +5048,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5267,7 +5267,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5488,7 +5488,7 @@
   
 <sequence-group>
 <or-group occurrence="+">
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5549,7 +5549,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5668,7 +5668,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7472,7 +7472,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7665,7 +7665,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7779,7 +7779,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8025,7 +8025,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8228,7 +8228,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8754,7 +8754,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8900,7 +8900,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9601,7 +9601,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9673,7 +9673,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9754,7 +9754,7 @@
 <element-name name="titleabbrev" occurrence="?"/>
 </sequence-group>
 <or-group occurrence="+">
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10513,7 +10513,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10641,7 +10641,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10703,7 +10703,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10768,7 +10768,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -11281,7 +11281,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -11602,7 +11602,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12033,7 +12033,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12701,7 +12701,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12847,7 +12847,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13607,7 +13607,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13758,7 +13758,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13863,7 +13863,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14187,7 +14187,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14679,7 +14679,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14795,7 +14795,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14911,7 +14911,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15027,7 +15027,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15143,7 +15143,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15237,7 +15237,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16199,7 +16199,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16287,7 +16287,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16372,7 +16372,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17314,7 +17314,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17401,7 +17401,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17478,7 +17478,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17764,7 +17764,7 @@
   
 <element-name name="warning"/>
   
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
   
 <element-name name="programlisting"/>
   
@@ -17811,7 +17811,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18170,7 +18170,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18403,7 +18403,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18671,7 +18671,7 @@
   
 <element-name name="simplelist"/>
   
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
   
 <element-name name="programlisting"/>
   
@@ -18776,7 +18776,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19127,7 +19127,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19517,7 +19517,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19620,7 +19620,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19897,7 +19897,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -20298,7 +20298,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -20626,7 +20626,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -21006,7 +21006,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -21077,7 +21077,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index f772aeb..e362569 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -63,7 +63,7 @@ TODO:
  but then at <xsl:template match="/"><html> it will only show you HTML elements!
 =>So better "Assign meta DTD" and "Add meta DTD", the latter will expand the current meta DTD
 -Option to insert empty element in <empty/> form
--Show expanded entities with TQChar::TQChar( int rc ) + tqunicode font
+-Show expanded entities with TQChar::TQChar( int rc ) + unicode font
 -Don't ignore entities defined in the document's prologue
 -Only offer 'valid' elements, i.e. don't take the elements as a set but check
  if the DTD is matched ( order, number of occurences, ... )
@@ -937,7 +937,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
       --col;
     }
 
-    ushort ch = str.at( col).tqunicode();
+    ushort ch = str.at( col).unicode();
 
     switch( parseState )
     {
@@ -981,7 +981,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
 
             TQString tag = str.mid( col + 1 );
             for( uint pos = 0, len = tag.length(); pos < len; ++pos ) {
-              ch = tag.at( pos).tqunicode();
+              ch = tag.at( pos).unicode();
               if( ch == ' ' || ch == '\t' || ch == '>' ) {
                 tag.truncate( pos );
                 break;
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index b13c35f..af66188 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -410,7 +410,7 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress )
       {
         TQString exp = expandedElem.text();
         // TODO: support more than one &#...; in the expanded text
-        /* TODO include do this when the tqunicode font problem is solved:
+        /* TODO include do this when the unicode font problem is solved:
         if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) {
         // hexadecimal numbers, e.g. "&#x236;"
         uint end = exp.find( ";" );
@@ -445,7 +445,7 @@ TQStringList PseudoDTD::entities( TQString start )
     if( (*it).startsWith(start) )
     {
       TQString str = it.key();
-      /* TODO: show entities as tqunicode character
+      /* TODO: show entities as unicode character
       if( !it.data().isEmpty() ) {
       //str += " -- " + it.data();
       TQRegExp re( "&#(\\d+);" );