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

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

1 files changed, 11 insertions, 11 deletions

diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index bcaa4408..a470c3c7 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -11,8 +11,8 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
-#include <layout.h>
-#include <textedit.h>
+#include <tqlayout.h>
+#include <tqtextedit.h>
 #include <tqtooltip.h>
 
 #include <kapplication.h>
@@ -34,13 +34,13 @@ KSircTopic::KSircTopic( TQWidget *parent, const char *name )
     m_editor = 0;
     m_doEdit = false;
     m_height = 0;
-//    setBackgroundColor( colorGroup().light() );
+//    setBackgroundColor( tqcolorGroup().light() );
     setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
     setTextFormat( RichText );
     setWordWrap(TQTextEdit::NoWrap);
     doResize();
-//    setAlignment( alignment() | WordBreak );
+//    tqsetAlignment( tqalignment() | WordBreak );
 }
 
 void KSircTopic::setText( const TQString &_text)
@@ -49,7 +49,7 @@ void KSircTopic::setText( const TQString &_text)
     TQString text = _text;
 
     TQString richText( "<font color=\"%1\">" );
-    richText = richText.arg( ksopts->textColor.name() );
+    richText = richText.tqarg( ksopts->textColor.name() );
 
     text.replace('&', "&amp;");
     text.replace('<', "&lt;");
@@ -65,11 +65,11 @@ void KSircTopic::setText( const TQString &_text)
     // '<nick message<' , which is supposedly a bug in TQt's reordering.  The
     // same is done for [nick] and >nick< to catch queries.
     TQRegExp bidiRe( "^(&lt;\\S+&gt;)(.+)$" );
-    text.replace( bidiRe, TQString::fromLatin1( "<span>\\1</span>\\2" ) );
+    text.replace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) );
     TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" );
-    text.replace( bidiRe2, TQString::fromLatin1( "<span>\\1</span>\\2" ) );
+    text.replace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) );
     TQRegExp bidiRe3( "^(&gt;\\S+&lt;)(.+)$" );
-    text.replace( bidiRe3, TQString::fromLatin1( "<span>\\1</span>\\2" ) );
+    text.replace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) );
 
     KSParser parser;
     richText += parser.parse( text );
@@ -111,7 +111,7 @@ void KSircTopic::contentsMouseReleaseEvent( TQMouseEvent *e )
          * the size really breaks and you get
          * a huge widget
          */
-        m_editor->setGeometry( geometry() );
+        m_editor->setGeometry( tqgeometry() );
         m_editor->setFocus();
         m_editor->show();
 
@@ -211,7 +211,7 @@ void KSircTopicEditor::focusOutEvent( TQFocusEvent * fe )
     // menu
     if ( fe->reason() == TQFocusEvent::Popup  )
     {
-        TQWidget *focusw = tqApp->focusWidget();
+        TQWidget *focusw = tqApp->tqfocusWidget();
         if ( focusw && m_popup && focusw == m_popup )
             return;
     }