Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 24 insertions, 24 deletions

diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp
index 9810e8b0..6126d6c5 100644
--- a/lib/kotext/KoParagCounter.cpp
+++ b/lib/kotext/KoParagCounter.cpp
@@ -43,7 +43,7 @@ KoParagCounter::KoParagCounter()
     m_customBulletChar = TQChar( '-' );
     m_customBulletFont = TQString();
     m_align = TQt::AlignAuto;
-    invalidate();
+    tqinvalidate();
 }
 
 bool KoParagCounter::operator==( const KoParagCounter & c2 ) const
@@ -83,7 +83,7 @@ unsigned int KoParagCounter::depth() const
     return m_depth;
 }
 
-void KoParagCounter::invalidate()
+void KoParagCounter::tqinvalidate()
 {
     m_cache.number = -1;
     m_cache.text = TQString();
@@ -144,7 +144,7 @@ void KoParagCounter::load( TQDomElement & element )
     m_align = element.attribute("align", "0").toInt(); //AlignAuto as defeult
     TQString restart = element.attribute("restart");
     m_restartCounter = (restart == "true") || (restart == "1");
-    invalidate();
+    tqinvalidate();
 }
 
 static int importCounterType( TQChar numFormat )
@@ -216,7 +216,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle,
         TQString bulletChar = listStyle.attributeNS( KoXmlNS::text, "bullet-char", TQString() );
         if ( !bulletChar.isEmpty() ) {
             // Reverse engineering, I found those codes:
-            switch( bulletChar[0].unicode() ) {
+            switch( bulletChar[0].tqunicode() ) {
             case 0x2022: // small disc -> circle
                 m_style = STYLE_CIRCLEBULLET;
                 break;
@@ -235,7 +235,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle,
                 m_style = STYLE_BOXBULLET;
                 break;
             default:
-                kdDebug() << "Unhandled bullet code 0x" << TQString::number( (uint)m_customBulletChar.unicode(), 16 ) << endl;
+                kdDebug() << "Unhandled bullet code 0x" << TQString::number( (uint)m_customBulletChar.tqunicode(), 16 ) << endl;
                 // fallback
             case 0x2794: // arrow
             case 0x2717: // cross
@@ -259,7 +259,7 @@ void KoParagCounter::loadOasisListStyle( const TQDomElement& listStyle,
             m_style = STYLE_DISCBULLET;
         }
     }
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::saveOasis( KoGenStyle& listStyle, bool savingStyle ) const
@@ -326,7 +326,7 @@ void KoParagCounter::saveOasisListLevel( KoXmlWriter& listLevelWriter, bool incl
         listLevelWriter.startElement( "style:list-level-properties" );
         listLevelWriter.addAttribute( "fo:text-align", KoParagLayout::saveOasisAlignment( (TQt::AlignmentFlags)m_align ) );
         // OASIS has other style properties: text:space-before (indent), text:min-label-width (TODO),
-        // text:min-label-distance, style:font-name (for bullets), image size and vertical alignment.
+        // text:min-label-distance, style:font-name (for bullets), image size and vertical tqalignment.
         listLevelWriter.endElement(); // style:list-level-properties
     }
 }
@@ -504,7 +504,7 @@ void KoParagCounter::save( TQDomElement & element )
     element.setAttribute( "depth", m_depth );
     if ( (Style)m_style == STYLE_CUSTOMBULLET )
     {
-        element.setAttribute( "bullet", m_customBulletChar.unicode() );
+        element.setAttribute( "bullet", m_customBulletChar.tqunicode() );
         if ( !m_customBulletFont.isEmpty() )
             element.setAttribute( "bulletfont", m_customBulletFont );
     }
@@ -531,66 +531,66 @@ void KoParagCounter::save( TQDomElement & element )
 void KoParagCounter::setCustom( TQString c )
 {
     m_custom = c;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setCustomBulletCharacter( TQChar c )
 {
     m_customBulletChar = c;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setCustomBulletFont( TQString f )
 {
     m_customBulletFont = f;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setDepth( unsigned int d )
 {
     m_depth = d;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setNumbering( Numbering n )
 {
     m_numbering = n;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setPrefix( TQString p )
 {
     m_prefix = p;
-    invalidate();
+    tqinvalidate();
 }
 void KoParagCounter::setStartNumber( int s )
 {
     m_startNumber = s;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setDisplayLevels( int l )
 {
     m_displayLevels = l;
-    invalidate();
+    tqinvalidate();
 }
 
-void KoParagCounter::setAlignment( int a )
+void KoParagCounter::tqsetAlignment( int a )
 {
     m_align = a;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setStyle( Style s )
 {
     m_style = s;
-    invalidate();
+    tqinvalidate();
 }
 
 void KoParagCounter::setSuffix( TQString s )
 {
     m_suffix = s;
-    invalidate();
+    tqinvalidate();
 }
 
 int KoParagCounter::startNumber() const
@@ -603,7 +603,7 @@ int KoParagCounter::displayLevels() const
     return m_displayLevels;
 }
 
-int KoParagCounter::alignment() const
+int KoParagCounter::tqalignment() const
 {
     return m_align;
 }
@@ -626,7 +626,7 @@ bool KoParagCounter::restartCounter() const
 void KoParagCounter::setRestartCounter( bool restart )
 {
     m_restartCounter = restart;
-    invalidate();
+    tqinvalidate();
 }
 
 // Return the text for that level only
@@ -839,7 +839,7 @@ const TQCString RNThousands[] = {"", "m", "mm", "mmm"};
 TQString KoParagCounter::makeRomanNumber( int n )
 {
     if ( n >= 0 )
-        return TQString::fromLatin1( RNThousands[ ( n / 1000 ) ] +
+        return TQString::tqfromLatin1( RNThousands[ ( n / 1000 ) ] +
                                     RNHundreds[ ( n / 100 ) % 10 ] +
                                     RNTens[ ( n / 10 ) % 10 ] +
                                     RNUnits[ ( n ) % 10 ] );
@@ -973,7 +973,7 @@ void KoParagCounter::printRTDebug( KoTextParag* parag )
     if ( restartCounter() )
         additionalInfo = "[restartCounter]";
     if ( m_style == STYLE_CUSTOMBULLET )
-        additionalInfo += " [customBullet: " + TQString::number( m_customBulletChar.unicode() )
+        additionalInfo += " [customBullet: " + TQString::number( m_customBulletChar.tqunicode() )
                           + " in font '" + m_customBulletFont + "']";
     static const char * const s_numbering[] = { "List", "Chapter", "None", "Footnote" };
     kdDebug(32500) << "  Counter style=" << style()