summaryrefslogtreecommitdiffstats
path: root/krusader
diff options
context:
space:
mode:
Diffstat (limited to 'krusader')
-rw-r--r--krusader/BookMan/krbookmarkhandler.cpp2
-rw-r--r--krusader/Makefile.am4
-rw-r--r--krusader/Splitter/combiner.cpp4
-rw-r--r--krusader/Splitter/splitter.cpp6
-rw-r--r--krusader/VFS/krquery.h2
-rw-r--r--krusader/VFS/normal_vfs.cpp2
-rw-r--r--krusader/VFS/preservingcopyjob.cpp2
-rw-r--r--krusader/main.cpp2
8 files changed, 12 insertions, 12 deletions
diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp
index 573cb47..f9cafbe 100644
--- a/krusader/BookMan/krbookmarkhandler.cpp
+++ b/krusader/BookMan/krbookmarkhandler.cpp
@@ -143,7 +143,7 @@ void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &par
// <title>My own bookmarks</title>
// <bookmark href="http://www.koffice.org"><title>KOffice Web Site</title></bookmark>
// <separator/>
-// <bookmark href="http://www.tdevelop.org"><title>KDevelop Web Site</title></bookmark>
+// <bookmark href="http://www.kdevelop.org"><title>KDevelop Web Site</title></bookmark>
// </folder>
// </folder>
// </xbel>
diff --git a/krusader/Makefile.am b/krusader/Makefile.am
index cd37db8..a0ebd48 100644
--- a/krusader/Makefile.am
+++ b/krusader/Makefile.am
@@ -95,7 +95,7 @@ krusader_LDADD = \
GUI/libGUI.a \
$(LIB_KONQ) \
$(LIB_KJSEMBED) \
- $(LIB_KPARTS) \
+ $(LIB_TDEPARTS) \
$(LIB_TDEFILE) \
$(LIB_TDEHTML) \
$(LIB_TDEUI) \
@@ -108,7 +108,7 @@ krusader_LDADD = \
# the library search path.
-krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdewalletclient
+krusader_LDFLAGS = $(all_libraries) $(kde_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdewalletclient
###########################################################
diff --git a/krusader/Splitter/combiner.cpp b/krusader/Splitter/combiner.cpp
index 6f738b3..2295483 100644
--- a/krusader/Splitter/combiner.cpp
+++ b/krusader/Splitter/combiner.cpp
@@ -243,7 +243,7 @@ void Combiner::combineDataReceived(TDEIO::Job *, const TQByteArray &byteArray)
void Combiner::combineReceiveFinished(TDEIO::Job *job)
{
- combineReadJob = 0; /* KIO automatically deletes the object after Finished signal */
+ combineReadJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( job->error() )
{
@@ -288,7 +288,7 @@ void Combiner::combineDataSend(TDEIO::Job *, TQByteArray &byteArray)
void Combiner::combineSendFinished(TDEIO::Job *job)
{
- combineWriteJob = 0; /* KIO automatically deletes the object after Finished signal */
+ combineWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( job->error() ) /* any error occurred? */
{
diff --git a/krusader/Splitter/splitter.cpp b/krusader/Splitter/splitter.cpp
index 03acc8c..00ef801 100644
--- a/krusader/Splitter/splitter.cpp
+++ b/krusader/Splitter/splitter.cpp
@@ -114,7 +114,7 @@ void Splitter::splitDataReceived(TDEIO::Job *, const TQByteArray &byteArray)
void Splitter::splitReceiveFinished(TDEIO::Job *job)
{
- splitReadJob = 0; /* KIO automatically deletes the object after Finished signal */
+ splitReadJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( splitWriteJob ) /* write out the end of the file */
splitWriteJob->resume();
@@ -193,7 +193,7 @@ void Splitter::splitDataSend(TDEIO::Job *, TQByteArray &byteArray)
void Splitter::splitSendFinished(TDEIO::Job *job)
{
- splitWriteJob = 0; /* KIO automatically deletes the object after Finished signal */
+ splitWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( job->error() ) /* any error occurred? */
{
@@ -237,7 +237,7 @@ void Splitter::splitFileSend(TDEIO::Job *, TQByteArray &byteArray)
void Splitter::splitFileFinished(TDEIO::Job *job)
{
- splitWriteJob = 0; /* KIO automatically deletes the object after Finished signal */
+ splitWriteJob = 0; /* TDEIO automatically deletes the object after Finished signal */
if( job->error() ) /* any error occurred? */
{
diff --git a/krusader/VFS/krquery.h b/krusader/VFS/krquery.h
index e422acc..5193107 100644
--- a/krusader/VFS/krquery.h
+++ b/krusader/VFS/krquery.h
@@ -57,7 +57,7 @@ public:
// matching a file with the query
bool match( vfile *file ) const;// checks if the given vfile object matches the conditions
- // matching a KIO file with the query
+ // matching a TDEIO file with the query
bool match( KFileItem *file ) const;// checks if the given vfile object matches the conditions
// matching a name with the query
bool match( const TQString &name ) const;// matching the filename only
diff --git a/krusader/VFS/normal_vfs.cpp b/krusader/VFS/normal_vfs.cpp
index d01d8d6..d9c1930 100644
--- a/krusader/VFS/normal_vfs.cpp
+++ b/krusader/VFS/normal_vfs.cpp
@@ -71,7 +71,7 @@ normal_vfs::normal_vfs(TQObject* panel):vfs(panel), watcher(0) {
bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){
TQString path = origin.path(-1);
- // set the writable attribute to true, if that's not the case - the KIO job
+ // set the writable attribute to true, if that's not the case - the TDEIO job
// will give the warnings and errors
isWritable = true;
diff --git a/krusader/VFS/preservingcopyjob.cpp b/krusader/VFS/preservingcopyjob.cpp
index 1ca4397..77a6bb0 100644
--- a/krusader/VFS/preservingcopyjob.cpp
+++ b/krusader/VFS/preservingcopyjob.cpp
@@ -155,7 +155,7 @@ void PreservingCopyJob::slotAboutToCreate( TDEIO::Job */*job*/, const TQValueLis
void PreservingCopyJob::slotResult( Job *job ) {
if( !job->error() ) {
- if( job->inherits( "TDEIO::StatJob" ) ) { /* Unfortunately KIO forgets to set times when the file is in the */
+ if( job->inherits( "TDEIO::StatJob" ) ) { /* Unfortunately TDEIO forgets to set times when the file is in the */
KURL url = ((TDEIO::SimpleJob *)job)->url(); /* base directory. That's why we capture every StatJob and set the */
/* time manually. */
TDEIO::UDSEntry entry = static_cast<TDEIO::StatJob*>(job)->statResult();
diff --git a/krusader/main.cpp b/krusader/main.cpp
index 00577bc..cecfe89 100644
--- a/krusader/main.cpp
+++ b/krusader/main.cpp
@@ -135,7 +135,7 @@ int main(int argc, char *argv[]) {
aboutData.addCredit("Mark Eatough", "Handbook Proof-Reader", "markeatough@yahoo.com", 0);
aboutData.addCredit("Jan Halasa", "The old Bookmark Module", "xhalasa@fi.muni.cz", 0);
aboutData.addCredit("Hans Loeffler", "Dir history button", 0, 0);
- aboutData.addCredit("Szombathelyi György", "ISO KIO slave", 0, 0);
+ aboutData.addCredit("Szombathelyi György", "ISO TDEIO slave", 0, 0);
aboutData.addCredit("Jan Willem van de Meent (Adios)", "Icons for Krusader", "janwillem@lorentz.leidenuniv.nl", 0);
aboutData.addCredit("Mikolaj Machowski", "Usability and QA", "<mikmach@wp.pl>", 0);
aboutData.addCredit("Cristi Dumitrescu","QA, bug-hunting, patches and general help","cristid@chip.ro",0);