Rename obsolete tq methods to standard names

6 files changed, 18 insertions, 18 deletions

diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 2827d025d..0f8291cf9 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -1408,8 +1408,8 @@ void ArticleWidget::slotCopyURL()
     address = mCurrentURL.path();
   else
     address = mCurrentURL.url();
-  TQApplication::tqclipboard()->setText( address, TQClipboard::Clipboard );
-  TQApplication::tqclipboard()->setText( address, TQClipboard::Selection );
+  TQApplication::clipboard()->setText( address, TQClipboard::Clipboard );
+  TQApplication::clipboard()->setText( address, TQClipboard::Selection );
 }
 
 void ArticleWidget::slotAddBookmark()
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index 7b73cc7ba..e1fb20697 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -93,7 +93,7 @@ void KNCollectionView::readConfig()
   KConfig *conf = knGlobals.config();
   conf->setGroup( "GroupView" );
 
-  // execute the listview tqlayout stuff only once
+  // execute the listview layout stuff only once
   static bool initDone = false;
   if (!initDone) {
     initDone = true;
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index c2523d13a..d03a653cf 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -1782,9 +1782,9 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n)
   KConfig *config = knGlobals.config();
   KConfigGroupSaver saver(config, "VISUAL_APPEARANCE");
   TQColor defaultColor1( kapp->tqpalette().active().text()); // defaults from kmreaderwin.cpp
-  TQColor defaultColor2( kapp->tqpalette().active().text() );
-  TQColor defaultColor3( kapp->tqpalette().active().text() );
-  TQColor defaultForeground( kapp->tqpalette().active().text() );
+  TQColor defaultColor2( kapp->palette().active().text() );
+  TQColor defaultColor3( kapp->palette().active().text() );
+  TQColor defaultForeground( kapp->palette().active().text() );
   TQColor col1 = config->readColorEntry( "ForegroundColor", &defaultForeground );
   TQColor col2 = config->readColorEntry( "quote3Color", &defaultColor3 );
   TQColor col3 = config->readColorEntry( "quote2Color", &defaultColor2 );
@@ -2152,7 +2152,7 @@ TQStringList KNComposer::Editor::processedText()
 
 void KNComposer::Editor::slotPasteAsQuotation()
 {
-  TQString s = TQApplication::tqclipboard()->text();
+  TQString s = TQApplication::clipboard()->text();
   if (!s.isEmpty()) {
     for (int i=0; (uint)i<s.length(); i++) {
       if ( s[i] < ' ' && s[i] != '\n' && s[i] != '\t' )
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index bde9fd42b..2eecea7e1 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -452,7 +452,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
   switch(i) {
 
     case background:
-      return kapp->tqpalette().active().base();
+      return kapp->palette().active().base();
 
     case alternateBackground:
       return KGlobalSettings::alternateBackgroundColor();
@@ -466,13 +466,13 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
 
     case normalText:
     case unreadThread:
-      return kapp->tqpalette().active().text();
+      return kapp->palette().active().text();
 
     case url:
       return KGlobalSettings::linkColor();
 
     case readThread:
-      return kapp->tqpalette().disabled().text();
+      return kapp->palette().disabled().text();
 
     case unreadArticle:
       return TQColor( 183, 154, 11 );
@@ -492,7 +492,7 @@ TQColor KNConfig::Appearance::defaultColor(int i) const
       return TQColor( 0xFF, 0x40, 0x40 );
   }
 
-  return kapp->tqpalette().disabled().text();
+  return kapp->palette().disabled().text();
 }
 
 
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index aa93af980..b34d76381 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -2373,10 +2373,10 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren
 
   mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this );
   mExpGroup->setColumnLayout(0, Qt::Vertical );
-  mExpGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
-  mExpGroup->tqlayout()->setMargin( KDialog::marginHint() );
+  mExpGroup->layout()->setSpacing( KDialog::spacingHint() );
+  mExpGroup->layout()->setMargin( KDialog::marginHint() );
   top->addWidget( mExpGroup );
-  TQGridLayout *grid = new TQGridLayout( mExpGroup->tqlayout(), 7, 2 );
+  TQGridLayout *grid = new TQGridLayout( mExpGroup->layout(), 7, 2 );
 
   grid->setRowSpacing( 0, KDialog::spacingHint() );
 
@@ -2482,11 +2482,11 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) :
 
   TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this);
   foldersB->setColumnLayout(0, Qt::Vertical );
-  foldersB->tqlayout()->setSpacing( KDialog::spacingHint() );
-  foldersB->tqlayout()->setMargin( KDialog::marginHint() );
+  foldersB->layout()->setSpacing( KDialog::spacingHint() );
+  foldersB->layout()->setMargin( KDialog::marginHint() );
 
   topL->addWidget(foldersB);
-  TQGridLayout *foldersL=new TQGridLayout(foldersB->tqlayout(), 3,2);
+  TQGridLayout *foldersL=new TQGridLayout(foldersB->layout(), 3,2);
 
   foldersL->setRowSpacing( 0, KDialog::spacingHint() );
 
diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp
index 3aa9677bb..be91593a7 100644
--- a/knode/kngroupbrowser.cpp
+++ b/knode/kngroupbrowser.cpp
@@ -92,7 +92,7 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp
   connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)),
           this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*)));
 
-  //tqlayout
+  //layout
   TQGridLayout *topL=new TQGridLayout(page,3,1,0,5);
   TQHBoxLayout *filterL=new TQHBoxLayout(10);
   TQVBoxLayout *arrL=new TQVBoxLayout(10);