diff options
Diffstat (limited to 'ksirc/topic.cpp')
| -rw-r--r-- | ksirc/topic.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index a470c3c7..bcaa4408 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -11,8 +11,8 @@ #include <tqapplication.h> #include <tqtimer.h> #include <tqregexp.h> -#include <tqlayout.h> -#include <tqtextedit.h> +#include <layout.h> +#include <textedit.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( tqcolorGroup().light() ); +// setBackgroundColor( colorGroup().light() ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); setTextFormat( RichText ); setWordWrap(TQTextEdit::NoWrap); doResize(); -// tqsetAlignment( tqalignment() | WordBreak ); +// setAlignment( alignment() | 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.tqarg( ksopts->textColor.name() ); + richText = richText.arg( ksopts->textColor.name() ); text.replace('&', "&"); text.replace('<', "<"); @@ -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( "^(<\\S+>)(.+)$" ); - text.replace( bidiRe, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe2( "^(\\[\\S+\\])(.+)$" ); - text.replace( bidiRe2, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe2, TQString::fromLatin1( "<span>\\1</span>\\2" ) ); TQRegExp bidiRe3( "^(>\\S+<)(.+)$" ); - text.replace( bidiRe3, TQString::tqfromLatin1( "<span>\\1</span>\\2" ) ); + text.replace( bidiRe3, TQString::fromLatin1( "<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( tqgeometry() ); + m_editor->setGeometry( geometry() ); m_editor->setFocus(); m_editor->show(); @@ -211,7 +211,7 @@ void KSircTopicEditor::focusOutEvent( TQFocusEvent * fe ) // menu if ( fe->reason() == TQFocusEvent::Popup ) { - TQWidget *focusw = tqApp->tqfocusWidget(); + TQWidget *focusw = tqApp->focusWidget(); if ( focusw && m_popup && focusw == m_popup ) return; } |