From e3379a9953ab5532065dbe90bdb5a5fe14565641 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 14:20:53 -0600
Subject: Rename additional kioslave libraries

---
 tdeioslave/iso/CMakeLists.txt    |  8 ++++----
 tdeioslave/iso/Makefile.am       | 12 +++++------
 tdeioslave/iso/iso.cpp           | 44 ++++++++++++++++++++--------------------
 tdeioslave/iso/iso.h             |  6 +++---
 tdeioslave/iso/iso.protocol      |  2 +-
 tdeioslave/iso/kio_iso.desktop   | 13 ------------
 tdeioslave/iso/kio_isorc         |  2 --
 tdeioslave/iso/kiso.cpp          |  2 +-
 tdeioslave/iso/tdeio_iso.desktop | 13 ++++++++++++
 tdeioslave/iso/tdeio_isorc       |  2 ++
 10 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 tdeioslave/iso/kio_iso.desktop
 delete mode 100644 tdeioslave/iso/kio_isorc
 create mode 100644 tdeioslave/iso/tdeio_iso.desktop
 create mode 100644 tdeioslave/iso/tdeio_isorc

(limited to 'tdeioslave/iso')

diff --git a/tdeioslave/iso/CMakeLists.txt b/tdeioslave/iso/CMakeLists.txt
index df3bfeee1..89b5f0f38 100644
--- a/tdeioslave/iso/CMakeLists.txt
+++ b/tdeioslave/iso/CMakeLists.txt
@@ -31,13 +31,13 @@ link_directories(
 
 install( FILES iso.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES isoservice.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
-install( FILES kio_isorc DESTINATION ${CONFIG_INSTALL_DIR} )
-install( FILES kio_iso.desktop DESTINATION ${APPS_INSTALL_DIR} )
+install( FILES tdeio_isorc DESTINATION ${CONFIG_INSTALL_DIR} )
+install( FILES tdeio_iso.desktop DESTINATION ${APPS_INSTALL_DIR} )
 
 
-##### kio_iso ###################################
+##### tdeio_iso ###################################
 
-set( target kio_iso )
+set( target tdeio_iso )
 
 set( ${target}_SRCS
   kisodirectory.cpp kisofile.cpp qfilehack.cpp
diff --git a/tdeioslave/iso/Makefile.am b/tdeioslave/iso/Makefile.am
index bc1c7b3ea..e7eec33f6 100644
--- a/tdeioslave/iso/Makefile.am
+++ b/tdeioslave/iso/Makefile.am
@@ -1,4 +1,4 @@
-kde_module_LTLIBRARIES = kio_iso.la
+kde_module_LTLIBRARIES = tdeio_iso.la
 
 
 INCLUDES = $(all_includes)
@@ -6,18 +6,18 @@ INCLUDES = $(all_includes)
 
 #LDFLAGS =      
 
-kio_iso_la_METASOURCES=AUTO
+tdeio_iso_la_METASOURCES=AUTO
 
-kio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
-kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
+tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
+tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
 
-kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 
 SUBDIRS = libisofs
 
 noinst_HEADERS = iso.h kiso.h qfilehack.h kisofile.h kisodirectory.h
-EXTRA_DIST = iso.protocol isoservice.desktop kio_iso.desktop
+EXTRA_DIST = iso.protocol isoservice.desktop tdeio_iso.desktop
 
 install-data-local:
 	$(mkinstalldirs)  $(DESTDIR)$(kde_servicesdir)/
diff --git a/tdeioslave/iso/iso.cpp b/tdeioslave/iso/iso.cpp
index 59f5f781e..8696b0c67 100644
--- a/tdeioslave/iso/iso.cpp
+++ b/tdeioslave/iso/iso.cpp
@@ -60,17 +60,17 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 
 int kdemain( int argc, char **argv )
 {
-  TDEInstance instance( "kio_iso" );
+  TDEInstance instance( "tdeio_iso" );
 
   kdDebug()   << "Starting " << getpid() << endl;
 
   if (argc != 4)
   {
-     fprintf(stderr, "Usage: kio_iso protocol domain-socket1 domain-socket2\n");
+     fprintf(stderr, "Usage: tdeio_iso protocol domain-socket1 domain-socket2\n");
      exit(-1);
   }
 
-  kio_isoProtocol slave(argv[2], argv[3]);
+  tdeio_isoProtocol slave(argv[2], argv[3]);
   slave.dispatchLoop();
 
   kdDebug()   << "Done" << endl;
@@ -78,20 +78,20 @@ int kdemain( int argc, char **argv )
 }
 
 
-kio_isoProtocol::kio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app )
+tdeio_isoProtocol::tdeio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app )
 {
-  kdDebug() << "kio_isoProtocol::kio_isoProtocol" << endl;
+  kdDebug() << "tdeio_isoProtocol::tdeio_isoProtocol" << endl;
   m_isoFile = 0L;
 }
 
-kio_isoProtocol::~kio_isoProtocol()
+tdeio_isoProtocol::~tdeio_isoProtocol()
 {
     delete m_isoFile;
 }
 
-bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec )
+bool tdeio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec )
 {
-    kdDebug()   << "kio_isoProtocol::checkNewFile " << fullPath << " startsec: " <<
+    kdDebug()   << "tdeio_isoProtocol::checkNewFile " << fullPath << " startsec: " <<
         startsec << endl;
 
     // Are we already looking at that file ?
@@ -105,7 +105,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
             if ( m_mtime == statbuf.st_mtime )
             {
                 path = fullPath.mid( m_isoFile->fileName().length() );
-                kdDebug()   << "kio_isoProtocol::checkNewFile returning " << path << endl;
+                kdDebug()   << "tdeio_isoProtocol::checkNewFile returning " << path << endl;
                 return true;
             }
         }
@@ -157,7 +157,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
     }
     if ( isoFile.isEmpty() )
     {
-        kdDebug()   << "kio_isoProtocol::checkNewFile: not found" << endl;
+        kdDebug()   << "tdeio_isoProtocol::checkNewFile: not found" << endl;
         return false;
     }
 
@@ -177,7 +177,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
 }
 
 
-void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry )
+void tdeio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry )
 {
     UDSAtom atom;
 
@@ -230,9 +230,9 @@ void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry &
     entry.append( atom );
 }
 
-void kio_isoProtocol::listDir( const KURL & url )
+void tdeio_isoProtocol::listDir( const KURL & url )
 {
-    kdDebug() << "kio_isoProtocol::listDir " << url.url() << endl;
+    kdDebug() << "tdeio_isoProtocol::listDir " << url.url() << endl;
 
     TQString path;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
@@ -263,7 +263,7 @@ void kio_isoProtocol::listDir( const KURL & url )
         kdDebug() << "url.path()==" << url.path() << endl;
         if (url.hasRef()) redir.setRef(url.htmlRef());
         redir.setPath( url.path() + TQString::fromLatin1("/") );
-        kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl;
+        kdDebug() << "tdeio_isoProtocol::listDir: redirection " << redir.url() << endl;
         redirection( redir );
         finished();
         return;
@@ -310,21 +310,21 @@ void kio_isoProtocol::listDir( const KURL & url )
 
     finished();
 
-    kdDebug()  << "kio_isoProtocol::listDir done" << endl;
+    kdDebug()  << "tdeio_isoProtocol::listDir done" << endl;
 }
 
-void kio_isoProtocol::stat( const KURL & url )
+void tdeio_isoProtocol::stat( const KURL & url )
 {
     TQString path;
     UDSEntry entry;
 
-    kdDebug() << "kio_isoProtocol::stat " << url.url() << endl;
+    kdDebug() << "tdeio_isoProtocol::stat " << url.url() << endl;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
     {
         // We may be looking at a real directory - this happens
         // when pressing up after being in the root of an archive
         TQCString _path( TQFile::encodeName(url.path()));
-        kdDebug()  << "kio_isoProtocol::stat (stat) on " << _path << endl;
+        kdDebug()  << "tdeio_isoProtocol::stat (stat) on " << _path << endl;
         struct stat buff;
         if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
             kdDebug() << "isdir=" << S_ISDIR( buff.st_mode ) << "  errno=" << strerror(errno) << endl;
@@ -336,7 +336,7 @@ void kio_isoProtocol::stat( const KURL & url )
         atom.m_uds = TDEIO::UDS_NAME;
         atom.m_str = url.fileName();
         entry.append( atom );
-        kdDebug()  << "kio_isoProtocol::stat returning name=" << url.fileName() << endl;
+        kdDebug()  << "tdeio_isoProtocol::stat returning name=" << url.fileName() << endl;
 
         atom.m_uds = TDEIO::UDS_FILE_TYPE;
         atom.m_long = buff.st_mode & S_IFMT;
@@ -371,7 +371,7 @@ void kio_isoProtocol::stat( const KURL & url )
     finished();
 }
 
-void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path )
+void tdeio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path )
 {
     unsigned long long size, pos = 0;
     bool mime=false,zlib=false;
@@ -485,9 +485,9 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
 
 }
 
-void kio_isoProtocol::get( const KURL & url )
+void tdeio_isoProtocol::get( const KURL & url )
 {
-    kdDebug()  << "kio_isoProtocol::get" << url.url() << endl;
+    kdDebug()  << "tdeio_isoProtocol::get" << url.url() << endl;
 
     TQString path;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
diff --git a/tdeioslave/iso/iso.h b/tdeioslave/iso/iso.h
index f0393d7cb..b284e2295 100644
--- a/tdeioslave/iso/iso.h
+++ b/tdeioslave/iso/iso.h
@@ -28,11 +28,11 @@
 
 class KIso;
 
-class kio_isoProtocol : public TDEIO::SlaveBase
+class tdeio_isoProtocol : public TDEIO::SlaveBase
 {
 public:
-    kio_isoProtocol( const TQCString &pool, const TQCString &app );
-    virtual ~kio_isoProtocol();
+    tdeio_isoProtocol( const TQCString &pool, const TQCString &app );
+    virtual ~tdeio_isoProtocol();
 
     virtual void listDir( const KURL & url );
     virtual void stat( const KURL & url );
diff --git a/tdeioslave/iso/iso.protocol b/tdeioslave/iso/iso.protocol
index cd2d1d28b..150b03634 100644
--- a/tdeioslave/iso/iso.protocol
+++ b/tdeioslave/iso/iso.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_iso
+exec=tdeio_iso
 protocol=iso
 listing=Name,Type,Size,Date,AccessDate,CreationDate,Access,Owner,Group,Link
 input=filesystem
diff --git a/tdeioslave/iso/kio_iso.desktop b/tdeioslave/iso/kio_iso.desktop
deleted file mode 100644
index 8578f44b4..000000000
--- a/tdeioslave/iso/kio_iso.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=konqueror iso:%f
-Icon=cd
-Terminal=false
-MimeType=application/x-iso;
-InitialPreference=10
-NoDisplay=true
-Name=ISO9660 Image Viewer
-Name[hu]=ISO9660 Nézet
-Name[fr]=Lecteur ISO9660
-X-DCOP-ServiceType=None
-Categories=Qt;TDE;System;
\ No newline at end of file
diff --git a/tdeioslave/iso/kio_isorc b/tdeioslave/iso/kio_isorc
deleted file mode 100644
index 3a874172e..000000000
--- a/tdeioslave/iso/kio_isorc
+++ /dev/null
@@ -1,2 +0,0 @@
-showhidden=false
-showrr=true
diff --git a/tdeioslave/iso/kiso.cpp b/tdeioslave/iso/kiso.cpp
index 7556a3350..513bd7c04 100644
--- a/tdeioslave/iso/kiso.cpp
+++ b/tdeioslave/iso/kiso.cpp
@@ -326,7 +326,7 @@ void KIso::readParams()
 {
     TDEConfig *config;
 
-    config = new TDEConfig("kio_isorc");
+    config = new TDEConfig("tdeio_isorc");
     
     showhidden=config->readBoolEntry("showhidden",false);
     showrr=config->readBoolEntry("showrr",true);
diff --git a/tdeioslave/iso/tdeio_iso.desktop b/tdeioslave/iso/tdeio_iso.desktop
new file mode 100644
index 000000000..8578f44b4
--- /dev/null
+++ b/tdeioslave/iso/tdeio_iso.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Exec=konqueror iso:%f
+Icon=cd
+Terminal=false
+MimeType=application/x-iso;
+InitialPreference=10
+NoDisplay=true
+Name=ISO9660 Image Viewer
+Name[hu]=ISO9660 Nézet
+Name[fr]=Lecteur ISO9660
+X-DCOP-ServiceType=None
+Categories=Qt;TDE;System;
\ No newline at end of file
diff --git a/tdeioslave/iso/tdeio_isorc b/tdeioslave/iso/tdeio_isorc
new file mode 100644
index 000000000..3a874172e
--- /dev/null
+++ b/tdeioslave/iso/tdeio_isorc
@@ -0,0 +1,2 @@
+showhidden=false
+showrr=true
-- 
cgit v1.2.1