diff options
Diffstat (limited to 'kioslave')
38 files changed, 182 insertions, 182 deletions
diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp index 0181c066a..e527c2db4 100644 --- a/kioslave/cgi/cgi.cpp +++ b/kioslave/cgi/cgi.cpp @@ -156,7 +156,7 @@ void CgiProtocol::get( const KURL& url ) } else { kdDebug(7124) << "Cmd: " << cmd << endl; - fd = popen( TQFile::encodeName(KProcess::quote( cmd )).data(), "r" ); + fd = popen( TQFile::encodeName(TDEProcess::quote( cmd )).data(), "r" ); if ( !fd ) { kdDebug(7124) << "Error running '" << cmd << "'" << endl; diff --git a/kioslave/cgi/cgi.h b/kioslave/cgi/cgi.h index fbfba7a91..908b6bc99 100644 --- a/kioslave/cgi/cgi.h +++ b/kioslave/cgi/cgi.h @@ -22,7 +22,7 @@ #include <kio/slavebase.h> -class KProcess; +class TDEProcess; /*! This class implements an ioslave for viewing CGI script output without the diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp index 9c8a8df5e..a5c0181c5 100644 --- a/kioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp @@ -35,7 +35,7 @@ extern "C" { KDE_EXPORT KCModule *create_cgi( TQWidget *parent, const char * ) { - KGlobal::locale()->insertCatalogue("kcmcgi"); + TDEGlobal::locale()->insertCatalogue("kcmcgi"); return new KCMCgi( parent, "kcmcgi" ); } } diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp index 356d35c9d..efa4d7cb8 100644 --- a/kioslave/finger/kio_finger.cpp +++ b/kioslave/finger/kio_finger.cpp @@ -121,17 +121,17 @@ void FingerProtocol::get(const KURL& url ) //kdDebug() << "Refresh rate: " << refreshRate << endl; - myKProcess = new KProcess(); - *myKProcess << *myPerlPath << *myFingerPerlScript + myTDEProcess = new TDEProcess(); + *myTDEProcess << *myPerlPath << *myFingerPerlScript << *myFingerPath << *myFingerCSSFile << refreshRate << myURL->host() << myURL->user() ; - connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); - //connect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - // this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); + connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + //connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + // this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); - myKProcess->start(KProcess::Block, KProcess::All); + myTDEProcess->start(TDEProcess::Block, TDEProcess::All); data(TQCString(TQString(*myStdStream).local8Bit())); @@ -140,14 +140,14 @@ void FingerProtocol::get(const KURL& url ) //clean up - delete myKProcess; + delete myTDEProcess; } /* ---------------------------------------------------------------------------------- */ -void FingerProtocol::slotGetStdOutput(KProcess* /* p */, char *s, int len) +void FingerProtocol::slotGetStdOutput(TDEProcess* /* p */, char *s, int len) { //kdDebug() << "void FingerProtocol::slotGetStdoutOutput()" << endl; *myStdStream += TQString::fromLocal8Bit(s, len); @@ -172,7 +172,7 @@ void FingerProtocol::getProgramPath() //kdDebug() << "kfingerMainWindow::getProgramPath()" << endl; // Not to sure wether I'm using the right error number here. - schlpbch - - myPerlPath = new TQString(KGlobal::dirs()->findExe("perl")); + myPerlPath = new TQString(TDEGlobal::dirs()->findExe("perl")); if (myPerlPath->isEmpty()) { //kdDebug() << "Perl command not found" << endl; @@ -185,7 +185,7 @@ void FingerProtocol::getProgramPath() //kdDebug() << "Perl command found:" << *myPerlPath << endl; } - myFingerPath = new TQString(KGlobal::dirs()->findExe("finger")); + myFingerPath = new TQString(TDEGlobal::dirs()->findExe("finger")); if ((myFingerPath->isEmpty())) { //kdDebug() << "Finger command not found" << endl; diff --git a/kioslave/finger/kio_finger.h b/kioslave/finger/kio_finger.h index 92366f45d..97c68f8c3 100644 --- a/kioslave/finger/kio_finger.h +++ b/kioslave/finger/kio_finger.h @@ -41,7 +41,7 @@ public: virtual void get(const KURL& url); private slots: - void slotGetStdOutput(KProcess*, char*, int); + void slotGetStdOutput(TDEProcess*, char*, int); private: KURL *myURL; @@ -54,7 +54,7 @@ private: QString *myStdStream; - KProcess *myKProcess; + TDEProcess *myTDEProcess; void getProgramPath(); void parseCommandLine(const KURL& url); diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp index ccd815048..ac8556291 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp @@ -19,9 +19,9 @@ done by David Faure <[email protected]>. Structure is a bit complicated, since I made the mistake to use - KProcess... now there is a lightweight homebrew async IO system + TDEProcess... now there is a lightweight homebrew async IO system inside, but if signals/slots become available for ioslaves, switching - back to KProcess should be easy. + back to TDEProcess should be easy. */ #include "config.h" diff --git a/kioslave/home/kdedmodule/homedirnotifymodule.cpp b/kioslave/home/kdedmodule/homedirnotifymodule.cpp index 03f664117..4eb71c332 100644 --- a/kioslave/home/kdedmodule/homedirnotifymodule.cpp +++ b/kioslave/home/kdedmodule/homedirnotifymodule.cpp @@ -30,7 +30,7 @@ HomeDirNotifyModule::HomeDirNotifyModule(const TQCString &obj) extern "C" { KDE_EXPORT KDEDModule *create_homedirnotify(const TQCString &obj) { - KGlobal::locale()->insertCatalogue("kio_home"); + TDEGlobal::locale()->insertCatalogue("kio_home"); return new HomeDirNotifyModule(obj); } } diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc index f220da589..4af1f4c63 100644 --- a/kioslave/info/info.cc +++ b/kioslave/info/info.cc @@ -25,7 +25,7 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app ) { kdDebug( 7108 ) << "InfoProtocol::InfoProtocol" << endl; - m_perl = KGlobal::dirs()->findExe( "perl" ); + m_perl = TDEGlobal::dirs()->findExe( "perl" ); m_infoScript = locate( "data", "kio_info/kde-info2html" ); m_infoConf = locate("data", "kio_info/kde-info2html.conf"); @@ -92,21 +92,21 @@ void InfoProtocol::get( const KURL& url ) // extract the path and node from url decodeURL( url ); - TQString path = KGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true); + TQString path = TDEGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true); int revindex = path.findRev('/'); path = path.left(revindex); - TQString cmd = KProcess::quote(m_perl); + TQString cmd = TDEProcess::quote(m_perl); cmd += " "; - cmd += KProcess::quote(m_infoScript); + cmd += TDEProcess::quote(m_infoScript); cmd += " "; - cmd += KProcess::quote(m_infoConf); + cmd += TDEProcess::quote(m_infoConf); cmd += " "; - cmd += KProcess::quote(path); + cmd += TDEProcess::quote(path); cmd += " "; - cmd += KProcess::quote(m_page); + cmd += TDEProcess::quote(m_page); cmd += " "; - cmd += KProcess::quote(m_node); + cmd += TDEProcess::quote(m_node); kdDebug( 7108 ) << "cmd: " << cmd << endl; diff --git a/kioslave/info/info.h b/kioslave/info/info.h index 20c142cf3..068546803 100644 --- a/kioslave/info/info.h +++ b/kioslave/info/info.h @@ -5,7 +5,7 @@ #include <kio/slavebase.h> -class KProcess; +class TDEProcess; class InfoProtocol : public KIO::SlaveBase { diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp index d13b59f71..47b56119c 100644 --- a/kioslave/mac/kio_mac.cpp +++ b/kioslave/mac/kio_mac.cpp @@ -60,8 +60,8 @@ MacProtocol::~MacProtocol() { delete logStream; logStream = 0; */ - delete myKProcess; - myKProcess = 0L; + delete myTDEProcess; + myTDEProcess = 0L; } //get() called when a file is to be read @@ -100,24 +100,24 @@ void MacProtocol::get(const KURL& url) { } //now we can read the file - myKProcess = new KProcess(); + myTDEProcess = new TDEProcess(); - *myKProcess << "hpcopy" << mode << path << "-"; + *myTDEProcess << "hpcopy" << mode << path << "-"; //data is now sent directly from the slot - connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotSetDataStdOutput(KProcess *, char *, int))); + connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int))); - myKProcess->start(KProcess::Block, KProcess::All); + myTDEProcess->start(TDEProcess::Block, TDEProcess::All); - if (!myKProcess->normalExit() || !(myKProcess->exitStatus() == 0)) { + if (!myTDEProcess->normalExit() || !(myTDEProcess->exitStatus() == 0)) { error(ERR_SLAVE_DEFINED, i18n("There was an error with hpcopy - please ensure it is installed")); return; } //clean up - delete myKProcess; myKProcess = 0; + delete myTDEProcess; myTDEProcess = 0; //finish data(TQByteArray()); finished(); @@ -130,24 +130,24 @@ void MacProtocol::listDir(const KURL& url) { if (filename.isNull()) { error(ERR_CANNOT_LAUNCH_PROCESS, i18n("No filename was found")); } else { - myKProcess = new KProcess(); - *myKProcess << "hpls" << "-la" << filename; + myTDEProcess = new TDEProcess(); + *myTDEProcess << "hpls" << "-la" << filename; standardOutputStream = TQString::null; - connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); + connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); - myKProcess->start(KProcess::Block, KProcess::All); + myTDEProcess->start(TDEProcess::Block, TDEProcess::All); - if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) { + if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) { error(ERR_SLAVE_DEFINED, i18n("There was an error with hpls - please ensure it is installed")); } //clean up - delete myKProcess; myKProcess = 0; - disconnect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); + delete myTDEProcess; myTDEProcess = 0; + disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); UDSEntry entry; if (!standardOutputStream.isEmpty()) { @@ -186,25 +186,25 @@ TQValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) { if (filename.isNull()) { error(ERR_SLAVE_DEFINED, i18n("No filename was found in the URL")); } else if (! filename.isEmpty()) { - myKProcess = new KShellProcess(); + myTDEProcess = new KShellProcess(); - *myKProcess << "hpls" << "-ld" << filename; + *myTDEProcess << "hpls" << "-ld" << filename; standardOutputStream = TQString::null; - connect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); + connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); - myKProcess->start(KProcess::Block, KProcess::All); + myTDEProcess->start(TDEProcess::Block, TDEProcess::All); - if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) { + if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) { error(ERR_SLAVE_DEFINED, i18n("hpls did not exit normally - please ensure you have installed the hfsplus tools")); } //clean up - delete myKProcess; myKProcess = 0; - disconnect(myKProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); + delete myTDEProcess; myTDEProcess = 0; + disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); if (standardOutputStream.isEmpty()) { filename.replace("\\ ", " "); //get rid of escapes @@ -254,13 +254,13 @@ TQString MacProtocol::prepareHP(const KURL& url) { delete config; config = 0; //first we run just hpmount and check the output to see if it's version 1.0.2 or 1.0.4 - myKProcess = new KProcess(); - *myKProcess << "hpmount"; + myTDEProcess = new TDEProcess(); + *myTDEProcess << "hpmount"; standardOutputStream = TQString::null; - connect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); + connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); - myKProcess->start(KProcess::Block, KProcess::All); + myTDEProcess->start(TDEProcess::Block, TDEProcess::All); bool version102 = true; @@ -268,21 +268,21 @@ TQString MacProtocol::prepareHP(const KURL& url) { version102 = false; } - delete myKProcess; myKProcess = 0; - disconnect(myKProcess, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); + delete myTDEProcess; myTDEProcess = 0; + disconnect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); //now mount the drive - myKProcess = new KProcess(); + myTDEProcess = new TDEProcess(); if (version102) { - *myKProcess << "hpmount" << device; + *myTDEProcess << "hpmount" << device; } else { - *myKProcess << "hpmount" << "-r" << device; + *myTDEProcess << "hpmount" << "-r" << device; } - myKProcess->start(KProcess::Block, KProcess::All); + myTDEProcess->start(TDEProcess::Block, TDEProcess::All); - if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) { + if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) { //TODO this error interrupts the user when typing ?dev=foo on each letter of foo error(ERR_SLAVE_DEFINED, i18n("hpmount did not exit normally - please ensure that hfsplus utils are installed,\n" @@ -293,7 +293,7 @@ TQString MacProtocol::prepareHP(const KURL& url) { } //clean up - delete myKProcess; myKProcess = 0; + delete myTDEProcess; myTDEProcess = 0; //escape any funny characters //TODO are there any more characters to escape? @@ -310,19 +310,19 @@ TQString MacProtocol::prepareHP(const KURL& url) { dir = path.left(s); path = path.mid(s+1); - myKProcess = new KProcess(); - *myKProcess << "hpcd" << dir; + myTDEProcess = new TDEProcess(); + *myTDEProcess << "hpcd" << dir; - myKProcess->start(KProcess::Block, KProcess::All); + myTDEProcess->start(TDEProcess::Block, TDEProcess::All); - if ((!myKProcess->normalExit()) || (!myKProcess->exitStatus() == 0)) { + if ((!myTDEProcess->normalExit()) || (!myTDEProcess->exitStatus() == 0)) { error(ERR_SLAVE_DEFINED, i18n("hpcd did not exit normally - please ensure it is installed")); return NULL; } //clean up - delete myKProcess; myKProcess = 0; + delete myTDEProcess; myTDEProcess = 0; s = path.find('/'); } @@ -412,13 +412,13 @@ TQValueList<KIO::UDSAtom> MacProtocol::makeUDS(const TQString& _line) { //slotGetStdOutput() grabs output from the hp commands // and adds it to the buffer -void MacProtocol::slotGetStdOutput(KProcess*, char *s, int len) { +void MacProtocol::slotGetStdOutput(TDEProcess*, char *s, int len) { standardOutputStream += TQString::fromLocal8Bit(s, len); } //slotSetDataStdOutput() is used during hpcopy to give //standard output to KDE -void MacProtocol::slotSetDataStdOutput(KProcess*, char *s, int len) { +void MacProtocol::slotSetDataStdOutput(TDEProcess*, char *s, int len) { processedBytes += len; processedSize(processedBytes); TQByteArray array; diff --git a/kioslave/mac/kio_mac.h b/kioslave/mac/kio_mac.h index 7f74dfca7..1376efe7a 100644 --- a/kioslave/mac/kio_mac.h +++ b/kioslave/mac/kio_mac.h @@ -36,8 +36,8 @@ public: virtual void listDir(const KURL& url); virtual void stat(const KURL& url); protected slots: - void slotGetStdOutput(KProcess*, char*, int); - void slotSetDataStdOutput(KProcess*, char *s, int len); + void slotGetStdOutput(TDEProcess*, char*, int); + void slotSetDataStdOutput(TDEProcess*, char *s, int len); protected: TQString prepareHP(const KURL& _url); TQValueList<KIO::UDSAtom> makeUDS(const TQString& _line); @@ -47,7 +47,7 @@ protected: KIO::filesize_t processedBytes; TQString standardOutputStream; - KProcess* myKProcess; + TDEProcess* myTDEProcess; //for debugging //TQFile* logFile; diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index 67778aaca..cc7ac770b 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -116,7 +116,7 @@ MANProtocol::MANProtocol(const TQCString &pool_socket, const TQCString &app_sock { assert(!_self); _self = this; - const TQString common_dir = KGlobal::dirs()->findResourceDir( "html", "en/common/kde-common.css" ); + const TQString common_dir = TDEGlobal::dirs()->findResourceDir( "html", "en/common/kde-common.css" ); const TQString strPath=TQString( "file:%1/en/common" ).arg( common_dir ); m_htmlPath=strPath.local8Bit(); // ### TODO encode for HTML m_cssPath=strPath.local8Bit(); // ### TODO encode for CSS @@ -195,12 +195,12 @@ TQMap<TQString, TQString> MANProtocol::buildIndexMap(const TQString §ion) break; } if ( it_name == names.end() ) { - KProcess proc; + TDEProcess proc; proc << "whatis" << "-M" << (*it_dir) << "-w" << "*"; myStdStream = TQString::null; - connect( &proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int ) ), - TQT_SLOT( slotGetStdOutput( KProcess *, char *, int ) ) ); - proc.start( KProcess::Block, KProcess::Stdout ); + connect( &proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ), + TQT_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) ); + proc.start( TDEProcess::Block, TDEProcess::Stdout ); TQTextStream t( &myStdStream, IO_ReadOnly ); parseWhatIs( i, t, mark ); } @@ -223,7 +223,7 @@ TQStringList MANProtocol::manDirectories() { // Translated pages in "<mandir>/<lang>" if the directory // exists - TQStringList languages = KGlobal::locale()->languageList(); + TQStringList languages = TDEGlobal::locale()->languageList(); for (TQStringList::ConstIterator it_lang = languages.begin(); it_lang != languages.end(); @@ -512,12 +512,12 @@ void MANProtocol::get(const KURL& url ) finished(); } -void MANProtocol::slotGetStdOutput(KProcess* /* p */, char *s, int len) +void MANProtocol::slotGetStdOutput(TDEProcess* /* p */, char *s, int len) { myStdStream += TQString::fromLocal8Bit(s, len); } -void MANProtocol::slotGetStdOutputUtf8(KProcess* /* p */, char *s, int len) +void MANProtocol::slotGetStdOutputUtf8(TDEProcess* /* p */, char *s, int len) { myStdStream += TQString::fromUtf8(s, len); } @@ -537,15 +537,15 @@ char *MANProtocol::readManPage(const char *_filename) if (filename.contains("sman", false)) //file_mimetype == "text/html" || ) { myStdStream =TQString::null; - KProcess proc; + TDEProcess proc; /* Determine path to sgml2roff, if not already done. */ getProgramPath(); proc << mySgml2RoffPath << filename; - TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); - proc.start(KProcess::Block, KProcess::All); + TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + proc.start(TDEProcess::Block, TDEProcess::All); const TQCString cstr=myStdStream.latin1(); const int len = cstr.size()-1; @@ -570,14 +570,14 @@ char *MANProtocol::readManPage(const char *_filename) lastdir = filename.left(filename.findRev('/')); myStdStream = TQString::null; - KProcess proc; + TDEProcess proc; /* TODO: detect availability of 'man --recode' so that this can go * upstream */ proc << "man" << "--recode" << "UTF-8" << filename; - TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (KProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutputUtf8(KProcess *, char *, int))); - proc.start(KProcess::Block, KProcess::All); + TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)), + this, TQT_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int))); + proc.start(TDEProcess::Block, TDEProcess::All); const TQCString cstr=myStdStream.utf8(); const int len = cstr.size()-1; @@ -1517,12 +1517,12 @@ void MANProtocol::getProgramPath() if (!mySgml2RoffPath.isEmpty()) return; - mySgml2RoffPath = KGlobal::dirs()->findExe("sgml2roff"); + mySgml2RoffPath = TDEGlobal::dirs()->findExe("sgml2roff"); if (!mySgml2RoffPath.isEmpty()) return; /* sgml2roff isn't found in PATH. Check some possible locations where it may be found. */ - mySgml2RoffPath = KGlobal::dirs()->findExe("sgml2roff", TQString(SGML2ROFF_DIRS)); + mySgml2RoffPath = TDEGlobal::dirs()->findExe("sgml2roff", TQString(SGML2ROFF_DIRS)); if (!mySgml2RoffPath.isEmpty()) return; diff --git a/kioslave/man/kio_man.h b/kioslave/man/kio_man.h index 3a0db59e6..ee987ddd9 100644 --- a/kioslave/man/kio_man.h +++ b/kioslave/man/kio_man.h @@ -60,8 +60,8 @@ public: static MANProtocol *self(); private slots: - void slotGetStdOutput(KProcess*, char*, int); - void slotGetStdOutputUtf8(KProcess*, char*, int); + void slotGetStdOutput(TDEProcess*, char*, int); + void slotGetStdOutputUtf8(TDEProcess*, char*, int); private: void checkManPaths(); diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp index 6760b4e8f..29c48d990 100644 --- a/kioslave/media/kcmodule/main.cpp +++ b/kioslave/media/kcmodule/main.cpp @@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_media, MediaFactory( "kcmmedia" ) ) MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList& ) : KCModule(MediaFactory::instance(), parent, name ) { - KGlobal::locale()->insertCatalogue("kio_media"); + TDEGlobal::locale()->insertCatalogue("kio_media"); TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQTabWidget *tab = new TQTabWidget( this ); diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp index d10314701..0dfc4110e 100644 --- a/kioslave/media/libmediacommon/notifieraction.cpp +++ b/kioslave/media/libmediacommon/notifieraction.cpp @@ -57,7 +57,7 @@ TQPixmap NotifierAction::pixmap() const } else { - TQString path = KGlobal::iconLoader()->iconPath( m_iconName, -32 ); + TQString path = TDEGlobal::iconLoader()->iconPath( m_iconName, -32 ); return TQPixmap( path ); } } diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp index 0cdf6f26b..cc90e5ef7 100644 --- a/kioslave/media/libmediacommon/notifiersettings.cpp +++ b/kioslave/media/libmediacommon/notifiersettings.cpp @@ -361,7 +361,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQString &mimetype ) const { TQValueList<NotifierServiceAction*> services; - TQStringList dirs = KGlobal::dirs()->findDirs("data", "konqueror/servicemenus/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "konqueror/servicemenus/"); TQStringList::ConstIterator dir_it = dirs.begin(); TQStringList::ConstIterator dir_end = dirs.end(); diff --git a/kioslave/media/mediamanager/dialog.cpp b/kioslave/media/mediamanager/dialog.cpp index 549bbdc4a..40e99a84d 100644 --- a/kioslave/media/mediamanager/dialog.cpp +++ b/kioslave/media/mediamanager/dialog.cpp @@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) : enableButton( User1, false ); - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge); + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge); decryptDialog->encryptedIcon->setPixmap( pixmap ); connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &))); diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index ca0c4e26c..9ebf0ade7 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -376,9 +376,9 @@ void HALBackend::DeviceCondition(const char* udi, const char* condition) } } if (medium) { - KProcess p; + TDEProcess p; p << "kio_media_mounthelper" << "-e" << medium->name(); - p.start(KProcess::DontCare); + p.start(TDEProcess::DontCare); } } @@ -1128,7 +1128,7 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& command, const TQString& dialogCaption, const TQString& dialogComment) { - KProcess tdesudoProcess; + TDEProcess tdesudoProcess; tdesudoProcess << tdesudoPath << "-d" @@ -1138,7 +1138,7 @@ TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& comman << "-c" << command; // @todo handle tdesudo output - tdesudoProcess.start(KProcess::Block); + tdesudoProcess.start(TDEProcess::Block); return TQString(); } @@ -1146,7 +1146,7 @@ TQString startKdeSudoProcess(const TQString& tdesudoPath, const TQString& comman TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command, const TQString& dialogCaption) { - KProcess tdesuProcess; + TDEProcess tdesuProcess; tdesuProcess << tdesuPath << "-d" @@ -1155,7 +1155,7 @@ TQString startKdeSuProcess(const TQString& tdesuPath, const TQString& command, << "-c" << command; // @todo handle tdesu output - tdesuProcess.start(KProcess::Block); + tdesuProcess.start(TDEProcess::Block); return TQString(); } @@ -1299,7 +1299,7 @@ static TQString mount_priv(const char *udi, const char *mount_point, const char TQString HALBackend::listUsingProcesses(const Medium* medium) { TQString proclist, fullmsg; - TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); + TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(TDEProcess::quote(medium->mountPoint())); FILE *fuser = popen(cmdline.latin1(), "r"); uint counter = 0; @@ -1336,7 +1336,7 @@ TQString HALBackend::listUsingProcesses(const Medium* medium) TQString HALBackend::killUsingProcesses(const Medium* medium) { TQString proclist, fullmsg; - TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint())); + TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(TDEProcess::quote(medium->mountPoint())); FILE *fuser = popen(cmdline.latin1(), "r"); uint counter = 0; diff --git a/kioslave/media/mediamanager/mediamanager.cpp b/kioslave/media/mediamanager/mediamanager.cpp index 6223036a6..db2c12a71 100644 --- a/kioslave/media/mediamanager/mediamanager.cpp +++ b/kioslave/media/mediamanager/mediamanager.cpp @@ -415,7 +415,7 @@ void MediaManager::slotMediumChanged(const TQString &/*id*/, const TQString &nam extern "C" { KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj) { - KGlobal::locale()->insertCatalogue("kio_media"); + TDEGlobal::locale()->insertCatalogue("kio_media"); return new MediaManager(obj); } } diff --git a/kioslave/media/mediamanager/tdehardwarebackend.cpp b/kioslave/media/mediamanager/tdehardwarebackend.cpp index 15e27a43a..1086a3e77 100644 --- a/kioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/kioslave/media/mediamanager/tdehardwarebackend.cpp @@ -63,7 +63,7 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent) , m_parent(parent) { // Initialize the TDE device manager - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); // Connect device monitoring signals/slots connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*))); @@ -78,7 +78,7 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent) TDEBackend::~TDEBackend() { // Remove all media from the media list - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices(); TDEGenericDevice *hwdevice; for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { @@ -113,7 +113,7 @@ void TDEBackend::ModifyDeviceHandler(TDEGenericDevice *device) { // List devices (at startup) bool TDEBackend::ListDevices() { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList hwlist = hwdevices->listAllPhysicalDevices(); TDEGenericDevice *hwdevice; for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { @@ -391,7 +391,7 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat void TDEBackend::setVolumeProperties(Medium* medium) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -570,7 +570,7 @@ void TDEBackend::setVolumeProperties(Medium* medium) // Handle floppies and zip drives bool TDEBackend::setFloppyProperties(Medium* medium) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -636,7 +636,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium) void TDEBackend::setCameraProperties(Medium* medium) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -702,7 +702,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name) return TQStringList(); } - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -961,7 +961,7 @@ TQString TDEBackend::mount(const Medium *medium) } - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -1162,7 +1162,7 @@ TQString TDEBackend::unmount(const TQString &_udi) TQString udi = TQString::null; - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id()); if (!sdevice) { @@ -1271,7 +1271,7 @@ TQString TDEBackend::isInFstab(const Medium *medium) TQString TDEBackend::listUsingProcesses(const Medium* medium) { TQString proclist, fullmsg; - TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); + TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(TDEProcess::quote(medium->mountPoint())); FILE *fuser = popen(cmdline.latin1(), "r"); uint counter = 0; @@ -1308,7 +1308,7 @@ TQString TDEBackend::listUsingProcesses(const Medium* medium) TQString TDEBackend::killUsingProcesses(const Medium* medium) { TQString proclist, fullmsg; - TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(KProcess::quote(medium->mountPoint())); + TQString cmdline = TQString("/usr/bin/env fuser -vmk %1 2>&1").arg(TDEProcess::quote(medium->mountPoint())); FILE *fuser = popen(cmdline.latin1(), "r"); uint counter = 0; @@ -1346,7 +1346,7 @@ TQString TDEBackend::generateName(const TQString &devNode) } TQString TDEBackend::driveUDIFromDeviceUID(TQString uuid) { - TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); + TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEStorageDevice * sdevice = hwdevices->findDiskByUID(uuid); TQString ret; diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp index d02f1c4b5..94ee0e8c2 100644 --- a/kioslave/media/medianotifier/medianotifier.cpp +++ b/kioslave/media/medianotifier/medianotifier.cpp @@ -199,7 +199,7 @@ bool MediaNotifier::execAutorun( const KFileItem &medium, const TQString &path, // confirmed its execution the autostart file MUST be executed // with the current working directory ( CWD ) set to the root // directory of the medium. - KProcess proc; + TDEProcess proc; proc << "sh" << autorunFile; proc.setWorkingDirectory( path ); proc.start(); @@ -313,7 +313,7 @@ extern "C" { KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name) { - KGlobal::locale()->insertCatalogue("kay"); + TDEGlobal::locale()->insertCatalogue("kay"); return new MediaNotifier(name); } } diff --git a/kioslave/media/mounthelper/dialog.cpp b/kioslave/media/mounthelper/dialog.cpp index 549bbdc4a..40e99a84d 100644 --- a/kioslave/media/mounthelper/dialog.cpp +++ b/kioslave/media/mounthelper/dialog.cpp @@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) : enableButton( User1, false ); - TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge); + TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge); decryptDialog->encryptedIcon->setPixmap( pixmap ); connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &))); diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp index 23a207fab..f321293d6 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp +++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp @@ -182,19 +182,19 @@ MountHelper::MountHelper() : TDEApplication() void MountHelper::invokeEject(const TQString &device, bool quiet) { - KProcess *proc = new KProcess(TQT_TQOBJECT(this)); + TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this)); *proc << "kdeeject"; if (quiet) { *proc << "-q"; } *proc << device; - connect( proc, TQT_SIGNAL(processExited(KProcess *)), - this, TQT_SLOT( ejectFinished(KProcess *) ) ); + connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), + this, TQT_SLOT( ejectFinished(TDEProcess *) ) ); proc->start(); } -void MountHelper::ejectFinished(KProcess* proc) +void MountHelper::ejectFinished(TDEProcess* proc) { /* * If eject failed, report the error stored in m_errorStr @@ -268,7 +268,7 @@ int main(int argc, char **argv) "0.1"); TDECmdLineArgs::addCmdLineOptions( options ); - KGlobal::locale()->setMainCatalogue("kio_media"); + TDEGlobal::locale()->setMainCatalogue("kio_media"); TDEApplication::addCmdLineOptions(); if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage(); diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h index ffb5d1dba..7eff1e54a 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.h +++ b/kioslave/media/mounthelper/kio_media_mounthelper.h @@ -47,7 +47,7 @@ private: private slots: void slotSendPassword(); void slotCancel(); - void ejectFinished(KProcess* proc); + void ejectFinished(TDEProcess* proc); void error(); signals: diff --git a/kioslave/remote/kdedmodule/remotedirnotify.cpp b/kioslave/remote/kdedmodule/remotedirnotify.cpp index e6e2359a6..fa880b78b 100644 --- a/kioslave/remote/kdedmodule/remotedirnotify.cpp +++ b/kioslave/remote/kdedmodule/remotedirnotify.cpp @@ -30,10 +30,10 @@ RemoteDirNotify::RemoteDirNotify() { - KGlobal::dirs()->addResourceType("remote_entries", + TDEGlobal::dirs()->addResourceType("remote_entries", KStandardDirs::kde_default("data") + "remoteview"); - TQString path = KGlobal::dirs()->saveLocation("remote_entries"); + TQString path = TDEGlobal::dirs()->saveLocation("remote_entries"); m_baseURL.setPath(path); } diff --git a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp index 894400ce2..13bfcfc29 100644 --- a/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp +++ b/kioslave/remote/kdedmodule/remotedirnotifymodule.cpp @@ -30,7 +30,7 @@ RemoteDirNotifyModule::RemoteDirNotifyModule(const TQCString &obj) extern "C" { KDE_EXPORT KDEDModule *create_remotedirnotify(const TQCString &obj) { - KGlobal::locale()->insertCatalogue("kio_remote"); + TDEGlobal::locale()->insertCatalogue("kio_remote"); return new RemoteDirNotifyModule(obj); } } diff --git a/kioslave/remote/remoteimpl.cpp b/kioslave/remote/remoteimpl.cpp index 47e41b821..fbc21bfec 100644 --- a/kioslave/remote/remoteimpl.cpp +++ b/kioslave/remote/remoteimpl.cpp @@ -36,10 +36,10 @@ RemoteImpl::RemoteImpl() { - KGlobal::dirs()->addResourceType("remote_entries", + TDEGlobal::dirs()->addResourceType("remote_entries", KStandardDirs::kde_default("data") + "remoteview"); - TQString path = KGlobal::dirs()->saveLocation("remote_entries"); + TQString path = TDEGlobal::dirs()->saveLocation("remote_entries"); TQDir dir = path; if (!dir.exists()) @@ -54,7 +54,7 @@ void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const kdDebug(1220) << "RemoteImpl::listRoot" << endl; TQStringList names_found; - TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); @@ -89,7 +89,7 @@ bool RemoteImpl::findDirectory(const TQString &filename, TQString &directory) co { kdDebug(1220) << "RemoteImpl::findDirectory" << endl; - TQStringList dirList = KGlobal::dirs()->resourceDirs("remote_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("remote_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); diff --git a/kioslave/sftp/CHANGELOG b/kioslave/sftp/CHANGELOG index 2b5f18de3..b60e7f44b 100644 --- a/kioslave/sftp/CHANGELOG +++ b/kioslave/sftp/CHANGELOG @@ -4,12 +4,12 @@ - After the user cancels with the stop button, we get ERR_CANNOT_LAUNCH_PROCESS errors, until we kill the ioslave. Same thing after trying the wrong passwd too many times. - This is happening because KProcess thinks that the ssh process is still running + This is happening because TDEProcess thinks that the ssh process is still running even though it exited. - How to handle password and caching? - Write our own askpass program using kde - set env SSH_ASKPASS_PROGRAM before launching - -how to do this? KProcess doesn't give us access to env variables. + -how to do this? TDEProcess doesn't give us access to env variables. - Our askpass program can probably talk to the tdesu daemon to implement caching. - chmod() succeeds, but konqueror always puts permissions to 0 afterwards. The properties dialog is right though. diff --git a/kioslave/smb/kio_smb.h b/kioslave/smb/kio_smb.h index da40bda13..c7c316478 100644 --- a/kioslave/smb/kio_smb.h +++ b/kioslave/smb/kio_smb.h @@ -87,7 +87,7 @@ extern "C" #define KIO_SMB 7106 using namespace KIO; -class KProcess; +class TDEProcess; //=========================================================================== @@ -262,8 +262,8 @@ public: virtual void special( const TQByteArray & ); private slots: - void readOutput(KProcess *proc, char *buffer, int buflen); - void readStdErr(KProcess *proc, char *buffer, int buflen); + void readOutput(TDEProcess *proc, char *buffer, int buflen); + void readStdErr(TDEProcess *proc, char *buffer, int buflen); private: TQString mybuf, mystderr; diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp index f9c366235..5466ee06a 100644 --- a/kioslave/smb/kio_smb_mount.cpp +++ b/kioslave/smb/kio_smb_mount.cpp @@ -25,12 +25,12 @@ #include <tqdir.h> #include <kprocess.h> -void SMBSlave::readOutput(KProcess *, char *buffer, int buflen) +void SMBSlave::readOutput(TDEProcess *, char *buffer, int buflen) { mybuf += TQString::fromLocal8Bit(buffer, buflen); } -void SMBSlave::readStdErr(KProcess *, char *buffer, int buflen) +void SMBSlave::readStdErr(TDEProcess *, char *buffer, int buflen) { mystderr += TQString::fromLocal8Bit(buffer, buflen); } @@ -85,7 +85,7 @@ void SMBSlave::special( const TQByteArray & data) // using smbmount instead of "mount -t smbfs", because mount does not allow a non-root // user to do a mount, but a suid smbmnt does allow this - KProcess proc; + TDEProcess proc; proc.setUseShell(true); // to have the path to smbmnt (which is used by smbmount); see man smbmount proc << "smbmount"; @@ -98,28 +98,28 @@ void SMBSlave::special( const TQByteArray & data) } else { - options = "-o username=" + KProcess::quote(smburl.user()); + options = "-o username=" + TDEProcess::quote(smburl.user()); user = smburl.user(); if ( ! smburl.pass().isEmpty() ) - options += ",password=" + KProcess::quote(smburl.pass()); + options += ",password=" + TDEProcess::quote(smburl.pass()); } // TODO: check why the control center uses encodings with a blank char, e.g. "cp 1250" //if ( ! m_default_encoding.isEmpty() ) - //options += ",codepage=" + KProcess::quote(m_default_encoding); + //options += ",codepage=" + TDEProcess::quote(m_default_encoding); - proc << KProcess::quote(remotePath.local8Bit()); - proc << KProcess::quote(mountPoint.local8Bit()); + proc << TDEProcess::quote(remotePath.local8Bit()); + proc << TDEProcess::quote(mountPoint.local8Bit()); proc << options; - connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )), - TQT_SLOT(readOutput(KProcess *, char *, int))); + connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )), + TQT_SLOT(readOutput(TDEProcess *, char *, int))); - connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )), - TQT_SLOT(readStdErr(KProcess *, char *, int))); + connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )), + TQT_SLOT(readStdErr(TDEProcess *, char *, int))); - if (!proc.start( KProcess::Block, KProcess::AllOutput )) + if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput )) { error(KIO::ERR_CANNOT_LAUNCH_PROCESS, "smbmount"+i18n("\nMake sure that the samba package is installed properly on your system.")); @@ -146,21 +146,21 @@ void SMBSlave::special( const TQByteArray & data) TQString mountPoint; stream >> mountPoint; - KProcess proc; + TDEProcess proc; proc.setUseShell(true); proc << "smbumount"; - proc << KProcess::quote(mountPoint); + proc << TDEProcess::quote(mountPoint); mybuf.truncate(0); mystderr.truncate(0); - connect(&proc, TQT_SIGNAL( receivedStdout(KProcess *, char *, int )), - TQT_SLOT(readOutput(KProcess *, char *, int))); + connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )), + TQT_SLOT(readOutput(TDEProcess *, char *, int))); - connect(&proc, TQT_SIGNAL( receivedStderr(KProcess *, char *, int )), - TQT_SLOT(readStdErr(KProcess *, char *, int))); + connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )), + TQT_SLOT(readStdErr(TDEProcess *, char *, int))); - if ( !proc.start( KProcess::Block, KProcess::AllOutput ) ) + if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { error(KIO::ERR_CANNOT_LAUNCH_PROCESS, "smbumount"+i18n("\nMake sure that the samba package is installed properly on your system.")); diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/kioslave/system/kdedmodule/systemdirnotify.cpp index 4f703efd6..3a6f029e6 100644 --- a/kioslave/system/kdedmodule/systemdirnotify.cpp +++ b/kioslave/system/kdedmodule/systemdirnotify.cpp @@ -41,11 +41,11 @@ void SystemDirNotify::init() printf("[systemdirnotify] SystemDirNotify::init(mInited)"); return; mInited = true; - KGlobal::dirs()->addResourceType("system_entries", + TDEGlobal::dirs()->addResourceType("system_entries", KStandardDirs::kde_default("data") + "systemview"); TQStringList names_found; - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); diff --git a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp index b89daf129..64e8c8d62 100644 --- a/kioslave/system/kdedmodule/systemdirnotifymodule.cpp +++ b/kioslave/system/kdedmodule/systemdirnotifymodule.cpp @@ -30,7 +30,7 @@ SystemDirNotifyModule::SystemDirNotifyModule(const TQCString &obj) extern "C" { KDE_EXPORT KDEDModule *create_systemdirnotify(const TQCString &obj) { - KGlobal::locale()->insertCatalogue("kio_system"); + TDEGlobal::locale()->insertCatalogue("kio_system"); return new SystemDirNotifyModule(obj); } } diff --git a/kioslave/system/systemimpl.cpp b/kioslave/system/systemimpl.cpp index 43792f8de..24d7776bf 100644 --- a/kioslave/system/systemimpl.cpp +++ b/kioslave/system/systemimpl.cpp @@ -33,7 +33,7 @@ SystemImpl::SystemImpl() : TQObject() { - KGlobal::dirs()->addResourceType("system_entries", + TDEGlobal::dirs()->addResourceType("system_entries", KStandardDirs::kde_default("data") + "systemview"); } @@ -42,7 +42,7 @@ bool SystemImpl::listRoot(TQValueList<KIO::UDSEntry> &list) kdDebug() << "SystemImpl::listRoot" << endl; TQStringList names_found; - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); @@ -114,7 +114,7 @@ bool SystemImpl::statByName(const TQString &filename, KIO::UDSEntry& entry) { kdDebug() << "SystemImpl::statByName" << endl; - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); @@ -147,7 +147,7 @@ KURL SystemImpl::findBaseURL(const TQString &filename) const { kdDebug() << "SystemImpl::findBaseURL" << endl; - TQStringList dirList = KGlobal::dirs()->resourceDirs("system_entries"); + TQStringList dirList = TDEGlobal::dirs()->resourceDirs("system_entries"); TQStringList::ConstIterator dirpath = dirList.begin(); TQStringList::ConstIterator end = dirList.end(); diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp index d0edbd38e..0cc8d54d3 100644 --- a/kioslave/thumbnail/exrcreator.cpp +++ b/kioslave/thumbnail/exrcreator.cpp @@ -62,7 +62,7 @@ bool EXRCreator::create(const TQString &path, int, int, TQImage &img) // EXR images just to turn it into an icon, so we go back // to honouring it in here. kdDebug() << "EXRcreator - using original image" << endl; - KConfig * config = KGlobal::config(); + KConfig * config = TDEGlobal::config(); KConfigGroupSaver cgs( config, "PreviewSettings" ); unsigned long long maxSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ ); unsigned long long fileSize = TQFile( path ).size(); diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp index 29c3c8620..ac7525c60 100644 --- a/kioslave/thumbnail/thumbnail.cpp +++ b/kioslave/thumbnail/thumbnail.cpp @@ -195,7 +195,7 @@ void ThumbnailProtocol::get(const KURL &url) #endif if (!iconSize) - iconSize = KGlobal::iconLoader()->currentSize(KIcon::Desktop); + iconSize = TDEGlobal::iconLoader()->currentSize(KIcon::Desktop); if (iconSize != m_iconSize) m_iconDict.clear(); m_iconSize = iconSize; @@ -206,7 +206,7 @@ void ThumbnailProtocol::get(const KURL &url) TQImage img; - KConfigGroup group( KGlobal::config(), "PreviewSettings" ); + KConfigGroup group( TDEGlobal::config(), "PreviewSettings" ); // ### KFMI @@ -341,7 +341,7 @@ void ThumbnailProtocol::get(const KURL &url) } #endif - if ((flags & ThumbCreator::BlendIcon) && KGlobal::iconLoader()->alphaBlending(KIcon::Desktop)) + if ((flags & ThumbCreator::BlendIcon) && TDEGlobal::iconLoader()->alphaBlending(KIcon::Desktop)) { // blending the mimetype icon in TQImage icon = getIcon(); diff --git a/kioslave/trash/kfile-plugin/kfile_trash.cpp b/kioslave/trash/kfile-plugin/kfile_trash.cpp index edd57014d..182d9c40e 100644 --- a/kioslave/trash/kfile-plugin/kfile_trash.cpp +++ b/kioslave/trash/kfile-plugin/kfile_trash.cpp @@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY(kfile_trash, TrashFactory("kfile_trash")) KTrashPlugin::KTrashPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) { - KGlobal::locale()->insertCatalogue( "kio_trash" ); + TDEGlobal::locale()->insertCatalogue( "kio_trash" ); kdDebug(7034) << "Trash file meta info plugin\n"; diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp index d1efdf2cd..ef255e91d 100644 --- a/kioslave/trash/testtrash.cpp +++ b/kioslave/trash/testtrash.cpp @@ -135,7 +135,7 @@ static void removeDir( const TQString& trashDir, const TQString& dirName ) void TestTrash::setup() { - m_trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash"; + m_trashDir = TDEGlobal::dirs()->localxdgdatadir() + "Trash"; kdDebug() << "setup: using trash directory " << m_trashDir << endl; // Look for another writable partition than $HOME (not mandatory) @@ -380,7 +380,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat infoFile.setGroup( "Trash Info" ); const TQString origPath = infoFile.readEntry( "Path" ); assert( !origPath.isEmpty() ); - assert( origPath == KURL::encode_string( origFilePath, KGlobal::locale()->fileEncodingMib() ) ); + assert( origPath == KURL::encode_string( origFilePath, TDEGlobal::locale()->fileEncodingMib() ) ); const TQString date = infoFile.readEntry( "DeletionDate" ); assert( !date.isEmpty() ); assert( date.contains( "T" ) ); diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp index 081cc9ef0..96888f9d5 100644 --- a/kioslave/trash/trashimpl.cpp +++ b/kioslave/trash/trashimpl.cpp @@ -56,7 +56,7 @@ TrashImpl::TrashImpl() : m_lastId( 0 ), m_homeDevice( 0 ), m_trashDirectoriesScanned( false ), - m_mibEnum( KGlobal::locale()->fileEncodingMib() ), + m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ), // not using kio_trashrc since KIO uses that one already for kio_trash // so better have a separate one, for faster parsing by e.g. kmimetype.cpp m_config( "trashrc" ) @@ -132,7 +132,7 @@ bool TrashImpl::init() // see also kdesktop/init.cc for first time initialization m_initStatus = InitError; // $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default. - const TQString xdgDataDir = KGlobal::dirs()->localxdgdatadir(); + const TQString xdgDataDir = TDEGlobal::dirs()->localxdgdatadir(); if ( !KStandardDirs::makeDir( xdgDataDir, 0700 ) ) { kdWarning() << "failed to create " << xdgDataDir << endl; return false; @@ -161,7 +161,7 @@ bool TrashImpl::init() void TrashImpl::migrateOldTrash() { kdDebug() << k_funcinfo << endl; - const TQString oldTrashDir = KGlobalSettings::trashPath(); + const TQString oldTrashDir = TDEGlobalSettings::trashPath(); const TQStrList entries = listDir( oldTrashDir ); bool allOK = true; TQStrListIterator entryIt( entries ); |