diff options
Diffstat (limited to 'tdeioslave/mac')
| -rw-r--r-- | tdeioslave/mac/TODO | 2 | ||||
| -rw-r--r-- | tdeioslave/mac/tdeio_mac.cpp | 32 | ||||
| -rw-r--r-- | tdeioslave/mac/tdeio_mac.h | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/tdeioslave/mac/TODO b/tdeioslave/mac/TODO index 69fcb0d2e..469a616be 100644 --- a/tdeioslave/mac/TODO +++ b/tdeioslave/mac/TODO @@ -5,7 +5,7 @@ grep TODO tdeio_mac.cpp //TODO this means dev=foo must be the last argument in the query //TODO this error interrupts the user when typing ?dev=foo on each letter of foo //TODO are there any more characters to escape? - QString theSize(fileRE.group(4)); //TODO: this is data size, what about resource size? + TQString theSize(fileRE.group(4)); //TODO: this is data size, what about resource size? Future things: - maybe make it work with plain old hfs partitions diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp index caef50784..fb6bed31e 100644 --- a/tdeioslave/mac/tdeio_mac.cpp +++ b/tdeioslave/mac/tdeio_mac.cpp @@ -18,7 +18,7 @@ #define PARTITION "/dev/hda11" -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdelocale.h> #include <tdeconfig.h> @@ -35,7 +35,7 @@ using namespace TDEIO; extern "C" { - int KDE_EXPORT kdemain(int, char **argv) { + int TDE_EXPORT kdemain(int, char **argv) { TDEInstance instance("tdeio_mac"); MacProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); @@ -105,8 +105,8 @@ void MacProtocol::get(const KURL& url) { *myTDEProcess << "hpcopy" << mode << path << "-"; //data is now sent directly from the slot - connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); @@ -134,8 +134,8 @@ void MacProtocol::listDir(const KURL& url) { *myTDEProcess << "hpls" << "-la" << filename; standardOutputStream = TQString::null; - connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); @@ -146,8 +146,8 @@ void MacProtocol::listDir(const KURL& url) { //clean up delete myTDEProcess; myTDEProcess = 0; - disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + disconnect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); UDSEntry entry; if (!standardOutputStream.isEmpty()) { @@ -191,8 +191,8 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) { *myTDEProcess << "hpls" << "-ld" << filename; standardOutputStream = TQString::null; - connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); @@ -203,8 +203,8 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) { //clean up delete myTDEProcess; myTDEProcess = 0; - disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + disconnect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); if (standardOutputStream.isEmpty()) { filename.replace("\\ ", " "); //get rid of escapes @@ -257,8 +257,8 @@ TQString MacProtocol::prepareHP(const KURL& url) { myTDEProcess = new TDEProcess(); *myTDEProcess << "hpmount"; standardOutputStream = TQString::null; - connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); @@ -269,8 +269,8 @@ TQString MacProtocol::prepareHP(const KURL& url) { } delete myTDEProcess; myTDEProcess = 0; - disconnect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + disconnect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); //now mount the drive myTDEProcess = new TDEProcess(); diff --git a/tdeioslave/mac/tdeio_mac.h b/tdeioslave/mac/tdeio_mac.h index ca4f8b95a..0a71778aa 100644 --- a/tdeioslave/mac/tdeio_mac.h +++ b/tdeioslave/mac/tdeio_mac.h @@ -19,7 +19,7 @@ #include <tdeio/slavebase.h> #include <tdeio/global.h> #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqstring.h> #include <tqcstring.h> |