Browse Source

rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 7 years ago
parent
commit
6e21bc798b
100 changed files with 552 additions and 552 deletions
  1. 1
    1
      arts/kde/kplayobjectfactory.cc
  2. 4
    4
      arts/knotify/knotify.cpp
  3. 15
    15
      dcop/client/dcop.cpp
  4. 4
    4
      dcop/client/dcopfind.cpp
  5. 3
    3
      dcop/client/marshall.cpp
  6. 9
    9
      dcop/dcopclient.cpp
  7. 2
    2
      dcop/dcopidl/scanner.cc
  8. 1
    1
      dcop/dcopidl/yacc.cc
  9. 1
    1
      dcop/dcopidl/yacc.yy
  10. 3
    3
      dcop/dcopidl2cpp/main.cpp
  11. 2
    2
      dcop/dcopidl2cpp/skel.cpp
  12. 5
    5
      dcop/dcopidl2cpp/stub.cpp
  13. 1
    1
      dcop/dcopidl2cpp/stubimpl.cpp
  14. 1
    1
      dcop/dcopobject.cpp
  15. 4
    4
      dcop/dcopref.cpp
  16. 17
    17
      dcop/dcopserver.cpp
  17. 1
    1
      dcop/dcopserver.h
  18. 9
    9
      dcop/dcopsignals.cpp
  19. 1
    1
      dnssd/domainbrowser.cpp
  20. 2
    2
      dnssd/servicebase.cpp
  21. 5
    5
      interfaces/kimproxy/library/kimproxy.cpp
  22. 1
    1
      interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  23. 1
    1
      interfaces/ktexteditor/editorchooser.cpp
  24. 1
    1
      interfaces/ktexteditor/templateinterface.cpp
  25. 5
    5
      kab/qconfigDB.cc
  26. 8
    8
      kabc/address.cpp
  27. 2
    2
      kabc/addresseedialog.cpp
  28. 16
    16
      kabc/addresslineedit.cpp
  29. 1
    1
      kabc/distributionlist.cpp
  30. 5
    5
      kabc/kab2kabc.cpp
  31. 3
    3
      kabc/ldapclient.cpp
  32. 2
    2
      kabc/ldapurl.cpp
  33. 1
    1
      kabc/ldif.cpp
  34. 4
    4
      kabc/ldifconverter.cpp
  35. 1
    1
      kabc/plugins/dir/resourcedirconfig.cpp
  36. 1
    1
      kabc/plugins/file/resourcefileconfig.cpp
  37. 21
    21
      kabc/plugins/ldapkio/resourceldapkio.cpp
  38. 1
    1
      kabc/plugins/ldapkio/resourceldapkioconfig.cpp
  39. 1
    1
      kabc/plugins/net/resourcenetconfig.cpp
  40. 2
    2
      kabc/plugins/sql/resourcesql.cpp
  41. 1
    1
      kabc/resource.cpp
  42. 10
    10
      kabc/scripts/addressee.src.cpp
  43. 1
    1
      kabc/vcard/AdrParam.cpp
  44. 6
    6
      kabc/vcard/ContentLine.cpp
  45. 5
    5
      kabc/vcard/DateValue.cpp
  46. 1
    1
      kabc/vcard/GeoValue.cpp
  47. 1
    1
      kabc/vcard/SourceParam.cpp
  48. 1
    1
      kabc/vcard/URIValue.cpp
  49. 1
    1
      kabc/vcard/UTCValue.cpp
  50. 4
    4
      kabc/vcard/VCard.cpp
  51. 2
    2
      kabc/vcard/VCardEntity.cpp
  52. 52
    52
      kabc/vcard21parser.cpp
  53. 3
    3
      kabc/vcardformatimpl.cpp
  54. 3
    3
      kabc/vcardparser/vcard.cpp
  55. 3
    3
      kabc/vcardparser/vcardline.cpp
  56. 5
    5
      kabc/vcardparser/vcardparser.cpp
  57. 19
    19
      kabc/vcardtool.cpp
  58. 2
    2
      kate/part/katearbitraryhighlight.cpp
  59. 30
    30
      kate/part/kateautoindent.cpp
  60. 1
    1
      kate/part/katebookmarks.cpp
  61. 3
    3
      kate/part/katecmds.cpp
  62. 1
    1
      kate/part/katecodefoldinghelpers.h
  63. 2
    2
      kate/part/katedialogs.cpp
  64. 15
    15
      kate/part/katedocument.cpp
  65. 7
    7
      kate/part/katefiletype.cpp
  66. 24
    24
      kate/part/katehighlight.cpp
  67. 1
    1
      kate/part/katehighlight.h
  68. 2
    2
      kate/part/kateprinter.cpp
  69. 9
    9
      kate/part/kateschema.cpp
  70. 4
    4
      kate/part/katesearch.cpp
  71. 1
    1
      kate/part/katespell.cpp
  72. 1
    1
      kate/part/katesupercursor.cpp
  73. 2
    2
      kate/part/katetextline.cpp
  74. 1
    1
      kate/part/kateview.cpp
  75. 1
    1
      kate/part/test_regression.cpp
  76. 2
    2
      kate/plugins/kdatatool/kate_kdatatool.cpp
  77. 1
    1
      kcert/kcertpart.cc
  78. 18
    18
      kconf_update/kconf_update.cpp
  79. 3
    3
      kdecore/kaccel.cpp
  80. 8
    8
      kdecore/kaccelbase.cpp
  81. 15
    15
      kdecore/kaccelmanager.cpp
  82. 13
    13
      kdecore/kapplication.cpp
  83. 7
    7
      kdecore/kcharsets.cpp
  84. 2
    2
      kdecore/kclipboard.cpp
  85. 6
    6
      kdecore/kcmdlineargs.cpp
  86. 2
    2
      kdecore/kcompletion.cpp
  87. 1
    1
      kdecore/kcompletionbase.cpp
  88. 5
    5
      kdecore/kconfig.cpp
  89. 11
    11
      kdecore/kconfig_compiler/kconfig_compiler.cpp
  90. 2
    2
      kdecore/kconfigbackend.cpp
  91. 10
    10
      kdecore/kconfigbase.cpp
  92. 6
    6
      kdecore/kconfigdialogmanager.cpp
  93. 1
    1
      kdecore/kconfigskeleton.cpp
  94. 3
    3
      kdecore/kdcoppropertyproxy.cpp
  95. 24
    24
      kdecore/kde-config.cpp.cmake
  96. 12
    12
      kdecore/kde-config.cpp.in
  97. 2
    2
      kdecore/kdebug.cpp
  98. 3
    3
      kdecore/kdesktopfile.cpp
  99. 2
    2
      kdecore/kglobal.cpp
  100. 0
    0
      kdecore/kglobalaccel_x11.cpp

+ 1
- 1
arts/kde/kplayobjectfactory.cc View File

@@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
155 155
 	}
156 156
 
157 157
 	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
158
-	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) )
158
+	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
159 159
 	{
160 160
 		// we rely on the delivered mimetype if it's a local file
161 161
 		d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false );

+ 4
- 4
arts/knotify/knotify.cpp View File

@@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
351 351
     if ( !event.isEmpty() ) {
352 352
 
353 353
         // get config file
354
-        if ( d->events.tqcontains( fromApp ) ) {
354
+        if ( d->events.contains( fromApp ) ) {
355 355
             eventsFile = d->events[fromApp];
356 356
         } else {
357 357
             eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
358 358
             d->events.insert( fromApp, eventsFile );
359 359
         }
360
-        if ( d->configs.tqcontains( fromApp) ) {
360
+        if ( d->configs.contains( fromApp) ) {
361 361
             configFile = d->configs[fromApp];
362 362
         } else {
363 363
             configFile=new KConfig(fromApp+".eventsrc",true,false);
@@ -695,7 +695,7 @@ void KNotify::playTimeout()
695 695
         ++it;
696 696
         if ( (*current)->state() != Arts::posPlaying )
697 697
         {
698
-            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
698
+            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
699 699
             if ( eit != d->playObjectEventMap.end() )
700 700
             {
701 701
                 soundFinished( *eit, PlayedOK );
@@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
730 730
 void KNotify::abortFirstPlayObject()
731 731
 {
732 732
 #ifndef WITHOUT_ARTS
733
-    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
733
+    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
734 734
     if ( it != d->playObjectEventMap.end() )
735 735
     {
736 736
         soundFinished( it.data(), Aborted );

+ 15
- 15
dcop/client/dcop.cpp View File

@@ -159,8 +159,8 @@ void queryFunctions( const char* app, const char* obj )
159 159
 int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
160 160
 {
161 161
     TQString f = func; // Qt is better with tqunicode strings, so use one.
162
-    int left = f.tqfind( '(' );
163
-    int right = f.tqfind( ')' );
162
+    int left = f.find( '(' );
163
+    int right = f.find( ')' );
164 164
 
165 165
     if ( right <  left )
166 166
     {
@@ -181,12 +181,12 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
181 181
 	    return( 1 );
182 182
 	}
183 183
 	for ( QCStringList::Iterator it = funcs.begin(); it != funcs.end(); ++it ) {
184
-	    int l = (*it).tqfind( '(' );
184
+	    int l = (*it).find( '(' );
185 185
 	    int s;
186 186
 	    if (l > 0)
187
-	        s = (*it).tqfindRev( ' ', l);
187
+	        s = (*it).findRev( ' ', l);
188 188
 	    else
189
-	        s = (*it).tqfind( ' ' );
189
+	        s = (*it).find( ' ' );
190 190
 
191 191
 	    if ( s < 0 )
192 192
 		s = 0;
@@ -195,8 +195,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
195 195
 
196 196
 	    if ( l > 0 && (*it).mid( s, l - s ) == func ) {
197 197
 		realfunc = (*it).mid( s );
198
-		const TQString arguments = (*it).mid(l+1,(*it).tqfind( ')' )-l-1);
199
-		uint a = arguments.tqcontains(',');
198
+		const TQString arguments = (*it).mid(l+1,(*it).find( ')' )-l-1);
199
+		uint a = arguments.contains(',');
200 200
 		if ( (a==0 && !arguments.isEmpty()) || a>0)
201 201
 			a++;
202 202
 		if ( a == args.count()  )
@@ -209,8 +209,8 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
209 209
 	    return( 1 );
210 210
 	}
211 211
 	f = realfunc;
212
-	left = f.tqfind( '(' );
213
-	right = f.tqfind( ')' );
212
+	left = f.find( '(' );
213
+	right = f.find( ')' );
214 214
     }
215 215
 
216 216
  doit:
@@ -230,7 +230,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
230 230
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
231 231
 	    TQString lt = (*it).simplifyWhiteSpace();
232 232
 
233
-	    int s = lt.tqfind(' ');
233
+	    int s = lt.find(' ');
234 234
 
235 235
 	    // If there are spaces in the name, there may be two
236 236
 	    // reasons: the parameter name is still there, ie.
@@ -250,7 +250,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
250 250
 		//
251 251
 		s=1;
252 252
 
253
-		while (s < static_cast<int>(partl.count()) && intTypes.tqcontains(partl[s]))
253
+		while (s < static_cast<int>(partl.count()) && intTypes.contains(partl[s]))
254 254
 		{
255 255
 			s++;
256 256
 		}
@@ -464,9 +464,9 @@ int runDCOP( QCStringList args, UserList users, Session session,
464 464
     QCStringList params;
465 465
     DCOPClient *client = 0L;
466 466
     int retval = 0;
467
-    if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 )
467
+    if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 )
468 468
     {
469
-	int delimPos = args[ 0 ].tqfindRev( ',' );
469
+	int delimPos = args[ 0 ].findRev( ',' );
470 470
 	if( delimPos == -1 )
471 471
         {
472 472
 	    cerr_ << "Error: '" << args[ 0 ]
@@ -569,7 +569,7 @@ int runDCOP( QCStringList args, UserList users, Session session,
569 569
 	    }
570 570
 	    else if( !sessionName.isEmpty() )
571 571
 	    {
572
-		if( sessions.tqcontains( sessionName ) )
572
+		if( sessions.contains( sessionName ) )
573 573
 		{
574 574
 		    sessions.clear();
575 575
 		    sessions.append( sessionName );
@@ -861,7 +861,7 @@ int main( int argc, char** argv )
861 861
           if (prog[prog.length()-1] != '*')
862 862
           {
863 863
              // Strip a trailing -<PID> part.
864
-             int i = prog.tqfindRev('-');
864
+             int i = prog.findRev('-');
865 865
              if ((i >= 0) && prog.mid(i+1).toLong())
866 866
              {
867 867
                 prog = prog.left(i);      

+ 4
- 4
dcop/client/dcopfind.cpp View File

@@ -41,8 +41,8 @@ static bool bLaunchApp = 0;
41 41
 bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
42 42
 {
43 43
     TQString f = func; // Qt is better with tqunicode strings, so use one.
44
-    int left = f.tqfind( '(' );
45
-    int right = f.tqfind( ')' );
44
+    int left = f.find( '(' );
45
+    int right = f.find( ')' );
46 46
 
47 47
     if ( right <  left )
48 48
     {
@@ -66,7 +66,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
66 66
 	for ( TQStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
67 67
 	    TQString lt = (*it).simplifyWhiteSpace();
68 68
 
69
-	    int s = lt.tqfind(' ');
69
+	    int s = lt.find(' ');
70 70
 
71 71
 	    // If there are spaces in the name, there may be two
72 72
 	    // reasons: the parameter name is still there, ie.
@@ -86,7 +86,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
86 86
 		//
87 87
 	    	s=1;
88 88
 
89
-		while (s < (int)partl.count() && intTypes.tqcontains(partl[s]))
89
+		while (s < (int)partl.count() && intTypes.contains(partl[s]))
90 90
 		{
91 91
 			s++;
92 92
 		}

+ 3
- 3
dcop/client/marshall.cpp View File

@@ -205,7 +205,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
205 205
         result = r.url().local8Bit();
206 206
     } else if ( type.left( 11 ) == "TQValueList<" )
207 207
     {
208
-        if ( (uint)type.tqfind( '>', 11 ) != type.length() - 1 )
208
+        if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
209 209
             return result;
210 210
 
211 211
         TQString nestedType = type.mid( 11, type.length() - 12 );
@@ -227,12 +227,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
227 227
         }
228 228
     } else if ( type.left( 5 ) == "TQMap<" )
229 229
     {
230
-        int commaPos = type.tqfind( ',', 5 );
230
+        int commaPos = type.find( ',', 5 );
231 231
 
232 232
         if ( commaPos == -1 )
233 233
             return result;
234 234
 
235
-        if ( (uint)type.tqfind( '>', commaPos ) != type.length() - 1 )
235
+        if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
236 236
             return result;
237 237
 
238 238
         TQString keyType = type.mid( 5, commaPos - 5 );

+ 9
- 9
dcop/dcopclient.cpp View File

@@ -97,13 +97,13 @@ client_map_t *cliMap()
97 97
 
98 98
 DCOPClient *DCOPClient::findLocalClient( const TQCString &_appId )
99 99
 {
100
-    return cliMap()->tqfind(_appId.data());
100
+    return cliMap()->find(_appId.data());
101 101
 }
102 102
 
103 103
 static
104 104
 void registerLocalClient( const TQCString &_appId, DCOPClient *client )
105 105
 {
106
-    cliMap()->tqreplace(_appId.data(), client);
106
+    cliMap()->replace(_appId.data(), client);
107 107
 }
108 108
 
109 109
 static
@@ -263,12 +263,12 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
263 263
         disp = "NODISPLAY";
264 264
 
265 265
     int i;
266
-    if((i = disp.tqfindRev('.')) > disp.tqfindRev(KPATH_SEPARATOR) && i >= 0)
266
+    if((i = disp.findRev('.')) > disp.findRev(KPATH_SEPARATOR) && i >= 0)
267 267
         disp.truncate(i);
268 268
 
269 269
     if (!old)
270 270
     {
271
-        while( (i = disp.tqfind(KPATH_SEPARATOR)) >= 0)
271
+        while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
272 272
             disp[i] = '_';
273 273
     }
274 274
 
@@ -790,7 +790,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
790 790
                // Should we abort ?
791 791
             }
792 792
             contents[size] = '\0';
793
-            int pos = contents.tqfind('\n');
793
+            int pos = contents.find('\n');
794 794
             if ( pos == -1 ) // Shouldn't happen
795 795
             {
796 796
                 qDebug("Only one line in dcopserver file !: %s", contents.data());
@@ -1399,7 +1399,7 @@ static TQObject* findQtObject( TQCString id )
1399 1399
     for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
1400 1400
         if ( (*it).s == id ) // exact match
1401 1401
             return (*it).o;
1402
-        if ( !firstContains && (*it).s.tqcontains( expr ) ) {
1402
+        if ( !firstContains && (*it).s.contains( expr ) ) {
1403 1403
             firstContains = (*it).o;
1404 1404
         }
1405 1405
     }
@@ -1413,7 +1413,7 @@ static QCStringList  findQtObjects( TQCString id )
1413 1413
     fillQtObjectsEx( l, 0, "qt" );
1414 1414
     QCStringList result;
1415 1415
     for ( TQValueList<O>::ConstIterator it = l.begin(); it != l.end(); ++it ) {
1416
-        if ( (*it).s.tqcontains( expr ) )
1416
+        if ( (*it).s.contains( expr ) )
1417 1417
             result << (*it).s;
1418 1418
     }
1419 1419
     return result;
@@ -1501,7 +1501,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
1501 1501
             TQStrList lst = o->tqmetaObject()->propertyNames( true );
1502 1502
             for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
1503 1503
                 TQMetaObject *mo = o->tqmetaObject();
1504
-                const TQMetaProperty* p = mo->property( mo->tqfindProperty( it.current(), true ), true );
1504
+                const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
1505 1505
                 if ( !p )
1506 1506
                     continue;
1507 1507
                 TQCString prop = p->type();
@@ -1532,7 +1532,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
1532 1532
             reply << (TQ_INT8) o->setProperty( name, value );
1533 1533
             return true;
1534 1534
         } else {
1535
-            int slot = o->tqmetaObject()->tqfindSlot( fun, true );
1535
+            int slot = o->tqmetaObject()->findSlot( fun, true );
1536 1536
             if ( slot != -1 ) {
1537 1537
                 replyType = "void";
1538 1538
                 TQUObject uo[ 1 ];

+ 2
- 2
dcop/dcopidl/scanner.cc View File

@@ -1226,8 +1226,8 @@ YY_RULE_SETUP
1226 1226
 #line 170 "scanner.ll"
1227 1227
 {
1228 1228
 			  TQString s( yytext );
1229
-                          int i = s.tqfind(TQRegExp("[\"<]"))+1;
1230
-                          int j = s.tqfind(TQRegExp("[\">]"), i);
1229
+                          int i = s.find(TQRegExp("[\"<]"))+1;
1230
+                          int j = s.find(TQRegExp("[\">]"), i);
1231 1231
 			  yylval._str = new TQString( s.mid( i, j - i ) );
1232 1232
                           idl_line_no++;
1233 1233
                           return T_INCLUDE;

+ 1
- 1
dcop/dcopidl/yacc.cc View File

@@ -1643,7 +1643,7 @@ yyreduce:
1643 1643
   case 15:
1644 1644
 #line 221 "yacc.yy"
1645 1645
     {
1646
-                      int pos = in_namespace.tqfindRev( "::", -3 );
1646
+                      int pos = in_namespace.findRev( "::", -3 );
1647 1647
                       if( pos >= 0 )
1648 1648
                           in_namespace = in_namespace.left( pos + 2 );
1649 1649
                       else

+ 1
- 1
dcop/dcopidl/yacc.yy View File

@@ -219,7 +219,7 @@ declaration
219 219
                   } 
220 220
             main T_RIGHT_CURLY_BRACKET opt_semicolon
221 221
                   {
222
-                      int pos = in_namespace.tqfindRev( "::", -3 );
222
+                      int pos = in_namespace.findRev( "::", -3 );
223 223
                       if( pos >= 0 )
224 224
                           in_namespace = in_namespace.left( pos + 2 );
225 225
                       else

+ 3
- 3
dcop/dcopidl2cpp/main.cpp View File

@@ -104,11 +104,11 @@ int main( int argc, char** argv )
104 104
     TQString base( argv[argpos] );
105 105
     TQString idl = base;
106 106
 
107
-    int pos = base.tqfindRev( '.' );
107
+    int pos = base.findRev( '.' );
108 108
     if ( pos != -1 )
109 109
 	base = base.left( pos );
110 110
 
111
-    pos = idl.tqfindRev('/');
111
+    pos = idl.findRev('/');
112 112
     if ( pos != -1 )
113 113
 	idl = idl.mid( pos+1 );
114 114
 
@@ -118,7 +118,7 @@ int main( int argc, char** argv )
118 118
     if ( generate_stub ) {
119 119
 	TQString header = base;
120 120
 	generateStub( idl, header + "_stub.h", de );
121
-	pos = header.tqfindRev('/');
121
+	pos = header.findRev('/');
122 122
 	if ( pos != -1 )
123 123
 	    header = header.mid( pos+1 );
124 124
 	generateStubImpl( idl, header + "_stub.h", base+".h", base + "_stub." + suffix, de);

+ 2
- 2
dcop/dcopidl2cpp/skel.cpp View File

@@ -177,7 +177,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
177 177
 	TQString namespace_tmp = className;
178 178
 	str << endl;
179 179
 	for(;;) {
180
-	    int pos = namespace_tmp.tqfind( "::" );
180
+	    int pos = namespace_tmp.find( "::" );
181 181
 	    if( pos < 0 ) {
182 182
 		className = namespace_tmp;
183 183
 		break;
@@ -223,7 +223,7 @@ void generateSkel( const TQString& idl, const TQString& filename, TQDomElement d
223 223
 	    str << "\t    fdict->insert( " << className << "_ftable[i][1],  new int( i ) );" << endl;
224 224
 	    str << "    }" << endl;
225 225
     
226
-	    str << "    int* fp = fdict->tqfind( fun );" << endl;
226
+	    str << "    int* fp = fdict->find( fun );" << endl;
227 227
 	    str << "    switch ( fp?*fp:-1) {" << endl;
228 228
 	}
229 229
 	s = n.nextSibling().toElement();

+ 5
- 5
dcop/dcopidl2cpp/stub.cpp View File

@@ -54,7 +54,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
54 54
     str << endl;
55 55
 
56 56
     TQString ifdefstring = idl.upper();
57
-    int pos = idl.tqfindRev( '.' );
57
+    int pos = idl.findRev( '.' );
58 58
     if ( pos != -1 )
59 59
 	ifdefstring = ifdefstring.left( pos );
60 60
 
@@ -107,13 +107,13 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
107 107
 	}
108 108
 
109 109
 	if( DCOPParent != "DCOPObject" ) { // we need to include the .h file for the base stub
110
-	    if( all_includes.tqcontains( DCOPParent + ".h" ))
110
+	    if( all_includes.contains( DCOPParent + ".h" ))
111 111
 		str << "#include <" << DCOPParent << "_stub.h>" << endl;
112
-	    else if( all_includes.tqcontains( DCOPParent.lower() + ".h" ))
112
+	    else if( all_includes.contains( DCOPParent.lower() + ".h" ))
113 113
 		str << "#include <" << DCOPParent.lower() << "_stub.h>" << endl;
114 114
 	    else {// damn ... let's assume it's the last include
115 115
 		TQString stub_h = all_includes.last();
116
-		unsigned int pos = stub_h.tqfind( ".h" );
116
+		unsigned int pos = stub_h.find( ".h" );
117 117
 		if( pos > 0 ) {
118 118
 		    stub_h = stub_h.remove( pos, 100000 );
119 119
 		    str << "#include <" << stub_h << "_stub.h>" << endl;
@@ -128,7 +128,7 @@ void generateStub( const TQString& idl, const TQString& filename, TQDomElement d
128 128
 	int namespace_count = 0;
129 129
 	TQString namespace_tmp = className;
130 130
 	for(;;) {
131
-	    int pos = namespace_tmp.tqfind( "::" );
131
+	    int pos = namespace_tmp.find( "::" );
132 132
 	    if( pos < 0 ) {
133 133
 		className = namespace_tmp;
134 134
 		break;

+ 1
- 1
dcop/dcopidl2cpp/stubimpl.cpp View File

@@ -98,7 +98,7 @@ void generateStubImpl( const TQString& idl, const TQString& header, const TQStri
98 98
 	TQString namespace_tmp = className_stub;
99 99
 	str << endl;
100 100
 	for(;;) {
101
-	    int pos = namespace_tmp.tqfind( "::" );
101
+	    int pos = namespace_tmp.find( "::" );
102 102
 	    if( pos < 0 ) {
103 103
 		className_stub = namespace_tmp;
104 104
 		break;

+ 1
- 1
dcop/dcopobject.cpp View File

@@ -116,7 +116,7 @@ TQCString DCOPObject::objId() const
116 116
 
117 117
 bool DCOPObject::hasObject(const TQCString &_objId)
118 118
 {
119
-  if (objMap()->tqcontains(_objId))
119
+  if (objMap()->contains(_objId))
120 120
     return true;
121 121
   else
122 122
     return false;

+ 4
- 4
dcop/dcopref.cpp View File

@@ -62,9 +62,9 @@ DCOPReply DCOPRef::callInternal( const TQCString& fun, const TQCString& args, co
62 62
 	return reply;
63 63
     }
64 64
     TQCString sig = fun;
65
-    if ( fun.tqfind('(') == -1 ) {
65
+    if ( fun.find('(') == -1 ) {
66 66
 	sig += args;
67
-	if( args.tqfind( "<unknown" ) != -1 )
67
+	if( args.find( "<unknown" ) != -1 )
68 68
 	    qWarning("DCOPRef: unknown type error "
69 69
 		     "<\"%s\",\"%s\">::call(\"%s\",%s",
70 70
 		     STR(m_app), STR(m_obj), STR(fun), args.data()+1 );
@@ -87,9 +87,9 @@ bool DCOPRef::sendInternal( const TQCString& fun, const TQCString& args, const T
87 87
     }
88 88
     Q_UNUSED( data );
89 89
     TQCString sig = fun;
90
-    if ( fun.tqfind('(') == -1 ) {
90
+    if ( fun.find('(') == -1 ) {
91 91
 	sig += args;
92
-	if( args.tqfind( "<unknown" ) != -1 )
92
+	if( args.find( "<unknown" ) != -1 )
93 93
 	    qWarning("DCOPRef: unknown type error "
94 94
 		     "<\"%s\",\"%s\">::send(\"%s\",%s",
95 95
 		     STR(m_app), STR(m_obj), STR(fun), args.data()+1 );

+ 17
- 17
dcop/dcopserver.cpp View File

@@ -320,7 +320,7 @@ void DCOPServer::slotOutputReady(int socket)
320 320
 qWarning("DCOPServer: slotOutputReady fd = %d", socket);
321 321
 #endif
322 322
    // Find out connection.
323
-   DCOPConnection *conn = fd_clients.tqfind(socket);
323
+   DCOPConnection *conn = fd_clients.find(socket);
324 324
    //assert(conn);
325 325
    //assert(conn->outputBlocked);
326 326
    //assert(conn->socket() == socket);
@@ -711,7 +711,7 @@ void DCOPProcessMessage( IceConn iceConn, IcePointer /*clientData*/,
711 711
 void DCOPServer::processMessage( IceConn iceConn, int opcode,
712 712
 				 unsigned long length, Bool /*swap*/)
713 713
 {
714
-    DCOPConnection* conn = clients.tqfind( iceConn );
714
+    DCOPConnection* conn = clients.find( iceConn );
715 715
     if ( !conn ) {
716 716
 	qWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode);
717 717
 	return;
@@ -1110,7 +1110,7 @@ DCOPConnection* DCOPServer::findApp( const TQCString& appId )
1110 1110
 {
1111 1111
     if ( appId.isNull() )
1112 1112
 	return 0;
1113
-    DCOPConnection* conn = appIds.tqfind( appId );
1113
+    DCOPConnection* conn = appIds.find( appId );
1114 1114
     return conn;
1115 1115
 }
1116 1116
 
@@ -1205,7 +1205,7 @@ void DCOPServer::removeConnection( void* data )
1205 1205
     while (!conn->waitingForReply.isEmpty()) {
1206 1206
 	IceConn iceConn = conn->waitingForReply.take(0);
1207 1207
 	if (iceConn) {
1208
-	    DCOPConnection* target = clients.tqfind( iceConn );
1208
+	    DCOPConnection* target = clients.find( iceConn );
1209 1209
 	    qWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "<unknown>" , conn->appId.data() );
1210 1210
 	    TQByteArray reply;
1211 1211
 	    DCOPMsg *pMsg;
@@ -1227,7 +1227,7 @@ void DCOPServer::removeConnection( void* data )
1227 1227
     while (!conn->waitingForDelayedReply.isEmpty()) {
1228 1228
 	IceConn iceConn = conn->waitingForDelayedReply.take(0);
1229 1229
 	if (iceConn) {
1230
-	    DCOPConnection* target = clients.tqfind( iceConn );
1230
+	    DCOPConnection* target = clients.find( iceConn );
1231 1231
 	    qWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "<unknown>", conn->appId.data() );
1232 1232
 	    TQByteArray reply;
1233 1233
 	    DCOPMsg *pMsg;
@@ -1248,7 +1248,7 @@ void DCOPServer::removeConnection( void* data )
1248 1248
     {
1249 1249
 	IceConn iceConn = conn->waitingOnReply.take(0);
1250 1250
         if (iceConn) {
1251
-           DCOPConnection* target = clients.tqfind( iceConn );
1251
+           DCOPConnection* target = clients.find( iceConn );
1252 1252
            if (!target)
1253 1253
            {
1254 1254
                qWarning("DCOP Error: still waiting for answer from non-existing client.");
@@ -1360,7 +1360,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1360 1360
 
1361 1361
     if ( obj == "emit")
1362 1362
     {
1363
-        DCOPConnection* conn = clients.tqfind( iceConn );
1363
+        DCOPConnection* conn = clients.find( iceConn );
1364 1364
         if (conn) {
1365 1365
 	    //qDebug("DCOPServer: %s emits %s", conn->appId.data(), fun.data());
1366 1366
 	    dcopSignals->emitSignal(conn, fun, data, false);
@@ -1377,7 +1377,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1377 1377
 
1378 1378
             daemon = static_cast<bool>( iDaemon );
1379 1379
 
1380
-	    DCOPConnection* conn = clients.tqfind( iceConn );
1380
+	    DCOPConnection* conn = clients.find( iceConn );
1381 1381
             if ( conn && !conn->appId.isNull() ) {
1382 1382
                 if ( daemon ) {
1383 1383
                     if ( !conn->daemon )
@@ -1415,10 +1415,10 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1415 1415
 	if (!args.atEnd()) {
1416 1416
 	    TQCString app2 = readQCString(args);
1417 1417
 	    TQDataStream reply( replyData, IO_WriteOnly );
1418
-	    DCOPConnection* conn = clients.tqfind( iceConn );
1418
+	    DCOPConnection* conn = clients.find( iceConn );
1419 1419
 	    if ( conn && !app2.isEmpty() ) {
1420 1420
 		if ( !conn->appId.isNull() &&
1421
-		     appIds.tqfind( conn->appId ) == conn ) {
1421
+		     appIds.find( conn->appId ) == conn ) {
1422 1422
 		    appIds.remove( conn->appId );
1423 1423
 
1424 1424
 		}
@@ -1441,7 +1441,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1441 1441
 #endif
1442 1442
 
1443 1443
 		conn->appId = app2;
1444
-		if ( appIds.tqfind( app2 ) != 0 ) {
1444
+		if ( appIds.find( app2 ) != 0 ) {
1445 1445
 		    // we already have this application, unify
1446 1446
 		    int n = 1;
1447 1447
 		    TQCString tmp;
@@ -1450,12 +1450,12 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1450 1450
 			tmp.setNum( n );
1451 1451
 			tmp.prepend("-");
1452 1452
 			tmp.prepend( app2 );
1453
-		    } while ( appIds.tqfind( tmp ) != 0 );
1453
+		    } while ( appIds.find( tmp ) != 0 );
1454 1454
 		    conn->appId = tmp;
1455 1455
 		}
1456 1456
 		appIds.insert( conn->appId, conn );
1457 1457
 
1458
-		int c = conn->appId.tqfind( '-' );
1458
+		int c = conn->appId.find( '-' );
1459 1459
 		if ( c > 0 )
1460 1460
 		    conn->plainAppId = conn->appId.left( c );
1461 1461
 		else
@@ -1497,7 +1497,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1497 1497
 	if (!args.atEnd()) {
1498 1498
 	    TQ_INT8 notifyActive;
1499 1499
 	    args >> notifyActive;
1500
-	    DCOPConnection* conn = clients.tqfind( iceConn );
1500
+	    DCOPConnection* conn = clients.find( iceConn );
1501 1501
 	    if ( conn ) {
1502 1502
 		if ( notifyActive )
1503 1503
 		    conn->notifyRegister++;
@@ -1508,7 +1508,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1508 1508
 	    return true;
1509 1509
 	}
1510 1510
     } else if ( fun == "connectSignal(TQCString,TQCString,TQCString,TQCString,TQCString,bool)") {
1511
-        DCOPConnection* conn = clients.tqfind( iceConn );
1511
+        DCOPConnection* conn = clients.find( iceConn );
1512 1512
         if (!conn) return false;
1513 1513
         TQDataStream args(data, IO_ReadOnly );
1514 1514
         if (args.atEnd()) return false;
@@ -1528,7 +1528,7 @@ bool DCOPServer::receive(const TQCString &/*app*/, const TQCString &obj,
1528 1528
         reply << (TQ_INT8) (b?1:0);
1529 1529
         return true;
1530 1530
     } else if ( fun == "disconnectSignal(TQCString,TQCString,TQCString,TQCString,TQCString)") {
1531
-        DCOPConnection* conn = clients.tqfind( iceConn );
1531
+        DCOPConnection* conn = clients.find( iceConn );
1532 1532
         if (!conn) return false;
1533 1533
         TQDataStream args(data, IO_ReadOnly );
1534 1534
         if (args.atEnd()) return false;
@@ -1623,7 +1623,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
1623 1623
 	TQCString contents( size+1 );
1624 1624
 	bool ok = f.readBlock( contents.data(), size ) == size;
1625 1625
 	contents[size] = '\0';
1626
-	int pos = contents.tqfind('\n');
1626
+	int pos = contents.find('\n');
1627 1627
 	ok = ok && ( pos != -1 );
1628 1628
 	pid_t pid = ok ? contents.mid(pos+1).toUInt(&ok) : 0;
1629 1629
 	f.close();

+ 1
- 1
dcop/dcopserver.h View File

@@ -130,7 +130,7 @@ public:
130 130
 
131 131
     DCOPConnection *findApp(const TQCString &appId);
132 132
     DCOPConnection *findConn(IceConn iceConn)
133
-       { return clients.tqfind(iceConn); }
133
+       { return clients.find(iceConn); }
134 134
 
135 135
     void sendMessage(DCOPConnection *conn, const TQCString &sApp,
136 136
                      const TQCString &rApp, const TQCString &rObj,

+ 9
- 9
dcop/dcopsignals.cpp View File

@@ -39,14 +39,14 @@ DCOPSignals::emitSignal( DCOPConnection *conn, const TQCString &_fun, const TQBy
39 39
 {
40 40
    TQCString senderObj;
41 41
    TQCString fun = _fun;
42
-   int i = fun.tqfind('#');
42
+   int i = fun.find('#');
43 43
    if (i > -1)
44 44
    {
45 45
       senderObj = fun.left(i);
46 46
       fun = fun.mid(i+1);
47 47
    }
48 48
 
49
-   DCOPSignalConnectionList *list = connections.tqfind(fun);
49
+   DCOPSignalConnectionList *list = connections.find(fun);
50 50
    if (!list) return;
51 51
    for(DCOPSignalConnection *current = list->first(); current; current = list->next())
52 52
    {
@@ -102,16 +102,16 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
102 102
    // TODO: Check if signal and slot match
103 103
    TQCString signalArgs, slotArgs;
104 104
    int i,j;
105
-   i = signal.tqfind('(');
105
+   i = signal.find('(');
106 106
    if (i < 0) return false;
107 107
    signalArgs = signal.mid(i+1);
108
-   j = signalArgs.tqfind(')');
108
+   j = signalArgs.find(')');
109 109
    if (j < 0) return false;
110 110
    signalArgs.truncate(j);
111
-   i = slot.tqfind('(');
111
+   i = slot.find('(');
112 112
    if (i < 0) return false;
113 113
    slotArgs = slot.mid(i+1);
114
-   j = slotArgs.tqfind(')');
114
+   j = slotArgs.find(')');
115 115
    if (j < 0) return false;
116 116
    slotArgs.truncate(j);
117 117
 
@@ -142,7 +142,7 @@ DCOPSignals::connectSignal( const TQCString &sender, const TQCString &senderObj,
142 142
    current->recvObj = receiverObj;
143 143
    current->slot = slot;
144 144
 
145
-   DCOPSignalConnectionList *list = connections.tqfind(signal);
145
+   DCOPSignalConnectionList *list = connections.find(signal);
146 146
    if (!list)
147 147
    {
148 148
       list = new DCOPSignalConnectionList;
@@ -177,7 +177,7 @@ DCOPSignals::disconnectSignal( const TQCString &sender, const TQCString &senderO
177 177
       return true;
178 178
    }
179 179
 
180
-   DCOPSignalConnectionList *list = connections.tqfind(signal);
180
+   DCOPSignalConnectionList *list = connections.find(signal);
181 181
    if (!list)
182 182
       return false; // Not found...
183 183
 
@@ -255,7 +255,7 @@ DCOPSignals::removeConnections(DCOPConnection *conn, const TQCString &obj)
255 255
       if (current->recvConn != conn)
256 256
          current->recvConn->signalConnectionList()->removeRef(current);
257 257
 
258
-      DCOPSignalConnectionList *signalList = connections.tqfind(current->signal);
258
+      DCOPSignalConnectionList *signalList = connections.find(current->signal);
259 259
       if (signalList)
260 260
       {
261 261
          signalList->removeRef(current);

+ 1
- 1
dnssd/domainbrowser.cpp View File

@@ -125,7 +125,7 @@ void DomainBrowser::startBrowse()
125 125
 
126 126
 void DomainBrowser::gotNewDomain(const TQString& domain)
127 127
 {
128
-	if (d->m_domains.tqcontains(domain)) return;
128
+	if (d->m_domains.contains(domain)) return;
129 129
 	d->m_domains.append(domain);
130 130
 	emit domainAdded(domain);
131 131
 }

+ 2
- 2
dnssd/servicebase.cpp View File

@@ -51,14 +51,14 @@ void ServiceBase::decode(const TQString& name)
51 51
 	} else {		// normal service or domain
52 52
 		TQString decoded_name=name;
53 53
 		decoded_name=decoded_name.replace("\\\\","\\");
54
-		int i = decoded_name.tqfind(TQRegExp("[^\\\\]\\."));
54
+		int i = decoded_name.find(TQRegExp("[^\\\\]\\."));
55 55
 		if (i==-1) return;            // first find service name
56 56
 		rest = decoded_name.mid(i+2);
57 57
 		m_serviceName=decoded_name.left(i+1).replace("\\.",".");
58 58
 	}
59 59
 	m_type = rest.section('.',0,1);
60 60
 	// does it really have a type?
61
-	if (m_type[0]=='_' && m_type[m_type.tqfind('.')+1]=='_')
61
+	if (m_type[0]=='_' && m_type[m_type.find('.')+1]=='_')
62 62
 		m_domain = rest.section('.',2,-1,TQString::SectionIncludeTrailingSep);
63 63
 	else {
64 64
 		m_type="";

+ 5
- 5
interfaces/kimproxy/library/kimproxy.cpp View File

@@ -248,7 +248,7 @@ bool KIMProxy::initialize()
248 248
 						{
249 249
 							m_apps_available = true;
250 250
 							//kdDebug( 790 ) << " app name: " << (*offer)->name() << ", has instance " << *app << ", dcopService: " << dcopService << endl;
251
-							if ( !m_im_client_stubs.tqfind( dcopService ) )
251
+							if ( !m_im_client_stubs.find( dcopService ) )
252 252
 							{
253 253
 								kdDebug( 790 ) << "App " << *app << ", dcopObjectId " << dcopObjectId << " found, using it for presence info." << endl;
254 254
 								m_im_client_stubs.insert( *app, new KIMIface_stub( d->dc, *app, dcopObjectId ) );
@@ -284,7 +284,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
284 284
 		if ( appId.left( dcopService.length() ) == dcopService )
285 285
 		{
286 286
 			// if it's not already known, insert it
287
-			if ( !m_im_client_stubs.tqfind( appId ) )
287
+			if ( !m_im_client_stubs.find( appId ) )
288 288
 			{
289 289
 				newApp = true;
290 290
 				kdDebug( 790 ) << "App: " << appId << ", dcopService: " << dcopService << " started, using it for presence info."<< endl;
@@ -301,7 +301,7 @@ void KIMProxy::registeredToDCOP( const TQCString& appId )
301 301
 void KIMProxy::unregisteredFromDCOP( const TQCString& appId )
302 302
 {
303 303
 	//kdDebug( 790 ) << k_funcinfo << appId << endl;
304
-	if ( m_im_client_stubs.tqfind( appId ) )
304
+	if ( m_im_client_stubs.find( appId ) )
305 305
 	{
306 306
 		kdDebug( 790 ) << appId << " quit, removing its presence info." << endl;
307 307
 		
@@ -618,7 +618,7 @@ KIMIface_stub * KIMProxy::stubForUid( const TQString &uid )
618 618
 	// get best appPresence
619 619
 	AppPresenceCurrent ap = d->presence_map[ uid ].best();
620 620
 	// look up the presence string from that app
621
-		return m_im_client_stubs.tqfind( ap.appId );
621
+		return m_im_client_stubs.find( ap.appId );
622 622
 }
623 623
 
624 624
 KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
@@ -626,7 +626,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol)
626 626
 	KIMIface_stub * app;
627 627
 	// see if the preferred client supports this protocol
628 628
 	TQString preferred = preferredApp();
629
-	if ( ( app = m_im_client_stubs.tqfind( preferred ) ) )
629
+	if ( ( app = m_im_client_stubs.find( preferred ) ) )
630 630
 	{
631 631
 		if ( app->protocols().grep( protocol ).count() > 0 )
632 632
 			return app;

+ 1
- 1
interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp View File

@@ -110,7 +110,7 @@ void KFileAudioPreview::showPreview( const KURL &url )
110 110
         return;
111 111
 
112 112
     KMimeType::Ptr mt = KMimeType::findByURL( url );
113
-    bool supported = m_supportedFormats.tqfind( mt->name() );
113
+    bool supported = m_supportedFormats.find( mt->name() );
114 114
     d->player->view()->setEnabled( supported );
115 115
     if ( !supported )
116 116
         return;

+ 1
- 1
interfaces/ktexteditor/editorchooser.cpp View File

@@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
82 82
 	if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
83 83
 	else
84 84
 	{
85
-		int idx=d->elements.tqfindIndex(editor);
85
+		int idx=d->elements.findIndex(editor);
86 86
 		idx=idx+1;
87 87
 		d->chooser->editorCombo->setCurrentItem(idx);
88 88
 	}

+ 1
- 1
interfaces/ktexteditor/templateinterface.cpp View File

@@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
173 173
         }
174 174
       }
175 175
       TQString placeholder = rx.cap( 1 );
176
-      if ( ! enhancedInitValues.tqcontains( placeholder ) )
176
+      if ( ! enhancedInitValues.contains( placeholder ) )
177 177
         enhancedInitValues[ placeholder ] = "";
178 178
 
179 179
       pos += rx.matchedLength();

+ 5
- 5
kab/qconfigDB.cc View File

@@ -73,7 +73,7 @@ static void tokenize(list<TQCString>& res, const TQCString& text, char tr, bool
73 73
   while(zwei!=-1)
74 74
     {
75 75
       teil="";
76
-      zwei=text.tqfind(tr, eins);
76
+      zwei=text.find(tr, eins);
77 77
       if(zwei!=-1)
78 78
 	{
79 79
 	  teil=text.mid(eins, zwei-eins);
@@ -573,7 +573,7 @@ KeyValueMap::insertLine(TQCString line, bool force, bool relax, bool encode)
573 573
       return false;
574 574
     }
575 575
   // -----
576
-  index=line.tqfind('=');
576
+  index=line.find('=');
577 577
   if(index==-1)  // not found
578 578
       {
579 579
 	  kdDebug() << "KeyValueMap::insertLine: no \"=\" found in \""<<line<<"\".\n";
@@ -1015,7 +1015,7 @@ KeyValueMap::get(const TQCString& key, list<TQCString>& values) const
1015 1015
       second=first;
1016 1016
       for(;;)
1017 1017
 	{
1018
-	  second=raw.tqfind('\\', second);
1018
+	  second=raw.find('\\', second);
1019 1019
 	  // ----- this may never be the last and also not the second last
1020 1020
 	  //       character in a complex string:
1021 1021
 	  if(second!=-1)
@@ -1124,7 +1124,7 @@ KeyValueMap::get(const TQCString& key, TQStrList& values) const
1124 1124
       second=first;
1125 1125
       for(;;)
1126 1126
 	{
1127
-	  second=raw.tqfind('\\', second);
1127
+	  second=raw.find('\\', second);
1128 1128
 	  // ----- this may never be the last and also not the second last
1129 1129
 	  //       character in a complex string:
1130 1130
 	  if(second!=-1)
@@ -1975,7 +1975,7 @@ QConfigDB::stringToKeylist(const TQCString& desc)
1975 1975
     }
1976 1976
   for(;;)
1977 1977
     {
1978
-      second=desc.tqfind('/', first);
1978
+      second=desc.find('/', first);
1979 1979
       if(second==-1)
1980 1980
 	{
1981 1981
 	  if((unsigned)first<desc.length()+1)

+ 8
- 8
kabc/address.cpp View File

@@ -399,7 +399,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
399 399
   bool ret = false;
400 400
   
401 401
   // first check for brackets that have to be evaluated first 
402
-  int fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos );
402
+  int fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
403 403
   while ( -1 != fpos ) {
404 404
     int bpos1 = fpos + KABC_FMTTAG_purgeempty.length();
405 405
     int bpos2;
@@ -430,7 +430,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
430 430
         stpos = bpos1; 
431 431
       }
432 432
     }
433
-    fpos = result.tqfind( KABC_FMTTAG_purgeempty, stpos );
433
+    fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
434 434
   }
435 435
 
436 436
   // after sorting out all purge tags, we just search'n'replace the rest,
@@ -438,7 +438,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
438 438
   // The following macro needs TQString for R_FIELD
439 439
   // It substitutes !_P_! for empty fields so conditional tags work later
440 440
 #define REPLTAG(R_TAG,R_FIELD) \
441
-  if ( result.tqfind(R_TAG, false) != -1 ) { \
441
+  if ( result.find(R_TAG, false) != -1 ) { \
442 442
     TQString rpl = R_FIELD.isEmpty() ? TQString("!_P_!") : R_FIELD; \
443 443
     result.replace( R_TAG, rpl ); \
444 444
     if ( !R_FIELD.isEmpty() ) { \
@@ -461,7 +461,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
461 461
 #undef REPLTAG
462 462
  
463 463
   // conditional comma 
464
-  fpos = result.tqfind( KABC_FMTTAG_condcomma, 0 );
464
+  fpos = result.find( KABC_FMTTAG_condcomma, 0 );
465 465
   while ( -1 != fpos ) {
466 466
     TQString str1 = result.mid( fpos - 5, 5 );
467 467
     TQString str2 = result.mid( fpos + 2, 5 );
@@ -470,10 +470,10 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
470 470
     } else {
471 471
       result.remove( fpos, 2 );
472 472
     }
473
-    fpos = result.tqfind( KABC_FMTTAG_condcomma, fpos );
473
+    fpos = result.find( KABC_FMTTAG_condcomma, fpos );
474 474
   }
475 475
   // conditional whitespace
476
-  fpos = result.tqfind( KABC_FMTTAG_condwhite, 0 );
476
+  fpos = result.find( KABC_FMTTAG_condwhite, 0 );
477 477
   while ( -1 != fpos ) {
478 478
     TQString str1 = result.mid( fpos - 5, 5 );
479 479
     TQString str2 = result.mid( fpos + 2, 5 );
@@ -482,7 +482,7 @@ bool Address::parseAddressTemplateSection( const TQString &tsection,
482 482
     } else {
483 483
       result.remove( fpos, 2 );
484 484
     }
485
-    fpos = result.tqfind( KABC_FMTTAG_condwhite, fpos );
485
+    fpos = result.find( KABC_FMTTAG_condwhite, fpos );
486 486
   }
487 487
 
488 488
   // remove purged:
@@ -560,7 +560,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
560 560
     TQString strbuf = s.readLine();
561 561
     int pos;
562 562
     while ( !strbuf.isEmpty() ) {
563
-      if ( (pos = strbuf.tqfind( searchStr )) != -1 ) {
563
+      if ( (pos = strbuf.find( searchStr )) != -1 ) {
564 564
         file.close();
565 565
         return i18n( strbuf.left( pos ).utf8() );
566 566
       }

+ 2
- 2
kabc/addresseedialog.cpp View File

@@ -152,7 +152,7 @@ void AddresseeDialog::selectItem( const TQString &str )
152 152
 {
153 153
   if ( str.isEmpty() ) return;
154 154
 
155
-  TQListViewItem *item = mItemDict.tqfind( str );
155
+  TQListViewItem *item = mItemDict.find( str );
156 156
   if ( item ) {
157 157
     mAddresseeList->blockSignals( true );
158 158
     mAddresseeList->setSelected( item, true );
@@ -174,7 +174,7 @@ void AddresseeDialog::addSelected( TQListViewItem *item )
174 174
 
175 175
   Addressee a = addrItem->addressee();
176 176
 
177
-  TQListViewItem *selectedItem = mSelectedDict.tqfind( a.uid() );
177
+  TQListViewItem *selectedItem = mSelectedDict.find( a.uid() );
178 178
   if ( !selectedItem ) {
179 179
     selectedItem = new AddresseeItem( mSelectedList, a );
180 180
     mSelectedDict.insert( a.uid(), selectedItem );

+ 16
- 16
kabc/addresslineedit.cpp View File

@@ -219,13 +219,13 @@ void AddressLineEdit::insert(const TQString &t)
219 219
       KURL u(newText);
220 220
       newText = u.path();
221 221
     }
222
-    else if (newText.tqfind(" at ") != -1)
222
+    else if (newText.find(" at ") != -1)
223 223
     {
224 224
        // Anti-spam stuff
225 225
        newText.replace( " at ", "@" );
226 226
        newText.replace( " dot ", "." );
227 227
     }
228
-    else if (newText.tqfind("(at)") != -1)
228
+    else if (newText.find("(at)") != -1)
229 229
     {
230 230
       newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" );
231 231
     }
@@ -293,7 +293,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
293 293
     TQString prevAddr;    
294 294
     
295 295
     TQString s(text());    
296
-    int n = s.tqfindRev(',');
296
+    int n = s.findRev(',');
297 297
         
298 298
     if (n >= 0)
299 299
     {
@@ -343,7 +343,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
343 343
             items += s_completion->substringCompletion( '<' + s );
344 344
             uint beforeDollarCompletionCount = items.count();
345 345
 
346
-            if( s.tqfind( ' ' ) == -1 ) // one word, possibly given name
346
+            if( s.find( ' ' ) == -1 ) // one word, possibly given name
347 347
                 items += s_completion->allMatches( "$$" + s );
348 348
 
349 349
             if ( !items.isEmpty() )
@@ -355,7 +355,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
355 355
                          it != items.end();
356 356
                          ++it )
357 357
                     { 
358
-                        int pos = (*it).tqfind( '$', 2 );
358
+                        int pos = (*it).find( '$', 2 );
359 359
                         if( pos < 0 ) // ???
360 360
                             continue;
361 361
                         (*it)=(*it).mid( pos + 1 );
@@ -373,7 +373,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
373 373
                 
374 374
                 if (!autoSuggest)
375 375
                 {
376
-                    int index = items.first().tqfind( s );
376
+                    int index = items.first().find( s );
377 377
                     TQString newText = prevAddr + items.first().mid( index );
378 378
                     //kdDebug() << "OLD TEXT: " << text() << endl;
379 379
                     //kdDebug() << "NEW TEXT: " << newText << endl;
@@ -437,11 +437,11 @@ void AddressLineEdit::loadAddresses()
437 437
 void AddressLineEdit::addAddress( const TQString& adr )
438 438
 {
439 439
     s_completion->addItem( adr );
440
-    int pos = adr.tqfind( '<' );
440
+    int pos = adr.find( '<' );
441 441
     if( pos >= 0 )
442 442
     {
443 443
         ++pos;
444
-        int pos2 = adr.tqfind( pos, '>' );
444
+        int pos2 = adr.find( pos, '>' );
445 445
         if( pos2 >= 0 )
446 446
             s_completion->addItem( adr.mid( pos, pos2 - pos ));
447 447
     }
@@ -465,7 +465,7 @@ void AddressLineEdit::startLoadingLDAPEntries()
465 465
     TQString s( *s_LDAPText );
466 466
     // TODO cache last?
467 467
     TQString prevAddr;
468
-    int n = s.tqfindRev(',');
468
+    int n = s.findRev(',');
469 469
     if (n>= 0)
470 470
     {
471 471
         prevAddr = s.left(n+1) + ' ';
@@ -484,8 +484,8 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs )
484 484
         return;
485 485
     for( TQStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) {
486 486
         TQString name(*it);
487
-        int pos = name.tqfind( " <" );
488
-        int pos_comma = name.tqfind( ',' );
487
+        int pos = name.find( " <" );
488
+        int pos_comma = name.find( ',' );
489 489
         // put name in quotes, if we have a comma in the name
490 490
         if (pos>0 && pos_comma>0 && pos_comma<pos) {
491 491
           name.insert(pos, '\"');
@@ -577,18 +577,18 @@ TQStringList AddressLineEdit::addresses()
577 577
     for ( mit = emails.begin(); mit != emails.end(); ++mit ) {
578 578
       email = *mit;
579 579
       if (!email.isEmpty()) {
580
-        if (n.isEmpty() || (email.tqfind( '<' ) != -1))
580
+        if (n.isEmpty() || (email.find( '<' ) != -1))
581 581
           addr = TQString::null;
582 582
         else { /* do we really need quotes around this name ? */
583
-                if (n.tqfind(needQuotes) != -1)
583
+                if (n.find(needQuotes) != -1)
584 584
             addr = '"' + n + endQuote;
585 585
           else
586 586
             addr = n + space;
587 587
         }
588 588
 
589
-        if (!addr.isEmpty() && (email.tqfind( '<' ) == -1)
590
-            && (email.tqfind( '>' ) == -1)
591
-            && (email.tqfind( ',' ) == -1))
589
+        if (!addr.isEmpty() && (email.find( '<' ) == -1)
590
+            && (email.find( '>' ) == -1)
591
+            && (email.find( ',' ) == -1))
592 592
           addr += '<' + email + '>';
593 593
         else
594 594
           addr += email;

+ 1
- 1
kabc/distributionlist.cpp View File

@@ -250,7 +250,7 @@ bool DistributionListManager::save()
250 250
       value.append( (*it).email );
251 251
     }
252 252
 
253
-    if ( d->mMissingEntries.tqfind( list->name() ) != d->mMissingEntries.end() ) {
253
+    if ( d->mMissingEntries.find( list->name() ) != d->mMissingEntries.end() ) {
254 254
       const MissingEntryList missList = d->mMissingEntries[ list->name() ];
255 255
       MissingEntryList::ConstIterator missIt;
256 256
       for ( missIt = missList.begin(); missIt != missList.end(); ++missIt ) {

+ 5
- 5
kabc/kab2kabc.cpp View File

@@ -58,7 +58,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
58 58
   TQString comment;
59 59
 
60 60
   if ( entry.tqat( entry.length() -1 ) == ')' ) {
61
-    int br = entry.tqfindRev( '(' );
61
+    int br = entry.findRev( '(' );
62 62
     if ( br >= 0 ) {
63 63
       comment = entry.mid( br + 1, entry.length() - br - 2 );
64 64
       entry.truncate( br );
@@ -68,7 +68,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
68 68
     }
69 69
   }
70 70
 
71
-  int posSpace = entry.tqfindRev( ' ' );
71
+  int posSpace = entry.findRev( ' ' );
72 72
   if ( posSpace < 0 ) {
73 73
     email = entry;
74 74
     if ( !comment.isEmpty() ) {
@@ -91,7 +91,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
91 91
   }
92 92
 
93 93
   if ( name.tqat( name.length() -1 ) == ')' ) {
94
-    int br = name.tqfindRev( '(' );
94
+    int br = name.findRev( '(' );
95 95
     if ( br >= 0 ) {
96 96
       comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
97 97
       name.truncate( br );
@@ -180,7 +180,7 @@ void readKAddressBookEntries( const TQString &dataString, Addressee &a )
180 180
 
181 181
   TQStringList::ConstIterator it;
182 182
   for ( it = entries.begin(); it != entries.end(); ++it ) {
183
-    int pos = (*it).tqfind( "\n" );
183
+    int pos = (*it).find( "\n" );
184 184
     TQString fieldName = (*it).left( pos );
185 185
     TQString fieldValue = (*it).mid( pos + 2 );
186 186
 
@@ -325,7 +325,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
325 325
     TQStringList::ConstIterator customIt;
326 326
     for ( customIt = entry.custom.begin(); customIt != entry.custom.end(); ++customIt ) {
327 327
       if ( (*customIt).startsWith( "X-KABC-UID:" ) ) {
328
-        a.setUid( (*customIt).mid( (*customIt).tqfind( ":" ) + 1 ) );
328
+        a.setUid( (*customIt).mid( (*customIt).find( ":" ) + 1 ) );
329 329
         idFound = true;
330 330
       } else if ( (*customIt).startsWith( "KMail:1.0\n" ) ) {
331 331
         readKAddressBookEntries( *customIt, a );

+ 3
- 3
kabc/ldapclient.cpp View File

@@ -306,11 +306,11 @@ void LdapSearch::startSearch( const TQString& txt )
306 306
 
307 307
   cancelSearch();
308 308
 
309
-  int pos = txt.tqfind( '\"' );
309
+  int pos = txt.find( '\"' );
310 310
   if( pos >= 0 )
311 311
   {
312 312
     ++pos;
313
-    int pos2 = txt.tqfind( '\"', pos );
313
+    int pos2 = txt.find( '\"', pos );
314 314
     if( pos2 >= 0 )
315 315
         mSearchText = txt.mid( pos , pos2 - pos );
316 316
     else
@@ -408,7 +408,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
408 408
     }
409 409
 
410 410
     LdapResult sr;
411
-    sr.clientNumber = mClients.tqfindIndex( (*it1).client );
411
+    sr.clientNumber = mClients.findIndex( (*it1).client );
412 412
     sr.name = name;
413 413
     sr.email = mail;
414 414
     resList.append( sr );

+ 2
- 2
kabc/ldapurl.cpp View File

@@ -58,14 +58,14 @@ void LDAPUrl::setDn( const TQString &dn)
58 58
 
59 59
 bool LDAPUrl::hasExtension( const TQString &key ) const
60 60
 {
61
-  return m_extensions.tqcontains( key );
61
+  return m_extensions.contains( key );
62 62
 }
63 63
 
64 64
 LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const
65 65
 {
66 66
   TQMap<TQString, Extension>::const_iterator it;
67 67
 
68
-  it = m_extensions.tqfind( key );
68
+  it = m_extensions.find( key );
69 69
   if ( it != m_extensions.constEnd() )
70 70
     return (*it);
71 71
   else {

+ 1
- 1
kabc/ldif.cpp View File

@@ -112,7 +112,7 @@ bool LDIF::splitLine( const TQCString &line, TQString &fieldname, TQByteArray &v
112 112
 
113 113
 //  kdDebug(5700) << "splitLine line: " << TQString::fromUtf8(line) << endl;
114 114
 
115
-  position = line.tqfind( ":" );
115
+  position = line.find( ":" );
116 116
   if ( position == -1 ) {
117 117
     // strange: we did not find a fieldname
118 118
     fieldname = "";

+ 4
- 4
kabc/ldifconverter.cpp View File

@@ -271,7 +271,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
271 271
   }
272 272
   if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
273 273
        fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
274
-    if ( a.emails().tqfindIndex( value ) == -1 )
274
+    if ( a.emails().findIndex( value ) == -1 )
275 275
       a.insertEmail( value );
276 276
     return true;
277 277
   }
@@ -528,7 +528,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
528 528
     return TQString();
529 529
 
530 530
   // append format if not given
531
-  if (formatStr.tqfind(':') == -1)
531
+  if (formatStr.find(':') == -1)
532 532
     formatStr.append(": %1\n");
533 533
 
534 534
   // check if base64-encoding is needed
@@ -543,12 +543,12 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
543 543
   }
544 544
 
545 545
   if (printable) // always encode if we find special chars...
546
-    printable = (value.tqfind('\n') == -1);
546
+    printable = (value.find('\n') == -1);
547 547
 
548 548
   if (!printable && allowEncode) {
549 549
     // encode to base64
550 550
     value = KCodecs::base64Encode( value.utf8() );
551
-    int p = formatStr.tqfind(':');
551
+    int p = formatStr.find(':');
552 552
     if (p>=0)
553 553
       formatStr.insert(p, ':');
554 554
   }

+ 1
- 1
kabc/plugins/dir/resourcedirconfig.cpp View File

@@ -82,7 +82,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res )
82 82
     return;
83 83
   }
84 84
 
85
-  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
85
+  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
86 86
 
87 87
   mFileNameEdit->setURL( resource->path() );
88 88
   if ( mFileNameEdit->url().isEmpty() )

+ 1
- 1
kabc/plugins/file/resourcefileconfig.cpp View File

@@ -86,7 +86,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res  )
86 86
     return;
87 87
   }
88 88
 
89
-  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
89
+  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
90 90
 
91 91
   mFileNameEdit->setURL( resource->fileName() );
92 92
   if ( mFileNameEdit->url().isEmpty() )

+ 21
- 21
kabc/plugins/ldapkio/resourceldapkio.cpp View File

@@ -330,49 +330,49 @@ void ResourceLDAPKIO::init()
330 330
     handle them in the load() method below.
331 331
     These are the default values
332 332
    */
333
-  if ( !mAttributes.tqcontains("objectClass") )
333
+  if ( !mAttributes.contains("objectClass") )
334 334
     mAttributes.insert( "objectClass", "inetOrgPerson" );
335
-  if ( !mAttributes.tqcontains("commonName") )
335
+  if ( !mAttributes.contains("commonName") )
336 336
     mAttributes.insert( "commonName", "cn" );
337
-  if ( !mAttributes.tqcontains("formattedName") )
337
+  if ( !mAttributes.contains("formattedName") )
338 338
     mAttributes.insert( "formattedName", "displayName" );
339
-  if ( !mAttributes.tqcontains("familyName") )
339
+  if ( !mAttributes.contains("familyName") )
340 340
     mAttributes.insert( "familyName", "sn" );
341
-  if ( !mAttributes.tqcontains("givenName") )
341
+  if ( !mAttributes.contains("givenName") )
342 342
     mAttributes.insert( "givenName", "givenName" );
343
-  if ( !mAttributes.tqcontains("mail") )
343
+  if ( !mAttributes.contains("mail") )
344 344
     mAttributes.insert( "mail", "mail" );
345
-  if ( !mAttributes.tqcontains("mailAlias") )
345
+  if ( !mAttributes.contains("mailAlias") )
346 346
     mAttributes.insert( "mailAlias", "" );
347
-  if ( !mAttributes.tqcontains("phoneNumber") )
347
+  if ( !mAttributes.contains("phoneNumber") )
348 348
     mAttributes.insert( "phoneNumber", "homePhone" );
349
-  if ( !mAttributes.tqcontains("telephoneNumber") )
349
+  if ( !mAttributes.contains("telephoneNumber") )
350 350
     mAttributes.insert( "telephoneNumber", "telephoneNumber" );
351
-  if ( !mAttributes.tqcontains("facsimileTelephoneNumber") )
351
+  if ( !mAttributes.contains("facsimileTelephoneNumber") )
352 352
     mAttributes.insert( "facsimileTelephoneNumber", "facsimileTelephoneNumber" );
353
-  if ( !mAttributes.tqcontains("mobile") )
353
+  if ( !mAttributes.contains("mobile") )
354 354
     mAttributes.insert( "mobile", "mobile" );
355
-  if ( !mAttributes.tqcontains("pager") )
355
+  if ( !mAttributes.contains("pager") )
356 356
     mAttributes.insert( "pager", "pager" );
357
-  if ( !mAttributes.tqcontains("description") )
357
+  if ( !mAttributes.contains("description") )
358 358
     mAttributes.insert( "description", "description" );
359 359
 
360
-  if ( !mAttributes.tqcontains("title") )
360
+  if ( !mAttributes.contains("title") )
361 361
     mAttributes.insert( "title", "title" );
362
-  if ( !mAttributes.tqcontains("street") )
362
+  if ( !mAttributes.contains("street") )
363 363
     mAttributes.insert( "street", "street" );
364
-  if ( !mAttributes.tqcontains("state") )
364
+  if ( !mAttributes.contains("state") )
365 365
     mAttributes.insert( "state", "st" );
366
-  if ( !mAttributes.tqcontains("city") )
366
+  if ( !mAttributes.contains("city") )
367 367
     mAttributes.insert( "city", "l" );
368
-  if ( !mAttributes.tqcontains("organization") )
368
+  if ( !mAttributes.contains("organization") )
369 369
     mAttributes.insert( "organization", "o" );
370
-  if ( !mAttributes.tqcontains("postalcode") )
370
+  if ( !mAttributes.contains("postalcode") )
371 371
     mAttributes.insert( "postalcode", "postalCode" );
372 372
 
373
-  if ( !mAttributes.tqcontains("uid") )
373
+  if ( !mAttributes.contains("uid") )
374 374
     mAttributes.insert( "uid", "uid" );
375
-  if ( !mAttributes.tqcontains("jpegPhoto") )
375
+  if ( !mAttributes.contains("jpegPhoto") )
376 376
     mAttributes.insert( "jpegPhoto", "jpegPhoto" );
377 377
 
378 378
   d->mLDAPUrl = KURL();

+ 1
- 1
kabc/plugins/ldapkio/resourceldapkioconfig.cpp View File

@@ -281,7 +281,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
281 281
   for ( i = 1; i < mMapCombo->count(); i++ ) {
282 282
     TQDictIterator<KLineEdit> it2( mLineEditDict );
283 283
     for ( ; it2.current(); ++it2 ) {
284
-      if ( mMapList[ i ].tqcontains( it2.currentKey() ) ) {
284
+      if ( mMapList[ i ].contains( it2.currentKey() ) ) {
285 285
         if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break;
286 286
       } else {
287 287
         if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break;

+ 1
- 1
kabc/plugins/net/resourcenetconfig.cpp View File

@@ -79,7 +79,7 @@ void ResourceNetConfig::loadSettings( KRES::Resource *res )
79 79
     return;
80 80
   }
81 81
 
82
-  mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );
82
+  mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
83 83
 
84 84
   mUrlEdit->setURL( resource->url().url() );
85 85
 }

+ 2
- 2
kabc/plugins/sql/resourcesql.cpp View File

@@ -317,8 +317,8 @@ bool ResourceSql::save( Ticket * )
317 317
       TQStringList list = (*it).customs();
318 318
       TQStringList::ConstIterator it;
319 319
       for( it = list.begin(); it != list.end(); ++it ) {
320
-        int dashPos = (*it).tqfind( '-' );
321
-        int colonPos = (*it).tqfind( ':' );
320
+        int dashPos = (*it).find( '-' );
321
+        int colonPos = (*it).find( ':' );
322 322
         TQString app = (*it).left( dashPos );
323 323
         TQString name = (*it).mid( dashPos + 1, colonPos - dashPos - 1 );
324 324
         TQString value = (*it).right( (*it).length() - colonPos - 1 );

+ 1
- 1
kabc/resource.cpp View File

@@ -268,7 +268,7 @@ void Resource::removeAddressee( const Addressee &addr )
268 268
 
269 269
 Addressee Resource::findByUid( const TQString &uid )
270 270
 {
271
-  Addressee::Map::ConstIterator it = mAddrMap.tqfind( uid );
271
+  Addressee::Map::ConstIterator it = mAddrMap.find( uid );
272 272
 
273 273
   if ( it != mAddrMap.end() )
274 274
     return it.data();

+ 10
- 10
kabc/scripts/addressee.src.cpp View File

@@ -225,7 +225,7 @@ void Addressee::setNameFromString( const TQString &s )
225 225
   TQString emptyStr = "";
226 226
   AddresseeHelper *helper = AddresseeHelper::self();
227 227
 
228
-  int i = str.tqfind( ',' );
228
+  int i = str.find( ',' );
229 229
   if( i < 0 ) {
230 230
     TQStringList parts = TQStringList::split( spaceStr, str );
231 231
     int leftOffset = 0;
@@ -398,7 +398,7 @@ TQString Addressee::fullEmail( const TQString &email ) const
398 398
     text = e;
399 399
   else {
400 400
     TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" );
401
-    if ( realName().tqfind( needQuotes ) != -1 ) {
401
+    if ( realName().find( needQuotes ) != -1 ) {
402 402
       TQString name = realName();
403 403
       name.replace( "\"", "\\\"" );
404 404
       text = "\"" + name + "\" <" + e + ">";
@@ -417,7 +417,7 @@ void Addressee::insertEmail( const TQString &email, bool preferred )
417 417
   detach();
418 418
   mData->empty = false;
419 419
 
420
-  TQStringList::Iterator it = mData->emails.tqfind( email );
420
+  TQStringList::Iterator it = mData->emails.find( email );
421 421
 
422 422
   if ( it != mData->emails.end() ) {
423 423
     if ( !preferred || it == mData->emails.begin() ) return;
@@ -436,7 +436,7 @@ void Addressee::removeEmail( const TQString &email )
436 436
 {
437 437
   detach();
438 438
 
439
-  TQStringList::Iterator it = mData->emails.tqfind( email );
439
+  TQStringList::Iterator it = mData->emails.find( email );
440 440
   if ( it == mData->emails.end() ) return;
441 441
 
442 442
   mData->emails.remove( it );
@@ -755,7 +755,7 @@ void Addressee::insertCategory( const TQString &c )
755 755
   detach();
756 756
   mData->empty = false;
757 757
 
758
-  if ( mData->categories.tqfindIndex( c ) != -1 ) return;
758
+  if ( mData->categories.findIndex( c ) != -1 ) return;
759 759
 
760 760
   mData->categories.append( c );
761 761
 }
@@ -764,7 +764,7 @@ void Addressee::removeCategory( const TQString &c )
764 764
 {
765 765
   detach();
766 766
 
767
-  TQStringList::Iterator it = mData->categories.tqfind( c );
767
+  TQStringList::Iterator it = mData->categories.find( c );
768 768
   if ( it == mData->categories.end() ) return;
769 769
 
770 770
   mData->categories.remove( it );
@@ -772,7 +772,7 @@ void Addressee::removeCategory( const TQString &c )
772 772
 
773 773
 bool Addressee::hasCategory( const TQString &c ) const
774 774
 {
775
-  return ( mData->categories.tqfindIndex( c ) != -1 );
775
+  return ( mData->categories.findIndex( c ) != -1 );
776 776
 }
777 777
 
778 778
 void Addressee::setCategories( const TQStringList &c )
@@ -832,7 +832,7 @@ TQString Addressee::custom( const TQString &app, const TQString &name ) const
832 832
   TQStringList::ConstIterator it;
833 833
   for( it = mData->custom.constBegin(); it != mData->custom.constEnd(); ++it ) {
834 834
     if ( (*it).startsWith( qualifiedName ) ) {
835
-      value = (*it).mid( (*it).tqfind( ":" ) + 1 );
835
+      value = (*it).mid( (*it).find( ":" ) + 1 );
836 836
       break;
837 837
     }
838 838
   }
@@ -1104,7 +1104,7 @@ bool listEquals( const TQValueList<L> &list, const TQValueList<L> &pattern )
1104 1104
     return false;
1105 1105
 
1106 1106
   for ( uint i = 0; i < list.count(); ++i )
1107
-    if ( pattern.tqfind( list[ i ] ) == pattern.end() )
1107
+    if ( pattern.find( list[ i ] ) == pattern.end() )
1108 1108
       return false;
1109 1109
 
1110 1110
   return true;
@@ -1120,7 +1120,7 @@ bool emailsEquals( const TQStringList &list, const TQStringList &pattern )
1120 1120
 
1121 1121
   TQStringList::ConstIterator it;
1122 1122
   for ( it = list.begin(); it != list.end(); ++it )
1123
-    if ( pattern.tqfind( *it ) == pattern.end() )
1123
+    if ( pattern.find( *it ) == pattern.end() )
1124 1124
       return false;
1125 1125
 
1126 1126
   return true;

+ 1
- 1
kabc/vcard/AdrParam.cpp View File

@@ -80,7 +80,7 @@ AdrParam::operator == (AdrParam & x)
80 80
 	TQStrListIterator it(x.adrTypeList_);
81 81
 	
82 82
 	for (; it.current(); ++it)
83
-		if (!adrTypeList_.tqfind(it.current()))
83
+		if (!adrTypeList_.find(it.current()))
84 84
 			return false;
85 85
 	
86 86
 	return true;

+ 6
- 6
kabc/vcard/ContentLine.cpp View File

@@ -122,7 +122,7 @@ ContentLine::operator == (ContentLine & x)
122 122
 	
123 123
 	TQPtrListIterator<Param> it(x.paramList());
124 124
 	
125
-	if (!paramList_.tqfind(it.current()))
125
+	if (!paramList_.find(it.current()))
126 126
 		return false;
127 127
 
128 128
 	return true;
@@ -140,9 +140,9 @@ ContentLine::_parse()
140 140
 	vDebug("parse");
141 141
 	
142 142
 	// Unqote newlines
143
-	strRep_ = strRep_.tqreplace( TQRegExp( "\\\\n" ), "\n" );
143
+	strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" );
144 144
 	
145
-	int split = strRep_.tqfind(':');
145
+	int split = strRep_.find(':');
146 146
 	
147 147
 	if (split == -1) { // invalid content line
148 148
 		vDebug("No ':'");
@@ -152,7 +152,7 @@ ContentLine::_parse()
152 152
 	TQCString firstPart(strRep_.left(split));
153 153
 	TQCString valuePart(strRep_.mid(split + 1));
154 154
 	
155
-	split = firstPart.tqfind('.');
155
+	split = firstPart.find('.');
156 156
 	
157 157
 	if (split != -1) {
158 158
 		group_		= firstPart.left(split);
@@ -193,7 +193,7 @@ ContentLine::_parse()
193 193
 
194 194
 		TQCString str = *it;
195 195
 
196
-		split = str.tqfind("=");
196
+		split = str.find("=");
197 197
 		if (split < 0 ) {
198 198
 			vDebug("No '=' in parameter.");
199 199
 			continue;
@@ -275,7 +275,7 @@ ContentLine::_assemble()
275 275
         }
276 276
 
277 277
 	// Quote newlines
278
-	line = line.tqreplace( TQRegExp( "\n" ), "\\n" );
278
+	line = line.replace( TQRegExp( "\n" ), "\\n" );
279 279
 		
280 280
 	// Fold lines longer than 72 chars
281 281
 	const int maxLen = 72;

+ 5
- 5
kabc/vcard/DateValue.cpp View File

@@ -152,7 +152,7 @@ DateValue::_parse()
152 152
 	// time = time-hour [":"] time-minute [":"] time-second [":"]
153 153
 	// [time-secfrac] [time-zone]
154 154
 	
155
-	int timeSep = strRep_.tqfind('T');
155
+	int timeSep = strRep_.find('T');
156 156
 	
157 157
 	TQCString dateStr;
158 158
 	TQCString timeStr;
@@ -173,7 +173,7 @@ DateValue::_parse()
173 173
 	
174 174
 	/////////////////////////////////////////////////////////////// DATE
175 175
 	
176
-	dateStr.tqreplace(TQRegExp("-"), "");
176
+	dateStr.replace(TQRegExp("-"), "");
177 177
 
178 178
 	kdDebug(5710) << "dateStr: " << dateStr << endl;
179 179
 
@@ -192,7 +192,7 @@ DateValue::_parse()
192 192
 
193 193
 	/////////////////////////////////////////////////////////////// ZONE
194 194
 	
195
-	int zoneSep = timeStr.tqfind('Z');
195
+	int zoneSep = timeStr.find('Z');
196 196
 	
197 197
 	if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
198 198
 		
@@ -208,7 +208,7 @@ DateValue::_parse()
208 208
 
209 209
 	//////////////////////////////////////////////////// SECOND FRACTION
210 210
 	
211
-	int secFracSep = timeStr.tqfindRev(',');
211
+	int secFracSep = timeStr.findRev(',');
212 212
 	
213 213
 	if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
214 214
 		TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
@@ -217,7 +217,7 @@ DateValue::_parse()
217 217
 	
218 218
 	/////////////////////////////////////////////////////////////// HMS
219 219
 
220
-	timeStr.tqreplace(TQRegExp(":"), "");
220
+	timeStr.replace(TQRegExp(":"), "");
221 221
 	
222 222
 	hour_	= timeStr.left(2).toInt();
223 223
 	minute_	= timeStr.mid(2, 2).toInt();

+ 1
- 1
kabc/vcard/GeoValue.cpp View File

@@ -84,7 +84,7 @@ GeoValue::clone()
84 84
 	void
85 85
 GeoValue::_parse()
86 86
 {
87
-  int semiColon = strRep_.tqfind( ";" );
87
+  int semiColon = strRep_.find( ";" );
88 88
 
89 89
   if ( semiColon == -1 ) // invalid
90 90
     return;

+ 1
- 1
kabc/vcard/SourceParam.cpp View File

@@ -80,7 +80,7 @@ SourceParam::~SourceParam()
80 80
 	void
81 81
 SourceParam::_parse()
82 82
 {
83
-	int i = strRep_.tqfind('=');
83
+	int i = strRep_.find('=');
84 84
 	if (i == -1) // Invalid
85 85
 		return;
86 86
 	

+ 1
- 1
kabc/vcard/URIValue.cpp View File

@@ -89,7 +89,7 @@ URIValue::~URIValue()
89 89
 	void
90 90
 URIValue::_parse()
91 91
 {
92
-	int split = strRep_.tqfind(':');
92
+	int split = strRep_.find(':');
93 93
 	if (split == -1)
94 94
 		return;
95 95
 	

+ 1
- 1
kabc/vcard/UTCValue.cpp View File

@@ -93,7 +93,7 @@ UTCValue::_parse()
93 93
 
94 94
 	positive_ = ( strRep_[0] == '+' );
95 95
 	
96
-	int colon = strRep_.tqfind( ':' );
96
+	int colon = strRep_.find( ':' );
97 97
 	
98 98
 	if ( colon == -1 ) // Not valid.
99 99
 		return;

+ 4
- 4
kabc/vcard/VCard.cpp View File

@@ -113,7 +113,7 @@ VCard::_parse()
113 113
 	///////////////////////////////////////////////////////////////
114 114
 	// FIRST LINE
115 115
 
116
-	int split = beginLine.tqfind(':');
116
+	int split = beginLine.find(':');
117 117
 
118 118
 	if (split == -1) { // invalid, no BEGIN
119 119
 		vDebug("No split");
@@ -123,7 +123,7 @@ VCard::_parse()
123 123
 	TQCString firstPart(beginLine.left(split));
124 124
 	TQCString valuePart(beginLine.mid(split + 1));
125 125
 
126
-	split = firstPart.tqfind('.');
126
+	split = firstPart.find('.');
127 127
 
128 128
 	if (split != -1) {
129 129
 		group_		= firstPart.left(split);
@@ -188,7 +188,7 @@ VCard::_parse()
188 188
 	///////////////////////////////////////////////////////////////
189 189
 	// LAST LINE
190 190
 
191
-	split = endLine.tqfind(':');
191
+	split = endLine.find(':');
192 192
 
193 193
 	if (split == -1) // invalid, no END
194 194
 		return;
@@ -196,7 +196,7 @@ VCard::_parse()
196 196
 	firstPart = endLine.left(split);
197 197
 	valuePart = endLine.right(firstPart.length() - split - 1);
198 198
 
199
-	split = firstPart.tqfind('.');
199
+	split = firstPart.find('.');
200 200
 
201 201
 	if (split != -1) {
202 202
 		group_		= firstPart.left(split);

+ 2
- 2
kabc/vcard/VCardEntity.cpp View File

@@ -76,11 +76,11 @@ VCardEntity::_parse()
76 76
 	vDebug("parse");
77 77
 	TQCString s(strRep_);
78 78
 	
79
-	int i = s.tqfind(TQRegExp("BEGIN:VCARD", false));
79
+	int i = s.find(TQRegExp("BEGIN:VCARD", false));
80 80
 	
81 81
 	while (i != -1) {
82 82
 		
83
-		i = s.tqfind(TQRegExp("BEGIN:VCARD", false), 11);
83
+		i = s.find(TQRegExp("BEGIN:VCARD", false), 11);
84 84
 		
85 85
 		TQCString cardStr(s.left(i));
86 86
 		

+ 52
- 52
kabc/vcard21parser.cpp View File

@@ -41,12 +41,12 @@ bool VCardLineX::isValid() const
41 41
   switch( name[0] ) {
42 42
     case 'a':
43 43
       if ( name == VCARD_ADR && qualified &&
44
-                   (qualifiers.tqcontains(VCARD_ADR_DOM)    ||
45
-                    qualifiers.tqcontains(VCARD_ADR_INTL)   ||
46
-                    qualifiers.tqcontains(VCARD_ADR_POSTAL) ||
47
-                    qualifiers.tqcontains(VCARD_ADR_HOME)   ||
48
-                    qualifiers.tqcontains(VCARD_ADR_WORK)   ||
49
-                    qualifiers.tqcontains(VCARD_ADR_PREF)
44
+                   (qualifiers.contains(VCARD_ADR_DOM)    ||
45
+                    qualifiers.contains(VCARD_ADR_INTL)   ||
46
+                    qualifiers.contains(VCARD_ADR_POSTAL) ||
47
+                    qualifiers.contains(VCARD_ADR_HOME)   ||
48
+                    qualifiers.contains(VCARD_ADR_WORK)   ||
49
+                    qualifiers.contains(VCARD_ADR_PREF)
50 50
          ) )
51 51
         return true;
52 52
 
@@ -63,18 +63,18 @@ bool VCardLineX::isValid() const
63 63
       if ( name == VCARD_CATEGORIES )
64 64
         return true;
65 65
       if ( name == VCARD_CLASS && qualified &&
66
-                   (qualifiers.tqcontains(VCARD_CLASS_PUBLIC)      ||
67
-                    qualifiers.tqcontains(VCARD_CLASS_PRIVATE)     ||
68
-                    qualifiers.tqcontains(VCARD_CLASS_CONFIDENTIAL)
66
+                   (qualifiers.contains(VCARD_CLASS_PUBLIC)      ||
67
+                    qualifiers.contains(VCARD_CLASS_PRIVATE)     ||
68
+                    qualifiers.contains(VCARD_CLASS_CONFIDENTIAL)
69 69
          ) )
70 70
         return true;
71 71
       break;
72 72
 
73 73
     case 'e':
74 74
       if ( name == VCARD_EMAIL && qualified &&
75
-                  (qualifiers.tqcontains(VCARD_EMAIL_INTERNET) ||
76
-                   qualifiers.tqcontains(VCARD_EMAIL_PREF)     ||
77
-                   qualifiers.tqcontains(VCARD_EMAIL_X400)
75
+                  (qualifiers.contains(VCARD_EMAIL_INTERNET) ||
76
+                   qualifiers.contains(VCARD_EMAIL_PREF)     ||
77
+                   qualifiers.contains(VCARD_EMAIL_X400)
78 78
          ) )
79 79
         return true;
80 80
       break;
@@ -91,8 +91,8 @@ bool VCardLineX::isValid() const
91 91
 
92 92
     case 'k':
93 93
       if ( name == VCARD_KEY && qualified &&
94
-                   (qualifiers.tqcontains(VCARD_KEY_X509) ||
95
-                    qualifiers.tqcontains(VCARD_KEY_PGP)
94
+                   (qualifiers.contains(VCARD_KEY_X509) ||
95
+                    qualifiers.contains(VCARD_KEY_PGP)
96 96
          ) )
97 97
         return true;
98 98
       break;
@@ -150,20 +150,20 @@ bool VCardLineX::isValid() const
150 150
 
151 151
     case 't':
152 152
       if ( name == VCARD_TEL && qualified &&
153
-                   (qualifiers.tqcontains(VCARD_TEL_HOME)  ||
154
-                    qualifiers.tqcontains(VCARD_TEL_WORK)  ||
155
-                    qualifiers.tqcontains(VCARD_TEL_PREF)  ||
156
-                    qualifiers.tqcontains(VCARD_TEL_VOICE) ||
157
-                    qualifiers.tqcontains(VCARD_TEL_FAX)   ||
158
-                    qualifiers.tqcontains(VCARD_TEL_MSG)   ||
159
-                    qualifiers.tqcontains(VCARD_TEL_CELL)  ||
160
-                    qualifiers.tqcontains(VCARD_TEL_PAGER) ||
161
-                    qualifiers.tqcontains(VCARD_TEL_BBS)   ||
162
-                    qualifiers.tqcontains(VCARD_TEL_MODEM) ||
163
-                    qualifiers.tqcontains(VCARD_TEL_CAR)   ||
164
-                    qualifiers.tqcontains(VCARD_TEL_ISDN)  ||
165
-                    qualifiers.tqcontains(VCARD_TEL_VIDEO) ||
166
-                    qualifiers.tqcontains(VCARD_TEL_PCS)
153
+                   (qualifiers.contains(VCARD_TEL_HOME)  ||
154
+                    qualifiers.contains(VCARD_TEL_WORK)  ||
155
+                    qualifiers.contains(VCARD_TEL_PREF)  ||
156
+                    qualifiers.contains(VCARD_TEL_VOICE) ||
157
+                    qualifiers.contains(VCARD_TEL_FAX)   ||
158
+                    qualifiers.contains(VCARD_TEL_MSG)   ||
159
+                    qualifiers.contains(VCARD_TEL_CELL)  ||
160
+                    qualifiers.contains(VCARD_TEL_PAGER) ||
161
+                    qualifiers.contains(VCARD_TEL_BBS)   ||
162
+                    qualifiers.contains(VCARD_TEL_MODEM) ||
163
+                    qualifiers.contains(VCARD_TEL_CAR)   ||
164
+                    qualifiers.contains(VCARD_TEL_ISDN)  ||
165
+                    qualifiers.contains(VCARD_TEL_VIDEO) ||
166
+                    qualifiers.contains(VCARD_TEL_PCS)
167 167
          ) )
168 168
         return true;
169 169
       if ( name == VCARD_TZ )
@@ -266,33 +266,33 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
266 266
     if ( (*i).name == VCARD_TEL ) {
267 267
       int type = 0;
268 268
       if ( (*i).qualified ) {
269
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_HOME ) )
269
+        if ( (*i).qualifiers.contains( VCARD_TEL_HOME ) )
270 270
           type |= PhoneNumber::Home;
271
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_WORK ) )
271
+        if ( (*i).qualifiers.contains( VCARD_TEL_WORK ) )
272 272
           type |= PhoneNumber::Work;
273
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_PREF ) )
273
+        if ( (*i).qualifiers.contains( VCARD_TEL_PREF ) )
274 274
           type |= PhoneNumber::Pref;
275
-        // if ( (*i).qualifiers.tqcontains( VCARD_TEL_VOICE ) )
275
+        // if ( (*i).qualifiers.contains( VCARD_TEL_VOICE ) )
276 276
         //  type |= PhoneNumber::Voice;
277
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_FAX ) )
277
+        if ( (*i).qualifiers.contains( VCARD_TEL_FAX ) )
278 278
           type |= PhoneNumber::Fax;
279
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_MSG ) )
279
+        if ( (*i).qualifiers.contains( VCARD_TEL_MSG ) )
280 280
           type |= PhoneNumber::Msg;
281
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_CELL ) )
281
+        if ( (*i).qualifiers.contains( VCARD_TEL_CELL ) )
282 282
           type |= PhoneNumber::Cell;
283
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_PAGER ) )
283
+        if ( (*i).qualifiers.contains( VCARD_TEL_PAGER ) )
284 284
           type |= PhoneNumber::Pager;
285
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_BBS ) )
285
+        if ( (*i).qualifiers.contains( VCARD_TEL_BBS ) )
286 286
           type |= PhoneNumber::Bbs;
287
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_MODEM ) )
287
+        if ( (*i).qualifiers.contains( VCARD_TEL_MODEM ) )
288 288
           type |= PhoneNumber::Modem;
289
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_CAR ) )
289
+        if ( (*i).qualifiers.contains( VCARD_TEL_CAR ) )
290 290
           type |= PhoneNumber::Car;
291
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_ISDN ) )
291
+        if ( (*i).qualifiers.contains( VCARD_TEL_ISDN ) )
292 292
           type |= PhoneNumber::Isdn;
293
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_VIDEO ) )
293
+        if ( (*i).qualifiers.contains( VCARD_TEL_VIDEO ) )
294 294
           type |= PhoneNumber::Video;
295
-        if ( (*i).qualifiers.tqcontains( VCARD_TEL_PCS ) )
295
+        if ( (*i).qualifiers.contains( VCARD_TEL_PCS ) )
296 296
           type |= PhoneNumber::Pcs;
297 297
       }
298 298
       addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) );
@@ -304,19 +304,19 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
304 304
     if ( (*i).name == VCARD_ADR ) {
305 305
       int type = 0;
306 306
       if ( (*i).qualified ) {
307
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_DOM ) )
307
+        if ( (*i).qualifiers.contains( VCARD_ADR_DOM ) )
308 308
           type |= Address::Dom;
309
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_INTL ) )
309
+        if ( (*i).qualifiers.contains( VCARD_ADR_INTL ) )
310 310
           type |= Address::Intl;
311
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_POSTAL ) )
311
+        if ( (*i).qualifiers.contains( VCARD_ADR_POSTAL ) )
312 312
           type |= Address::Postal;
313
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_PARCEL ) )
313
+        if ( (*i).qualifiers.contains( VCARD_ADR_PARCEL ) )
314 314
           type |= Address::Parcel;
315
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_HOME ) )
315
+        if ( (*i).qualifiers.contains( VCARD_ADR_HOME ) )
316 316
           type |= Address::Home;
317
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_WORK ) )
317
+        if ( (*i).qualifiers.contains( VCARD_ADR_WORK ) )
318 318
           type |= Address::Work;
319
-        if ( (*i).qualifiers.tqcontains( VCARD_ADR_PREF ) )
319
+        if ( (*i).qualifiers.contains( VCARD_ADR_PREF ) )
320 320
           type |= Address::Pref;
321 321
       }
322 322
       addressee.insertAddress( readAddressFromQStringList( (*i).parameters, type ) );
@@ -430,7 +430,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err )
430 430
       }
431 431
 
432 432
       // split into two tokens
433
-      int colon = (*j).tqfind( ':' );
433
+      int colon = (*j).find( ':' );
434 434
       if ( colon < 0 ) {
435 435
         _err = VC_ERR_INVALID_LINE;
436 436
         break;
@@ -556,7 +556,7 @@ TQString VCard21ParserImpl::getValue(const TQString& name, const TQString& quali
556 556
   const TQString lowqualifier = qualifier.lower();
557 557
 
558 558
   for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
559
-   if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.tqcontains(lowqualifier)) {
559
+   if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier)) {
560 560
     if ((*i).parameters.count() > 0)
561 561
      return (*i).parameters[0];
562 562
     else return failed;
@@ -598,7 +598,7 @@ TQStringList VCard21ParserImpl::getValues(const TQString& name, const TQString&
598 598
   const TQString lowname = name.lower();
599 599
   const TQString lowqualifier = qualifier.lower();
600 600
   for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
601
-    if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.tqcontains(lowqualifier))
601
+    if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier))
602 602
        return (*i).parameters;
603 603
   }
604 604
   // failed.

+ 3
- 3
kabc/vcardformatimpl.cpp View File

@@ -123,7 +123,7 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCARD::VCard &v )
123 123
     TQCString n = cl->name();
124 124
     if ( n.left( 2 ) == "X-" ) {
125 125
       n = n.mid( 2 );
126
-      int posDash = n.tqfind( "-" );
126
+      int posDash = n.find( "-" );
127 127
       addressee.insertCustom( TQString::fromUtf8( n.left( posDash ) ),
128 128
                         TQString::fromUtf8( n.mid( posDash + 1 ) ),
129 129
                         TQString::fromUtf8( cl->value()->asString() ) );
@@ -351,8 +351,8 @@ void VCardFormatImpl::addCustomValue( VCARD::VCard *v, const TQString &txt )
351 351
   if ( txt.isEmpty() ) return;
352 352
 
353 353
   ContentLine cl;
354
-  cl.setName( "X-" + txt.left( txt.tqfind( ":" ) ).utf8() );
355
-  TQString value = txt.mid( txt.tqfind( ":" ) + 1 );
354
+  cl.setName( "X-" + txt.left( txt.find( ":" ) ).utf8() );
355
+  TQString value = txt.mid( txt.find( ":" ) + 1 );
356 356
   if ( value.isEmpty() )
357 357
     return;
358 358
   cl.setValue( new TextValue( value.utf8() ) );

+ 3
- 3
kabc/vcardparser/vcard.cpp View File

@@ -62,7 +62,7 @@ void VCard::addLine( const VCardLine& line )
62 62
 
63 63
 VCardLine::List VCard::lines( const TQString& identifier ) const
64 64
 {
65
-  LineMap::ConstIterator it = mLineMap.tqfind( identifier );
65
+  LineMap::ConstIterator it = mLineMap.find( identifier );
66 66
   if ( it == mLineMap.end() )
67 67
     return VCardLine::List();
68 68
 
@@ -71,7 +71,7 @@ VCardLine::List VCard::lines( const TQString& identifier ) const
71 71
 
72 72
 VCardLine VCard::line( const TQString& identifier ) const
73 73
 {
74
-  LineMap::ConstIterator it = mLineMap.tqfind( identifier );
74
+  LineMap::ConstIterator it = mLineMap.find( identifier );
75 75
   if ( it == mLineMap.end() )
76 76
     return VCardLine();
77 77
 
@@ -97,7 +97,7 @@ void VCard::setVersion( Version version )
97 97
 
98 98
 VCard::Version VCard::version() const
99 99
 {
100
-  LineMap::ConstIterator versionEntry = mLineMap.tqfind( "VERSION" );
100
+  LineMap::ConstIterator versionEntry = mLineMap.find( "VERSION" );
101 101
   if ( versionEntry == mLineMap.end() )
102 102
     return v3_0;
103 103
 

+ 3
- 3
kabc/vcardparser/vcardline.cpp View File

@@ -124,13 +124,13 @@ TQStringList VCardLine::parameterList() const
124 124
 void VCardLine::addParameter( const TQString& param, const TQString& value )
125 125
 {
126 126
   TQStringList &list = mParamMap[ param ];
127
-  if ( list.tqfindIndex( value ) == -1 ) // not included yet
127
+  if ( list.findIndex( value ) == -1 ) // not included yet
128 128
     list.append( value );
129 129
 }
130 130
 
131 131
 TQStringList VCardLine::parameters( const TQString& param ) const
132 132
 {
133
-  ParamMap::ConstIterator it = mParamMap.tqfind( param );
133
+  ParamMap::ConstIterator it = mParamMap.find( param );
134 134
   if ( it == mParamMap.end() )
135 135
     return TQStringList();
136 136
   else
@@ -139,7 +139,7 @@ TQStringList VCardLine::parameters( const TQString& param ) const
139 139
 
140 140
 TQString VCardLine::parameter( const TQString& param ) const
141 141
 {
142
-  ParamMap::ConstIterator it = mParamMap.tqfind( param );
142
+  ParamMap::ConstIterator it = mParamMap.find( param );
143 143
   if ( it == mParamMap.end() )
144 144
     return TQString::null;
145 145
   else {

+ 5
- 5
kabc/vcardparser/vcardparser.cpp View File

@@ -81,7 +81,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
81 81
       continue;
82 82
     } else {
83 83
       if ( inVCard && !currentLine.isEmpty() ) { // now parse the line
84
-        int colon = currentLine.tqfind( ':' );
84
+        int colon = currentLine.find( ':' );
85 85
         if ( colon == -1 ) { // invalid line
86 86
           currentLine = (*it);
87 87
           continue;
@@ -94,7 +94,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
94 94
         TQStringList params = TQStringList::split( ';', key );
95 95
 
96 96
         // check for group
97
-        if ( params[0].tqfind( '.' ) != -1 ) {
97
+        if ( params[0].find( '.' ) != -1 ) {
98 98
           const TQStringList groupList = TQStringList::split( '.', params[0] );
99 99
           vCardLine.setGroup( groupList[0] );
100 100
           vCardLine.setIdentifier( groupList[1] );
@@ -118,7 +118,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
118 118
               }
119 119
             }
120 120
             // This is pretty much a faster pair[1].contains( ',' )...
121
-            if ( pair[1].tqfind( ',' ) != -1 ) { // parameter in type=x,y,z format
121
+            if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format
122 122
               const TQStringList args = TQStringList::split( ',', pair[ 1 ] );
123 123
               TQStringList::ConstIterator argIt;
124 124
               for ( argIt = args.begin(); argIt != args.end(); ++argIt )
@@ -134,7 +134,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
134 134
         bool wasBase64Encoded = false;
135 135
 
136 136
         params = vCardLine.parameterList();
137
-        if ( params.tqfindIndex( "encoding" ) != -1 ) { // have to decode the data
137
+        if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data
138 138
           TQByteArray input;
139 139
           input = TQCString(value.latin1());
140 140
           if ( vCardLine.parameter( "encoding" ).lower() == "b" ||
@@ -155,7 +155,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
155 155
           output = TQCString(value.latin1());
156 156
         }
157 157
 
158
-        if ( params.tqfindIndex( "charset" ) != -1 ) { // have to convert the data
158
+        if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data
159 159
           TQTextCodec *codec =
160 160
             TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
161 161
           if ( codec ) {

+ 19
- 19
kabc/vcardtool.cpp View File

@@ -335,8 +335,8 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
335 335
     // X-
336 336
     const TQStringList customs = (*addrIt).customs();
337 337
     for ( strIt = customs.begin(); strIt != customs.end(); ++strIt ) {
338
-      TQString identifier = "X-" + (*strIt).left( (*strIt).tqfind( ":" ) );
339
-      TQString value = (*strIt).mid( (*strIt).tqfind( ":" ) + 1 );
338
+      TQString identifier = "X-" + (*strIt).left( (*strIt).find( ":" ) );
339
+      TQString value = (*strIt).mid( (*strIt).find( ":" ) + 1 );
340 340
       if ( value.isEmpty() )
341 341
         continue;
342 342
 
@@ -428,7 +428,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
428 428
         // EMAIL
429 429
         else if ( identifier == "email" ) {
430 430
           const TQStringList types = (*lineIt).parameters( "type" );
431
-          addr.insertEmail( (*lineIt).value().asString(), types.tqfindIndex( "PREF" ) != -1 );
431
+          addr.insertEmail( (*lineIt).value().asString(), types.findIndex( "PREF" ) != -1 );
432 432
         }
433 433
 
434 434
         // FN
@@ -594,7 +594,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
594 594
         // X-
595 595
         else if ( identifier.startsWith( "x-" ) ) {
596 596
           const TQString key = (*lineIt).identifier().mid( 2 );
597
-          int dash = key.tqfind( "-" );
597
+          int dash = key.find( "-" );
598 598
           addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).value().asString() );
599 599
         }
600 600
       }
@@ -610,11 +610,11 @@ TQDateTime VCardTool::parseDateTime( const TQString &str )
610 610
 {
611 611
   TQDateTime dateTime;
612 612
 
613
-  if ( str.tqfind( '-' ) == -1 ) { // is base format (yyyymmdd)
613
+  if ( str.find( '-' ) == -1 ) { // is base format (yyyymmdd)
614 614
     dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 4, 2 ).toInt(),
615 615
                              str.mid( 6, 2 ).toInt() ) );
616 616
 
617
-    if ( str.tqfind( 'T' ) ) // has time information yyyymmddThh:mm:ss
617
+    if ( str.find( 'T' ) ) // has time information yyyymmddThh:mm:ss
618 618
       dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
619 619
                                str.mid( 17, 2 ).toInt() ) );
620 620
 
@@ -622,7 +622,7 @@ TQDateTime VCardTool::parseDateTime( const TQString &str )
622 622
     dateTime.setDate( TQDate( str.left( 4 ).toInt(), str.mid( 5, 2 ).toInt(),
623 623
                              str.mid( 8, 2 ).toInt() ) );
624 624
 
625
-    if ( str.tqfind( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss
625
+    if ( str.find( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss
626 626
       dateTime.setTime( TQTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
627 627
                                str.mid( 17, 2 ).toInt() ) );
628 628
   }
@@ -653,16 +653,16 @@ Picture VCardTool::parsePicture( const VCardLine &line )
653 653
   Picture pic;
654 654
 
655 655
   const TQStringList params = line.parameterList();
656
-  if ( params.tqfindIndex( "encoding" ) != -1 ) {
656
+  if ( params.findIndex( "encoding" ) != -1 ) {
657 657
     TQImage img;
658 658
     img.loadFromData( line.value().asByteArray() );
659 659
     pic.setData( img );
660
-  } else if ( params.tqfindIndex( "value" ) != -1 ) {
660
+  } else if ( params.findIndex( "value" ) != -1 ) {
661 661
     if ( line.parameter( "value" ).lower() == "uri" )
662 662
       pic.setUrl( line.value().asString() );
663 663
   }
664 664
 
665
-  if ( params.tqfindIndex( "type" ) != -1 )
665
+  if ( params.findIndex( "type" ) != -1 )
666 666
     pic.setType( line.parameter( "type" ) );
667 667
 
668 668
   return pic;
@@ -700,9 +700,9 @@ Sound VCardTool::parseSound( const VCardLine &line )
700 700
   Sound snd;
701 701
 
702 702
   const TQStringList params = line.parameterList();
703
-  if ( params.tqfindIndex( "encoding" ) != -1 )
703
+  if ( params.findIndex( "encoding" ) != -1 )
704 704
     snd.setData( line.value().asByteArray() );
705
-  else if ( params.tqfindIndex( "value" ) != -1 ) {
705
+  else if ( params.findIndex( "value" ) != -1 ) {
706 706
     if ( line.parameter( "value" ).lower() == "uri" )
707 707
       snd.setUrl( line.value().asString() );
708 708
   }
@@ -738,12 +738,12 @@ Key VCardTool::parseKey( const VCardLine &line )
738 738
   Key key;
739 739
 
740 740
   const TQStringList params = line.parameterList();
741
-  if ( params.tqfindIndex( "encoding" ) != -1 )
741
+  if ( params.findIndex( "encoding" ) != -1 )
742 742
     key.setBinaryData( line.value().asByteArray() );
743 743
   else
744 744
     key.setTextData( line.value().asString() );
745 745
 
746
-  if ( params.tqfindIndex( "type" ) != -1 ) {
746
+  if ( params.findIndex( "type" ) != -1 ) {
747 747
     if ( line.parameter( "type" ).lower() == "x509" )
748 748
       key.setType( Key::X509 );
749 749
     else if ( line.parameter( "type" ).lower() == "pgp" )
@@ -814,7 +814,7 @@ Agent VCardTool::parseAgent( const VCardLine &line )
814 814
   Agent agent;
815 815
 
816 816
   const TQStringList params = line.parameterList();
817
-  if ( params.tqfindIndex( "value" ) != -1 ) {
817
+  if ( params.findIndex( "value" ) != -1 ) {
818 818
     if ( line.parameter( "value" ).lower() == "uri" )
819 819
       agent.setUrl( line.value().asString() );
820 820
   } else {
@@ -866,7 +866,7 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str )
866 866
   TQString value( str );
867 867
 
868 868
   int start = 0;
869
-  int pos = value.tqfind( sep, start );
869
+  int pos = value.find( sep, start );
870 870
 
871 871
   while ( pos != -1 ) {
872 872
     if ( value[ pos - 1 ] != '\\' ) {
@@ -876,13 +876,13 @@ TQStringList VCardTool::splitString( const TQChar &sep, const TQString &str )
876 876
         list << TQString::null;
877 877
 
878 878
       start = pos + 1;
879
-      pos = value.tqfind( sep, start );
879
+      pos = value.find( sep, start );
880 880
     } else {
881 881
       if ( pos != 0 ) {
882 882
         value.replace( pos - 1, 2, sep );
883
-        pos = value.tqfind( sep, pos );
883
+        pos = value.find( sep, pos );
884 884
       } else
885
-        pos = value.tqfind( sep, pos + 1 );
885
+        pos = value.find( sep, pos + 1 );
886 886
     }
887 887
   }
888 888
 

+ 2
- 2
kate/part/katearbitraryhighlight.cpp View File

@@ -90,7 +90,7 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi
90 90
 }
91 91
 
92 92
 void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) {
93
-   int id=m_docHLs.tqfindRef(static_cast<KateSuperRangeList*>(obj));
93
+   int id=m_docHLs.findRef(static_cast<KateSuperRangeList*>(obj));
94 94
    if (id>=0) m_docHLs.take(id);
95 95
    
96 96
    for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it)
@@ -152,7 +152,7 @@ KateView* KateArbitraryHighlight::viewForRange(KateSuperRange* range)
152 152
 {
153 153
   for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it)
154 154
     for (KateSuperRangeList* l = (*it)->first(); l; l = (*it)->next())
155
-      if (l->tqcontains(range))
155
+      if (l->contains(range))
156 156
         return it.key();
157 157
 
158 158
   // This must belong to a document-global highlight

+ 30
- 30
kate/part/kateautoindent.cpp View File

@@ -224,55 +224,55 @@ void KateNormalIndent::updateConfig ()
224 224
   for (uint i=0; i<items.count(); i++)
225 225
   {
226 226
     TQString name = items.tqat(i)->name;
227
-    if (name.tqfind("Comment") != -1 && commentAttrib == 255)
227
+    if (name.find("Comment") != -1 && commentAttrib == 255)
228 228
     {
229 229
       commentAttrib = i;
230 230
     }
231
-    else if (name.tqfind("Region Marker") != -1 && regionAttrib == 255)
231
+    else if (name.find("Region Marker") != -1 && regionAttrib == 255)
232 232
     {
233 233
       regionAttrib = i;
234 234
     }
235
-    else if (name.tqfind("Symbol") != -1 && symbolAttrib == 255)
235
+    else if (name.find("Symbol") != -1 && symbolAttrib == 255)
236 236
     {
237 237
       symbolAttrib = i;
238 238
     }
239
-    else if (name.tqfind("Alert") != -1)
239
+    else if (name.find("Alert") != -1)
240 240
     {
241 241
       alertAttrib = i;
242 242
     }
243
-    else if (name.tqfind("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255)
243
+    else if (name.find("Comment") != -1 && commentAttrib != 255 && doxyCommentAttrib == 255)
244 244
     {
245 245
       doxyCommentAttrib = i;
246 246
     }
247
-    else if (name.tqfind("Tags") != -1 && tagAttrib == 255)
247
+    else if (name.find("Tags") != -1 && tagAttrib == 255)
248 248
     {
249 249
       tagAttrib = i;
250 250
     }
251
-    else if (name.tqfind("Word") != -1 && wordAttrib == 255)
251
+    else if (name.find("Word") != -1 && wordAttrib == 255)
252 252
     {
253 253
       wordAttrib = i;
254 254
     }
255
-    else if (name.tqfind("Keyword") != -1 && keywordAttrib == 255)
255
+    else if (name.find("Keyword") != -1 && keywordAttrib == 255)
256 256
     {
257 257
       keywordAttrib = i;
258 258
     }
259
-    else if (name.tqfind("Normal") != -1 && normalAttrib == 255)
259
+    else if (name.find("Normal") != -1 && normalAttrib == 255)
260 260
     {
261 261
       normalAttrib = i;
262 262
     }
263
-    else if (name.tqfind("Extensions") != -1 && extensionAttrib == 255)
263
+    else if (name.find("Extensions") != -1 && extensionAttrib == 255)
264 264
     {
265 265
       extensionAttrib = i;
266 266
     }
267
-    else if (name.tqfind("Preprocessor") != -1 && preprocessorAttrib == 255)
267
+    else if (name.find("Preprocessor") != -1 && preprocessorAttrib == 255)
268 268
     {
269 269
       preprocessorAttrib = i;
270 270
     }
271
-    else if (name.tqfind("String") != -1 && stringAttrib == 255)
271
+    else if (name.find("String") != -1 && stringAttrib == 255)
272 272
     {
273 273
       stringAttrib = i;
274 274
     }
275
-    else if (name.tqfind("Char") != -1 && charAttrib == 255)
275
+    else if (name.find("Char") != -1 && charAttrib == 255)
276 276
     {
277 277
       charAttrib = i;
278 278
     }
@@ -583,7 +583,7 @@ bool KateCSmartIndent::handleDoxygen (KateDocCursor &begin)
583 583
       if (last <= 0 || !(justAfterDoxygen = textLine->stringAtPos(last-1, "*/")))
584 584
         insideDoxygen = true;
585 585
       if (justAfterDoxygen)
586
-        justAfterDoxygen &= textLine->string().tqfind("/**") < 0;
586
+        justAfterDoxygen &= textLine->string().find("/**") < 0;
587 587
       while (textLine->attribute(first) != doxyCommentAttrib && first <= textLine->lastChar())
588 588
         first++;
589 589
       if (textLine->stringAtPos(first, "//"))
@@ -700,7 +700,7 @@ static inline bool colonPermitsReindent(const KateNormalIndent &indenter,
700 700
 {
701 701
   const TQString txt = line->string(0,curCol);
702 702
   // do we have any significant preceding colon?
703
-  for (int pos = 0; (pos = txt.tqfind(':', pos)) >= 0; pos++) {
703
+  for (int pos = 0; (pos = txt.find(':', pos)) >= 0; pos++) {
704 704
     if (line->attribute(pos) == indenter.symbolAttrib)
705 705
       // yes, it has already contributed to this line's indentation, don't
706 706
       // indent again
@@ -722,7 +722,7 @@ void KateCSmartIndent::processChar(TQChar c)
722 722
   static const TQString triggers("}{)/:#n");
723 723
   static const TQString firstTriggers("}{)/:#");
724 724
   static const TQString lastTriggers(":n");
725
-  if (triggers.tqfind(c) < 0)
725
+  if (triggers.find(c) < 0)
726 726
     return;
727 727
 
728 728
   KateView *view = doc->activeView();
@@ -775,8 +775,8 @@ void KateCSmartIndent::processChar(TQChar c)
775 775
   // of the line
776 776
   const TQChar lastChar = textLine->getChar(textLine->lastChar());
777 777
   int pos;
778
-  if (((c == firstChar && firstTriggers.tqfind(firstChar) >= 0)
779
-        || (c == lastChar && lastTriggers.tqfind(lastChar) >= 0))
778
+  if (((c == firstChar && firstTriggers.find(firstChar) >= 0)
779
+        || (c == lastChar && lastTriggers.find(lastChar) >= 0))
780 780
       && (c != ':' || colonPermitsReindent(*this, textLine, curCol)))
781 781
     processLine(begin);
782 782
 }
@@ -1176,7 +1176,7 @@ uint KateCSmartIndent::findOpeningComment(KateDocCursor &start)
1176 1176
   {
1177 1177
     KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line());
1178 1178
 
1179
-    int pos = textLine->string().tqfind("/*", false);
1179
+    int pos = textLine->string().find("/*", false);
1180 1180
     if (pos >= 0)
1181 1181
     {
1182 1182
       KateDocCursor temp(cur.line(), pos, doc);
@@ -1359,7 +1359,7 @@ void KateXmlIndent::processChar (TQChar c)
1359 1359
   // only alter lines that start with a close element
1360 1360
   KateView *view = doc->activeView();
1361 1361
   TQString text = doc->plainKateTextLine(view->cursorLine())->string();
1362
-  if(text.tqfind(startsWithCloseTag) == -1) return;
1362
+  if(text.find(startsWithCloseTag) == -1) return;
1363 1363
 
1364 1364
   // process it
1365 1365
   processLine(view->cursorLine());
@@ -1404,7 +1404,7 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
1404 1404
   // <a>
1405 1405
   // </a>              <!-- indentation *already* decreased -->
1406 1406
   // requires that we discount the </a> from the number of closed tags
1407
-  if(text.tqfind(startsWithCloseTag) != -1) ++numTags;
1407
+  if(text.find(startsWithCloseTag) != -1) ++numTags;
1408 1408
 
1409 1409
   // count the number of open and close tags
1410 1410
   int lastCh = 0;
@@ -1445,10 +1445,10 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
1445 1445
           for(uint backLine = line; backLine; ) {
1446 1446
             // find first line with an open tag
1447 1447
             KateTextLine::Ptr x = doc->plainKateTextLine(--backLine);
1448
-            if(x->string().tqfind('<') == -1) continue;
1448
+            if(x->string().find('<') == -1) continue;
1449 1449
 
1450 1450
             // recalculate the indent
1451
-            if(x->string().tqfind(unclosedDoctype) != -1) --numTags;
1451
+            if(x->string().find(unclosedDoctype) != -1) --numTags;
1452 1452
             getLineInfo(backLine, prevIndent, numTags, attrCol, unclosedTag);
1453 1453
             break;
1454 1454
           }
@@ -1499,7 +1499,7 @@ uint KateXmlIndent::processLine (uint line)
1499 1499
   if(indent < 0) indent = 0;
1500 1500
 
1501 1501
   // unindent lines that start with a close tag
1502
-  if(kateLine->string().tqfind(startsWithCloseTag) != -1) {
1502
+  if(kateLine->string().find(startsWithCloseTag) != -1) {
1503 1503
     indent -= indentWidth;
1504 1504
   }
1505 1505
   if(indent < 0) indent = 0;
@@ -1606,7 +1606,7 @@ TQString KateCSAndSIndent::findOpeningCommentIndentation(const KateDocCursor &st
1606 1606
   {
1607 1607
     KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line());
1608 1608
 
1609
-    int pos = textLine->string().tqfindRev("/*");
1609
+    int pos = textLine->string().findRev("/*");
1610 1610
     // FIXME: /* inside /* is possible. This screws up in that case...
1611 1611
     if (pos >= 0)
1612 1612
       return initialWhitespace(textLine, pos);
@@ -1760,7 +1760,7 @@ int KateCSAndSIndent::lastNonCommentChar( const KateDocCursor &line )
1760 1760
 
1761 1761
   // find a possible start-of-comment
1762 1762
   int p = -2; // so the first find starts at position 0
1763
-  do p = str.tqfind( "//", p + 2 );
1763
+  do p = str.find( "//", p + 2 );
1764 1764
   while ( p >= 0 && textLine->attribute(p) != commentAttrib && textLine->attribute(p) != doxyCommentAttrib );
1765 1765
 
1766 1766
   // no // found? use whole string
@@ -2112,7 +2112,7 @@ void KateCSAndSIndent::processChar(TQChar c)
2112 2112
 {
2113 2113
   // 'n' trigger is for c# regions.
2114 2114
   static const TQString triggers("}{)]/:;#n");
2115
-  if (triggers.tqfind(c) == -1)
2115
+  if (triggers.find(c) == -1)
2116 2116
     return;
2117 2117
 
2118 2118
   // for historic reasons, processChar doesn't get a cursor
@@ -2372,9 +2372,9 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va
2372 2372
   {
2373 2373
     d->couples = 0;
2374 2374
     TQStringList l = TQStringList::split( " ", val );
2375
-    if ( l.tqcontains("parens") ) d->couples |= Parens;
2376
-    if ( l.tqcontains("braces") ) d->couples |= Braces;
2377
-    if ( l.tqcontains("brackets") ) d->couples |= Brackets;
2375
+    if ( l.contains("parens") ) d->couples |= Parens;
2376
+    if ( l.contains("braces") ) d->couples |= Braces;
2377
+    if ( l.contains("brackets") ) d->couples |= Brackets;
2378 2378
   }
2379 2379
   else if ( var == "var-indent-couple-attribute" )
2380 2380
   {

+ 1
- 1
kate/part/katebookmarks.cpp View File

@@ -176,7 +176,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu )
176 176
       {
177 177
         sortArray[i] = (*it)->line;
178 178
         ssort( sortArray, i );
179
-        idx = sortArray.tqfind( (*it)->line ) + 3;
179
+        idx = sortArray.find( (*it)->line ) + 3;
180 180
       }
181 181
 
182 182
       menu.insertItem(

+ 3
- 3
kate/part/katecmds.cpp View File

@@ -303,7 +303,7 @@ static void replace(TQString &s, const TQString &needle, const TQString &with)
303 303
   int pos=0;
304 304
   while (1)
305