Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 15 insertions, 15 deletions

diff --git a/kioslave/iso/Makefile.am b/kioslave/iso/Makefile.am
index 0a928a6e8..8151bec5c 100644
--- a/kioslave/iso/Makefile.am
+++ b/kioslave/iso/Makefile.am
@@ -39,9 +39,9 @@ uninstall-local:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.
 # kde_icondir         Where your icon should go to - better use KDE_ICON.
 # kde_sounddir        Where your sounds should go to.
-# kde_htmldir         Where your docs should go to. (tqcontains lang subdirs)
+# kde_htmldir         Where your docs should go to. (contains lang subdirs)
 # kde_datadir         Where you install application data. (Use a subdir)
-# kde_locale          Where translation files should go to. (tqcontains lang subdirs)
+# kde_locale          Where translation files should go to. (contains lang subdirs)
 # kde_cgidir          Where cgi-bin executables should go to.
 # kde_confdir         Where config files should go to (system-wide ones with default values).
 # kde_mimedir         Where mimetypes .desktop files should go to.
@@ -60,7 +60,7 @@ uninstall-local:
 # make messages.po. Move this one to ../po/ and "make merge" in po
 # the -x is for skipping messages already translated in kdelibs
 messages:
-	LIST=`tqfind . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
 	if test -n "$$LIST"; then \
 		 $(XGETTEXT) -C -ki18n -x $(kde_includes)/kde.pot $$LIST -o ../po/iso.pot; \
 	fi
diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp
index 542654f74..268805770 100644
--- a/kioslave/iso/iso.cpp
+++ b/kioslave/iso/iso.cpp
@@ -130,7 +130,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
         fullPath += '/';
 
     kdDebug()   << "the full path is " << fullPath << endl;
-    while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 )
+    while ( (pos=fullPath.find( '/', pos+1 )) != -1 )
     {
         TQString tryPath = fullPath.left( pos );
         kdDebug()   << fullPath << "  trying " << tryPath << endl;
@@ -150,7 +150,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
                     path.truncate( len - 1 );
             }
             else
-                path = TQString::tqfromLatin1("/");
+                path = TQString::fromLatin1("/");
             kdDebug()   << "Found. isoFile=" << isoFile << " path=" << path << endl;
             break;
         }
@@ -259,10 +259,10 @@ void kio_isoProtocol::listDir( const KURL & url )
 
     if ( path.isEmpty() )
     {
-        KURL redir( TQString::tqfromLatin1( "iso:/") );
+        KURL redir( TQString::fromLatin1( "iso:/") );
         kdDebug() << "url.path()==" << url.path() << endl;
         if (url.hasRef()) redir.setRef(url.htmlRef());
-        redir.setPath( url.path() + TQString::tqfromLatin1("/") );
+        redir.setPath( url.path() + TQString::fromLatin1("/") );
         kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl;
         redirection( redir );
         finished();
@@ -356,7 +356,7 @@ void kio_isoProtocol::stat( const KURL & url )
     const KArchiveEntry* isoEntry;
     if ( path.isEmpty() )
     {
-        path = TQString::tqfromLatin1( "/" );
+        path = TQString::fromLatin1( "/" );
         isoEntry = root;
     } else {
         isoEntry = root->entry( path );
@@ -463,7 +463,7 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
             if (fileData.size()==0) break;
         }
         if (!mime) {
-            KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferFileType( fileData, path );
+            KMimeMagicResult * result = KMimeMagic::self()->findBufferFileType( fileData, path );
             kdDebug() << "Emitting mimetype " << result->mimeType() << endl;
             mimeType( result->mimeType() );
             mime=true;
diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
index 67481d75b..dff111bff 100644
--- a/kioslave/iso/kiso.cpp
+++ b/kioslave/iso/kiso.cpp
@@ -55,7 +55,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 /**
- * puts the track tqlayout of the device 'fname' into 'tracks'
+ * puts the track layout of the device 'fname' into 'tracks'
  * tracks structure: start sector, track number, ...
  * tracks should be 100*2 entry long (this is the maximum in the CD-ROM standard)
  * currently it's linux only, porters are welcome
@@ -115,7 +115,7 @@ KIso::KIso( const TQString& filename, const TQString & _mimetype )
     bool forced = true;
     if ( mimetype.isEmpty() )
     {
-        mimetype = KMimeType::tqfindByFileContent( filename )->name();
+        mimetype = KMimeType::findByFileContent( filename )->name();
         kdDebug() << "KIso::KIso mimetype=" << mimetype << endl;
 
         // Don't move to prepareDevice - the other constructor theoretically allows ANY filter
@@ -359,7 +359,7 @@ bool KIso::openArchive( int mode )
         memset(&buf,0,sizeof(struct stat));
         buf.st_mode=0777;
     } else {
-        /* If it's a block device, try to query the track tqlayout (for multisession) */
+        /* If it's a block device, try to query the track layout (for multisession) */
         if (m_startsec == -1 && S_ISBLK(buf.st_mode))
             trackno=getTracks(m_filename.latin1(),(int*) &tracks);
     }
diff --git a/kioslave/iso/libisofs/COPYING b/kioslave/iso/libisofs/COPYING
index e6ed46e1b..c7aea1896 100644
--- a/kioslave/iso/libisofs/COPYING
+++ b/kioslave/iso/libisofs/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions:
     stating that you changed the files and the date of any change.
 
     b) You must cause any work that you distribute or publish, that in
-    whole or in part tqcontains or is derived from the Program or any
+    whole or in part contains or is derived from the Program or any
     part thereof, to be licensed as a whole at no charge to all third
     parties under the terms of this License.
 
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include