Rename old tq methods that no longer need a unique name

32 files changed, 112 insertions, 112 deletions

diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 9e74cbb6d..272df8363 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -635,7 +635,7 @@ void ArticleWidget::displayHeader()
   TQString xface = "";
   if ( !xfhead.isEmpty() ) {
     KPIM::KXFace xf;
-    xface = TQString::tqfromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" )
+    xface = TQString::fromLatin1( "<div class=\"senderpic\"><img src=\"%1\" width=\"48\" height=\"48\"/></div>" )
       .tqarg( imgToDataUrl( xf.toImage( xfhead ), "PNG" ) );
   }
 
@@ -663,7 +663,7 @@ void ArticleWidget::displayHeader()
     html += TQString( "<b>%1</b>" ).tqarg( i18n("References:") );
 
     while ( i <= refCnt ) {
-      html += " <a href=\"news:" + TQString::tqfromLatin1( id ) + "\">" + TQString::number( i ) + "</a>";
+      html += " <a href=\"news:" + TQString::fromLatin1( id ) + "\">" + TQString::number( i ) + "</a>";
       id = refs->next();
       id = id.mid( 1, id.length() - 2 );  // remove <>
       i++;
@@ -915,7 +915,7 @@ TQString ArticleWidget::imgToDataUrl( const TQImage &image, const char* fmt  )
   TQBuffer buffer( ba );
   buffer.open( IO_WriteOnly );
   image.save( &buffer, fmt );
-  return TQString::tqfromLatin1("data:image/%1;base64,%2")
+  return TQString::fromLatin1("data:image/%1;base64,%2")
     .tqarg( fmt, TQString(KCodecs::base64Encode( ba )) );
 }
 
@@ -1416,7 +1416,7 @@ void ArticleWidget::slotAddBookmark()
 {
   if ( mCurrentURL.isEmpty() )
     return;
-  TQString filename = locateLocal( "data", TQString::tqfromLatin1("konqueror/bookmarks.xml") );
+  TQString filename = locateLocal( "data", TQString::fromLatin1("konqueror/bookmarks.xml") );
   KBookmarkManager *bookManager = KBookmarkManager::managerForFile( filename, false );
   KBookmarkGroup group = bookManager->root();
   group.addBookmark( bookManager, mCurrentURL.url(), mCurrentURL );
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index 78b46a4cf..c3fa53073 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -601,14 +601,14 @@ void KNHeaderViewToolTip::maybeTip( const TQPoint &p )
   if ( !item->showToolTip( column ) )
     return;
 
-  const TQRect tqitemRect = listView->tqitemRect( item );
-  if ( !tqitemRect.isValid() )
+  const TQRect itemRect = listView->itemRect( item );
+  if ( !itemRect.isValid() )
     return;
   const TQRect headerRect = listView->header()->sectionRect( column );
   if ( !headerRect.isValid() )
     return;
 
-  tip( TQRect( headerRect.left(), tqitemRect.top(), headerRect.width(), tqitemRect.height() ),
+  tip( TQRect( headerRect.left(), itemRect.top(), headerRect.width(), itemRect.height() ),
        TQStyleSheet::escape( item->text( column ) ) );
 }
 
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index 627ff4cdd..e8d1ef380 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -223,7 +223,7 @@ void KNAccountManager::loadPasswordsAsync()
   if ( !mWallet && !mWalletOpenFailed ) {
     if ( knGlobals.top )
       mWallet = Wallet::openWallet( Wallet::NetworkWallet(),
-                                    knGlobals.topWidget->tqtopLevelWidget()->winId(),
+                                    knGlobals.topWidget->topLevelWidget()->winId(),
                                     Wallet::Asynchronous );
     else
       mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous );
@@ -263,7 +263,7 @@ KWallet::Wallet* KNAccountManager::wallet()
   delete mWallet;
   if ( knGlobals.top )
     mWallet = Wallet::openWallet( Wallet::NetworkWallet(),
-                                  knGlobals.topWidget->tqtopLevelWidget()->winId() );
+                                  knGlobals.topWidget->topLevelWidget()->winId() );
   else
     mWallet = Wallet::openWallet( Wallet::NetworkWallet() );
 
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index d82bb5c74..3a2a414e2 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -209,9 +209,9 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo
   TQString attribution=knGlobals.configManager()->postNewsComposer()->intro();
   TQString name(a->from()->name());
   if (name.isEmpty())
-    name = TQString::tqfromLatin1(a->from()->email());
+    name = TQString::fromLatin1(a->from()->email());
   attribution.replace(TQRegExp("%NAME"),name);
-  attribution.replace(TQRegExp("%EMAIL"),TQString::tqfromLatin1(a->from()->email()));
+  attribution.replace(TQRegExp("%EMAIL"),TQString::fromLatin1(a->from()->email()));
   attribution.replace(TQRegExp("%DATE"),KGlobal::locale()->formatDateTime(a->date()->qdt(),false));
   attribution.replace(TQRegExp("%MSID"),a->messageID()->asUnicodeString());
   attribution.replace(TQRegExp("%GROUP"),g->groupname());
@@ -419,7 +419,7 @@ void KNArticleFactory::createCancel(KNArticle *a)
   art->lines()->setNumberOfLines(1);
 
   //body
-  art->fromUnicodeString(TQString::tqfromLatin1("cancel by original author\n"));
+  art->fromUnicodeString(TQString::fromLatin1("cancel by original author\n"));
 
   //assemble
   art->assemble();
@@ -875,9 +875,9 @@ KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, TQString &sig, T
       if(origPost) {
         TQString name(origPost->from()->name());
         if (name.isEmpty())
-          name = TQString::tqfromLatin1(origPost->from()->email());
+          name = TQString::fromLatin1(origPost->from()->email());
         value.replace(TQRegExp("%NAME"), name);
-        value.replace(TQRegExp("%EMAIL"), TQString::tqfromLatin1(origPost->from()->email()));
+        value.replace(TQRegExp("%EMAIL"), TQString::fromLatin1(origPost->from()->email()));
       }
       else
         if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1)
diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp
index 359985198..8a7236c4e 100644
--- a/knode/knarticlefilter.cpp
+++ b/knode/knarticlefilter.cpp
@@ -324,7 +324,7 @@ void KNArticleFilter::setTranslatedName(const TQString &s)
   bool retranslated = false;
   for (const char **c=defFil;(*c)!=0;c++)   // ok, try if it matches any of the standard filter names
     if (s==i18n("default filter name",*c)) {
-      n_ame = TQString::tqfromLatin1(*c);
+      n_ame = TQString::fromLatin1(*c);
       retranslated = true;
       break;
     }
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index de354ef76..d21f9b7fe 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -432,7 +432,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri
 
 void KNComposer::slotUndo()
 {
-    TQWidget* fw = tqfocusWidget();
+    TQWidget* fw = focusWidget();
     if (!fw) return;
 
     if (fw->inherits("KEdit"))
@@ -443,7 +443,7 @@ void KNComposer::slotUndo()
 
 void KNComposer::slotRedo()
 {
-    TQWidget* fw = tqfocusWidget();
+    TQWidget* fw = focusWidget();
     if (!fw) return;
 
     if (fw->inherits("KEdit"))
@@ -454,7 +454,7 @@ void KNComposer::slotRedo()
 
 void KNComposer::slotCut()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -466,7 +466,7 @@ void KNComposer::slotCut()
 
 void KNComposer::slotCopy()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -480,7 +480,7 @@ void KNComposer::slotCopy()
 
 void KNComposer::slotPaste()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (fw->inherits("KEdit"))
@@ -492,7 +492,7 @@ void KNComposer::slotPaste()
 
 void KNComposer::slotSelectAll()
 {
-  TQWidget* fw = tqfocusWidget();
+  TQWidget* fw = focusWidget();
   if (!fw) return;
 
   if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
@@ -969,7 +969,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
   ts.setCodec(codec);
 
   if (box)
-    temp = TQString::tqfromLatin1(",----[ %1 ]\n").tqarg(boxTitle);
+    temp = TQString::fromLatin1(",----[ %1 ]\n").tqarg(boxTitle);
 
   if (box && (v_iew->e_dit->wordWrap()!=TQMultiLineEdit::NoWrap)) {
     int wrapAt = v_iew->e_dit->wrapColumnOrWidth();
@@ -993,7 +993,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
   }
 
   if (box)
-    temp += TQString::tqfromLatin1("`----");
+    temp += TQString::fromLatin1("`----");
 
   if(clear)
     v_iew->e_dit->setText(temp);
@@ -1447,7 +1447,7 @@ void KNComposer::slotGroupsChanged(const TQString &t)
   split.init(t.latin1(), ",");
   splitOk=split.first();
   while(splitOk) {
-    v_iew->f_up2->insertItem(TQString::tqfromLatin1(split.string()));
+    v_iew->f_up2->insertItem(TQString::fromLatin1(split.string()));
     splitOk=split.next();
   }
   v_iew->f_up2->insertItem("");
@@ -1998,7 +1998,7 @@ KNComposer::Editor::Editor(KNComposer::ComposerView *_composerView, KNComposer *
   spell = 0L;
   installEventFilter(this);
   KCursor::setAutoHideCursor( this, true, true );
-  m_bound = TQRegExp( TQString::tqfromLatin1("[\\s\\W]") );
+  m_bound = TQRegExp( TQString::fromLatin1("[\\s\\W]") );
 }
 
 
@@ -2233,7 +2233,7 @@ void KNComposer::Editor::slotAddBox()
   } else {
     int l = currentLine();
     int c = currentColumn();
-    TQString s = TQString::tqfromLatin1(",----[  ]\n| %1\n`----").tqarg(textLine(l));
+    TQString s = TQString::fromLatin1(",----[  ]\n| %1\n`----").tqarg(textLine(l));
     insertLine(s,l);
     removeLine(l+3);
     setCursorPosition(l+1,c+2);
@@ -2244,7 +2244,7 @@ void KNComposer::Editor::slotAddBox()
 void KNComposer::Editor::slotRemoveBox()
 {
   if (hasMarkedText()) {
-    TQString s = TQString::tqfromLatin1("\n") + markedText() + TQString::tqfromLatin1("\n");
+    TQString s = TQString::fromLatin1("\n") + markedText() + TQString::fromLatin1("\n");
     s.replace(TQRegExp("\n,----[^\n]*\n"),"\n");
     s.replace(TQRegExp("\n| "),"\n");
     s.replace(TQRegExp("\n`----[^\n]*\n"),"\n");
@@ -2604,7 +2604,7 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ
     this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&)));
 
   //finish GUI
-  setFixedHeight(tqsizeHint().height());
+  setFixedHeight(sizeHint().height());
   KNHelper::restoreWindowSize("attProperties", this, TQSize(300,250));
   setHelp("anc-knode-editor-advanced");
 }
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index 98caed2bb..bde9fd42b 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -942,11 +942,11 @@ void KNConfig::PostNewsTechnical::save()
   conf->setGroup("POSTNEWS");
 
   conf->writeEntry("ComposerCharsets", c_omposerCharsets);
-  conf->writeEntry("Charset", TQString::tqfromLatin1(c_harset));
+  conf->writeEntry("Charset", TQString::fromLatin1(c_harset));
   conf->writeEntry("8BitEncoding", a_llow8BitBody);
   conf->writeEntry("UseOwnCharset", u_seOwnCharset);
   conf->writeEntry("generateMId", g_enerateMID);
-  conf->writeEntry("MIdhost", TQString::tqfromLatin1(h_ostname));
+  conf->writeEntry("MIdhost", TQString::fromLatin1(h_ostname));
   conf->writeEntry("dontIncludeUA", d_ontIncludeUA);
   conf->writeEntry("useExternalMailer", u_seExternalMailer);
 
@@ -1100,7 +1100,7 @@ KNConfig::Cleanup::Cleanup( bool global ) :
   // default values for new accounts / groups
   d_oExpire( true ), r_emoveUnavailable( true ), p_reserveThr( true ),
   e_xpireInterval( 5 ), r_eadMaxAge( 10 ), u_nreadMaxAge( 15 ),
-  mGlobal(global), mDefault(!global), mLastExpDate( TQDate::tqcurrentDate() )
+  mGlobal(global), mDefault(!global), mLastExpDate( TQDate::currentDate() )
 {
   if (mGlobal) {
     KConfig *conf = knGlobals.config();
@@ -1174,7 +1174,7 @@ bool KNConfig::Cleanup::expireToday()
   if (!d_oExpire)
     return false;
 
-  TQDate today = TQDate::tqcurrentDate();
+  TQDate today = TQDate::currentDate();
   if (mLastExpDate == TQDateTime(today))
     return false;
 
@@ -1184,7 +1184,7 @@ bool KNConfig::Cleanup::expireToday()
 
 void KNConfig::Cleanup::setLastExpireDate()
 {
-  mLastExpDate = TQDateTime::tqcurrentDateTime();
+  mLastExpDate = TQDateTime::currentDateTime();
 }
 
 
@@ -1193,7 +1193,7 @@ bool KNConfig::Cleanup::compactToday()
   if (!d_oCompact)
     return false;
 
-  TQDate today = TQDate::tqcurrentDate();
+  TQDate today = TQDate::currentDate();
   if (mLastCompDate == TQDateTime(today))
     return false;
 
@@ -1203,7 +1203,7 @@ bool KNConfig::Cleanup::compactToday()
 
 void KNConfig::Cleanup::setLastCompactDate()
 {
-  mLastCompDate = TQDateTime::tqcurrentDateTime();
+  mLastCompDate = TQDateTime::currentDateTime();
 }
 
 
diff --git a/knode/knconfig.h b/knode/knconfig.h
index f2fd7d114..0f0f868cc 100644
--- a/knode/knconfig.h
+++ b/knode/knconfig.h
@@ -391,7 +391,7 @@ class KDE_EXPORT XHeader {
 
     TQCString name()   { return n_ame; }
     TQString value()   { return v_alue; }
-    TQString header()  { return (TQString::tqfromLatin1(("X-"+n_ame+": "))+v_alue); }
+    TQString header()  { return (TQString::fromLatin1(("X-"+n_ame+": "))+v_alue); }
 
   protected:
     TQCString n_ame;
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 0860ee05e..99f25d783 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -561,7 +561,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge
 
   connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) );
 
-  KNHelper::restoreWindowSize("accNewsPropDLG", this, tqsizeHint());
+  KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint());
 
   setHelp("anc-setting-the-news-account");
 }
@@ -1548,8 +1548,8 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader
     v_alueCB[i]->setChecked(h->flag(i+4));
   }
 
-  setFixedHeight(tqsizeHint().height());
-  KNHelper::restoreWindowSize("accReadHdrPropDLG", this, tqsizeHint());
+  setFixedHeight(sizeHint().height());
+  KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint());
 
   connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&)));
 
@@ -2138,8 +2138,8 @@ KNConfig::XHeaderConfDialog::XHeaderConfDialog(const TQString &h, TQWidget *p, c
     v_alue->setText(h.mid(pos, h.length()-pos));
   }
 
-  setFixedHeight(tqsizeHint().height());
-  KNHelper::restoreWindowSize("XHeaderDlg", this, tqsizeHint());
+  setFixedHeight(sizeHint().height());
+  KNHelper::restoreWindowSize("XHeaderDlg", this, sizeHint());
 
   n_ame->setFocus();
 }
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index 70d447034..2db7b6f30 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -96,7 +96,7 @@ will be created before the conversion starts.").tqarg(KNODE_VERSION), w_1);
 
   w_2=new TQLabel(s_tack);
   w_2->setText(i18n("<b>Converting, please wait...</b>"));
-  w_2->tqsetAlignment(AlignCenter);
+  w_2->setAlignment(AlignCenter);
   s_tack->addWidget(w_2, 2);
 
   w_3=new TQWidget(s_tack);
diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp
index 1f6952f46..65b165222 100644
--- a/knode/kndisplayedheader.cpp
+++ b/knode/kndisplayedheader.cpp
@@ -107,7 +107,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s)
   bool retranslated = false;
   for (const char **c=predef;(*c)!=0;c++) {  // ok, first the standard header names
     if (s==i18n("collection of article headers",*c)) {
-      n_ame = TQString::tqfromLatin1(*c);
+      n_ame = TQString::fromLatin1(*c);
       retranslated = true;
       break;
     }
@@ -116,7 +116,7 @@ void KNDisplayedHeader::setTranslatedName(const TQString &s)
   if (!retranslated) {
     for (const char **c=disp;(*c)!=0;c++)   // now our standard display names
       if (s==i18n("collection of article headers",*c)) {
-        n_ame = TQString::tqfromLatin1(*c);
+        n_ame = TQString::fromLatin1(*c);
         retranslated = true;
         break;
       }
diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp
index ea05a21cc..729ec495c 100644
--- a/knode/knfilterdialog.cpp
+++ b/knode/knfilterdialog.cpp
@@ -74,8 +74,8 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char
   fw->messageId->setFilter(f->messageId);
   fw->references->setFilter(f->references);
 
-  setFixedHeight(tqsizeHint().height());
-  KNHelper::restoreWindowSize("filterDLG", this, tqsizeHint());
+  setFixedHeight(sizeHint().height());
+  KNHelper::restoreWindowSize("filterDLG", this, sizeHint());
 
   setHelp("anc-using-filters");
   connect( fname,  TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & )));
diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp
index df40915f2..c0ba082b5 100644
--- a/knode/kngroup.cpp
+++ b/knode/kngroup.cpp
@@ -133,7 +133,7 @@ void KNGroup::saveInfo()
     info.writeEntry("dynDataFormat", d_ynDataFormat);
     info.writeEntry("name", n_ame);
     info.writeEntry("useCharset", u_seCharset);
-    info.writeEntry("defaultChSet", TQString::tqfromLatin1(d_efaultChSet));
+    info.writeEntry("defaultChSet", TQString::fromLatin1(d_efaultChSet));
     switch (s_tatus) {
       case unknown: info.writeEntry("status","unknown");
                     break;
diff --git a/knode/kngroup.h b/knode/kngroup.h
index 387ff0f6e..76a9d0dd1 100644
--- a/knode/kngroup.h
+++ b/knode/kngroup.h
@@ -35,7 +35,7 @@ namespace KNConfig {
 class KNGroup : public KNArticleCollection , public KNJobItem  {
 
   public:
-    enum tqStatus { unknown=0, readOnly=1, postingAllowed=2, moderated=3 };
+    enum Status { unknown=0, readOnly=1, postingAllowed=2, moderated=3 };
 
     KNGroup(KNCollection *p=0);
     ~KNGroup();
@@ -123,8 +123,8 @@ class KNGroup : public KNArticleCollection , public KNJobItem  {
     KNNntpAccount* account();
     KNConfig::Identity* identity()const          { return i_dentity; }
     void setIdentity(KNConfig::Identity *i) { i_dentity=i; }
-    tqStatus status()const                         { return s_tatus; }
-    void setqStatus(tqStatus s)                { s_tatus=s; }
+    Status status()const                         { return s_tatus; }
+    void seStatus(Status s)                { s_tatus=s; }
     void showProperties();
 
     // cleanup configuration
@@ -153,7 +153,7 @@ class KNGroup : public KNArticleCollection , public KNJobItem  {
     bool      l_ocked,
               u_seCharset;
 
-    tqStatus    s_tatus;
+    Status    s_tatus;
 
     TQStringList c_rosspostIDBuffer;
 
diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index 0050e96a5..6807979b9 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -300,7 +300,7 @@ void KNGroupDialog::slotUser2()
   topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1);
 
   KDatePicker *dateSel = new KDatePicker(btnGrp, lastDate);
-  dateSel->setMinimumSize(dateSel->tqsizeHint());
+  dateSel->setMinimumSize(dateSel->sizeHint());
   topL->addWidget(dateSel, 3, 1, TQt::AlignLeft);
 
   connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool)));
@@ -314,7 +314,7 @@ void KNGroupDialog::slotUser2()
   if (dlg->exec()) {
     if (takeCustom->isChecked())
       lastDate = dateSel->date();
-    a_ccount->setLastNewFetch(TQDate::tqcurrentDate());
+    a_ccount->setLastNewFetch(TQDate::currentDate());
     leftLabel->setText(i18n("Checking for new groups..."));
     enableButton(User1,false);
     enableButton(User2,false);
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index dd8b05961..ea24f7930 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -51,7 +51,7 @@ KNGroupInfo::KNGroupInfo()
 }
 
 
-KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::tqStatus s_tatus)
+KNGroupInfo::KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup, bool s_ubscribed, KNGroup::Status s_tatus)
   : name(n_ame), description(d_escription), newGroup(n_ewGroup), subscribed(s_ubscribed),
     status(s_tatus)
 {
@@ -101,7 +101,7 @@ bool KNGroupListData::readIn(KNProtocolClient *client)
   int sepPos1,sepPos2;
   TQString name,description;
   bool sub;
-  KNGroup::tqStatus status=KNGroup::unknown;
+  KNGroup::Status status=KNGroup::unknown;
   TQTime timer;
   uint size=f.size()+2;
 
@@ -435,7 +435,7 @@ void KNGroupManager::subscribeGroup(const KNGroupInfo *gi, KNNntpAccount *a)
   grp=new KNGroup(a);
   grp->setGroupname(gi->name);
   grp->setDescription(gi->description);
-  grp->setqStatus(gi->status);
+  grp->seStatus(gi->status);
   grp->saveInfo();
   mGroupList.append( grp );
   emit groupAdded(grp);
@@ -596,7 +596,7 @@ void KNGroupManager::processJob(KNJobData *j)
               for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() )
                 if ( inf->name == (*it)->groupname() ) {
                   (*it)->setDescription( inf->description );
-                  (*it)->setqStatus( inf->status );
+                  (*it)->seStatus( inf->status );
                   break;
                 }
             }
diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h
index 8b34979d6..c6ccc92fb 100644
--- a/knode/kngroupmanager.h
+++ b/knode/kngroupmanager.h
@@ -38,13 +38,13 @@ class KNGroupInfo {
   public:
 
     KNGroupInfo();
-    KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::tqStatus s_tatus=KNGroup::unknown );
+    KNGroupInfo(const TQString &n_ame, const TQString &d_escription, bool n_ewGroup=false, bool s_ubscribed=false, KNGroup::Status s_tatus=KNGroup::unknown );
     ~KNGroupInfo();
 
     /** group names will be utf-8 encoded in the future... */
     TQString name,description;
     bool newGroup, subscribed;
-    KNGroup::tqStatus status;
+    KNGroup::Status status;
 
     bool operator== (const KNGroupInfo &gi2);
     bool operator< (const KNGroupInfo &gi2);
diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp
index c0a107afd..a49e03a9e 100644
--- a/knode/kngrouppropdlg.cpp
+++ b/knode/kngrouppropdlg.cpp
@@ -152,7 +152,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam
   cleanupLayout->addWidget( mCleanupWidget );
   cleanupLayout->addStretch( 1 );
 
-  KNHelper::restoreWindowSize("groupPropDLG", this, tqsizeHint());
+  KNHelper::restoreWindowSize("groupPropDLG", this, sizeHint());
 }
 
 
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index a5cdac894..81c2595ea 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -95,7 +95,7 @@ void KNJobData::cancel()
     mJob = 0;
   }
   if ( mProgressItem ) {
-    mProgressItem->setqStatus( "Canceled" );
+    mProgressItem->seStatus( "Canceled" );
     mProgressItem->setComplete();
     mProgressItem = 0;
   }
@@ -140,7 +140,7 @@ void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent )
 void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg )
 {
   kdDebug(5003) << k_funcinfo << "Status: " << msg << endl;
-  setqStatus( msg );
+  seStatus( msg );
 }
 
 
diff --git a/knode/knjobdata.h b/knode/knjobdata.h
index ade7b7f35..7f14dc7b9 100644
--- a/knode/knjobdata.h
+++ b/knode/knjobdata.h
@@ -115,7 +115,7 @@ class KNJobData : public TQObject
     void createProgressItem();
 
     // safe forwards to the progress item
-    void setqStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->setqStatus( msg ); }
+    void seStatus( const TQString &msg ) { if ( mProgressItem ) mProgressItem->seStatus( msg ); }
     void setProgress( unsigned int progress ) { if ( mProgressItem ) mProgressItem->setProgress( progress ); }
     void setComplete() { if ( mProgressItem ) { mProgressItem->setComplete(); mProgressItem = 0; } }
 
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 4294f7a51..57e6f0bec 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -305,19 +305,19 @@ KNMainWidget::~KNMainWidget()
 void KNMainWidget::iniStatusBar()
 {
   //statusbar
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
   KStatusBar *sb =  mainWin ? mainWin->statusBar() : 0;
   s_tatusFilter = new KRSqueezedTextLabel( TQString(), sb );
-  s_tatusFilter->tqsetAlignment( AlignLeft | AlignVCenter );
+  s_tatusFilter->setAlignment( AlignLeft | AlignVCenter );
   s_tatusGroup = new KRSqueezedTextLabel( TQString(), sb );
-  s_tatusGroup->tqsetAlignment( AlignLeft | AlignVCenter );
+  s_tatusGroup->setAlignment( AlignLeft | AlignVCenter );
 }
 
 //================================== GUI =================================
 
 void KNMainWidget::seStatusMsg(const TQString& text, int id)
 {
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
   KStatusBar *bar =  mainWin ? mainWin->statusBar() : 0;
   if ( !bar )
     return;
@@ -342,7 +342,7 @@ void KNMainWidget::seStatusMsg(const TQString& text, int id)
 
 void KNMainWidget::seStatusHelpMsg(const TQString& text)
 {
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
   KStatusBar *bar =  mainWin ? mainWin->statusBar() : 0;
   if ( bar )
     bar->message(text, 2000);
@@ -375,7 +375,7 @@ void KNMainWidget::setCursorBusy(bool b)
 void KNMainWidget::blockUI(bool b)
 {
   b_lockui = b;
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
   KMenuBar *mbar =  mainWin ? mainWin->menuBar() : 0;
   if ( mbar )
     mbar->setEnabled(!b);
@@ -394,7 +394,7 @@ void KNMainWidget::blockUI(bool b)
 void KNMainWidget::disableAccels(bool b)
 {
   a_ccel->setEnabled(!b);
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
   KAccel *naccel = mainWin ? mainWin->accel() : 0;
   if ( naccel )
     naccel->setEnabled(!b);
@@ -409,7 +409,7 @@ void KNMainWidget::disableAccels(bool b)
 void KNMainWidget::secureProcessEvents()
 {
   b_lockui = true;
-  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+  KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget());
   KMenuBar *mbar =  mainWin ? mainWin->menuBar() : 0;
   if ( mbar )
     mbar->setEnabled(false);
@@ -431,7 +431,7 @@ void KNMainWidget::secureProcessEvents()
 }
 
 
-TQSize KNMainWidget::tqsizeHint() const
+TQSize KNMainWidget::sizeHint() const
 {
   return TQSize(759,478);    // default optimized for 800x600
 }
@@ -903,7 +903,7 @@ bool KNMainWidget::queryClose()
 
 void KNMainWidget::showEvent(TQShowEvent *)
 {
-  slotCheckDockWidgetqStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
@@ -1301,7 +1301,7 @@ void KNMainWidget::slotNetworkActive(bool b)
 }
 
 
-void KNMainWidget::slotCheckDockWidgetqStatus()
+void KNMainWidget::slotCheckDockWidgeStatus()
 {
   a_ctToggleGroupView->setChecked(c_olDock->isVisible());
   a_ctToggleArticleViewer->setChecked(a_rtDock->isVisible());
@@ -1966,7 +1966,7 @@ void KNMainWidget::slotFetchArticleWithID()
 void KNMainWidget::slotToggleGroupView()
 {
   c_olDock->changeHideShowState();
-  slotCheckDockWidgetqStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
@@ -1977,19 +1977,19 @@ void KNMainWidget::slotToggleHeaderView()
       if ( !h_drDock->isDockBackPossible() ) {
           h_drDock->manualDock( a_rtDock, KDockWidget::DockTop );
           h_drDock->makeDockVisible();
-          slotCheckDockWidgetqStatus();
+          slotCheckDockWidgeStatus();
           return;
       }
 
   h_drDock->changeHideShowState();
-  slotCheckDockWidgetqStatus();
+  slotCheckDockWidgeStatus();
 }
 
 
 void KNMainWidget::slotToggleArticleViewer()
 {
   a_rtDock->changeHideShowState();
-  slotCheckDockWidgetqStatus();
+  slotCheckDockWidgeStatus();
 }
 
 void KNMainWidget::slotToggleQuickSearch()
diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h
index c00c69982..6a6e8ed1a 100644
--- a/knode/knmainwidget.h
+++ b/knode/knmainwidget.h
@@ -83,7 +83,7 @@ public:
   void secureProcessEvents();
 
   /** useful default value */
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
   /** handle URL given as command-line argument */
   void openURL(const KURL &url);
@@ -230,7 +230,7 @@ protected slots:
   void slotNetworkActive(bool b);
 
   //dock widget slots
-  void slotCheckDockWidgetqStatus();
+  void slotCheckDockWidgeStatus();
   void slotGroupDockHidden();
   void slotHeaderDockHidden();
   void slotArticleDockHidden();
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index ec2c86632..1b67d62ea 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -102,7 +102,7 @@ void KNNetAccess::addJob(KNJobData *job)
   if ( !job->account()->readyForLogin() ) {
     mWalletQueue.append( job );
     knGlobals.accountManager()->loadPasswordsAsync();
-    job->setqStatus( i18n( "Waiting for KWallet..." ) );
+    job->seStatus( i18n( "Waiting for KWallet..." ) );
     return;
   }
 
@@ -142,7 +142,7 @@ void KNNetAccess::addJob(KNJobData *job)
         startJobNntp();
     }
   }
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -178,7 +178,7 @@ void KNNetAccess::stopJobsNntp( int type )
     } else
       ++it;
   }
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -207,7 +207,7 @@ void KNNetAccess::stopJobsSmtp( int type )
     } else
       ++it;
   }
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -340,7 +340,7 @@ void KNNetAccess::threadDoneNntp()
   if (!nntpJobQueue.isEmpty())
     startJobNntp();
 
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -368,7 +368,7 @@ void KNNetAccess::threadDoneSmtp()
   if (!smtpJobQueue.isEmpty())
     startJobSmtp();
 
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -399,52 +399,52 @@ void KNNetAccess::slotThreadSignal(int i)
       case KNProtocolClient::TSconnect:
         currMsg = i18n(" Connecting to server...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSloadGrouplist:
         currMsg = i18n(" Loading group list from disk...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSwriteGrouplist:
         currMsg = i18n(" Writing group list to disk...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadGrouplist:
         currMsg = i18n(" Downloading group list...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNewGroups:
         currMsg = i18n(" Looking for new groups...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadDesc:
         currMsg = i18n(" Downloading group descriptions...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadNew:
         currMsg = i18n(" Downloading new headers...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSsortNew:
         currMsg = i18n(" Sorting...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSdownloadArticle:
         currMsg = i18n(" Downloading article...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSsendArticle:
         currMsg = i18n(" Sending article...");
         knGlobals.seStatusMsg(currMsg);
-        currentNntpJob->setqStatus(currMsg);
+        currentNntpJob->seStatus(currMsg);
       break;
       case KNProtocolClient::TSjobStarted:
         currentNntpJob->setProgress(0);
@@ -477,7 +477,7 @@ void KNNetAccess::slotPasswordsChanged()
 {
   TQValueList<KNJobData*>::ConstIterator it;
   for ( it = mWalletQueue.begin(); it != mWalletQueue.end(); ++it ) {
-    (*it)->setqStatus( i18n("Waiting...") );
+    (*it)->seStatus( i18n("Waiting...") );
     if ( (*it)->type() == KNJobData::JTmail )
       smtpJobQueue.append( (*it) );
     else
@@ -528,10 +528,10 @@ void KNNetAccess::slotCancelJob( KPIM::ProgressItem *item )
   if ( currentSmtpJob && currentSmtpJob->progressItem() == item )
     cancelCurrentSmtpJob();
 
-  updatetqStatus();
+  updateStatus();
 }
 
-void KNNetAccess::updatetqStatus( )
+void KNNetAccess::updateStatus( )
 {
   if ( nntpJobQueue.isEmpty() && smtpJobQueue.isEmpty() && !currentNntpJob
        && !currentSmtpJob && mWalletQueue.isEmpty() )
diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h
index 6b34937a1..23e34e0c0 100644
--- a/knode/knnetaccess.h
+++ b/knode/knnetaccess.h
@@ -85,7 +85,7 @@ class KNNetAccess : public TQObject  {
     void cancelCurrentNntpJob( int type = 0 );
     void cancelCurrentSmtpJob( int type = 0 );
     /** Update activitiy status, i.e. emit netActive signal. */
-    void updatetqStatus();
+    void updateStatus();
 
   private slots:
     void slotJobResult( KIO::Job *job );
diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp
index 81b3cc425..8aa5f1b76 100644
--- a/knode/knnntpaccount.cpp
+++ b/knode/knnntpaccount.cpp
@@ -75,7 +75,7 @@ void KNNntpAccountIntervalChecking::slotCheckNews()
 KNNntpAccount::KNNntpAccount()
   : KNCollection(0), KNServerInfo(), i_dentity(0), f_etchDescriptions(true), w_asOpen(false), i_ntervalChecking(false), c_heckInterval(10)
 {
-  l_astNewFetch = TQDate::tqcurrentDate();
+  l_astNewFetch = TQDate::currentDate();
   a_ccountIntervalChecking = new KNNntpAccountIntervalChecking(this);
   mCleanupConf = new KNConfig::Cleanup( false );
 }
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index 26473b6a1..fbd8ce51d 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -93,7 +93,7 @@ void KNNntpClient::doFetchGroups()
 
   char *s, *line;
   TQString name;
-  KNGroup::tqStatus status;
+  KNGroup::Status status;
   bool subscribed;
 
   while (getNextLine()) {
@@ -228,7 +228,7 @@ void KNNntpClient::doCheckNewGroups()
 
   char *s, *line;
   TQString name;
-  KNGroup::tqStatus status;
+  KNGroup::Status status;
   TQSortedList<KNGroupInfo> tmpList;
   tmpList.setAutoDelete(true);
 
diff --git a/knode/knode.cpp b/knode/knode.cpp
index e0963816b..1af62747b 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -109,7 +109,7 @@ void KNMainWindow::setupStatusBar()
   statusBar()->addWidget( mLittleProgress, 0 , true );
 
   mStatusMsgLabel = new KRSqueezedTextLabel( TQString(), statusBar() );
-  mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
+  mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter );
   statusBar()->addWidget( mStatusMsgLabel, 2 );
   statusBar()->addWidget(m_mainWidget->statusBarLabelFilter(), 2);
   statusBar()->addWidget(m_mainWidget->statusBarLabelGroup(), 3);
diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp
index 28c67b030..f5aa55938 100644
--- a/knode/knrangefilter.cpp
+++ b/knode/knrangefilter.cpp
@@ -118,7 +118,7 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max
   op2->insertItem("<=");
 
   des=new TQLabel(value, this);
-  des->tqsetAlignment(AlignCenter);
+  des->setAlignment(AlignCenter);
 
   TQGridLayout *topL=new TQGridLayout(this, 2,6, 8,5 );
 
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index 4344cbbab..f72afe472 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -68,8 +68,8 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent)
   f_ilter->setLoaded(true);
   f_ilter->setSearchFilter(true);
 
-  setFixedHeight(tqsizeHint().height());
-  KNHelper::restoreWindowSize("searchDlg", this, tqsizeHint());
+  setFixedHeight(sizeHint().height());
+  KNHelper::restoreWindowSize("searchDlg", this, sizeHint());
   fcw->setStartFocus();
 }
 
diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp
index c3f21959a..e2afa4cf2 100644
--- a/knode/knwidgets.cpp
+++ b/knode/knwidgets.cpp
@@ -107,10 +107,10 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e)
 //====================================================================================
 
 
-KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
+KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name )
   : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false)
 {
-  connect(tqfocusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*)));
+  connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*)));
 }
 
 
@@ -141,7 +141,7 @@ void KNDockWidgetHeaderDrag::paintEvent(TQPaintEvent* ev)
   TQPainter paint;
 
   paint.begin(&drawBuffer);
-  paint.fillRect(drawBuffer.rect(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)));
+  paint.fillRect(drawBuffer.rect(), TQBrush(colorGroup().brush(TQColorGroup::Background)));
 
   paint.setPen(tqpalette().active().highlight());
   paint.drawLine(1, 2, width(), 2);
diff --git a/knode/knwidgets.h b/knode/knwidgets.h
index 002e31373..e9e782e20 100644
--- a/knode/knwidgets.h
+++ b/knode/knwidgets.h
@@ -72,7 +72,7 @@ class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag
   TQ_OBJECT
 
   public:
-    KNDockWidgetHeaderDrag(TQWidget *tqfocusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock,
+    KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock,
                             const char* name = 0);
     virtual ~KNDockWidgetHeaderDrag();
 
diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui
index b742d4dd7..54ffb5e4a 100644
--- a/knode/smtpaccountwidget_base.ui
+++ b/knode/smtpaccountwidget_base.ui
@@ -86,7 +86,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>