Browse Source

rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/smb4k@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tpearson 7 years ago
parent
commit
1b9ba97805

+ 1
- 1
plugin/smb4k_konqplugin.cpp View File

@@ -68,7 +68,7 @@ KonqSidebar_Smb4K::KonqSidebar_Smb4K(KInstance *inst,TQObject *tqparent,TQWidget
68 68
   KToolBar  *topBar = new KToolBar( widget, "Topbar" );
69 69
   topBar->setIconSize(16);
70 70
   topBar->insertButton( "reload",    0, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRescan() ) , TRUE, i18n( "Scan Network" ) );
71
-  topBar->insertButton( "tqfind",      1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSearch() ) , TRUE,  i18n( "Search" ) );
71
+  topBar->insertButton( "find",      1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSearch() ) , TRUE,  i18n( "Search" ) );
72 72
   topBar->insertButton( "configure", 2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSmb4KOptionsDlg() ) , TRUE,  i18n( "Configure" ) );
73 73
 
74 74
   //

+ 11
- 11
smb4k/browser/smb4knetworkbrowser_part.cpp View File

@@ -733,8 +733,8 @@ void Smb4KNetworkBrowserPart::slotWorkgroups( const TQValueList<Smb4KWorkgroupIt
733 733
               if ( TQString::compare( old_master, (*i)->master() ) != 0 && item->isOpen() )
734 734
               {
735 735
                 // Get the list view items:
736
-                Smb4KNetworkBrowserItem *oldMasterItem = static_cast<Smb4KNetworkBrowserItem *>( m_widget->tqfindItem( old_master, Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) );
737
-                Smb4KNetworkBrowserItem *newMasterItem = static_cast<Smb4KNetworkBrowserItem *>( m_widget->tqfindItem( (*i)->master(), Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) );
736
+                Smb4KNetworkBrowserItem *oldMasterItem = static_cast<Smb4KNetworkBrowserItem *>( m_widget->findItem( old_master, Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) );
737
+                Smb4KNetworkBrowserItem *newMasterItem = static_cast<Smb4KNetworkBrowserItem *>( m_widget->findItem( (*i)->master(), Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) );
738 738
 
739 739
                 // Get the host item of the new master from the scanner. The old master
740 740
                 // has been removed from the internal host list, so we cannot search for
@@ -778,7 +778,7 @@ void Smb4KNetworkBrowserPart::slotWorkgroups( const TQValueList<Smb4KWorkgroupIt
778 778
             {
779 779
               // Is the list entry in the list view? If not, add it to the list
780 780
               // view. (If it is, it will be found and updated by the code above.)
781
-              if ( m_widget->tqfindItem( (*i)->name(), Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) == 0 )
781
+              if ( m_widget->findItem( (*i)->name(), Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) == 0 )
782 782
               {
783 783
                 Smb4KNetworkBrowserItem *workgroup = new Smb4KNetworkBrowserItem( m_widget, *i );
784 784
                 workgroup->setExpandable( true );
@@ -834,7 +834,7 @@ void Smb4KNetworkBrowserPart::slotWorkgroupMembers( const TQString &workgroup, c
834 834
 
835 835
   if ( !workgroup.isEmpty() )
836 836
   {
837
-    workgroupItem = static_cast<Smb4KNetworkBrowserItem *>( m_widget->tqfindItem( workgroup, Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
837
+    workgroupItem = static_cast<Smb4KNetworkBrowserItem *>( m_widget->findItem( workgroup, Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
838 838
   }
839 839
   else
840 840
   {
@@ -880,7 +880,7 @@ void Smb4KNetworkBrowserPart::slotWorkgroupMembers( const TQString &workgroup, c
880 880
                 // scanner, we need omit all entries that do not belong to this
881 881
                 // workgroup.
882 882
                 if ( TQString::compare( (*i)->workgroup(), workgroupItem->workgroupItem()->name() ) == 0 &&
883
-                     m_widget->tqfindItem( (*i)->name(), Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) == 0 )
883
+                     m_widget->findItem( (*i)->name(), Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) == 0 )
884 884
                 {
885 885
                   Smb4KNetworkBrowserItem *hostItem = new Smb4KNetworkBrowserItem( workgroupItem, *i );
886 886
                   hostItem->setExpandable( true );
@@ -960,7 +960,7 @@ void Smb4KNetworkBrowserPart::slotShares( const TQString &host, const TQValueLis
960 960
 
961 961
   if ( !host.isEmpty() )
962 962
   {
963
-    hostItem = static_cast<Smb4KNetworkBrowserItem *>( m_widget->tqfindItem( host, Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
963
+    hostItem = static_cast<Smb4KNetworkBrowserItem *>( m_widget->findItem( host, Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
964 964
   }
965 965
   else
966 966
   {
@@ -1079,7 +1079,7 @@ void Smb4KNetworkBrowserPart::slotShares( const TQString &host, const TQValueLis
1079 1079
               {
1080 1080
                 // Does the host carry the list entry? If not, add it to it.
1081 1081
                 // (If it is, it will be found and updated by the code above.)
1082
-                if ( m_widget->tqfindItem( (*i)->name(), Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) == 0 )
1082
+                if ( m_widget->findItem( (*i)->name(), Smb4KNetworkBrowser::Network, CaseSensitive|ExactMatch ) == 0 )
1083 1083
                 {
1084 1084
                   // Respect the settings the user chose to use:
1085 1085
                   if ( !(*i)->isHidden() )
@@ -1244,7 +1244,7 @@ void Smb4KNetworkBrowserPart::slotAddIPAddress( Smb4KHostItem *item )
1244 1244
   {
1245 1245
     // Get the workgroup item the server is a child of and update
1246 1246
     // it.
1247
-    Smb4KNetworkBrowserItem *workgroup_item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->tqfindItem( item->workgroup(), Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
1247
+    Smb4KNetworkBrowserItem *workgroup_item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->findItem( item->workgroup(), Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
1248 1248
 
1249 1249
     if ( workgroup_item && TQString::compare( workgroup_item->workgroupItem()->name(), item->workgroup() ) == 0 )
1250 1250
     {
@@ -1262,7 +1262,7 @@ void Smb4KNetworkBrowserPart::slotAddIPAddress( Smb4KHostItem *item )
1262 1262
       }
1263 1263
     }
1264 1264
 
1265
-    Smb4KNetworkBrowserItem *host_item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->tqfindItem( item->name(), Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
1265
+    Smb4KNetworkBrowserItem *host_item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->findItem( item->name(), Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
1266 1266
 
1267 1267
     if ( host_item && host_item->tqparent() && TQString::compare( host_item->hostItem()->workgroup(), item->workgroup() ) == 0 )
1268 1268
     {
@@ -1287,7 +1287,7 @@ void Smb4KNetworkBrowserPart::slotAddInformation( Smb4KHostItem *item )
1287 1287
 {
1288 1288
   if ( item )
1289 1289
   {
1290
-    Smb4KNetworkBrowserItem *browser_item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->tqfindItem( item->name(), Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
1290
+    Smb4KNetworkBrowserItem *browser_item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->findItem( item->name(), Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
1291 1291
 
1292 1292
     if ( browser_item )
1293 1293
     {
@@ -1320,7 +1320,7 @@ void Smb4KNetworkBrowserPart::slotInsertHost( Smb4KHostItem *item )
1320 1320
   if ( item )
1321 1321
   {
1322 1322
     // Look up the workgroup:
1323
-    workgroup_item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->tqfindItem( item->workgroup(),
1323
+    workgroup_item = static_cast<Smb4KNetworkBrowserItem *>( m_widget->findItem( item->workgroup(),
1324 1324
                      Smb4KNetworkBrowser::Network, ExactMatch|CaseSensitive ) );
1325 1325
   }
1326 1326
   else

+ 2
- 2
smb4k/configdlg/smb4kconfigdialog.cpp View File

@@ -407,7 +407,7 @@ void Smb4KConfigDialog::saveCustomSambaOptions()
407 407
 
408 408
     for ( TQValueList<Smb4KSambaOptionsInfo *>::Iterator it = list.begin(); it != list.end(); ++it )
409 409
     {
410
-      if ( !custom_list->tqfindItem( (*it)->itemName(), Smb4KSambaOptions::ItemName ) )
410
+      if ( !custom_list->findItem( (*it)->itemName(), Smb4KSambaOptions::ItemName ) )
411 411
       {
412 412
         optionsHandler()->removeItem( (*it)->itemName(), false );
413 413
 
@@ -1028,7 +1028,7 @@ void Smb4KConfigDialog::slotCustomSambaSettingsChanged()
1028 1028
         it != list.end(); ++it )
1029 1029
   {
1030 1030
     // Find the item in the list view:
1031
-    TQListViewItem *item = view->tqfindItem( (*it)->itemName(), Smb4KSambaOptions::ItemName );
1031
+    TQListViewItem *item = view->findItem( (*it)->itemName(), Smb4KSambaOptions::ItemName );
1032 1032
 
1033 1033
     if ( item )
1034 1034
     {

+ 3
- 3
smb4k/core/smb4kcore.cpp View File

@@ -299,17 +299,17 @@ void Smb4KCore::searchPrograms()
299 299
   // List of paths that should be searched.
300 300
   TQStringList path_list = TQStringList::split( ":", TQString( "%1" ).tqarg( getenv( "PATH" ) ), false );
301 301
 
302
-  if ( path_list.tqfind( "/sbin" ) == path_list.end() )
302
+  if ( path_list.find( "/sbin" ) == path_list.end() )
303 303
   {
304 304
     path_list << "/sbin";
305 305
   }
306 306
 
307
-  if ( path_list.tqfind( "/usr/sbin" ) == path_list.end() )
307
+  if ( path_list.find( "/usr/sbin" ) == path_list.end() )
308 308
   {
309 309
     path_list << "/usr/sbin";
310 310
   }
311 311
 
312
-  if ( path_list.tqfind( "/usr/local/sbin" ) == path_list.end() )
312
+  if ( path_list.find( "/usr/local/sbin" ) == path_list.end() )
313 313
   {
314 314
     path_list << "/usr/local/sbin";
315 315
   }

+ 30
- 30
smb4k/core/smb4kfileio.cpp View File

@@ -234,12 +234,12 @@ bool Smb4KFileIO::writeSudoers( Smb4KFileIO::Operation operation )
234 234
               {
235 235
                 // Find the beginning and the end of the entries in
236 236
                 // the sudoers file:
237
-                TQStringList::Iterator begin = contents.tqfind( "# Entries for Smb4K users." );
238
-                TQStringList::Iterator end = contents.tqfind( "# End of Smb4K user entries." );
237
+                TQStringList::Iterator begin = contents.find( "# Entries for Smb4K users." );
238
+                TQStringList::Iterator end = contents.find( "# End of Smb4K user entries." );
239 239
 
240 240
                 for ( TQStringList::Iterator it = begin; it != end; ++it )
241 241
                 {
242
-                  if ( (*it).startsWith( "User_Alias\tSMB4KUSERS" ) && (*it).tqcontains( getpwuid( getuid() )->pw_name, true ) == 0 )
242
+                  if ( (*it).startsWith( "User_Alias\tSMB4KUSERS" ) && (*it).contains( getpwuid( getuid() )->pw_name, true ) == 0 )
243 243
                   {
244 244
                     (*it).append( ","+TQString( getpwuid( getuid() )->pw_name ) );
245 245
 
@@ -260,8 +260,8 @@ bool Smb4KFileIO::writeSudoers( Smb4KFileIO::Operation operation )
260 260
             {
261 261
               // Find the beginning and the end of the entries in
262 262
               // the sudoers file:
263
-              TQStringList::Iterator begin = contents.tqfind( "# Entries for Smb4K users." );
264
-              TQStringList::Iterator end = contents.tqfind( "# End of Smb4K user entries." );
263
+              TQStringList::Iterator begin = contents.find( "# Entries for Smb4K users." );
264
+              TQStringList::Iterator end = contents.find( "# End of Smb4K user entries." );
265 265
 
266 266
               // Now, check if the user is in the list of users. If he is,
267 267
               // remove him from there or remove all if he is the only one:
@@ -271,7 +271,7 @@ bool Smb4KFileIO::writeSudoers( Smb4KFileIO::Operation operation )
271 271
                 {
272 272
                   TQString users = (*it).section( "=", 1, 1 ).stripWhiteSpace();
273 273
 
274
-                  if ( users.tqcontains( "," ) == 0 )
274
+                  if ( users.contains( "," ) == 0 )
275 275
                   {
276 276
                     // In this case, there is only one user in the list. Check if
277 277
                     // it is the user who requested the removal:
@@ -298,7 +298,7 @@ bool Smb4KFileIO::writeSudoers( Smb4KFileIO::Operation operation )
298 298
                     TQStringList list = TQStringList::split( ",", users, false );
299 299
                     list.remove( getpwuid( getuid() )->pw_name );
300 300
 
301
-                    (*it).tqreplace( users, list.join( "," ) );
301
+                    (*it).replace( users, list.join( "," ) );
302 302
 
303 303
                     write = true;
304 304
 
@@ -587,12 +587,12 @@ bool Smb4KFileIO::writeSuperTab( Smb4KFileIO::Operation operation )
587 587
               {
588 588
                 // Find the beginning and the end of the entries in
589 589
                 // the super.tab file:
590
-                TQStringList::Iterator begin = contents.tqfind( "# Entries for Smb4K users." );
591
-                TQStringList::Iterator end = contents.tqfind( "# End of Smb4K user entries." );
590
+                TQStringList::Iterator begin = contents.find( "# Entries for Smb4K users." );
591
+                TQStringList::Iterator end = contents.find( "# End of Smb4K user entries." );
592 592
 
593 593
                 for ( TQStringList::Iterator it = begin; it != end; ++it )
594 594
                 {
595
-                  if ( (*it).startsWith( ":define Smb4KUsers" ) && (*it).tqcontains( getpwuid( getuid() )->pw_name, true ) == 0 )
595
+                  if ( (*it).startsWith( ":define Smb4KUsers" ) && (*it).contains( getpwuid( getuid() )->pw_name, true ) == 0 )
596 596
                   {
597 597
                     (*it).append( ","+TQString( getpwuid( getuid() )->pw_name ) );
598 598
 
@@ -613,8 +613,8 @@ bool Smb4KFileIO::writeSuperTab( Smb4KFileIO::Operation operation )
613 613
             {
614 614
               // Find the beginning and the end of the entries in
615 615
               // the super.tab file:
616
-              TQStringList::Iterator begin = contents.tqfind( "# Entries for Smb4K users." );
617
-              TQStringList::Iterator end = contents.tqfind( "# End of Smb4K user entries." );
616
+              TQStringList::Iterator begin = contents.find( "# Entries for Smb4K users." );
617
+              TQStringList::Iterator end = contents.find( "# End of Smb4K user entries." );
618 618
 
619 619
               // Now, check if the user is in the list of users. If he is,
620 620
               // remove him from there or remove all if he is the only one:
@@ -624,7 +624,7 @@ bool Smb4KFileIO::writeSuperTab( Smb4KFileIO::Operation operation )
624 624
                 {
625 625
                   TQString users = (*it).section( "Smb4KUsers", 1, 1 ).stripWhiteSpace();
626 626
 
627
-                  if ( users.tqcontains( "," ) == 0 )
627
+                  if ( users.contains( "," ) == 0 )
628 628
                   {
629 629
                     // In this case, there is only one user in the list. Check if
630 630
                     // it is the user who requested the removal:
@@ -651,7 +651,7 @@ bool Smb4KFileIO::writeSuperTab( Smb4KFileIO::Operation operation )
651 651
                     TQStringList list = TQStringList::split( ",", users, false );
652 652
                     list.remove( getpwuid( getuid() )->pw_name );
653 653
 
654
-                    (*it).tqreplace( users, list.join( "," ) );
654
+                    (*it).replace( users, list.join( "," ) );
655 655
 
656 656
                     write = true;
657 657
 
@@ -1237,12 +1237,12 @@ void Smb4KFileIO::processSudoers()
1237 1237
       {
1238 1238
         // Find the beginning and the end of the entries in
1239 1239
         // the sudoers file:
1240
-        TQStringList::Iterator begin = contents.tqfind( "# Entries for Smb4K users." );
1241
-        TQStringList::Iterator end = contents.tqfind( "# End of Smb4K user entries." );
1240
+        TQStringList::Iterator begin = contents.find( "# Entries for Smb4K users." );
1241
+        TQStringList::Iterator end = contents.find( "# End of Smb4K user entries." );
1242 1242
 
1243 1243
         for ( TQStringList::Iterator it = begin; it != end; ++it )
1244 1244
         {
1245
-          if ( (*it).startsWith( "User_Alias\tSMB4KUSERS" ) && (*it).tqcontains( getpwuid( getuid() )->pw_name, true ) == 0 )
1245
+          if ( (*it).startsWith( "User_Alias\tSMB4KUSERS" ) && (*it).contains( getpwuid( getuid() )->pw_name, true ) == 0 )
1246 1246
           {
1247 1247
             (*it).append( ","+TQString( getpwuid( getuid() )->pw_name ) );
1248 1248
 
@@ -1263,8 +1263,8 @@ void Smb4KFileIO::processSudoers()
1263 1263
     {
1264 1264
       // Find the beginning and the end of the entries in
1265 1265
       // the sudoers file:
1266
-      TQStringList::Iterator begin = contents.tqfind( "# Entries for Smb4K users." );
1267
-      TQStringList::Iterator end = contents.tqfind( "# End of Smb4K user entries." );
1266
+      TQStringList::Iterator begin = contents.find( "# Entries for Smb4K users." );
1267
+      TQStringList::Iterator end = contents.find( "# End of Smb4K user entries." );
1268 1268
 
1269 1269
       // Now, check if the user is in the list of users. If he is,
1270 1270
       // remove him from there or remove all if he is the only one:
@@ -1274,7 +1274,7 @@ void Smb4KFileIO::processSudoers()
1274 1274
         {
1275 1275
           TQString users = (*it).section( "=", 1, 1 ).stripWhiteSpace();
1276 1276
 
1277
-          if ( users.tqcontains( "," ) == 0 )
1277
+          if ( users.contains( "," ) == 0 )
1278 1278
           {
1279 1279
             // In this case, there is only one user in the list. Check if
1280 1280
             // it is the user who requested the removal:
@@ -1301,7 +1301,7 @@ void Smb4KFileIO::processSudoers()
1301 1301
             TQStringList list = TQStringList::split( ",", users, false );
1302 1302
             list.remove( getpwuid( getuid() )->pw_name );
1303 1303
 
1304
-            (*it).tqreplace( users, list.join( "," ) );
1304
+            (*it).replace( users, list.join( "," ) );
1305 1305
 
1306 1306
             write = true;
1307 1307
 
@@ -1500,12 +1500,12 @@ void Smb4KFileIO::processSuperTab()
1500 1500
       {
1501 1501
         // Find the beginning and the end of the entries in
1502 1502
         // the super.tab file:
1503
-        TQStringList::Iterator begin = contents.tqfind( "# Entries for Smb4K users." );
1504
-        TQStringList::Iterator end = contents.tqfind( "# End of Smb4K user entries." );
1503
+        TQStringList::Iterator begin = contents.find( "# Entries for Smb4K users." );
1504
+        TQStringList::Iterator end = contents.find( "# End of Smb4K user entries." );
1505 1505
 
1506 1506
         for ( TQStringList::Iterator it = begin; it != end; ++it )
1507 1507
         {
1508
-          if ( (*it).startsWith( ":define Smb4KUsers" ) && (*it).tqcontains( getpwuid( getuid() )->pw_name, true ) == 0 )
1508
+          if ( (*it).startsWith( ":define Smb4KUsers" ) && (*it).contains( getpwuid( getuid() )->pw_name, true ) == 0 )
1509 1509
           {
1510 1510
             (*it).append( ","+TQString( getpwuid( getuid() )->pw_name ) );
1511 1511
 
@@ -1526,8 +1526,8 @@ void Smb4KFileIO::processSuperTab()
1526 1526
     {
1527 1527
       // Find the beginning and the end of the entries in
1528 1528
       // the super.tab file:
1529
-      TQStringList::Iterator begin = contents.tqfind( "# Entries for Smb4K users." );
1530
-      TQStringList::Iterator end = contents.tqfind( "# End of Smb4K user entries." );
1529
+      TQStringList::Iterator begin = contents.find( "# Entries for Smb4K users." );
1530
+      TQStringList::Iterator end = contents.find( "# End of Smb4K user entries." );
1531 1531
 
1532 1532
       // Now, check if the user is in the list of users. If he is,
1533 1533
       // remove him from there or remove all if he is the only one:
@@ -1537,7 +1537,7 @@ void Smb4KFileIO::processSuperTab()
1537 1537
         {
1538 1538
           TQString users = (*it).section( "Smb4KUsers", 1, 1 ).stripWhiteSpace();
1539 1539
 
1540
-          if ( users.tqcontains( "," ) == 0 )
1540
+          if ( users.contains( "," ) == 0 )
1541 1541
           {
1542 1542
             // In this case, there is only one user in the list. Check if
1543 1543
             // it is the user who requested the removal:
@@ -1564,7 +1564,7 @@ void Smb4KFileIO::processSuperTab()
1564 1564
             TQStringList list = TQStringList::split( ",", users, false );
1565 1565
             list.remove( getpwuid( getuid() )->pw_name );
1566 1566
 
1567
-            (*it).tqreplace( users, list.join( "," ) );
1567
+            (*it).replace( users, list.join( "," ) );
1568 1568
 
1569 1569
             write = true;
1570 1570
 
@@ -1708,7 +1708,7 @@ void Smb4KFileIO::slotReceivedStderr( KProcess *, char *buf, int len )
1708 1708
 {
1709 1709
   TQString error_output = TQString::fromLocal8Bit( buf, len );
1710 1710
 
1711
-  if ( error_output.tqcontains( "smb4k_mv" ) != 0 )
1711
+  if ( error_output.contains( "smb4k_mv" ) != 0 )
1712 1712
   {
1713 1713
     m_error_occurred = true;
1714 1714
 
@@ -1721,7 +1721,7 @@ void Smb4KFileIO::slotReceivedStderr( KProcess *, char *buf, int len )
1721 1721
 
1722 1722
     removeLockFile();
1723 1723
   }
1724
-  else if ( error_output.tqcontains( "smb4k_cat" ) != 0 )
1724
+  else if ( error_output.contains( "smb4k_cat" ) != 0 )
1725 1725
   {
1726 1726
     m_error_occurred = true;
1727 1727
 

+ 2
- 2
smb4k/core/smb4kfileio.h View File

@@ -82,7 +82,7 @@ class Smb4KFileIO : public TQObject
82 82
      * @returns TRUE if the write process was successfully initiate and FALSE
83 83
      * otherwise.
84 84
      *
85
-     * @note You need to connect to the finished() and failed() signals to tqfind
85
+     * @note You need to connect to the finished() and failed() signals to find
86 86
      * out if the the write process finished successfully.
87 87
      *
88 88
      */
@@ -98,7 +98,7 @@ class Smb4KFileIO : public TQObject
98 98
      * @returns TRUE if the write process was successfully initiate and FALSE
99 99
      * otherwise.
100 100
      *
101
-     * @note You need to connect to the finished() and failed() signals to tqfind
101
+     * @note You need to connect to the finished() and failed() signals to find
102 102
      * out if the the write process finished successfully.
103 103
      *
104 104
      */

+ 1
- 1
smb4k/core/smb4khomesshareshandler.cpp View File

@@ -134,7 +134,7 @@ const TQString Smb4KHomesSharesHandler::specifyUser( const TQString &host, TQWid
134 134
 
135 135
     while ( index < userCombo->count() )
136 136
     {
137
-      if ( list.tqfind( userCombo->text( index ) ) == list.end() )
137
+      if ( list.find( userCombo->text( index ) ) == list.end() )
138 138
       {
139 139
         list.append( userCombo->text( index ) );
140 140
       }

+ 37
- 37
smb4k/core/smb4kmounter.cpp View File

@@ -300,16 +300,16 @@ void Smb4KMounter::import()
300 300
       {
301 301
         Smb4KShare *new_share = NULL;
302 302
 
303
-        if ( (*it).tqcontains( " smbfs ", false ) != 0 )
303
+        if ( (*it).contains( " smbfs ", false ) != 0 )
304 304
         {
305 305
           TQString share_and_path = (*it).section( " smbfs ", 0, 0 ).stripWhiteSpace();
306
-          TQString name = share_and_path.section( " ", 0, 0 ).stripWhiteSpace().tqreplace( "\\040", "\040" );
306
+          TQString name = share_and_path.section( " ", 0, 0 ).stripWhiteSpace().replace( "\\040", "\040" );
307 307
           TQString path = share_and_path.section( " ", 1, 1 ).stripWhiteSpace();
308 308
 
309
-          if ( path.tqcontains( "\\040" ) != 0 || path.tqcontains( "\040" ) != 0 )
309
+          if ( path.contains( "\\040" ) != 0 || path.contains( "\040" ) != 0 )
310 310
           {
311
-            name.tqreplace( "_", "\040" );
312
-            path.tqreplace( "\\040", "\040" );
311
+            name.replace( "_", "\040" );
312
+            path.replace( "\\040", "\040" );
313 313
           }
314 314
 
315 315
           int uid = (*it).section( "uid=", 1, 1 ).section( ",", 0, 0 ).stripWhiteSpace().toInt();
@@ -317,16 +317,16 @@ void Smb4KMounter::import()
317 317
 
318 318
           new_share = new Smb4KShare( name, path, "smbfs", uid, gid );
319 319
         }
320
-        else if ( (*it).tqcontains( " cifs ", false ) != 0 )
320
+        else if ( (*it).contains( " cifs ", false ) != 0 )
321 321
         {
322 322
           TQString share_and_path = (*it).section( " cifs ", 0, 0 ).stripWhiteSpace();
323
-          TQString name = share_and_path.section( " ", 0, 0 ).stripWhiteSpace().tqreplace( "\\040", "\040" );
323
+          TQString name = share_and_path.section( " ", 0, 0 ).stripWhiteSpace().replace( "\\040", "\040" );
324 324
           TQString path = share_and_path.section( " ", 1, 1 ).stripWhiteSpace();
325 325
 
326
-          if ( path.tqcontains( "\\040" ) != 0 || path.tqcontains( "\040" ) != 0 )
326
+          if ( path.contains( "\\040" ) != 0 || path.contains( "\040" ) != 0 )
327 327
           {
328
-            name.tqreplace( "_", "\040" );
329
-            path.tqreplace( "\\040", "\040" );
328
+            name.replace( "_", "\040" );
329
+            path.replace( "\\040", "\040" );
330 330
           }
331 331
 
332 332
           TQString login = (*it).section( "username=", 1, 1 ).section( ",", 0, 0 ).stripWhiteSpace();
@@ -776,7 +776,7 @@ void Smb4KMounter::unmount( const TQString &mountpoint, bool force, bool noMessa
776 776
     bool execute = false;
777 777
 
778 778
     TQString path = mountpoint;
779
-    m_priv->setPath( path.tqreplace( '\044', "\044" ) );
779
+    m_priv->setPath( path.replace( '\044', "\044" ) );
780 780
 
781 781
     TQString suid_program, command;
782 782
 
@@ -1032,16 +1032,16 @@ void Smb4KMounter::processMount()
1032 1032
 
1033 1033
   if ( m_proc->normalExit() )
1034 1034
   {
1035
-    if ( m_buffer.tqcontains( "smb4k_mount:", true ) == 0 &&
1036
-         m_buffer.tqcontains( "failed", true ) == 0 &&
1037
-         m_buffer.tqcontains( "ERR", true ) == 0 &&
1038
-         m_buffer.tqcontains( "/bin/sh:" ) == 0 &&
1039
-         m_buffer.tqcontains( "mount:", true ) == 0 &&
1040
-         m_buffer.tqcontains( "smbmnt" ) == 0 &&
1041
-         m_buffer.tqcontains( m_priv->path() ) == 0 &&
1042
-         m_buffer.tqcontains( "mount error" ) == 0 &&
1043
-         m_buffer.tqcontains( "bad user name" ) == 0 &&
1044
-         m_buffer.tqcontains( "bad group name" ) == 0 )
1035
+    if ( m_buffer.contains( "smb4k_mount:", true ) == 0 &&
1036
+         m_buffer.contains( "failed", true ) == 0 &&
1037
+         m_buffer.contains( "ERR", true ) == 0 &&
1038
+         m_buffer.contains( "/bin/sh:" ) == 0 &&
1039
+         m_buffer.contains( "mount:", true ) == 0 &&
1040
+         m_buffer.contains( "smbmnt" ) == 0 &&
1041
+         m_buffer.contains( m_priv->path() ) == 0 &&
1042
+         m_buffer.contains( "mount error" ) == 0 &&
1043
+         m_buffer.contains( "bad user name" ) == 0 &&
1044
+         m_buffer.contains( "bad group name" ) == 0 )
1045 1045
     {
1046 1046
       TQString name = TQString( "//%1/%2" ).tqarg( m_priv->host() ).tqarg( m_priv->share() );
1047 1047
 
@@ -1144,21 +1144,21 @@ void Smb4KMounter::processMount()
1144 1144
     }
1145 1145
     else
1146 1146
     {
1147
-      if ( m_buffer.tqcontains( "ERRbadpw" ) != 0 ||
1148
-           m_buffer.tqcontains( "ERRnoaccess" ) != 0 ||
1149
-           m_buffer.tqcontains( "mount error 13 = Permission denied" ) != 0 )
1147
+      if ( m_buffer.contains( "ERRbadpw" ) != 0 ||
1148
+           m_buffer.contains( "ERRnoaccess" ) != 0 ||
1149
+           m_buffer.contains( "mount error 13 = Permission denied" ) != 0 )
1150 1150
       {
1151 1151
         int state = Smb4KPasswordHandler::None;
1152 1152
 
1153
-        if ( m_buffer.tqcontains( "ERRbadpw" ) != 0 )
1153
+        if ( m_buffer.contains( "ERRbadpw" ) != 0 )
1154 1154
         {
1155 1155
           state = Smb4KPasswordHandler::BadPassword;
1156 1156
         }
1157
-        else if ( m_buffer.tqcontains( "ERRnoaccess" ) != 0 )
1157
+        else if ( m_buffer.contains( "ERRnoaccess" ) != 0 )
1158 1158
         {
1159 1159
           state = Smb4KPasswordHandler::AccessDenied;
1160 1160
         }
1161
-        else if ( m_buffer.tqcontains( "mount error 13 = Permission denied" ) != 0 )
1161
+        else if ( m_buffer.contains( "mount error 13 = Permission denied" ) != 0 )
1162 1162
         {
1163 1163
           state = Smb4KPasswordHandler::PermDenied;
1164 1164
         }
@@ -1169,9 +1169,9 @@ void Smb4KMounter::processMount()
1169 1169
           mountShare( m_priv->workgroup(), m_priv->host(), m_priv->ip(), m_priv->share() );
1170 1170
         }
1171 1171
       }
1172
-      else if ( m_buffer.tqcontains( "ERRnosuchshare" ) != 0 && m_priv->share().tqcontains( "_" ) != 0 )
1172
+      else if ( m_buffer.contains( "ERRnosuchshare" ) != 0 && m_priv->share().contains( "_" ) != 0 )
1173 1173
       {
1174
-        TQString share_string = static_cast<TQString>( m_priv->share() ).tqreplace( "_", " " );
1174
+        TQString share_string = static_cast<TQString>( m_priv->share() ).replace( "_", " " );
1175 1175
         mountShare( m_priv->workgroup(), m_priv->host(), m_priv->ip(), share_string );
1176 1176
       }
1177 1177
       else
@@ -1187,13 +1187,13 @@ void Smb4KMounter::processMount()
1187 1187
 
1188 1188
   if ( m_proc->normalExit() )
1189 1189
   {
1190
-    if ( m_buffer.tqcontains( "smb4k_mount:", true ) == 0 &&
1191
-         m_buffer.tqcontains( "syserr =", true ) == 0 &&
1190
+    if ( m_buffer.contains( "smb4k_mount:", true ) == 0 &&
1191
+         m_buffer.contains( "syserr =", true ) == 0 &&
1192 1192
          /* To make sure we catch all errors, also check for the following
1193 1193
             strings. Maybe we can remove them?? */
1194
-         m_buffer.tqcontains( "Authentication error", true ) == 0 &&
1195
-         m_buffer.tqcontains( "Connection refused", true ) == 0 &&
1196
-         m_buffer.tqcontains( "Operation not permitted", true ) == 0 )
1194
+         m_buffer.contains( "Authentication error", true ) == 0 &&
1195
+         m_buffer.contains( "Connection refused", true ) == 0 &&
1196
+         m_buffer.contains( "Operation not permitted", true ) == 0 )
1197 1197
     {
1198 1198
       import();  // FIXME: *cough* What is this for???
1199 1199
 
@@ -1212,7 +1212,7 @@ void Smb4KMounter::processMount()
1212 1212
     }
1213 1213
     else
1214 1214
     {
1215
-      if ( m_buffer.tqcontains( "Authentication error" ) != 0 )
1215
+      if ( m_buffer.contains( "Authentication error" ) != 0 )
1216 1216
       {
1217 1217
         // If the user supplied auth information, we will retry mounting.
1218 1218
         if ( passwordHandler()->askpass( m_priv->workgroup(), m_priv->host(), m_priv->share(), Smb4KPasswordHandler::AuthError ) )
@@ -1272,7 +1272,7 @@ void Smb4KMounter::processUnmount()
1272 1272
       // rare circumstances it might occur that sudo reports an error,
1273 1273
       // because it is not able to resolve the host. This error message
1274 1274
       // will be removed, because it does not affect the unmounting:
1275
-      if ( m_buffer.tqcontains( "sudo: unable to resolve host", true ) != 0 )
1275
+      if ( m_buffer.contains( "sudo: unable to resolve host", true ) != 0 )
1276 1276
       {
1277 1277
         size_t hostnamelen = 255;
1278 1278
         char *hostname = new char[hostnamelen];
@@ -1405,7 +1405,7 @@ TQValueList<Smb4KShare> Smb4KMounter::findShareByName( const TQString &name )
1405 1405
   for ( TQValueListIterator<Smb4KShare *> it = m_mounted_shares.begin(); it != m_mounted_shares.end(); ++it )
1406 1406
   {
1407 1407
     if( TQString::compare( (*it)->name().upper(), name.upper() ) == 0 ||
1408
-        TQString::compare( (*it)->name().upper(), n.tqreplace( " ", "_" ).upper() ) == 0 )
1408
+        TQString::compare( (*it)->name().upper(), n.replace( " ", "_" ).upper() ) == 0 )
1409 1409
     {
1410 1410
       list.append( *(*it) );
1411 1411
 

+ 8
- 8
smb4k/core/smb4kpasswordhandler.cpp View File

@@ -172,7 +172,7 @@ void Smb4KPasswordHandler::convert_old_entries()
172 172
     // this: HOST:USER, we only need to test whether the first
173 173
     // key contains a ":". If that's the case, we need to convert
174 174
     // the entries, otherwise we don't.
175
-    if ( entries.first().tqcontains( ":" ) != 0 )
175
+    if ( entries.first().contains( ":" ) != 0 )
176 176
     {
177 177
       for ( TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
178 178
       {
@@ -450,7 +450,7 @@ Smb4KAuthInfo *Smb4KPasswordHandler::readAuth( Smb4KAuthInfo *authInfo )
450 450
         else
451 451
         {
452 452
           // Check that the workgroup is correct.
453
-          if ( map.tqcontains( "Workgroup" ) && !authInfo->workgroup().isEmpty() )
453
+          if ( map.contains( "Workgroup" ) && !authInfo->workgroup().isEmpty() )
454 454
           {
455 455
             if ( TQString::compare( map["Workgroup"].upper(), authInfo->workgroup().upper() ) != 0 )
456 456
             {
@@ -473,7 +473,7 @@ Smb4KAuthInfo *Smb4KPasswordHandler::readAuth( Smb4KAuthInfo *authInfo )
473 473
       else
474 474
       {
475 475
         // Check that the workgroup is correct.
476
-        if ( map.tqcontains( "Workgroup" ) && !authInfo->workgroup().isEmpty() )
476
+        if ( map.contains( "Workgroup" ) && !authInfo->workgroup().isEmpty() )
477 477
         {
478 478
           if ( TQString::compare( map["Workgroup"].upper(), authInfo->workgroup().upper() ) != 0 )
479 479
           {
@@ -516,7 +516,7 @@ Smb4KAuthInfo *Smb4KPasswordHandler::readAuth( Smb4KAuthInfo *authInfo )
516 516
       else
517 517
       {
518 518
         // Check that the workgroup is correct.
519
-        if ( map.tqcontains( "Workgroup" ) && !authInfo->workgroup().isEmpty() )
519
+        if ( map.contains( "Workgroup" ) && !authInfo->workgroup().isEmpty() )
520 520
         {
521 521
           if ( TQString::compare( map["Workgroup"].upper(), authInfo->workgroup().upper() ) != 0 )
522 522
           {
@@ -874,8 +874,8 @@ void Smb4KPasswordHandler::slotWritePassword( KProcess *proc )
874 874
   }
875 875
 
876 876
   // Check if the [default] section is present.
877
-  if ( contents.tqfind( "[default]" ) == contents.end() &&
878
-       contents.tqfind( "[DEFAULT]" ) == contents.end() )
877
+  if ( contents.find( "[default]" ) == contents.end() &&
878
+       contents.find( "[DEFAULT]" ) == contents.end() )
879 879
   {
880 880
     TQMap<TQString,TQString> map = m_options_handler->globalSambaOptions();
881 881
     TQString workgroup = map["workgroup"];
@@ -908,7 +908,7 @@ void Smb4KPasswordHandler::slotWritePassword( KProcess *proc )
908 908
     section.append( TQString( "[%1:%2:%3]" ).tqarg( m_nsmbrc_auth.host().upper(), m_nsmbrc_auth.user().isEmpty() ? "GUEST" : m_nsmbrc_auth.user().upper(), m_nsmbrc_auth.share().upper() ) );
909 909
   }
910 910
 
911
-  TQStringList::Iterator it = contents.tqfind( section );
911
+  TQStringList::Iterator it = contents.find( section );
912 912
 
913 913
   if ( it == contents.end() )
914 914
   {
@@ -929,7 +929,7 @@ void Smb4KPasswordHandler::slotWritePassword( KProcess *proc )
929 929
   {
930 930
     for ( TQStringList::Iterator i = ++it; i != contents.end(); ++i )
931 931
     {
932
-      if ( (*i).tqcontains( "password=" ) )
932
+      if ( (*i).contains( "password=" ) )
933 933
       {
934 934
         TQString old_pass = (*i).section( "password=", 1, 1 ).stripWhiteSpace();
935 935
 

+ 4
- 4
smb4k/core/smb4kpreviewer.cpp View File

@@ -215,7 +215,7 @@ void Smb4KPreviewer::slotProcessExited( KProcess * )
215 215
     TQString error_code = list.grep( "NT_STATUS" ).first().stripWhiteSpace().section( " ", 0, 0 );
216 216
 
217 217
     // The error output of smbclient is a little bit inconsistent:
218
-    if ( error_code.tqcontains( "NT_STATUS" ) == 0 )
218
+    if ( error_code.contains( "NT_STATUS" ) == 0 )
219 219
     {
220 220
       error_code = list.grep( "NT_STATUS" ).first().stripWhiteSpace().section( " ", -1, -1 );
221 221
     }
@@ -287,7 +287,7 @@ void Smb4KPreviewer::slotProcessExited( KProcess * )
287 287
       {
288 288
         continue;
289 289
       }
290
-      else if ( (*it).tqcontains( "blocks of size" ) != 0 )
290
+      else if ( (*it).contains( "blocks of size" ) != 0 )
291 291
       {
292 292
         continue;
293 293
       }
@@ -297,7 +297,7 @@ void Smb4KPreviewer::slotProcessExited( KProcess * )
297 297
 
298 298
         TQString item = tmp.section( "  ", 0, -2 ).stripWhiteSpace();
299 299
 
300
-        if ( !item.isEmpty() && tmp.section( "  ", -1, -1 ).tqcontains( "D" ) != 0 )
300
+        if ( !item.isEmpty() && tmp.section( "  ", -1, -1 ).contains( "D" ) != 0 )
301 301
         {
302 302
           // We have a directory here.
303 303
           if ( item.startsWith( "." ) &&
@@ -313,7 +313,7 @@ void Smb4KPreviewer::slotProcessExited( KProcess * )
313 313
 
314 314
           continue;
315 315
         }
316
-        else if ( item.isEmpty() || tmp.section( "  ", -1, -1 ).tqcontains( "D" ) == 0 )
316
+        else if ( item.isEmpty() || tmp.section( "  ", -1, -1 ).contains( "D" ) == 0 )
317 317
         {
318 318
           // We have a file
319 319
           if ( item.isEmpty() )

+ 7
- 7
smb4k/core/smb4kprint.cpp View File

@@ -302,7 +302,7 @@ void Smb4KPrint::slotReceivedStderr( KProcess *, char *buf, int len )
302 302
 {
303 303
   m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
304 304
 
305
-  if ( m_buffer.tqcontains( "NT_STATUS" ) != 0 )
305
+  if ( m_buffer.contains( "NT_STATUS" ) != 0 )
306 306
   {
307 307
     abort();
308 308
   }
@@ -313,19 +313,19 @@ void Smb4KPrint::slotProcessExited( KProcess * )
313 313
 {
314 314
   bool retry = false;
315 315
 
316
-  if ( m_buffer.tqcontains( "NT_STATUS", true ) != 0 ||
317
-       m_buffer.tqcontains( "enscript", true ) != 0  ||
318
-       m_buffer.tqcontains( "dvips", true ) != 0 )
316
+  if ( m_buffer.contains( "NT_STATUS", true ) != 0 ||
317
+       m_buffer.contains( "enscript", true ) != 0  ||
318
+       m_buffer.contains( "dvips", true ) != 0 )
319 319
   {
320
-    if ( m_buffer.tqcontains( "NT_STATUS_ACCESS_DENIED" ) != 0 || m_buffer.tqcontains( "NT_STATUS_LOGON_FAILURE" ) != 0 )
320
+    if ( m_buffer.contains( "NT_STATUS_ACCESS_DENIED" ) != 0 || m_buffer.contains( "NT_STATUS_LOGON_FAILURE" ) != 0 )
321 321
     {
322 322
       int state = Smb4KPasswordHandler::None;
323 323
 
324
-      if ( m_buffer.tqcontains( "NT_STATUS_ACCESS_DENIED" ) != 0 )
324
+      if ( m_buffer.contains( "NT_STATUS_ACCESS_DENIED" ) != 0 )
325 325
       {
326 326
         state = Smb4KPasswordHandler::AccessDenied;
327 327
       }
328
-      else if (m_buffer.tqcontains( "NT_STATUS_LOGON_FAILURE" ) != 0  )
328
+      else if (m_buffer.contains( "NT_STATUS_LOGON_FAILURE" ) != 0  )
329 329
       {
330 330
         state = Smb4KPasswordHandler::LogonFailure;
331 331
       }

+ 2
- 2
smb4k/core/smb4ksambaoptionshandler.cpp View File

@@ -1389,7 +1389,7 @@ void Smb4KSambaOptionsHandler::read_smb_conf()
1389 1389
   }
1390 1390
 
1391 1391
   // Process the file contents.
1392
-  for ( TQStringList::Iterator it = contents.erase( contents.begin(), ++(contents.tqfind( "[global]" )) ); it != contents.end(); ++it )
1392
+  for ( TQStringList::Iterator it = contents.erase( contents.begin(), ++(contents.find( "[global]" )) ); it != contents.end(); ++it )
1393 1393
   {
1394 1394
     if ( (*it).stripWhiteSpace().startsWith( "#" ) || (*it).stripWhiteSpace().startsWith( ";" ) )
1395 1395
     {
@@ -1456,7 +1456,7 @@ void Smb4KSambaOptionsHandler::read_smb_conf()
1456 1456
 
1457 1457
   // Post-processing. Some values should be entered with their defaults, if they are
1458 1458
   // not already present.
1459
-  if ( !m_samba_options.tqcontains( "netbios name" ) )
1459
+  if ( !m_samba_options.contains( "netbios name" ) )
1460 1460
   {
1461 1461
     size_t hostnamelen = 255;
1462 1462
     char *hostname = new char[hostnamelen];

+ 1
- 1
smb4k/core/smb4ksambaoptionsinfo.cpp View File

@@ -107,7 +107,7 @@ void Smb4KSambaOptionsInfo::setKerberos( bool krb )
107 107
 
108 108
 int Smb4KSambaOptionsInfo::type()
109 109
 {
110
-  return m_name.tqcontains( "/" ) == 3 ? Share : Host;
110
+  return m_name.contains( "/" ) == 3 ? Share : Host;
111 111
 }
112 112
 
113 113
 

+ 38
- 38
smb4k/core/smb4kscanner.cpp View File

@@ -247,7 +247,7 @@ void Smb4KScanner::scanNetwork()
247 247
   // Look up the workgroups/domains and their master browsers.
248 248
   // At the moment we have three methods:
249 249
   // (1) Smb4KSettings::EnumBrowseList::LookupDomains: This method is
250
-  //     the most reliable one. It uses nmblookup and will only tqfind
250
+  //     the most reliable one. It uses nmblookup and will only find
251 251
   //     *active* workgroup master browsers and thus active domains.
252 252
   // (2) Smb4KSettings::EnumBrowseList::QueryCurrentMaster: This
253 253
   //     method will query the current master browser of the local
@@ -546,7 +546,7 @@ void Smb4KScanner::searchForHost( const TQString &host )
546 546
         command.append( nmblookup_options );
547 547
       }
548 548
 
549
-      if ( host.tqcontains( '.', true ) != 3 )
549
+      if ( host.contains( '.', true ) != 3 )
550 550
       {
551 551
         if ( !wins.isEmpty() )
552 552
         {
@@ -691,7 +691,7 @@ void Smb4KScanner::processWorkgroups()
691 691
 
692 692
         continue;
693 693
       }
694
-      else if ( (*it).tqcontains( "<00>" ) != 0 && (*it).tqcontains( "<GROUP>" ) == 0 )
694
+      else if ( (*it).contains( "<00>" ) != 0 && (*it).contains( "<GROUP>" ) == 0 )
695 695
       {
696 696
         if ( workgroup.isEmpty() && master.isEmpty() && !ip.isEmpty() )
697 697
         {
@@ -700,11 +700,11 @@ void Smb4KScanner::processWorkgroups()
700 700
 
701 701
         continue;
702 702
       }
703
-      else if ( (*it).tqcontains( "<00>" ) != 0 && (*it).tqcontains( "<GROUP>" ) != 0 )
703
+      else if ( (*it).contains( "<00>" ) != 0 && (*it).contains( "<GROUP>" ) != 0 )
704 704
       {
705 705
         if ( workgroup.isEmpty() && !master.isEmpty() && !ip.isEmpty() )
706 706
         {
707
-          workgroup = (*it).left( (*it).tqfind( "<00>" ) ).stripWhiteSpace();
707
+          workgroup = (*it).left( (*it).find( "<00>" ) ).stripWhiteSpace();
708 708
 
709 709
           m_workgroups_list->append( new Smb4KWorkgroupItem( workgroup, master, ip ) );
710 710
 
@@ -800,9 +800,9 @@ void Smb4KScanner::processIPScan()
800 800
       // Loop through the data:
801 801
       for ( TQStringList::ConstIterator i = it; i != list.end(); ++i )
802 802
       {
803
-        if ( (*i).tqcontains( " <00> " ) != 0 )
803
+        if ( (*i).contains( " <00> " ) != 0 )
804 804
         {
805
-          if ( (*i).tqcontains( " <GROUP> " ) != 0 )
805
+          if ( (*i).contains( " <GROUP> " ) != 0 )
806 806
           {
807 807
             workgroup = (*i).section( "<00>", 0, 0 ).stripWhiteSpace();
808 808
           }
@@ -813,13 +813,13 @@ void Smb4KScanner::processIPScan()
813 813
 
814 814
           continue;
815 815
         }
816
-        else if ( (*i).tqcontains( "__MSBROWSE__" ) != 0 && (*i).tqcontains( " <01> " ) != 0 )
816
+        else if ( (*i).contains( "__MSBROWSE__" ) != 0 && (*i).contains( " <01> " ) != 0 )
817 817
         {
818 818
           master = true;
819 819
 
820 820
           continue;
821 821
         }
822
-        else if ( (*i).tqcontains( "MAC Address" ) != 0 || (*i).stripWhiteSpace().isEmpty() )
822
+        else if ( (*i).contains( "MAC Address" ) != 0 || (*i).stripWhiteSpace().isEmpty() )
823 823
         {
824 824
           it = i;
825 825
 
@@ -897,9 +897,9 @@ void Smb4KScanner::processWorkgroupMembers()
897 897
     case Smb4KSettings::EnumBrowseList::QueryCurrentMaster:
898 898
     case Smb4KSettings::EnumBrowseList::QueryCustomMaster:
899 899
     {
900
-      if ( m_buffer.tqcontains( "NT_STATUS_ACCESS_DENIED" ) != 0 ||
901
-           m_buffer.tqcontains( "NT_STATUS_LOGON_FAILURE" ) != 0 ||
902
-           m_buffer.tqcontains( "The username or password was not correct" ) != 0 )
900
+      if ( m_buffer.contains( "NT_STATUS_ACCESS_DENIED" ) != 0 ||
901
+           m_buffer.contains( "NT_STATUS_LOGON_FAILURE" ) != 0 ||
902
+           m_buffer.contains( "The username or password was not correct" ) != 0 )
903 903
       {
904 904
         // Authentication failed:
905 905
         emit failed();
@@ -913,11 +913,11 @@ void Smb4KScanner::processWorkgroupMembers()
913 913
 
914 914
         return;
915 915
       }
916
-      else if ( m_buffer.tqcontains( "Could not connect to server" ) != 0 ||
917
-                m_buffer.tqcontains( "Unable to find a suitable server" ) != 0 ||
918
-                m_buffer.tqcontains( "Invalid ip address specified" ) != 0 )
916
+      else if ( m_buffer.contains( "Could not connect to server" ) != 0 ||
917
+                m_buffer.contains( "Unable to find a suitable server" ) != 0 ||
918
+                m_buffer.contains( "Invalid ip address specified" ) != 0 )
919 919
       {
920
-        // If the IP address is empty, the shell output tqcontains
920
+        // If the IP address is empty, the shell output contains
921 921
         // the IP address. Remove it, because it will confuse
922 922
         // the user:
923 923
         if ( m_priv->ip().isEmpty() )
@@ -974,7 +974,7 @@ void Smb4KScanner::processWorkgroupMembers()
974 974
           {
975 975
             TQString host, comment;
976 976
 
977
-            if ( line.tqcontains( "   " ) == 0 )
977
+            if ( line.contains( "   " ) == 0 )
978 978
             {
979 979
               host = line;
980 980
             }
@@ -1079,9 +1079,9 @@ void Smb4KScanner::processWorkgroupMembers()
1079 1079
     }
1080 1080
     case Smb4KSettings::EnumBrowseList::ScanBroadcastAreas:
1081 1081
     {
1082
-      if ( m_buffer.tqcontains( "NT_STATUS_ACCESS_DENIED" ) != 0 ||
1083
-           m_buffer.tqcontains( "NT_STATUS_LOGON_FAILURE" ) != 0 ||
1084
-           m_buffer.tqcontains( "The username or password was not correct" ) != 0 )
1082
+      if ( m_buffer.contains( "NT_STATUS_ACCESS_DENIED" ) != 0 ||
1083
+           m_buffer.contains( "NT_STATUS_LOGON_FAILURE" ) != 0 ||
1084
+           m_buffer.contains( "The username or password was not correct" ) != 0 )
1085 1085
       {
1086 1086
         // Authentication failed:
1087 1087
         emit failed();
@@ -1095,9 +1095,9 @@ void Smb4KScanner::processWorkgroupMembers()
1095 1095
 
1096 1096
         return;
1097 1097
       }
1098
-      else if ( m_buffer.tqcontains( "Could not connect to server" ) != 0 ||
1099
-                m_buffer.tqcontains( "Unable to find a suitable server" ) != 0 ||
1100
-                m_buffer.tqcontains( "Invalid ip address specified" ) != 0 )
1098
+      else if ( m_buffer.contains( "Could not connect to server" ) != 0 ||
1099
+                m_buffer.contains( "Unable to find a suitable server" ) != 0 ||
1100
+                m_buffer.contains( "Invalid ip address specified" ) != 0 )
1101 1101
       {
1102 1102
         // We are in IP scan mode, so we can ignore the error and emit
1103 1103
         // what we already have:
@@ -1128,7 +1128,7 @@ void Smb4KScanner::processWorkgroupMembers()
1128 1128
           // Extract host name and comment:
1129 1129
           TQString host, comment;
1130 1130
 
1131
-          if ( line.tqcontains( "   " ) == 0 )
1131
+          if ( line.contains( "   " ) == 0 )
1132 1132
           {
1133 1133
             host = line;
1134 1134
           }
@@ -1179,8 +1179,8 @@ void Smb4KScanner::processWorkgroupMembers()
1179 1179
 void Smb4KScanner::processShares()
1180 1180
 {
1181 1181
   // Error handling
1182
-  if ( m_buffer.tqcontains( "The username or password was not correct.", true ) != 0 ||
1183
-       m_buffer.tqcontains( "NT_STATUS_ACCOUNT_DISABLED" ) != 0 /* Active Directory error */ )
1182
+  if ( m_buffer.contains( "The username or password was not correct.", true ) != 0 ||
1183
+       m_buffer.contains( "NT_STATUS_ACCOUNT_DISABLED" ) != 0 /* Active Directory error */ )
1184 1184
   {
1185 1185
     // Authentication failed:
1186 1186
     emit failed();
@@ -1192,7 +1192,7 @@ void Smb4KScanner::processShares()
1192 1192
 
1193 1193
     return;
1194 1194
   }
1195
-  else if ( m_buffer.tqcontains( "could not obtain sid for domain", true ) != 0 )
1195
+  else if ( m_buffer.contains( "could not obtain sid for domain", true ) != 0 )
1196 1196
   {
1197 1197
     // FIXME: Does this error only occur when we scan a server that is
1198 1198
     // only capable of the RAP protocol or also under other conditions?
@@ -1202,9 +1202,9 @@ void Smb4KScanner::processShares()
1202 1202
 
1203 1203
     return;
1204 1204
   }
1205
-  else if ( (m_buffer.tqcontains( "Could not connect to server", true ) != 0 &&
1206
-             m_buffer.tqcontains( "The username or password was not correct.", true ) == 0) ||
1207
-            m_buffer.tqcontains( "Unable to find a suitable server" ) != 0 )
1205
+  else if ( (m_buffer.contains( "Could not connect to server", true ) != 0 &&
1206
+             m_buffer.contains( "The username or password was not correct.", true ) == 0) ||
1207
+            m_buffer.contains( "Unable to find a suitable server" ) != 0 )
1208 1208
   {
1209 1209
     // We could not get the list of shares:
1210 1210
     emit failed();
@@ -1232,19 +1232,19 @@ void Smb4KScanner::processShares()
1232 1232
     {
1233 1233
       TQString name, type, comment;
1234 1234
 
1235
-      if ( (*it).tqcontains( " Disk     ", true ) != 0 )
1235
+      if ( (*it).contains( " Disk     ", true ) != 0 )
1236 1236
       {
1237 1237
         name = (*it).section( " Disk     ", 0, 0 ).stripWhiteSpace();
1238 1238
         type = "Disk";
1239 1239
         comment = (*it).section( " Disk     ", 1, 1 ).stripWhiteSpace();
1240 1240
       }
1241
-      else if ( (*it).tqcontains( " Print    ", true ) != 0 )
1241
+      else if ( (*it).contains( " Print    ", true ) != 0 )
1242 1242
       {
1243 1243
         name = (*it).section( " Print    ", 0, 0 ).stripWhiteSpace();
1244 1244
         type = "Printer";
1245 1245
         comment = (*it).section( " Print    ", 1, 1 ).stripWhiteSpace();
1246 1246
       }
1247
-      else if ( (*it).tqcontains( " IPC      ", true ) != 0 )
1247
+      else if ( (*it).contains( " IPC      ", true ) != 0 )
1248 1248
       {
1249 1249
         name = (*it).section( " IPC      ", 0, 0 ).stripWhiteSpace();
1250 1250
         type = "IPC";
@@ -1278,8 +1278,8 @@ void Smb4KScanner::processSearch()
1278 1278
 
1279 1279
   // Stop right here if the user searched for illegal
1280 1280
   // strings like #, ', () etc.
1281
-  if ( m_buffer.tqcontains( "Usage:", true ) != 0 ||
1282
-       m_buffer.tqcontains( "/bin/sh:", true ) != 0 )
1281
+  if ( m_buffer.contains( "Usage:", true ) != 0 ||
1282
+       m_buffer.contains( "/bin/sh:", true ) != 0 )
1283 1283
   {
1284 1284
     emit searchResult( new Smb4KHostItem() );
1285 1285
 
@@ -1298,7 +1298,7 @@ void Smb4KScanner::processSearch()
1298 1298
         TQString workgroup = data.last().stripWhiteSpace();
1299 1299
         TQString host, ip;
1300 1300
 
1301
-        if ( m_priv->host().tqcontains( ".", true ) != 3 )
1301
+        if ( m_priv->host().contains( ".", true ) != 3 )
1302 1302
         {
1303 1303
           // The IP address is in the first entry:
1304 1304
           ip = data.first().stripWhiteSpace().section( " ", 0, 0 );
@@ -1324,7 +1324,7 @@ void Smb4KScanner::processSearch()
1324 1324
     {
1325 1325
       if ( data.count() > 1 && !data[1].isEmpty() )
1326 1326
       {
1327
-        if ( m_buffer.tqcontains( TQString( "Connection to %1 failed" ).tqarg( m_priv->host() ) ) != 0 )
1327
+        if ( m_buffer.contains( TQString( "Connection to %1 failed" ).tqarg( m_priv->host() ) ) != 0 )
1328 1328
         {
1329 1329
           emit searchResult( new Smb4KHostItem() );
1330 1330
         }
@@ -1377,7 +1377,7 @@ void Smb4KScanner::processInfo()
1377 1377
 
1378 1378
           break;
1379 1379
         }
1380
-        else if ( (*it).tqcontains( "Connection to", true ) != 0 )
1380
+        else if ( (*it).contains( "Connection to", true ) != 0 )
1381 1381
         {
1382 1382
           // The lookup of the info failed:
1383 1383
           emit failed();

+ 1
- 1
smb4k/core/smb4ksynchronizationinfo.h View File

@@ -124,7 +124,7 @@ class Smb4KSynchronizationInfo
124 124
     const int processedFileNumber() const { return m_processed_files; }
125 125
 
126 126
     /**
127
-     * Set the transfer rate. This should be a string that already tqcontains
127
+     * Set the transfer rate. This should be a string that already contains
128 128
      * all information, i.e. the string should look like this: 100 kB/s.
129 129
      *
130 130
      * @param rate        The rate string (e.g. 100 kB/s)

+ 6
- 6
smb4k/core/smb4ksynchronizer.cpp View File

@@ -389,7 +389,7 @@ void Smb4KSynchronizer::slotReceivedStdout( KProcess *, char *buf, int len )
389 389
 
390 390
   TQString partial, total, files, rate;
391 391
 
392
-  if ( m_buffer[0].isSpace() && m_buffer.tqcontains( "/s ", true ) > 0 )
392
+  if ( m_buffer[0].isSpace() && m_buffer.contains( "/s ", true ) > 0 )
393 393
   {
394 394
     partial = m_buffer.section( "%", 0, 0 ).section( " ", -1, -1 ).stripWhiteSpace();
395 395
 
@@ -398,7 +398,7 @@ void Smb4KSynchronizer::slotReceivedStdout( KProcess *, char *buf, int len )
398 398
       sync_info.setIndividualProgress( partial.toInt() );
399 399
     }
400 400
 
401
-    if ( m_buffer.tqcontains( "to-check=" ) > 0 )
401
+    if ( m_buffer.contains( "to-check=" ) > 0 )
402 402
     {
403 403
       // Newer versions of rsync:
404 404
       TQString tmp = m_buffer.section( "to-check=", 1, 1 ).section( ")", 0, 0 ).stripWhiteSpace();
@@ -423,7 +423,7 @@ void Smb4KSynchronizer::slotReceivedStdout( KProcess *, char *buf, int len )
423 423
       sync_info.setTotalProgress( total.toInt() );
424 424
     }
425 425
 
426
-    if ( m_buffer.tqcontains( "xfer#" ) > 0 )
426
+    if ( m_buffer.contains( "xfer#" ) > 0 )
427 427
     {
428 428
       // Newer versions of rsync:
429 429
       files = m_buffer.section( "xfer#", 1, 1 ).section( ",", 0, 0 ).stripWhiteSpace();
@@ -452,11 +452,11 @@ void Smb4KSynchronizer::slotReceivedStdout( KProcess *, char *buf, int len )
452 452
 
453 453
     m_buffer = TQString();
454 454
   }
455
-  else if ( !m_buffer[0].isSpace() && m_buffer.endsWith( "\n" ) && m_buffer.tqcontains( "/s ", true ) == 0 )
455
+  else if ( !m_buffer[0].isSpace() && m_buffer.endsWith( "\n" ) && m_buffer.contains( "/s ", true ) == 0 )
456 456
   {
457 457
     sync_info.setText( m_buffer.stripWhiteSpace() );
458 458
 
459
-    if ( m_buffer.tqcontains( "files to consider" ) != 0 )
459
+    if ( m_buffer.contains( "files to consider" ) != 0 )
460 460
     {
461 461
       m_total_files = m_buffer.section( " files to consider", 0, 0 ).section( " ", -1, -1 ).stripWhiteSpace();
462 462
 
@@ -479,7 +479,7 @@ void Smb4KSynchronizer::slotReceivedStderr( KProcess *, char *buf, int len )
479 479
   // when you kill the process (using SIGTERM). Pressing the cancel
480 480
   // button will exactly do this. Thus, we need to exclude this occasion
481 481
   // from here.
482
-  if ( !cancel && error_message.tqcontains( "rsync error:", true ) != 0 )
482
+  if ( !cancel && error_message.contains( "rsync error:", true ) != 0 )
483 483
   {
484 484
     // Cancel the whole synchronization in case an error occurred.
485 485
     // If we don't do it, the user might be flooded with error messages

+ 3
- 3
smb4k/dialogs/smb4kmountdialog.cpp View File

@@ -115,10 +115,10 @@ void Smb4KMountDialog::slotOk()
115 115
   if ( !m_share_input->text().stripWhiteSpace().isEmpty() )
116 116
   {
117 117
 #ifndef __FreeBSD__
118
-    if ( m_share_input->text().tqcontains( "/" ) == 3 )
118
+    if ( m_share_input->text().contains( "/" ) == 3 )
119 119
 #else
120
-    if ( m_share_input->text().tqcontains( "/" ) == 3
121
-         && m_share_input->text().tqcontains( '@' ) == 0 )
120
+    if ( m_share_input->text().contains( "/" ) == 3
121
+         && m_share_input->text().contains( '@' ) == 0 )
122 122
 #endif
123 123
     {
124 124
       TQString host = m_share_input->text().stripWhiteSpace().section( "/", 2, 2 );

+ 5
- 5
smb4k/dialogs/smb4kpreviewdialog.cpp View File

@@ -172,7 +172,7 @@ void Smb4KPreviewDialog::slotReceivedData( Smb4KPreviewItem *item )
172 172
 
173 173
     for ( TQStringList::Iterator it = m_history.begin(); it != m_history.end(); it++ )
174 174
     {
175
-      if ( !m_combo->listBox()->tqfindItem( *it, TQt::CaseSensitive|TQt::ExactMatch ) )
175
+      if ( !m_combo->listBox()->findItem( *it, TQt::CaseSensitive|TQt::ExactMatch ) )
176 176
       {
177 177
         m_combo->insertItem( *it, -1 );
178 178
       }
@@ -285,11 +285,11 @@ void Smb4KPreviewDialog::slotButtonClicked( int id )
285 285
         return;
286 286
       }
287 287
 
288
-      if ( m_item->path().tqcontains( "/" ) > 1 )
288
+      if ( m_item->path().contains( "/" ) > 1 )
289 289
       {
290 290
         m_item->setPath( m_item->path().section( "/", 0, -3 ).append( "/" ) );
291 291
       }
292
-      else if ( m_item->path().tqcontains( "/", true ) == 1 )
292
+      else if ( m_item->path().contains( "/", true ) == 1 )
293 293
       {
294 294
         m_item->setPath( TQString() );
295 295
       }
@@ -311,7 +311,7 @@ void Smb4KPreviewDialog::slotButtonClicked( int id )
311 311
       }
312 312
 
313 313
       // Get the path:
314
-      if ( (*m_current_item).tqcontains( "/", true ) == 3 )
314
+      if ( (*m_current_item).contains( "/", true ) == 3 )
315 315
       {
316 316
         m_item->setPath( TQString() );
317 317
       }
@@ -346,7 +346,7 @@ void Smb4KPreviewDialog::slotButtonClicked( int id )
346 346
       }
347 347
 
348 348
       // Get the path:
349
-      if ( (*m_current_item).tqcontains( "/", true ) == 3 )
349
+      if ( (*m_current_item).contains( "/", true ) == 3 )
350 350
       {
351 351
         m_item->setPath( TQString() );
352 352
       }

+ 4
- 4
smb4k/iconview/smb4ksharesiconview.cpp View File

@@ -120,7 +120,7 @@ void Smb4KSharesIconView::contentsDragEnterEvent( TQDragEnterEvent *e )
120 120
 
121 121
 void Smb4KSharesIconView::contentsDragMoveEvent( TQDragMoveEvent *e )
122 122
 {
123
-  TQIconViewItem *item = tqfindItem( e->pos() );
123
+  TQIconViewItem *item = findItem( e->pos() );
124 124
 
125 125
   e->accept( Smb4KSettings::enableDropSupport() && item );
126 126
 }
@@ -128,7 +128,7 @@ void Smb4KSharesIconView::contentsDragMoveEvent( TQDragMoveEvent *e )
128 128
 
129 129
 void Smb4KSharesIconView::contentsDropEvent( TQDropEvent *e )
130 130
 {
131
-  TQIconViewItem *item = tqfindItem( e->pos() );
131
+  TQIconViewItem *item = findItem( e->pos() );
132 132
   KURL::List src;
133 133
 
134 134
   // Do we have to stop here?
@@ -172,7 +172,7 @@ void Smb4KSharesIconView::contentsMouseMoveEvent( TQMouseEvent *e )
172 172
 {
173 173
   m_pos = e->globalPos();
174 174
 
175
-  Smb4KSharesIconViewItem *item = static_cast<Smb4KSharesIconViewItem *>( tqfindItem( e->pos() ) );
175
+  Smb4KSharesIconViewItem *item = static_cast<Smb4KSharesIconViewItem *>( findItem( e->pos() ) );
176 176
 
177 177
   if ( item )
178 178
   {
@@ -256,7 +256,7 @@ void Smb4KSharesIconView::slotPressed( TQIconViewItem *item )
256 256
 void Smb4KSharesIconView::slotShowToolTip()
257 257
 {
258 258
   if ( m_tooltip && hasMouse() && Smb4KSettings::showShareToolTip() &&
259
-       (m_tooltip->item() == static_cast<Smb4KSharesIconViewItem *>( tqfindItem( viewport()->mapFromGlobal( m_pos ) ) )) )
259
+       (m_tooltip->item() == static_cast<Smb4KSharesIconViewItem *>( findItem( viewport()->mapFromGlobal( m_pos ) ) )) )
260 260
   {
261 261
     m_tooltip->showTip( m_pos );
262 262
   }

+ 6
- 6
smb4k/main.cpp View File

@@ -119,12 +119,12 @@ int main( int argc, char *argv[] )
119 119
   KConfig config( "smb4krc", false, false, "config" );
120 120
 
121 121
   if ( !config.groupList().isEmpty() &&
122
-       (config.groupList().tqcontains( "Browse Options" ) != 0 ||
123
-        config.groupList().tqcontains( "Mount Options" ) != 0 ||
124
-        config.groupList().tqcontains( "Rsync" ) != 0 ||
125
-        config.groupList().tqcontains( "Super User Privileges") != 0 ||
126
-        config.groupList().tqcontains( "User Interface" ) != 0 ||
127
-        config.groupList().tqcontains( "System" ) != 0) )
122
+       (config.groupList().contains( "Browse Options" ) != 0 ||
123
+        config.groupList().contains( "Mount Options" ) != 0 ||
124
+        config.groupList().contains( "Rsync" ) != 0 ||
125
+        config.groupList().contains( "Super User Privileges") != 0 ||
126
+        config.groupList().contains( "User Interface" ) != 0 ||
127
+        config.groupList().contains( "System" ) != 0) )
128 128
   {
129 129
     int return_value = KMessageBox::warningContinueCancel( 0, i18n( "Smb4K now uses a different configuration system. Thus, your old settings are obsolete and you have to reconfigure the application.\nTo assure a clean transition, the current configuration file will be removed." ) );
130 130
 

+ 1
- 1
smb4k/searchdlg/smb4ksearchdialog.cpp View File

@@ -54,7 +54,7 @@ Smb4KSearchDialog::Smb4KSearchDialog( TQWidget *tqparent, const char *name )
54 54
 
55 55
   m_tool_bar->insertSeparator();
56 56
 
57
-  m_tool_bar->insertButton( "tqfind", Search, false, i18n( "Search" ) );
57
+  m_tool_bar->insertButton( "find", Search, false, i18n( "Search" ) );
58 58
   m_tool_bar->insertButton( "editdelete", Clear, false, i18n( "Clear" ) );
59 59
   m_tool_bar->insertButton( "button_ok", Add, false, i18n( "Add" ) );
60 60
 

+ 1
- 1
smb4k/smb4k.cpp View File

@@ -313,7 +313,7 @@ void Smb4KApp::setupView()
313 313
 
314 314
     if ( m_search_part )
315 315
     {
316
-      KDockWidget *search = createDockWidget( "SearchDialog", SmallIcon( "tqfind" ), 0L, i18n( "Search Dialog" ) );
316
+      KDockWidget *search = createDockWidget( "SearchDialog", SmallIcon( "find" ), 0L, i18n( "Search Dialog" ) );
317 317
       search->setWidget( m_search_part->widget() );
318 318
 
319 319
       KDockWidget *network = manager()->getDockWidgetFromName( "NetworkBrowser" );

+ 2
- 2
smb4k/smb4ksystemtray.cpp View File

@@ -828,11 +828,11 @@ void Smb4KSystemTray::slotSetupSharesMenu()
828 828
         {
829 829
           TQString item = TQString( "%1_::_%2" ).tqarg( TQString((*it)->name()), TQString((*it)->canonicalPath()) );
830 830
 
831
-          index = strings.tqfindIndex( item );
831
+          index = strings.findIndex( item );
832 832
         }
833 833
         else
834 834
         {
835
-          index = strings.tqfindIndex( (*it)->canonicalPath() );
835
+          index = strings.findIndex( (*it)->canonicalPath() );
836 836
         }
837 837
 
838 838
         m_shares_menu->insert( action_menu, index + 2 );  // +2 due to "Unmount All" and separator

+ 1
- 1
utilities/smb4k_kill.cpp View File

@@ -82,7 +82,7 @@ bool find_program( const char *name, char *path )
82 82
 
83 83
 	if ( !strcmp( file.c_str(), "" ) )
84 84
 	{
85
-		cerr << "smb4k_kill: Could not tqfind " << name << " binary" << endl;
85
+		cerr << "smb4k_kill: Could not find " << name << " binary" << endl;
86 86
 
87 87
 		return false;
88 88
 	}

+ 1
- 1
utilities/smb4k_mount.cpp View File

@@ -109,7 +109,7 @@ bool find_program( const char *name, char *path )
109 109
 
110 110
 	if ( !strcmp( file.c_str(), "" ) )
111 111
 	{
112
-		cerr << "smb4k_mount: Could not tqfind " << name << " binary" << endl;
112
+		cerr << "smb4k_mount: Could not find " << name << " binary" << endl;
113 113
 
114 114
 		return false;
115 115
 	}

+ 1
- 1
utilities/smb4k_mv.cpp View File

@@ -93,7 +93,7 @@ bool find_program( const char *name, char *path )
93 93
 
94 94
 	if ( !strcmp( file.c_str(), "" ) )
95 95
 	{
96
-		cerr << "smb4k_mv: Could not tqfind " << name << " binary" << endl;
96
+		cerr << "smb4k_mv: Could not find " << name << " binary" << endl;
97 97
 
98 98
 		return false;
99 99
 	}

+ 1
- 1
utilities/smb4k_umount.cpp View File

@@ -121,7 +121,7 @@ bool find_program( const char *name, char *path )
121 121
 
122 122
 	if ( !strcmp( file.c_str(), "" ) )
123 123
 	{
124
-		cerr << "smb4k_umount: Could not tqfind " << name << " binary" << endl;
124
+		cerr << "smb4k_umount: Could not find " << name << " binary" << endl;
125 125
 
126 126
 		return false;
127 127
 	}

Loading…
Cancel
Save