Rename obsolete tq methods to standard names

30 files changed, 110 insertions, 110 deletions

diff --git a/ksirc/KSPrefs/page_autoconnectbase.ui b/ksirc/KSPrefs/page_autoconnectbase.ui
index 3f9943c4..dae19a85 100644
--- a/ksirc/KSPrefs/page_autoconnectbase.ui
+++ b/ksirc/KSPrefs/page_autoconnectbase.ui
@@ -90,7 +90,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -98,7 +98,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout9</cstring>
+                                <cstring>layout9</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -121,7 +121,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout12</cstring>
+                                <cstring>layout12</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -147,7 +147,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout11</cstring>
+                                <cstring>layout11</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -170,7 +170,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout15</cstring>
+                                <cstring>layout15</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -201,7 +201,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -209,7 +209,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -235,7 +235,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout9</cstring>
+                                <cstring>layout9</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -263,7 +263,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout17</cstring>
+                        <cstring>layout17</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/ksirc/KSPrefs/page_colorsbase.ui b/ksirc/KSPrefs/page_colorsbase.ui
index a44d9b2e..e793d755 100644
--- a/ksirc/KSPrefs/page_colorsbase.ui
+++ b/ksirc/KSPrefs/page_colorsbase.ui
@@ -566,7 +566,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout12</cstring>
+                                    <cstring>layout12</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -618,7 +618,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout11</cstring>
+                                    <cstring>layout11</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -683,7 +683,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp
index 627c6ce4..5ea0dd9b 100644
--- a/ksirc/KSPrefs/page_font.cpp
+++ b/ksirc/KSPrefs/page_font.cpp
@@ -3,9 +3,9 @@
 PageFont::PageFont( TQWidget *parent, const char *name ) : 
   TQWidget( parent, name)
 {
-  tqlayout = new TQHBoxLayout(this);
+  layout = new TQHBoxLayout(this);
   fontchooser = new KFontChooser(this);
-  tqlayout->addWidget(fontchooser);
+  layout->addWidget(fontchooser);
   connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update())); 
 }
 
diff --git a/ksirc/KSPrefs/page_font.h b/ksirc/KSPrefs/page_font.h
index fcda96f2..0cc442d6 100644
--- a/ksirc/KSPrefs/page_font.h
+++ b/ksirc/KSPrefs/page_font.h
@@ -57,7 +57,7 @@ class PageFont : public TQWidget
 
  private:
   KFontChooser* fontchooser; /** The font choosing widget from kdelib */
-  TQHBoxLayout* tqlayout;
+  TQHBoxLayout* layout;
 };
 
 #endif
diff --git a/ksirc/KSPrefs/page_generalbase.ui b/ksirc/KSPrefs/page_generalbase.ui
index 2c31912f..839c0f59 100644
--- a/ksirc/KSPrefs/page_generalbase.ui
+++ b/ksirc/KSPrefs/page_generalbase.ui
@@ -357,7 +357,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp
index 6dce178b..4d2fda54 100644
--- a/ksirc/KSPrefs/page_shortcuts.cpp
+++ b/ksirc/KSPrefs/page_shortcuts.cpp
@@ -22,7 +22,7 @@ PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcu
 
     m_key = new KKeyChooser(servercontroller::self()->getGlobalAccel(), globalGB);
     connect(m_key, TQT_SIGNAL(keyChange()), this, TQT_SLOT(changed()));
-    globalGB->tqlayout()->add(m_key);
+    globalGB->layout()->add(m_key);
 }
 
 PageShortcuts::~PageShortcuts()
diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp
index 3dd44896..5927b498 100644
--- a/ksirc/ahistlineedit.cpp
+++ b/ksirc/ahistlineedit.cpp
@@ -131,7 +131,7 @@ void aHistLineEdit::slotMaybeResize()
         s.setHeight(h);
         resize(s);
         setFixedHeight( h );
-        TQLayout *l = topLevelWidget()->tqlayout();
+        TQLayout *l = topLevelWidget()->layout();
         if(l){
             l->invalidate();
             l->activate();
@@ -352,7 +352,7 @@ void aHistLineEdit::mousePressEvent ( TQMouseEvent *e )
 {
     if(e->button() == MidButton){
         /*
-         *  emit pasteText(TQApplication::tqclipboard()->text(TQClipboard::Selection));
+         *  emit pasteText(TQApplication::clipboard()->text(TQClipboard::Selection));
          */
   }
   else{
@@ -381,10 +381,10 @@ void aHistLineEdit::paste()
 {
     /* we let the top level take it */
     if(ksopts->oneLineEntry) {
-	emit pasteText(TQApplication::tqclipboard()->text(TQClipboard::Selection));
+	emit pasteText(TQApplication::clipboard()->text(TQClipboard::Selection));
     }
     else {
-	TQString paste = TQApplication::tqclipboard()->text(TQClipboard::Selection);
+	TQString paste = TQApplication::clipboard()->text(TQClipboard::Selection);
 	paste.replace("\n", " ~ ");
 	insert(paste);
     }
diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp
index 60e27cdf..cf7a4581 100644
--- a/ksirc/alistbox.cpp
+++ b/ksirc/alistbox.cpp
@@ -27,7 +27,7 @@ aListBox::aListBox(TQWidget *parent, const char *name )
     : TQListBox(parent,name)
 {
     clear();
-    p_scroll = TQPalette(tqpalette());
+    p_scroll = TQPalette(palette());
     setAcceptDrops( true );
     connect(this, TQT_SIGNAL(selected (const TQString&)),
             this, TQT_SIGNAL(selectedNick(const TQString&)));
diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp
index 26b09ffd..5aafba1c 100644
--- a/ksirc/chanButtons.cpp
+++ b/ksirc/chanButtons.cpp
@@ -38,37 +38,37 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name)
   toggleMenu[5] = Popupmenu->insertItem(i18n("w (receive wallops)"), this, TQT_SLOT(wallops()));
   toggleMenu[6] = Popupmenu->insertItem(i18n("s (get server notices)"), this, TQT_SLOT(serverNotices()));
 
-  tqlayout = new TQHBoxLayout(this);
-  tqlayout->setSpacing(0);
-  tqlayout->setMargin(0);
+  layout = new TQHBoxLayout(this);
+  layout->setSpacing(0);
+  layout->setMargin(0);
 
   protectButton = new TQPushButton(i18n("T"), this);
   protectButton->setToggleButton(true);
   makeSquare(protectButton);
   TQToolTip::add(protectButton, i18n("Only op'ed users can change the topic"));
   connect(protectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(protectMode()));
-  tqlayout->addWidget(protectButton);
+  layout->addWidget(protectButton);
 
   outsideButton = new TQPushButton(i18n("N"), this);
   outsideButton->setToggleButton(true);
   makeSquare(outsideButton);
   TQToolTip::add(outsideButton, i18n("No outside messages"));
   connect(outsideButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(outsideMode()));
-  tqlayout->addWidget(outsideButton);
+  layout->addWidget(outsideButton);
 
   moderateButton = new TQPushButton(i18n("M"), this);
   moderateButton->setToggleButton(true);
   makeSquare(moderateButton);
   TQToolTip::add(moderateButton, i18n("Only op'ed users and voiced users (+v) can speak"));
   connect(moderateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(moderateMode()));
-  tqlayout->addWidget(moderateButton);
+  layout->addWidget(moderateButton);
 
   menuButton = new TQPushButton(i18n("..."), this);
   makeSquare(menuButton);
   menuButton->setFixedWidth(menuButton->width()*2);
   menuButton->setPopup(Popupmenu);
   TQToolTip::add(menuButton, i18n("More mode commands"));
-  tqlayout->addWidget(menuButton);
+  layout->addWidget(menuButton);
 }
 
 void chanButtons::invite()
diff --git a/ksirc/chanButtons.h b/ksirc/chanButtons.h
index ec5ebe9d..8e998bdf 100644
--- a/ksirc/chanButtons.h
+++ b/ksirc/chanButtons.h
@@ -48,7 +48,7 @@ class chanButtons : public TQWidget
 
   private:
     int toggleMenu[7];
-    TQHBoxLayout *tqlayout;
+    TQHBoxLayout *layout;
     TQPushButton *protectButton;
     TQPushButton *moderateButton;
     TQPushButton *outsideButton;
diff --git a/ksirc/chanparser.cpp b/ksirc/chanparser.cpp
index 6392721f..32f2d670 100644
--- a/ksirc/chanparser.cpp
+++ b/ksirc/chanparser.cpp
@@ -417,7 +417,7 @@ parseResult * ChannelParser::parseINFONicks(TQString in_string)
     uint i;
 
     for(i = 0; i < nick.length();i++){
-      switch(nick[0].tqunicode()){
+      switch(nick[0].unicode()){
       case '@':
 	irc->setOp(TRUE);
         nick.remove(0,1);
@@ -801,7 +801,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string)
   pmList.setAutoDelete(true);
 
   for(uint pos = 0; pos < modes.length(); pos++){
-    switch(modes.at(pos).tqunicode()){
+    switch(modes.at(pos).unicode()){
     case '+':
       op = true;
       break;
@@ -858,7 +858,7 @@ parseResult * ChannelParser::parseINFOMode(TQString string)
     /*
      * Look at the second character, it's uniq, check for +,- latter
      */
-    if(mi->mode().tqunicode() == 'o'){
+    if(mi->mode().unicode() == 'o'){
       mode_o_plus = mi->op();
       mode_o_minus = !mi->op();
 
diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp
index 5c88ccac..abac9198 100644
--- a/ksirc/colorpicker.cpp
+++ b/ksirc/colorpicker.cpp
@@ -270,7 +270,7 @@ void ColorBar::mouseReleaseEvent( TQMouseEvent *ev )
 
 void ColorBar::updateCellSize()
 {
-    setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) );
+    setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, this ) );
 
     TQFontMetrics metrics( font() );
 
diff --git a/ksirc/dccManagerbase.ui b/ksirc/dccManagerbase.ui
index c475f05c..542a28eb 100644
--- a/ksirc/dccManagerbase.ui
+++ b/ksirc/dccManagerbase.ui
@@ -101,7 +101,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp
index 871c044d..fef6b27b 100644
--- a/ksirc/dccNew.cpp
+++ b/ksirc/dccNew.cpp
@@ -31,7 +31,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick )
     : dccNewBase( parent, name)
 {
 
-    TQColorGroup cg_mainw = kapp->tqpalette().active();
+    TQColorGroup cg_mainw = kapp->palette().active();
     cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor);
     cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor);
     cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor);
diff --git a/ksirc/dccNewbase.ui b/ksirc/dccNewbase.ui
index fce40055..8c6e9fef 100644
--- a/ksirc/dccNewbase.ui
+++ b/ksirc/dccNewbase.ui
@@ -141,7 +141,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp
index 65a9d725..7189a23a 100644
--- a/ksirc/kstextview.cpp
+++ b/ksirc/kstextview.cpp
@@ -645,7 +645,7 @@ bool Tokenizer::parseNextToken( Token &tok )
             return false;
 
         tok.id = Token::Text;
-        tok.value = StringPtr( m_text.tqunicode() + idx,
+        tok.value = StringPtr( m_text.unicode() + idx,
                                m_text.length() - idx );
         tok.attributes.clear();
         return true;
@@ -658,7 +658,7 @@ bool Tokenizer::parseNextToken( Token &tok )
     {
         tok.id = Token::Text;
         tok.attributes.clear();
-        tok.value = StringPtr( m_text.tqunicode(),
+        tok.value = StringPtr( m_text.unicode(),
                                (*m_lastTag).index );
 
         m_textBeforeFirstTagProcessed = true;
@@ -676,7 +676,7 @@ bool Tokenizer::parseNextToken( Token &tok )
     if ( lastType == TagIndex::Open &&
          type == TagIndex::Close )
     {
-        const TQChar *tagStart = m_text.tqunicode() + lastIndex + 1;
+        const TQChar *tagStart = m_text.unicode() + lastIndex + 1;
         uint tagLen = ( index - 1 ) - ( lastIndex + 1 ) + 1;
         // </bleh> ?
         if ( *tagStart == '/' )
@@ -699,7 +699,7 @@ bool Tokenizer::parseNextToken( Token &tok )
     {
         tok.id = Token::Text;
         tok.attributes.clear();
-        tok.value = StringPtr( m_text.tqunicode() + lastIndex + 1,
+        tok.value = StringPtr( m_text.unicode() + lastIndex + 1,
                               ( index - 1 ) - lastIndex );
 
         m_lastTag = it;
@@ -715,7 +715,7 @@ bool Tokenizer::parseNextToken( Token &tok )
 
 Tokenizer::TagIndexList Tokenizer::scanTagIndices( const TQString &text )
 {
-    const TQChar *start = text.tqunicode();
+    const TQChar *start = text.unicode();
     const TQChar *p = start;
     const TQChar *endP = p + text.length();
     bool quoted = false;
@@ -754,7 +754,7 @@ Tokenizer::TagIndexList Tokenizer::scanTagIndices( const TQString &text )
 
 void Tokenizer::resolveEntities( TQString &text, TagIndexList &tags )
 {
-    const TQChar *p = text.tqunicode();
+    const TQChar *p = text.unicode();
     const TQChar *endP = p + text.length();
     uint i = 0;
     bool scanForSemicolon = false;
@@ -793,13 +793,13 @@ void Tokenizer::resolveEntities( TQString &text, TagIndexList &tags )
         if ( entityValue.isNull() )
             continue;
 
-        const uint ampersandPos = ampersand - text.tqunicode();
+        const uint ampersandPos = ampersand - text.unicode();
 
         text[ ampersandPos ] = entityValue;
         text.remove( ampersandPos + 1, entityLength + 1 );
         i = ampersandPos;
-        p = text.tqunicode() + i;
-        endP = text.tqunicode() + text.length();
+        p = text.unicode() + i;
+        endP = text.unicode() + text.length();
         ampersand = 0;
 
         uint adjustment = entityLength + 1;
@@ -1225,7 +1225,7 @@ TextParag::~TextParag()
 {
 }
 
-void TextParag::tqlayout( int width )
+void TextParag::layout( int width )
 {
     TQPtrList<Item> items;
 
@@ -1658,7 +1658,7 @@ void TextView::viewportResizeEvent( TQResizeEvent *ev )
     TQScrollView::viewportResizeEvent(ev);
 
     if ( ev->size().width() != ev->oldSize().width() )
-	tqlayout();
+	layout();
 
     int newdiff = ev->size().height() - ev->oldSize().height();
     setContentsPos( 0, contentsY()-newdiff );
@@ -1720,7 +1720,7 @@ void TextView::clear()
     stopAutoScroll();
     clearSelection();
     m_parags.clear();
-    tqlayout();
+    layout();
     viewport()->erase();
 }
 
@@ -1728,7 +1728,7 @@ TextParagIterator TextView::appendParag( const TQString &richText )
 {
     TextParag *parag = new TextParag( this, richText );
     m_parags.append( parag );
-    tqlayout( false );
+    layout( false );
     scrollToBottom();
     TQPtrListIterator<TextParag> it( m_parags );
     it.toLast();
@@ -1758,7 +1758,7 @@ bool TextView::removeParag( const TextParagIterator &parag )
     if(m_selectionEnd.item != 0)
         m_selectionEnd.pos.ry() -= height;
 
-    //tqlayout( false );
+    //layout( false );
     contentsChange(-height, true);
 
 
@@ -1814,7 +1814,7 @@ void TextView::setLinkColor( const TQColor &linkColor )
 
 void TextView::copy()
 {
-    TQApplication::tqclipboard()->setText( m_selectedText );
+    TQApplication::clipboard()->setText( m_selectedText );
 }
 
 void TextView::clearSelectionInternal()
@@ -1953,7 +1953,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev )
     m_selectionMaybeStart = SelectionPoint();
 
     if ( (ev->button() & Qt::LeftButton) && !m_selectedText.isEmpty() )
-        TQApplication::tqclipboard()->setText( m_selectedText, TQClipboard::Selection );
+        TQApplication::clipboard()->setText( m_selectedText, TQClipboard::Selection );
 
     if ( clicked ) {
         emitLinkClickedForMouseEvent( ev );
@@ -1962,7 +1962,7 @@ void TextView::contentsMouseReleaseEvent( TQMouseEvent *ev )
 
     if (ev->button() & Qt::MidButton)
     {
-        emit pasteReq( KApplication::tqclipboard()->text( TQClipboard::Selection ) );
+        emit pasteReq( KApplication::clipboard()->text( TQClipboard::Selection ) );
         return;
     }
 }
@@ -1973,7 +1973,7 @@ void TextView::fontChange( const TQFont & )
     for (; it.current(); ++it )
         it.current()->fontChange( font() );
 
-    tqlayout( true );
+    layout( true );
 }
 
 void TextView::startDrag()
@@ -2156,7 +2156,7 @@ TQString TextView::updateSelection( const SelectionPoint &start, const Selection
     return selectedText;
 }
 
-void TextView::tqlayout( bool force )
+void TextView::layout( bool force )
 {
     int height = 0;
     int contentsWidth = visibleWidth();
@@ -2166,7 +2166,7 @@ void TextView::tqlayout( bool force )
     for (; it.current(); ++it )
     {
         if ( !it.current()->isLayouted() || force )
-            it.current()->tqlayout( width );
+            it.current()->layout( width );
 
         height += it.current()->height();
         contentsWidth = kMax( contentsWidth, it.current()->minWidth() );
@@ -2182,7 +2182,7 @@ void TextView::tqlayout( bool force )
 void TextView::contentsChange(int heightChange, bool force)
 {
     if(m_height == -1){
-        tqlayout(force);
+        layout(force);
     }
     else {
         m_height += heightChange;
@@ -2248,7 +2248,7 @@ void TextParagIterator::setRichText( const TQString &richText )
     m_paragIt.current()->setRichText( richText );
 
     TextView *textView = m_paragIt.current()->textView();
-    textView->tqlayout( false );
+    textView->layout( false );
 
     if ( textView->isUpdatesEnabled() )
         textView->updateContents();
diff --git a/ksirc/kstextview.h b/ksirc/kstextview.h
index 1ac273eb..1c537e95 100644
--- a/ksirc/kstextview.h
+++ b/ksirc/kstextview.h
@@ -40,7 +40,7 @@ struct StringPtr
     StringPtr( const TQChar *_ptr, uint _len )
         : ptr( _ptr ), len( _len ) {}
     explicit StringPtr( const TQString &s ) // use with care!
-        : ptr( s.tqunicode() ), len( s.length() ) {}
+        : ptr( s.unicode() ), len( s.length() ) {}
 
     inline bool isNull() const { return ptr == 0; }
 
@@ -354,7 +354,7 @@ public:
     
     ~TextParag();
 
-    void tqlayout( int width );
+    void layout( int width );
 
     void paint( TQPainter &p, int y, int maxY );
 
@@ -537,7 +537,7 @@ private:
     SelectionPoint *selectionStart();
     SelectionPoint *selectionEnd();
 
-    void tqlayout( bool force = true );
+    void layout( bool force = true );
 
     Item *itemAt( const TQPoint &pos, SelectionPoint *selectionInfo = 0,
                   Item::SelectionAccuracy accuracy = Item::SelectExact );
diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp
index 32c37e47..597b2393 100644
--- a/ksirc/ksview.cpp
+++ b/ksirc/ksview.cpp
@@ -308,7 +308,7 @@ void KSircView::openBrowser(const TQString &url )
 
 void KSircView::copyLinkToClipboard( const TQString &url )
 {
-    TQApplication::tqclipboard()->setText( url, TQClipboard::Clipboard );
+    TQApplication::clipboard()->setText( url, TQClipboard::Clipboard );
 }
 
 TQColor KSircView::ircColor(int code)
diff --git a/ksirc/nickColourMaker.cpp b/ksirc/nickColourMaker.cpp
index c5a3b972..ce866349 100644
--- a/ksirc/nickColourMaker.cpp
+++ b/ksirc/nickColourMaker.cpp
@@ -43,7 +43,7 @@ int nickColourMaker::findIdx(TQString nick) const
         return -1;
 
     for(i = 0; i < nick.length(); i++){
-        c = nick[i].tqunicode();
+        c = nick[i].unicode();
 	switch(c){
 	case '|':
 	case '-':
diff --git a/ksirc/puke/HOWTO-PUKE.pod b/ksirc/puke/HOWTO-PUKE.pod
index 8cae9c86..c6bf8136 100644
--- a/ksirc/puke/HOWTO-PUKE.pod
+++ b/ksirc/puke/HOWTO-PUKE.pod
@@ -11,7 +11,7 @@ under Linux.
 Puke's a generic protocol allowing dsirc to communicate with ksirc.
 Communications works over a unix domain socket between multiple
 client dsirc process's to a single ksirc process.  All communications
-is done via a variable length message with the following tqlayout:
+is done via a variable length message with the following layout:
 
 =begin text
 
@@ -68,17 +68,17 @@ supporting perl5-oop object.
 
 The C++ code must be able to hand all required settings and messages
 for the widget.  Each new widget iherites it's parent and so forth
-allowing for a nice oop tqlayout.  The widget structure the author is
+allowing for a nice oop layout.  The widget structure the author is
 following is the same as Qt's.  Their seems to work well, why
 re-invent the wheel?
 
 =item 2.1.1 General Layout, etc
 
 Figure where your new widget goes in the heirachy.  If it's a simple
-Qt widget, I recommend using their existing tqlayout.  Man pages list
+Qt widget, I recommend using their existing layout.  Man pages list
 what widgets inherit what.
 
-The general idea behind the widget tqlayout should be to be to provide
+The general idea behind the widget layout should be to be to provide
 all the functionality of the widget to dsirc perl script.  Incoming
 messages are handled via the messageHandler and ALL messages should
 return an ACK with current state info.
diff --git a/ksirc/puke/commands.h b/ksirc/puke/commands.h
index fc7f0f0d..ead9fb07 100644
--- a/ksirc/puke/commands.h
+++ b/ksirc/puke/commands.h
@@ -993,14 +993,14 @@
 #define PWIDGET_OBJFINDER 18
 
 
-// Group tqlayout commands exist between 10000 and 11000
+// Group layout commands exist between 10000 and 11000
 
-// Desc: create new box tqlayout
+// Desc: create new box layout
 // iWinId: PWidget parent
 // iArg: 2 shorts, short[0] direction, short[1] border
 // cArg: random character string
 #define PUKE_LAYOUT_NEW 11000
-// Desc: ack for box tqlayout
+// Desc: ack for box layout
 // iWinId: Layout ID.
 // iArg: not define
 // cArg: same random m character string as PUKE_LAYOUT_NEW
@@ -1009,7 +1009,7 @@
 #define PUKE_LAYOUT_ADDLAYOUT 11005
 #define PUKE_LAYOUT_ADDLAYOUT_ACK -11005
 
-// Desc: add widget into tqlayout manager
+// Desc: add widget into layout manager
 // iWinId: Layout Manager to add widget too
 // iArg: Widget Id to be added
 // cArg: 2 characters, char[0] strech, char[1] alignment
@@ -1032,7 +1032,7 @@
 // cArg: not define
 #define PUKE_LAYOUT_ADDSTRUT_ACK -11015
 
-// Desc: activates tqlayout management, like show() for widget
+// Desc: activates layout management, like show() for widget
 // iWinId: Layout Manager to activate
 // iArg: undef
 // cArg: undef
diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm
index 410437e7..65bc1b07 100644
--- a/ksirc/puke/dcc_status.pm
+++ b/ksirc/puke/dcc_status.pm
@@ -6,7 +6,7 @@
 &docommand("/load ptablevw.pm");
 &docommand("/load plistbox.pm");
 &docommand("/load pbutton.pm");;
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plabel.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/load_all.pm b/ksirc/puke/load_all.pm
index 048eb9eb..26594c0f 100644
--- a/ksirc/puke/load_all.pm
+++ b/ksirc/puke/load_all.pm
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm"); 
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/pboxlayout.pm b/ksirc/puke/pboxlayout.pm
index 9896fd1c..505ddc0d 100644
--- a/ksirc/puke/pboxlayout.pm
+++ b/ksirc/puke/pboxlayout.pm
@@ -40,7 +40,7 @@ sub new {
   #}
   #  else{
   if(ref($widget) ne ''){
-      #    print "*\cbI\cb* Generic Non-topleve tqlayout type\n";
+      #    print "*\cbI\cb* Generic Non-topleve layout type\n";
     $self->{Parent} = $widget;
     $self->{ParentType} = 'Widget';
     $self->{Direction} = shift;
@@ -99,7 +99,7 @@ sub addWidget {
   my $align = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add widget without first being added to parent tqlayout\n";
+    print "*E* Burp: Can't add widget without first being added to parent layout\n";
     return;
   }
 
@@ -128,41 +128,41 @@ sub addLayout {
   my $self = shift;
 
   if($self->{Added} == 0){
-    print "*E* Burp: Can't add tqlayout without first being added to parent tqlayout\n";
+    print "*E* Burp: Can't add layout without first being added to parent layout\n";
   }
 
   
-  my $tqlayout = shift;
-  if(ref($tqlayout) ne 'PBoxLayout'){
-    print "*E* Passed non tqlayout type to addLayout\n";
+  my $layout = shift;
+  if(ref($layout) ne 'PBoxLayout'){
+    print "*E* Passed non layout type to addLayout\n";
     return 1;
   }
 
-  if($tqlayout->{iWinId} <= 0){
-    print "*E* Trying to add invalid tqlayout " . ref($tqlayout) . "\n";
+  if($layout->{iWinId} <= 0){
+    print "*E* Trying to add invalid layout " . ref($layout) . "\n";
     return;
   }
 
 
   # make sure we can run, and the widget we want to add can run.
-  #  my @ARG = ($tqlayout);
+  #  my @ARG = ($layout);
   #$self->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
-  #$tqlayout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
+  #$layout->canRun($self, \&PBoxLayout::addLayout, \@ARG) || return;
 
   my %REPLY = $self->sendMessage('iCommand' => $::PUKE_LAYOUT_ADDLAYOUT,
                                  'iWinId' => $self->{iWinId},
-                                 'iArg' => $tqlayout->{iWinId},
+                                 'iArg' => $layout->{iWinId},
                                  'cArg' => pack("C", 0),
                                  'CallBack' => sub { },
                                  'WaitFor' => 1);
 
-  #  print "*I* Adding tqlayout\n";
+  #  print "*I* Adding layout\n";
   if($REPLY{'iArg'} != 0){
     print "*E* AddLayout call failed\n";
   }
   else{
-    #    print "*I* Added new Layout for " . $tqlayout->{iWinId} . "\n";
-    $tqlayout->{Added} = 1;
+    #    print "*I* Added new Layout for " . $layout->{iWinId} . "\n";
+    $layout->{Added} = 1;
   }
 
 }
diff --git a/ksirc/puke/playout.cpp b/ksirc/puke/playout.cpp
index 3dbe5c87..a2b6fbae 100644
--- a/ksirc/puke/playout.cpp
+++ b/ksirc/puke/playout.cpp
@@ -16,7 +16,7 @@ PLayout::~PLayout()
   //  kdDebug(5008) << "PObject: in destructor" << endl;
   /*
   delete widget();
-  tqlayout = 0;
+  layout = 0;
   setWidget();
   */
 }
@@ -34,12 +34,12 @@ PObject *PLayout::createWidget(CreateArgs &ca)
   if((ca.parent != 0) &&
      (ca.parent->widget()->isWidgetType() == TRUE)){
     qbl = new TQBoxLayout((TQWidget *) ca.parent->widget(), (TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating tqlayout with parent: " << parent.iWinId << endl;
+    //      kdDebug(5008) << "Creating layout with parent: " << parent.iWinId << endl;
 
   }
   else{
     qbl = new TQBoxLayout((TQBoxLayout::Direction) direction, border);
-    //      kdDebug(5008) << "Creating tqlayout NO PARENT" << endl;
+    //      kdDebug(5008) << "Creating layout NO PARENT" << endl;
   }
   pw->setWidget(qbl);
   pw->setWidgetId(ca.pwI);
@@ -142,16 +142,16 @@ void PLayout::setWidget(TQObject *_layout)
      return;
   }
 
-  tqlayout = (TQBoxLayout *) _layout;
+  layout = (TQBoxLayout *) _layout;
   PObject::setWidget(_layout);
   
 }
 
 TQBoxLayout *PLayout::widget()
 {
-  return tqlayout;
+  return layout;
 }
 
 
-#include "ptqlayout.moc"
+#include "playout.moc"
 
diff --git a/ksirc/puke/playout.h b/ksirc/puke/playout.h
index 4124cb14..1cc4290f 100644
--- a/ksirc/puke/playout.h
+++ b/ksirc/puke/playout.h
@@ -36,7 +36,7 @@ public:
 
 private:
 
-  TQBoxLayout *tqlayout;
+  TQBoxLayout *layout;
 
 };
 
diff --git a/ksirc/puke/small.pl b/ksirc/puke/small.pl
index fdeae902..7e7b251d 100644
--- a/ksirc/puke/small.pl
+++ b/ksirc/puke/small.pl
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm");
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/test.pl b/ksirc/puke/test.pl
index 369a2dc9..4b4c3169 100644
--- a/ksirc/puke/test.pl
+++ b/ksirc/puke/test.pl
@@ -1,7 +1,7 @@
 &docommand("/load pbase.pm");
 &docommand("/load pwidget.pm");
 &docommand("/load pframe.pm");
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plined.pm");
 &docommand("/load pbutton.pm");
 &docommand("/load ppushbt.pm");
diff --git a/ksirc/puke/user_monitor.ks b/ksirc/puke/user_monitor.ks
index d73fa513..a0b2a56a 100644
--- a/ksirc/puke/user_monitor.ks
+++ b/ksirc/puke/user_monitor.ks
@@ -3,7 +3,7 @@
 &docommand("/load pframe.pm");
 &docommand("/load ptablevw.pm");
 &docommand("/load plistbox.pm");
-&docommand("/load pboxtqlayout.pm");
+&docommand("/load pboxlayout.pm");
 &docommand("/load plabel.pm");
 &docommand("/load pmenudta.pm");
 &docommand("/load ppopmenu.pm");
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index 67b51c3c..57f26fb5 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -85,7 +85,7 @@ TQStringList KSircTopLevel::cmd_menu;
 void
 KSircTopLevel::initColors()
 {
-  TQColorGroup cg_mainw = kapp->tqpalette().active();
+  TQColorGroup cg_mainw = kapp->palette().active();
   cg_mainw.setColor(TQColorGroup::Base, ksopts->backgroundColor);
   cg_mainw.setColor(TQColorGroup::Text, ksopts->textColor);
   cg_mainw.setColor(TQColorGroup::Link, ksopts->linkColor);
@@ -216,7 +216,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
   kmenu->setAccel(Key_F, KST_CHANNEL_ID);
 
   /*
-   * Ok, let's look at the basic widget "tqlayout"
+   * Ok, let's look at the basic widget "layout"
    * Everything belongs to q TQFrame F, this is use so we
    * can give the KApplication a single main client widget, which is needs.
    *
@@ -1104,7 +1104,7 @@ void KSircTopLevel::returnPressed()
     uint i;
     TQChar c;
     for(i = 0; (c = s[i]); i++){
-        switch(c.tqunicode()){
+        switch(c.unicode()){
         case 0336:
             s[i] = 002;
             break;
@@ -1327,13 +1327,13 @@ void KSircTopLevel::control_message(int command, TQString str)
 //          nicks->show();
 //        lag->show();
       }
-      if(tqlayout()) {
-          //kdDebug(5008) << "Redoeing tqlayout" << endl;
-          tqlayout()->invalidate();
-          tqlayout()->activate();
+      if(layout()) {
+          //kdDebug(5008) << "Redoeing layout" << endl;
+          layout()->invalidate();
+          layout()->activate();
       }
       else {
-          //kdDebug(5008) << "No tqlayout" << endl;
+          //kdDebug(5008) << "No layout" << endl;
       }
       pan->refresh();
 
@@ -1497,8 +1497,8 @@ void KSircTopLevel::openQueryFromNick(const TQString &nick)
 void KSircTopLevel::pasteToWindow()
 {
     // Ctrl-V
-  //kdDebug(5008) << "Going to paste: " << KApplication::tqclipboard()->text( TQClipboard::Clipboard ) << endl;
-  slotTextDropped(KApplication::tqclipboard()->text( TQClipboard::Clipboard ) );
+  //kdDebug(5008) << "Going to paste: " << KApplication::clipboard()->text( TQClipboard::Clipboard ) << endl;
+  slotTextDropped(KApplication::clipboard()->text( TQClipboard::Clipboard ) );
 }
 
 void KSircTopLevel::pasteToNickList(int button,
@@ -1510,7 +1510,7 @@ void KSircTopLevel::pasteToNickList(int button,
 	emit open_toplevel(ci);
 
 	TQStringList lines = TQStringList::split( '\n',
-						KApplication::tqclipboard()->text( TQClipboard::Selection ),
+						KApplication::clipboard()->text( TQClipboard::Selection ),
 						true );
 	TQStringList::ConstIterator it = lines.begin();
 	TQStringList::ConstIterator end = lines.end();