diff options
Diffstat (limited to 'tdeioslave/smb')
| -rw-r--r-- | tdeioslave/smb/tdeio_smb.cpp | 2 | ||||
| -rw-r--r-- | tdeioslave/smb/tdeio_smb.h | 2 | ||||
| -rw-r--r-- | tdeioslave/smb/tdeio_smb_auth.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/smb/tdeio_smb_mount.cpp | 20 |
4 files changed, 14 insertions, 14 deletions
diff --git a/tdeioslave/smb/tdeio_smb.cpp b/tdeioslave/smb/tdeio_smb.cpp index 28c54b3ac..d21af7e4f 100644 --- a/tdeioslave/smb/tdeio_smb.cpp +++ b/tdeioslave/smb/tdeio_smb.cpp @@ -56,7 +56,7 @@ SMBSlave::~SMBSlave() SMBSlave* G_TheSlave; //=========================================================================== -int KDE_EXPORT kdemain( int argc, char **argv ) +int TDE_EXPORT kdemain( int argc, char **argv ) { TDEInstance instance( "tdeio_smb" ); diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h index 56c296c31..f56b11cbd 100644 --- a/tdeioslave/smb/tdeio_smb.h +++ b/tdeioslave/smb/tdeio_smb.h @@ -49,7 +49,7 @@ // KDE includes //-------------- #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/global.h> #include <tdeio/slavebase.h> #include <kurl.h> diff --git a/tdeioslave/smb/tdeio_smb_auth.cpp b/tdeioslave/smb/tdeio_smb_auth.cpp index 87dd8c026..e025f837e 100644 --- a/tdeioslave/smb/tdeio_smb_auth.cpp +++ b/tdeioslave/smb/tdeio_smb_auth.cpp @@ -32,7 +32,7 @@ #include "tdeio_smb.h" #include "tdeio_smb_internal.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tqdir.h> #include <stdlib.h> @@ -163,7 +163,7 @@ bool SMBSlave::auth_initialize_smbc() if(m_initialized_smbc == false) { kdDebug(TDEIO_SMB) << "smbc_init call" << endl; - KSimpleConfig cfg( "tdeioslaverc", true ); + TDESimpleConfig cfg( "tdeioslaverc", true ); cfg.setGroup( "SMB" ); int debug_level = cfg.readNumEntry( "DebugLevel", 0 ); diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp index 0aef92698..ea4928bec 100644 --- a/tdeioslave/smb/tdeio_smb_mount.cpp +++ b/tdeioslave/smb/tdeio_smb_mount.cpp @@ -19,11 +19,11 @@ */ #include "tdeio_smb.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqcstring.h> #include <unistd.h> #include <tqdir.h> -#include <kprocess.h> +#include <tdeprocess.h> void SMBSlave::readOutput(TDEProcess *, char *buffer, int buflen) { @@ -113,11 +113,11 @@ void SMBSlave::special( const TQByteArray & data) proc << TDEProcess::quote(mountPoint.local8Bit()); proc << options; - connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )), - TQT_SLOT(readOutput(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int )), + TQ_SLOT(readOutput(TDEProcess *, char *, int))); - connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )), - TQT_SLOT(readStdErr(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int )), + TQ_SLOT(readStdErr(TDEProcess *, char *, int))); if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput )) { @@ -154,11 +154,11 @@ void SMBSlave::special( const TQByteArray & data) mybuf.truncate(0); mystderr.truncate(0); - connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )), - TQT_SLOT(readOutput(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int )), + TQ_SLOT(readOutput(TDEProcess *, char *, int))); - connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )), - TQT_SLOT(readStdErr(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int )), + TQ_SLOT(readStdErr(TDEProcess *, char *, int))); if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { |