summaryrefslogtreecommitdiffstats
path: root/kspread/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/dialogs')
-rw-r--r--kspread/dialogs/kspread_dlg_cons.cc8
-rw-r--r--kspread/dialogs/kspread_dlg_database.cc24
-rw-r--r--kspread/dialogs/kspread_dlg_formula.cc18
-rw-r--r--kspread/dialogs/kspread_dlg_layout.cc20
-rw-r--r--kspread/dialogs/kspread_dlg_paperlayout.cc8
-rw-r--r--kspread/dialogs/kspread_dlg_reference.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_sort.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_styles.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_subtotal.cc2
-rw-r--r--kspread/dialogs/link.cc10
10 files changed, 49 insertions, 49 deletions
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc
index ca049ee1..16b0ebbb 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cc
@@ -302,7 +302,7 @@ void ConsolidateDialog::slotOk()
if ( c )
{
TQString s = c->value().asString();
- if ( !lst.tqcontains( s ) )
+ if ( !lst.contains( s ) )
lst.append( s );
}
}
@@ -384,7 +384,7 @@ void ConsolidateDialog::slotOk()
if ( c )
{
TQString s = c->value().asString();
- if ( !s.isEmpty() && lst.tqfind( s ) == lst.end() )
+ if ( !s.isEmpty() && lst.find( s ) == lst.end() )
lst.append( s );
}
}
@@ -467,7 +467,7 @@ void ConsolidateDialog::slotOk()
if ( c )
{
TQString s = c->value().asString();
- if ( !s.isEmpty() && cols.tqfind( s ) == cols.end() )
+ if ( !s.isEmpty() && cols.find( s ) == cols.end() )
cols.append( s );
}
}
@@ -487,7 +487,7 @@ void ConsolidateDialog::slotOk()
if ( c )
{
TQString s = c->value().asString();
- if ( !s.isEmpty() && rows.tqfind( s ) == rows.end() )
+ if ( !s.isEmpty() && rows.find( s ) == rows.end() )
rows.append( s );
}
}
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 1bca7c85..7aa5dfa9 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -944,18 +944,18 @@ TQString DatabaseDialog::getWhereCondition(TQString const & column,
TQString DatabaseDialog::exchangeWildcards(TQString const & value)
{
TQString str(value);
- int p = str.tqfind('*');
+ int p = str.find('*');
while ( p > -1 )
{
- str = str.tqreplace( p, 1, "%" );
- p = str.tqfind('*');
+ str = str.replace( p, 1, "%" );
+ p = str.find('*');
}
- p = str.tqfind('?');
+ p = str.find('?');
while ( p > -1 )
{
- str = str.tqreplace( p, 1, "_" );
- p = str.tqfind('?');
+ str = str.replace( p, 1, "_" );
+ p = str.find('?');
}
return str;
}
@@ -964,8 +964,8 @@ bool DatabaseDialog::optionsDoNext()
{
if ( m_operator_1->currentItem() == 4 )
{
- if ( ( m_operatorValue_1->text().tqfind('*') != -1 )
- || ( m_operatorValue_1->text().tqfind('?') != -1 ) )
+ if ( ( m_operatorValue_1->text().find('*') != -1 )
+ || ( m_operatorValue_1->text().find('?') != -1 ) )
{
// xgettext: no-c-format
int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. "
@@ -978,8 +978,8 @@ bool DatabaseDialog::optionsDoNext()
if ( m_operator_2->currentItem() == 4 )
{
- if ( ( m_operatorValue_2->text().tqfind('*') != -1 )
- || ( m_operatorValue_2->text().tqfind('?') != -1 ) )
+ if ( ( m_operatorValue_2->text().find('*') != -1 )
+ || ( m_operatorValue_2->text().find('?') != -1 ) )
{
// xgettext: no-c-format
int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. "
@@ -992,8 +992,8 @@ bool DatabaseDialog::optionsDoNext()
if ( m_operator_3->currentItem() == 4 )
{
- if ( ( m_operatorValue_3->text().tqfind('*') != -1 )
- || ( m_operatorValue_3->text().tqfind('?') != -1 ) )
+ if ( ( m_operatorValue_3->text().find('*') != -1 )
+ || ( m_operatorValue_3->text().find('?') != -1 ) )
{
// xgettext: no-c-format
int res = KMessageBox::warningYesNo( this, i18n("'*' or '?' are not valid wildcards in SQL. "
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc
index 0981a4e7..d8d7e9d7 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cc
@@ -224,8 +224,8 @@ FormulaDialog::FormulaDialog( View* tqparent, const char* name,const TQString& f
// Was a function name passed along with the constructor ? Then activate it.
if( !formulaName.isEmpty() )
{
- functions->setCurrentItem( functions->index( functions->tqfindItem( formulaName ) ) );
- slotDoubleClicked( functions->tqfindItem( formulaName ) );
+ functions->setCurrentItem( functions->index( functions->findItem( formulaName ) ) );
+ slotDoubleClicked( functions->findItem( formulaName ) );
}
else
{
@@ -266,7 +266,7 @@ void FormulaDialog::slotSearchText(const TQString &_text)
{
TQString result = listFunct.makeCompletion( _text.upper() );
if( !result.isNull() )
- functions->setCurrentItem( functions->index( functions->tqfindItem( result ) ) );
+ functions->setCurrentItem( functions->index( functions->findItem( result ) ) );
}
bool FormulaDialog::eventFilter( TQObject* obj, TQEvent* ev )
@@ -364,7 +364,7 @@ void FormulaDialog::slotSelectButton()
{
if( functions->currentItem() != -1 )
{
- slotDoubleClicked(functions->tqfindItem(functions->text(functions->currentItem())));
+ slotDoubleClicked(functions->findItem(functions->text(functions->currentItem())));
}
}
@@ -473,10 +473,10 @@ TQString FormulaDialog::createParameter( const TQString& _text, int param )
TQString tmp = _text;
int pos;
int start = 1;
- while( ( pos = tmp.tqfind( '"', start ) ) != -1 )
+ while( ( pos = tmp.find( '"', start ) ) != -1 )
{
if (tmp[pos - 1] != '\\')
- tmp.tqreplace( pos, 1, "\\\"" );
+ tmp.replace( pos, 1, "\\\"" );
else
start = pos + 1;
}
@@ -497,10 +497,10 @@ TQString FormulaDialog::createParameter( const TQString& _text, int param )
TQString tmp = _text;
int pos;
int start = 1;
- while( ( pos = tmp.tqfind( '"', start ) ) != -1 )
+ while( ( pos = tmp.find( '"', start ) ) != -1 )
{
if (tmp[pos - 1] != '\\')
- tmp.tqreplace( pos, 1, "\\\"" );
+ tmp.replace( pos, 1, "\\\"" );
else
start = pos + 1;
}
@@ -712,7 +712,7 @@ void FormulaDialog::slotShowFunction( const TQString& function )
slotActivated( category );
// select the function
- TQListBoxItem* item = functions->tqfindItem( function,
+ TQListBoxItem* item = functions->findItem( function,
TQt::ExactMatch | TQt::CaseSensitive );
if( item ) functions->setCurrentItem( item );
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) ||
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index 6c277be6..c6b52c15 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -331,7 +331,7 @@ void PaperLayout::slotOk()
else
{
bool error = true;
- int first = tmpPrintRange.tqfind(":");
+ int first = tmpPrintRange.find(":");
if ( ( first != -1 ) && ( (int)tmpPrintRange.length() > first ) )
{
Point point1 ( tmpPrintRange.left( first ) );
@@ -359,7 +359,7 @@ void PaperLayout::slotOk()
else
{
bool error = true;
- int first = tmpRepeatCols.tqfind(":");
+ int first = tmpRepeatCols.find(":");
if ( ( first != -1 ) && ( (int)tmpRepeatCols.length() > first ) )
{
int col1 = util_decodeColumnLabelText( tmpRepeatCols.left( first ) );
@@ -385,7 +385,7 @@ void PaperLayout::slotOk()
else
{
bool error = true;
- int first = tmpRepeatRows.tqfind(":");
+ int first = tmpRepeatRows.find(":");
if ( ( first != -1 ) && ( (int)tmpRepeatRows.length() > first ) )
{
int row1 = tmpRepeatRows.left( first ).toInt();
@@ -411,7 +411,7 @@ void PaperLayout::slotOk()
{
kdDebug() << "New zoom is different than original: " << m_cZoom->currentText() << endl;
TQString zoomtext = m_cZoom->currentText();
- zoomtext.tqreplace("%","");
+ zoomtext.replace("%","");
bool convertok = false;
double zoomvalue = zoomtext.toDouble(&convertok);
if (!convertok)
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index 1fbb55e3..8f315ca5 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -91,7 +91,7 @@ reference::reference( View* tqparent, const char* name )
for ( it = area.begin(); it != area.end(); ++it )
{
text = (*it).ref_name;
- if ( sheetName.tqcontains((*it).sheet_name ))
+ if ( sheetName.contains((*it).sheet_name ))
m_list->insertItem(text);
}
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 3b94da54..17beca41 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -574,7 +574,7 @@ void SortDialog::slotOk()
int h = outputPoint.pos().y() + sortArea.height();
int w = outputPoint.pos().x() + sortArea.width();
- if ( sortArea.tqcontains(outputPoint.pos())
+ if ( sortArea.contains(outputPoint.pos())
|| ( w >= sortArea.left() && w <= sortArea.right() )
|| ( h >= sortArea.top() && h <= sortArea.bottom() ) )
{
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index 818581f6..6a8e0fae 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -111,13 +111,13 @@ void StyleDlg::fillComboBox()
while ( entries.count() != count )
{
- if ( entries.tqfind( iter.data() ) == entries.end() )
+ if ( entries.find( iter.data() ) == entries.end() )
{
if ( iter.data()->tqparent() == 0 )
entries[iter.data()] = new KListViewItem( m_dlg->m_styleList, iter.data()->name() );
else
{
- Map::const_iterator i = entries.tqfind( iter.data()->tqparent() );
+ Map::const_iterator i = entries.find( iter.data()->tqparent() );
if ( i != entries.end() )
entries[iter.data()] = new KListViewItem( i.data(), iter.data()->name() );
}
diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc
index 696821cb..a2771642 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.cc
+++ b/kspread/dialogs/kspread_dlg_subtotal.cc
@@ -206,7 +206,7 @@ void SubtotalDialog::removeSubtotalLines()
continue;
text = cell->text();
- if ( text.tqfind( "SUBTOTAL" ) != -1 )
+ if ( text.find( "SUBTOTAL" ) != -1 )
{
containsSubtotal = true;
break;
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index 0e115e01..aba1a170 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -165,23 +165,23 @@ TQString LinkDialog::link() const
case 0:
str = d->internetLink->text();
if( !str.isEmpty() )
- if( str.tqfind( "http://" )==-1 )
- if( str.tqfind( "https://" )==-1 )
- if( str.tqfind( "ftp://" )==-1 )
+ if( str.find( "http://" )==-1 )
+ if( str.find( "https://" )==-1 )
+ if( str.find( "ftp://" )==-1 )
str.prepend( "http://" );
break;
case 1:
str = d->mailLink->text();
if( !str.isEmpty() )
- if( str.tqfind( "mailto:" )==-1 )
+ if( str.find( "mailto:" )==-1 )
str.prepend( "mailto:" );
break;
case 2:
str = d->fileLink->lineEdit()->text();
if( !str.isEmpty() )
- if( str.tqfind( "file:/" )==-1 )
+ if( str.find( "file:/" )==-1 )
str.prepend( "file://" );
break;