1 files changed, 10 insertions, 10 deletions

diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index fcbb734e..8c21d75a 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -1976,13 +1976,13 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* tqparent, CellFormatDialog *_d
         selFont.setFamily( dlg->textFontFamily );
         kdDebug(36001) << "Family = " << dlg->textFontFamily << endl;
 
-        if ( !family_combo->tqfindItem(dlg->textFontFamily))
+        if ( !family_combo->findItem(dlg->textFontFamily))
                 {
                 family_combo->insertItem("",0);
                 family_combo->setCurrentItem(0);
                 }
         else
-                family_combo->setCurrentItem(family_combo->index(family_combo->tqfindItem(dlg->textFontFamily)));
+                family_combo->setCurrentItem(family_combo->index(family_combo->findItem(dlg->textFontFamily)));
    }
    else
    {
@@ -3361,7 +3361,7 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev)
 
 
   TQRect rect(OFFSETX,OFFSETY-8,area->width()-OFFSETX,OFFSETY+8);
-  if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
+  if (rect.contains(TQPoint(_ev->x(),_ev->y())))
   {
     if (((top->getPenWidth()!=preview->getPenWidth()) ||
         (top->getColor()!=currentColor) ||
@@ -3378,7 +3378,7 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev)
   }
   rect.setCoords(OFFSETX,area->height()-OFFSETY-8,area->width()-OFFSETX,
                  area->height()-OFFSETY+8);
-  if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
+  if (rect.contains(TQPoint(_ev->x(),_ev->y())))
   {
     if (((bottom->getPenWidth()!=preview->getPenWidth()) ||
         (bottom->getColor()!=currentColor) ||
@@ -3395,7 +3395,7 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev)
   }
 
   rect.setCoords(OFFSETX-8,OFFSETY,OFFSETX+8,area->height()-OFFSETY);
-  if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
+  if (rect.contains(TQPoint(_ev->x(),_ev->y())))
   {
     if (((left->getPenWidth()!=preview->getPenWidth()) ||
         (left->getColor()!=currentColor) ||
@@ -3412,7 +3412,7 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev)
   }
   rect.setCoords(area->width()-OFFSETX-8,OFFSETY,area->width()-OFFSETX+8,
                  area->height()-OFFSETY);
-  if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
+  if (rect.contains(TQPoint(_ev->x(),_ev->y())))
   {
     if (((right->getPenWidth()!=preview->getPenWidth()) ||
         (right->getColor()!=currentColor) ||
@@ -3431,12 +3431,12 @@ void CellFormatPageBorder::slotPressEvent(TQMouseEvent *_ev)
 //don't work because I don't know how create a rectangle
 //for diagonal
 /*rect.setCoords(OFFSETX,OFFSETY,XLEN-OFFSETX,YHEI-OFFSETY);
-if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
+if (rect.contains(TQPoint(_ev->x(),_ev->y())))
         {
          invertState(fallDiagonal);
         }
 rect.setCoords(OFFSETX,YHEI-OFFSETY,XLEN-OFFSETX,OFFSETY);
-if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
+if (rect.contains(TQPoint(_ev->x(),_ev->y())))
         {
          invertState(goUpDiagonal);
         } */
@@ -3446,7 +3446,7 @@ if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
     rect.setCoords(area->width()/2-8,OFFSETY,area->width()/2+8,
                    area->height()-OFFSETY);
 
-    if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
+    if (rect.contains(TQPoint(_ev->x(),_ev->y())))
     {
       if (((vertical->getPenWidth()!=preview->getPenWidth()) ||
           (vertical->getColor()!=currentColor) ||
@@ -3466,7 +3466,7 @@ if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
   {
     rect.setCoords(OFFSETX,area->height()/2-8,area->width()-OFFSETX,
                    area->height()/2+8);
-    if (rect.tqcontains(TQPoint(_ev->x(),_ev->y())))
+    if (rect.contains(TQPoint(_ev->x(),_ev->y())))
     {
       if (((horizontal->getPenWidth()!=preview->getPenWidth()) ||
           (horizontal->getColor()!=currentColor) ||