summaryrefslogtreecommitdiffstats
path: root/libkscan
diff options
context:
space:
mode:
Diffstat (limited to 'libkscan')
-rw-r--r--libkscan/COPYING.LIB2
-rw-r--r--libkscan/devselector.cpp4
-rw-r--r--libkscan/img_canvas.cpp8
-rw-r--r--libkscan/kscandevice.cpp6
-rw-r--r--libkscan/kscanoption.cpp2
-rw-r--r--libkscan/kscanoptset.cpp2
-rw-r--r--libkscan/kscanslider.cpp2
-rw-r--r--libkscan/scanparams.cpp2
8 files changed, 14 insertions, 14 deletions
diff --git a/libkscan/COPYING.LIB b/libkscan/COPYING.LIB
index 5f4b0039..01148ab6 100644
--- a/libkscan/COPYING.LIB
+++ b/libkscan/COPYING.LIB
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
-all the source code for all modules it tqcontains, plus any associated
+all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp
index 011e7469..bbed0f3b 100644
--- a/libkscan/devselector.cpp
+++ b/libkscan/devselector.cpp
@@ -95,7 +95,7 @@ TQCString DeviceSelector::getDeviceFromConfig( void ) const
/* Now check if the scanner read from the config file is available !
* if not, ask the user !
*/
- if( skipDialog && devices.tqfind( result ) > -1 )
+ if( skipDialog && devices.find( result ) > -1 )
{
kdDebug(29000) << "Scanner from Config file is available - fine." << endl;
}
@@ -168,7 +168,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources,
if( ! default_ok )
{
/* if no default found, set the first */
- TQRadioButton *rb = (TQRadioButton*) selectBox->tqfind( checkDefNo );
+ TQRadioButton *rb = (TQRadioButton*) selectBox->find( checkDefNo );
if ( rb )
rb->setChecked( true );
}
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index 2037cb01..1ecc7970 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -783,7 +783,7 @@ void ImageCanvas::drawHAreaBorder(TQPainter &p,int x1,int x2,int y,int r)
} else if(!acquired) p.setPen(TQPen(TQColor(150,150,150)));
for(;;) {
- if(TQT_TQRECT_OBJECT(rect()).tqcontains(TQPoint(x1,y))) {
+ if(TQT_TQRECT_OBJECT(rect()).contains(TQPoint(x1,y))) {
if( r && acquired ) {
int re_x1, re_y;
inv_scale_matrix.map( x1+cx, y+cy, &re_x1, &re_y );
@@ -826,7 +826,7 @@ void ImageCanvas::drawVAreaBorder(TQPainter &p, int x, int y1, int y2, int r )
if( !acquired ) p.setPen( TQPen( TQColor(150,150,150) ) );
for(;;) {
- if(TQT_TQRECT_OBJECT(rect()).tqcontains( TQPoint(x,y1) )) {
+ if(TQT_TQRECT_OBJECT(rect()).contains( TQPoint(x,y1) )) {
if( r && acquired ) {
int re_y1, re_x;
inv_scale_matrix.map( x+cx, y1+cy, &re_x, &re_y1 );
@@ -921,7 +921,7 @@ preview_state ImageCanvas::classifyPoint(int x,int y)
if(x>=a.left()&&x<=a.right()) {
if(top) return MOVE_TOP;
if(bottom) return MOVE_BOTTOM;
- if(selected->tqcontains(TQPoint(x,y))) return MOVE_WHOLE;
+ if(selected->contains(TQPoint(x,y))) return MOVE_WHOLE;
}
return MOVE_NONE;
}
@@ -1058,7 +1058,7 @@ int ImageCanvas::highlight( const TQRect& rect, const TQPen& pen, const TQBrush&
saveRect.setRect( rect.x()-2, rect.y()-2, rect.width()+4, rect.height()+4 );
d->highlightRects.append( saveRect );
- int idx = d->highlightRects.tqfindIndex(saveRect);
+ int idx = d->highlightRects.findIndex(saveRect);
TQRect targetRect = scale_matrix.map( rect );
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp
index b603f15f..3aa8571e 100644
--- a/libkscan/kscandevice.cpp
+++ b/libkscan/kscandevice.cpp
@@ -240,7 +240,7 @@ KScanStat KScanDevice::openDevice( const TQCString& backend )
if( backend.isEmpty() ) return KSCAN_ERR_PARAM;
// search for scanner
- int indx = scanner_avail.tqfind( backend );
+ int indx = scanner_avail.find( backend );
if( indx < 0 ) {
stat = KSCAN_ERR_NO_DEVICE;
@@ -570,7 +570,7 @@ void KScanDevice::slSetDirty( const TQCString& name )
{
if( optionExists( name ) )
{
- if( dirtyList.tqfind( name ) == -1 )
+ if( dirtyList.find( name ) == -1 )
{
kdDebug(29000)<< "Setting dirty <" << name << ">" << endl;
/* item not found */
@@ -675,7 +675,7 @@ const TQString KScanDevice::previewFile()
TQString fname = dir + TQString::tqfromLatin1(".previews/");
TQString sname( getScannerName(shortScannerName()) );
- sname.tqreplace( '/', "_");
+ sname.replace( '/', "_");
return fname+sname;
}
diff --git a/libkscan/kscanoption.cpp b/libkscan/kscanoption.cpp
index 108d1c79..247ed05c 100644
--- a/libkscan/kscanoption.cpp
+++ b/libkscan/kscanoption.cpp
@@ -732,7 +732,7 @@ bool KScanOption::set( const TQCString& c_string )
TQRegExp re( "\\d+, \\d+, \\d+" );
re.setMinimal(true);
- if( TQString(c_string).tqcontains( re ))
+ if( TQString(c_string).contains( re ))
{
TQStringList relist = TQStringList::split( ", ", TQString(c_string) );
diff --git a/libkscan/kscanoptset.cpp b/libkscan/kscanoptset.cpp
index 91b6e196..80404d74 100644
--- a/libkscan/kscanoptset.cpp
+++ b/libkscan/kscanoptset.cpp
@@ -86,7 +86,7 @@ bool KScanOptSet::backupOption( const KScanOption& opt )
if( retval )
{
- KScanOption *newopt = tqfind( optName );
+ KScanOption *newopt = find( optName );
if( newopt )
{
diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp
index 4e04f095..1712f2be 100644
--- a/libkscan/kscanslider.cpp
+++ b/libkscan/kscanslider.cpp
@@ -260,7 +260,7 @@ void KScanCombo::createCombo( const TQString& text )
void KScanCombo::slSetEntry( const TQString &t )
{
if( t.isNull() ) return;
- int i = combolist.tqfind( t.local8Bit() );
+ int i = combolist.find( t.local8Bit() );
/* Important to check value to avoid recursive signals ;) */
if( i == combo->currentItem() )
diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp
index f8d21121..9cd0f3ab 100644
--- a/libkscan/scanparams.cpp
+++ b/libkscan/scanparams.cpp
@@ -547,7 +547,7 @@ void ScanParams::slSourceSelect( void )
sources = so.getList();
#undef CHEAT_FOR_DEBUGGING
#ifdef CHEAT_FOR_DEBUGGING
- if( sources.tqfind( "Automatic Document Feeder" ) == -1)
+ if( sources.find( "Automatic Document Feeder" ) == -1)
sources.append( "Automatic Document Feeder" );
#endif