Rename obsolete tq methods to standard names

2 files changed, 13 insertions, 13 deletions

diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp
index cec64193..28ab2646 100644
--- a/kspread/plugins/calculator/configdlg.cpp
+++ b/kspread/plugins/calculator/configdlg.cpp
@@ -48,10 +48,10 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct)
   lay1->setSpacing( KDialog::spacingHint() );
 
   box = new TQGroupBox(0, Qt::Vertical, i18n("Defaults"), this, "box");
-  box->tqlayout()->setSpacing(KDialog::spacingHint());
-  box->tqlayout()->setMargin(KDialog::marginHint());
+  box->layout()->setSpacing(KDialog::spacingHint());
+  box->layout()->setMargin(KDialog::marginHint());
 
-  TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),8,2);
+  TQGridLayout *grid1 = new TQGridLayout(box->layout(),8,2);
   label1 = new TQLabel(box);
   label1->setText(i18n("Foreground color:"));
   grid1->addWidget(label1,0,0);
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index e1a1d4c3..75051b17 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -390,12 +390,12 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     mainLayout->addLayout(btnLayout);
     mainLayout->addLayout(statusLayout);
 
-    // button tqlayout
+    // button layout
     btnLayout->addWidget(mSmallPage,0,AlignTop);
     btnLayout->addSpacing(mInternalSpacing);
     btnLayout->addWidget(mLargePage,0,AlignTop);
 
-    // small button tqlayout
+    // small button layout
     smallBtnLayout->addWidget(pbhyp, 0, 0);
     smallBtnLayout->addWidget(pbinv, 0, 1);
     smallBtnLayout->addWidget(pbA, 0, 2);
@@ -427,7 +427,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     smallBtnLayout->setRowStretch(4, 0);
     smallBtnLayout->setRowStretch(5, 0);
 
-    // large button tqlayout
+    // large button layout
     largeBtnLayout->addWidget(pbEE, 0, 0);
     largeBtnLayout->addWidget(pbMR, 0, 1);
     largeBtnLayout->addWidget(pbMplusminus, 0, 2);
@@ -472,11 +472,11 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
     topLayout->addWidget(calc_display, 10);
 
 
-    // radiobutton tqlayout
+    // radiobutton layout
     radioLayout->addWidget(base_group);
     radioLayout->addWidget(angle_group);
 
-    // status tqlayout
+    // status layout
     statusLayout->addWidget(statusINVLabel);
     statusLayout->addWidget(statusHYPLabel);
     statusLayout->addWidget(statusERRORLabel, 10);
@@ -1465,9 +1465,9 @@ void TQtCalculator::configclicked(){
   lay1->setSpacing( KDialog::spacingHint() );
 
   TQGroupBox *box = new TQGroupBox(0,Qt::Vertical,about,"box");
-  box->tqlayout()->setSpacing(KDialog::spacingHint());
-  box->tqlayout()->setMargin(KDialog::marginHint());
-  TQGridLayout *grid1 = new TQGridLayout(box->tqlayout(),2,2);
+  box->layout()->setSpacing(KDialog::spacingHint());
+  box->layout()->setMargin(KDialog::marginHint());
+  TQGridLayout *grid1 = new TQGridLayout(box->layout(),2,2);
   TQLabel  *label = new TQLabel(box,"label");
   TQLabel  *label2 = new TQLabel(box,"label2");
 
@@ -1628,7 +1628,7 @@ void TQtCalculator::display_selected(){
 
     if(calc_display->isLit()){
 
-      TQClipboard *cb = TQApplication::tqclipboard();
+      TQClipboard *cb = TQApplication::clipboard();
       cb->setText(calc_display->text());
       selection_timer->start(100);
 
@@ -1643,7 +1643,7 @@ void TQtCalculator::display_selected(){
   }
   else{
 
-    TQClipboard *cb = TQApplication::tqclipboard();
+    TQClipboard *cb = TQApplication::clipboard();
 
     CALCAMNT result;
     result = (CALCAMNT) cb->text().toDouble();