summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-30 13:40:13 -0600
committerTimothy Pearson <[email protected]>2013-01-30 13:40:13 -0600
commit1c0129ac2313c83b750193f2d1f771d9d2d14cc3 (patch)
tree244541cf1283b869a1fec44b4a248e7937e495a6
parent63b3db1998b0e4f48ea09a2f2e1daaaf061d8049 (diff)
downloadkchmviewer-1c0129ac2313c83b750193f2d1f771d9d2d14cc3.tar.gz
kchmviewer-1c0129ac2313c83b750193f2d1f771d9d2d14cc3.zip
Fix a few remaining references to kio_
-rw-r--r--FAQ2
-rw-r--r--lib/kio-msits/Makefile.am8
-rwxr-xr-xlib/kio-msits/msits.cpp26
-rwxr-xr-xlib/kio-msits/msits.protocol2
4 files changed, 19 insertions, 19 deletions
diff --git a/FAQ b/FAQ
index e3c43dc..6cca480 100644
--- a/FAQ
+++ b/FAQ
@@ -4,7 +4,7 @@ Q: The book shows without any problem using QTextWidget browser, but when I use
An error occurred while loading ms-its:/home/user/Symphony�FrameWork.chm::/index.html
The�file�or�folder�ms-its:/home/user/Symphony�FrameWork.chm::/index.html�does�not�exist.
-A: You have kio_chm installed, and because it installs itself as KIO slave for ms-its, sometime KDE uses it instead of kio_msits.
+A: You have tdeio_chm installed, and because it installs itself as KIO slave for ms-its, sometime KDE uses it instead of tdeio_msits.
To disable it, find the file chm.protocol in your KDE directory, and remove it. Then run tdeinit to reread the configuration.
diff --git a/lib/kio-msits/Makefile.am b/lib/kio-msits/Makefile.am
index f8970bb..9bd5cff 100644
--- a/lib/kio-msits/Makefile.am
+++ b/lib/kio-msits/Makefile.am
@@ -1,11 +1,11 @@
METASOURCES = AUTO
INCLUDES = $(QT_INCLUDES) $(CHM_INCLUDES) $(KDE_INCLUDES) $(LIBCHMFILE_INCLUDES)
-kde_module_LTLIBRARIES = kio_msits.la
+kde_module_LTLIBRARIES = tdeio_msits.la
-kio_msits_la_SOURCES = msits.cpp
-kio_msits_la_LIBADD = -ltdeio $(CHM_LIBS)
-kio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_TDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS)
+tdeio_msits_la_SOURCES = msits.cpp
+tdeio_msits_la_LIBADD = -ltdeio $(CHM_LIBS)
+tdeio_msits_la_LDFLAGS = -module -avoid-version $(KDE_LDFLAGS) $(LIB_QT) $(LIB_KIO) $(LIB_TDECORE) $(KDE_PLUGIN) $(QT_LDFLAGS)
protocol_DATA = msits.protocol
protocoldir = $(kde_servicesdir)
diff --git a/lib/kio-msits/msits.cpp b/lib/kio-msits/msits.cpp
index aa650d2..efe4f8a 100755
--- a/lib/kio-msits/msits.cpp
+++ b/lib/kio-msits/msits.cpp
@@ -42,26 +42,26 @@ extern "C"
{
int kdemain( int argc, char **argv )
{
- kdDebug() << "*** kio_msits Init" << endl;
+ kdDebug() << "*** tdeio_msits Init" << endl;
- TDEInstance instance( "kio_msits" );
+ TDEInstance instance( "tdeio_msits" );
if ( argc != 4 )
{
- kdDebug() << "Usage: kio_msits protocol domain-socket1 domain-socket2" << endl;
+ kdDebug() << "Usage: tdeio_msits protocol domain-socket1 domain-socket2" << endl;
exit (-1);
}
ProtocolMSITS slave ( argv[2], argv[3] );
slave.dispatchLoop();
- kdDebug() << "*** kio_msits Done" << endl;
+ kdDebug() << "*** tdeio_msits Done" << endl;
return 0;
}
}
ProtocolMSITS::ProtocolMSITS (const TQCString &pool_socket, const TQCString &app_socket)
- : SlaveBase ("kio_msits", pool_socket, app_socket)
+ : SlaveBase ("tdeio_msits", pool_socket, app_socket)
{
m_chmFile = 0;
}
@@ -88,12 +88,12 @@ void ProtocolMSITS::get( const KURL& url )
chmUnitInfo ui;
TQByteArray buf;
- kdDebug() << "kio_msits::get() " << url.path() << endl;
+ kdDebug() << "tdeio_msits::get() " << url.path() << endl;
if ( !parseLoadAndLookup ( url, fileName ) )
return; // error() has been called by parseLoadAndLookup
- kdDebug() << "kio_msits::get: parseLoadAndLookup returned " << fileName << endl;
+ kdDebug() << "tdeio_msits::get: parseLoadAndLookup returned " << fileName << endl;
if ( LCHMUrlFactory::handleFileType( url.path(), htmdata ) )
{
@@ -110,7 +110,7 @@ void ProtocolMSITS::get( const KURL& url )
if ( !ResolveObject ( fileName, &ui) )
{
- kdDebug() << "kio_msits::get: could not resolve filename " << fileName << endl;
+ kdDebug() << "tdeio_msits::get: could not resolve filename " << fileName << endl;
error( TDEIO::ERR_DOES_NOT_EXIST, url.prettyURL() );
return;
}
@@ -119,7 +119,7 @@ void ProtocolMSITS::get( const KURL& url )
if ( RetrieveObject (&ui, (unsigned char*) buf.data(), 0, ui.length) == 0 )
{
- kdDebug() << "kio_msits::get: could not retrieve filename " << fileName << endl;
+ kdDebug() << "tdeio_msits::get: could not retrieve filename " << fileName << endl;
error( TDEIO::ERR_NO_CONTENT, url.prettyURL() );
return;
}
@@ -235,7 +235,7 @@ void ProtocolMSITS::stat (const KURL & url)
TQString fileName;
chmUnitInfo ui;
- kdDebug() << "kio_msits::stat (const KURL& url) " << url.path() << endl;
+ kdDebug() << "tdeio_msits::stat (const KURL& url) " << url.path() << endl;
if ( !parseLoadAndLookup ( url, fileName ) )
return; // error() has been called by parseLoadAndLookup
@@ -246,7 +246,7 @@ void ProtocolMSITS::stat (const KURL & url)
return;
}
- kdDebug() << "kio_msits::stat: adding an entry for " << fileName << endl;
+ kdDebug() << "tdeio_msits::stat: adding an entry for " << fileName << endl;
UDSEntry entry;
if ( isDirectory ( fileName ) )
@@ -272,7 +272,7 @@ void ProtocolMSITS::listDir (const KURL & url)
{
TQString filepath;
- kdDebug() << "kio_msits::listDir (const KURL& url) " << url.path() << endl;
+ kdDebug() << "tdeio_msits::listDir (const KURL& url) " << url.path() << endl;
if ( !parseLoadAndLookup ( url, filepath ) )
return; // error() has been called by parseLoadAndLookup
@@ -285,7 +285,7 @@ void ProtocolMSITS::listDir (const KURL & url)
return;
}
- kdDebug() << "kio_msits::listDir: enumerating directory " << filepath << endl;
+ kdDebug() << "tdeio_msits::listDir: enumerating directory " << filepath << endl;
TQValueVector<TQString> listing;
diff --git a/lib/kio-msits/msits.protocol b/lib/kio-msits/msits.protocol
index 2f3b46e..bc1d65f 100755
--- a/lib/kio-msits/msits.protocol
+++ b/lib/kio-msits/msits.protocol
@@ -1,5 +1,5 @@
[Protocol]
-exec=kio_msits
+exec=tdeio_msits
protocol=ms-its
input=none
output=filesystem