TDE
/
smb4k
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/smb4k
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 37bfaf4493
commit e722dbcb9f
33 changed files with 242 additions and 242 deletions
Show Stats Download Patch File Download Diff File

32
ChangeLog
Unescape View File

@ -1,7 +1,7 @@
Smb4K 0.9.4:
- Smb4KGlobal::timer() is now deprecated.
- Smb4TDEGlobal::timer() is now deprecated.
- The core classes now use QObject::timerEvent() instead of a connection
to Smb4KGlobal::timer().
to Smb4TDEGlobal::timer().
- Smb4K will try to launch the wallet manager before it opens the wallet.
This should prevent it from hanging on start-up (closes #12707).
- If the digital wallet could not be opened, KWallet support won't be
@ -77,11 +77,11 @@ Smb4K 0.9.0:
- Removed obsolete Smb4KUser class.
- Implemented validity checks into the core container classes, so that only IPv4
and IPv6 IP addresses are used (closes #11470).
- Modified Smb4KGlobal namespace:
+ Removed Smb4KGlobal::kernelVersion() function.
+ Removed Smb4KGlobal::systemName() function.
+ Removed Smb4KGlobal::config() function.
+ Removed Smb4KGlobal::getUMASK().
- Modified Smb4TDEGlobal namespace:
+ Removed Smb4TDEGlobal::kernelVersion() function.
+ Removed Smb4TDEGlobal::systemName() function.
+ Removed Smb4TDEGlobal::config() function.
+ Removed Smb4TDEGlobal::getUMASK().
- Removed Smb4KHomesShareHandler::convert() function.
- Revised Smb4KCore class:
+ Rewrote Smb4KCore::searchPrograms().
@ -392,11 +392,11 @@ Smb4K 0.8.0:
+ Renamed and removed several error codes.
+ Adjusted code to use the new error codes.
+ Improved error messages.
- Revised Smb4KGlobal namespace:
- Revised Smb4TDEGlobal namespace:
+ Moved Smb4KPasswordHandler here.
+ Added Smb4KSambaOptionsHandler.
+ Added Smb4KHomesSharesHandler.
+ Smb4KGlobal now provides a function that creates a temporary directory. The
+ Smb4TDEGlobal now provides a function that creates a temporary directory. The
core classes were ported to use it.
- Revised Smb4KMounter class:
+ Optimized code in Smb4KMounter::import().
@ -509,7 +509,7 @@ Smb4K 0.7.3:
(closes #8325).
- Fixed insertion of a host from the search dialog to the browser window
when the host has no IP address displayed.
- Added missing error code to Smb4KGlobal::showCoreError().
- Added missing error code to Smb4TDEGlobal::showCoreError().
- The preview dialog won't accept the contents of a wrong address anymore.
- The wallet will be reopened if it was closed by the user, the screensaver,
etc. (closes #8558).
@ -652,15 +652,15 @@ Smb4K 0.7.0:
changed from GFDL to GPL.
- If a user tries to mount an already mounted share, no error message will
be displayed anymore.
- Renamed the global namespace to Smb4KGlobal and several functions inside.
- Centralized the application's timer in the Smb4KGlobal namespace. As a
- Renamed the global namespace to Smb4TDEGlobal and several functions inside.
- Centralized the application's timer in the Smb4TDEGlobal namespace. As a
side effect, this seems to fix the very-fast-vanishing-tooltips problem.
- If the user canceled the writing to /etc/super.tab or /etc/sudoers, the
previous state will be re-established.
- Removed "Specify User" dialog from Smb4KBrowserWidget and moved it to
Smb4KGlobal namespace. Now only core classes are using it.
Smb4TDEGlobal namespace. Now only core classes are using it.
- Reworked and cleaned up Linux specific code in Smb4KMounter::import().
- Moved error handling to Smb4KGlobal namespace. The reason is, that the
- Moved error handling to Smb4TDEGlobal namespace. The reason is, that the
previous signal/slot model was not able to handle errors during the
initialization of the core.
- Removed Smb4KPasswordHandler::AskPass class and integrated its functionality
@ -1123,7 +1123,7 @@ Smb4K 0.3.0:
- Improved "splash screen".
- /usr/local/etc (FreeBSD) is searched for smb.conf, too.
- Merged Smb4KSearch and Smb4KScanner core classes.
- Removed KProcess::setEnvironment() stuff from the browse and mount code.
- Removed TDEProcess::setEnvironment() stuff from the browse and mount code.
It only caused problems.
- Changed password handling. Passwords for single shares can be defined.
Unfortunaltelly, it is INCOMPATIBLE with the old one. Sorry, folks!
@ -1145,7 +1145,7 @@ Smb4K 0.2.1:
providing it.
- Added Swedish translation.
- Added experimental WINS server support.
- Separated KProcess stuff from the widget classes.
- Separated TDEProcess stuff from the widget classes.
- Login information is stored in a separate file with strict permissions.
- Many more improvements, bug fixes and code clean-ups.

2
plugin/smb4k_konqplugin.cpp
Unescape View File

@ -108,7 +108,7 @@ extern "C"
{
void* create_konqsidebar_smb4k(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name)
{
KGlobal::locale()->insertCatalogue("smb4k");
TDEGlobal::locale()->insertCatalogue("smb4k");
return new KonqSidebar_Smb4K(instance,par,widp,desktopname,name);
}
};

4
smb4k/browser/smb4knetworkbrowser_part.cpp
Unescape View File

@ -55,7 +55,7 @@
#include "../core/smb4kbookmark.h"
#include "../core/smb4kdefs.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
TDEInstance *Smb4KNetworkBrowserPartFactory::m_instance = 0L;
TDEAboutData *Smb4KNetworkBrowserPartFactory::m_about = 0L;
@ -1920,7 +1920,7 @@ extern "C"
{
void *init_libsmb4knetworkbrowser()
{
KGlobal::locale()->insertCatalogue( "smb4k" );
TDEGlobal::locale()->insertCatalogue( "smb4k" );
return new Smb4KNetworkBrowserPartFactory;
}
}

4
smb4k/configdlg/smb4kconfigdialog.cpp
Unescape View File

@ -55,7 +55,7 @@
#include "../core/smb4kauthinfo.h"
#include "../core/smb4kpasswordhandler.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
TDEInstance *Smb4KConfigDialogFactory::m_instance = 0L;
TDEAboutData *Smb4KConfigDialogFactory::m_about = 0L;
@ -1214,7 +1214,7 @@ extern "C"
{
void *init_libsmb4kconfigdialog()
{
KGlobal::locale()->insertCatalogue( "smb4k" );
TDEGlobal::locale()->insertCatalogue( "smb4k" );
return new Smb4KConfigDialogFactory;
}
}

2
smb4k/configdlg/smb4ksambaoptions.cpp
Unescape View File

@ -51,7 +51,7 @@
#include "../core/smb4kglobal.h"
#include "../core/smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KSambaOptions::Smb4KSambaOptions( TQWidget *parent, const char *name )

8
smb4k/core/smb4kbookmarkhandler.cpp
Unescape View File

@ -44,7 +44,7 @@
#include "smb4knetworkitems.h"
#include "smb4kbookmark.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KBookmarkHandler::Smb4KBookmarkHandler( TQValueList<Smb4KHostItem *> *hosts,
@ -53,7 +53,7 @@ TQObject *parent, const char *name )
{
// First we need the directory.
KStandardDirs *stddir = new KStandardDirs();
TQString dir = locateLocal( "data", "smb4k", KGlobal::instance() );
TQString dir = locateLocal( "data", "smb4k", TDEGlobal::instance() );
if ( !stddir->exists( dir ) )
{
@ -144,7 +144,7 @@ void Smb4KBookmarkHandler::writeBookmarkList( const TQValueList<Smb4KBookmark *>
m_bookmarks = list;
}
TQFile file( locateLocal( "data", "smb4k/bookmarks", KGlobal::instance() ) );
TQFile file( locateLocal( "data", "smb4k/bookmarks", TDEGlobal::instance() ) );
if ( file.open( IO_WriteOnly ) )
{
@ -190,7 +190,7 @@ void Smb4KBookmarkHandler::writeBookmarkList( const TQValueList<Smb4KBookmark *>
void Smb4KBookmarkHandler::loadBookmarks()
{
TQFile file( locateLocal( "data", "smb4k/bookmarks", KGlobal::instance() ) );
TQFile file( locateLocal( "data", "smb4k/bookmarks", TDEGlobal::instance() ) );
TQStringList contents;

2
smb4k/core/smb4kcore.cpp
Unescape View File

@ -53,7 +53,7 @@
#include "smb4ksambaoptionshandler.h"
#include "smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KCore *Smb4KCore::m_self = 0;
static KStaticDeleter<Smb4KCore> staticSmb4KCoreDeleter;

30
smb4k/core/smb4kfileio.cpp
Unescape View File

@ -50,7 +50,7 @@
#include "smb4kglobal.h"
#include "smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
@ -60,17 +60,17 @@ Smb4KFileIO::Smb4KFileIO( TQObject *parent, const char *name ) : TQObject( paren
m_state = Idle;
m_error_occurred = false;
m_proc = new KProcess( this, "FileIOProcess" );
m_proc = new TDEProcess( this, "FileIOProcess" );
m_proc->setUseShell( true );
connect( m_proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( processExited( KProcess * ) ),
this, TQT_SLOT( slotProcessExited( KProcess * ) ) );
connect( m_proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
connect( kapp, TQT_SIGNAL( shutDown() ),
this, TQT_SLOT( slotShutdown() ) );
@ -388,7 +388,7 @@ bool Smb4KFileIO::writeSudoers( Smb4KFileIO::Operation operation )
ok = true;
*m_proc << command;
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
// The process is not finished, so finished() will be emitted
// later and the lock file will also be removed at the end.
@ -741,7 +741,7 @@ bool Smb4KFileIO::writeSuperTab( Smb4KFileIO::Operation operation )
ok = true;
*m_proc << command;
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
// The process is not finished, so finished() will be emitted
// later and the lock file will also be removed at the end.
@ -1420,7 +1420,7 @@ void Smb4KFileIO::processSudoers()
*m_proc << command;
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
else
{
@ -1683,7 +1683,7 @@ void Smb4KFileIO::processSuperTab()
*m_proc << command;
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
else
{
@ -1704,7 +1704,7 @@ void Smb4KFileIO::slotShutdown()
}
void Smb4KFileIO::slotReceivedStderr( KProcess *, char *buf, int len )
void Smb4KFileIO::slotReceivedStderr( TDEProcess *, char *buf, int len )
{
TQString error_output = TQString::fromLocal8Bit( buf, len );
@ -1737,13 +1737,13 @@ void Smb4KFileIO::slotReceivedStderr( KProcess *, char *buf, int len )
}
void Smb4KFileIO::slotReceivedStdout( KProcess *, char *buf, int len )
void Smb4KFileIO::slotReceivedStdout( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
}
void Smb4KFileIO::slotProcessExited( KProcess * )
void Smb4KFileIO::slotProcessExited( TDEProcess * )
{
m_proc->clearArguments();

16
smb4k/core/smb4kfileio.h
Unescape View File

@ -128,31 +128,31 @@ class Smb4KFileIO : public TQObject
/**
* This slot receives shell program output from Stderr.
*
* @param proc The KProcess object
* @param proc The TDEProcess object
*
* @param buf The buffer that holds the error output
*
* @param len The length of the buffer
*/
void slotReceivedStderr( KProcess *proc, char *buf, int len );
void slotReceivedStderr( TDEProcess *proc, char *buf, int len );
/**
* This slot receives shell program output from Stdout.
*
* @param proc The KProcess object
* @param proc The TDEProcess object
*
* @param buf The buffer that holds the output
*
* @param len The length of the buffer
*/
void slotReceivedStdout( KProcess *proc, char *buf, int len );
void slotReceivedStdout( TDEProcess *proc, char *buf, int len );
/**
* This slot is called, when the process exited.
*
* @param proc The KProcess object
* @param proc The TDEProcess object
*/
void slotProcessExited( KProcess *proc );
void slotProcessExited( TDEProcess *proc );
private:
/**
@ -233,9 +233,9 @@ class Smb4KFileIO : public TQObject
Operation m_operation;
/**
* The KProcess object
* The TDEProcess object
*/
KProcess *m_proc;
TDEProcess *m_proc;
/**
* Tell if an error occurred.

16
smb4k/core/smb4kglobal.cpp
Unescape View File

@ -33,46 +33,46 @@
#include "smb4kdefs.h"
static Smb4KGlobalPrivate p;
static Smb4TDEGlobalPrivate p;
TQTimer *Smb4KGlobal::timer()
TQTimer *Smb4TDEGlobal::timer()
{
return p.timer();
}
const int Smb4KGlobal::timerInterval()
const int Smb4TDEGlobal::timerInterval()
{
return TIMER_INTERVAL;
}
const TQString Smb4KGlobal::specifyUser( const TQString &host, TQWidget *parent, const char *name )
const TQString Smb4TDEGlobal::specifyUser( const TQString &host, TQWidget *parent, const char *name )
{
return p.homesHandler()->specifyUser( host, parent, name );
}
Smb4KPasswordHandler *Smb4KGlobal::passwordHandler()
Smb4KPasswordHandler *Smb4TDEGlobal::passwordHandler()
{
return p.passwordHandler();
}
Smb4KSambaOptionsHandler *Smb4KGlobal::optionsHandler()
Smb4KSambaOptionsHandler *Smb4TDEGlobal::optionsHandler()
{
return p.optionsHandler();
}
const TQString &Smb4KGlobal::tempDir()
const TQString &Smb4TDEGlobal::tempDir()
{
return p.tempDir();
}
const TQStringList Smb4KGlobal::homesUsers( const TQString &host )
const TQStringList Smb4TDEGlobal::homesUsers( const TQString &host )
{
return p.homesUsers( host );
}

2
smb4k/core/smb4kglobal.h
Unescape View File

@ -42,7 +42,7 @@ class Smb4KHomesSharesHandler;
* @author Alexander Reinholdt <dustpuppy@users.berlios.de>
*/
namespace Smb4KGlobal
namespace Smb4TDEGlobal
{
/**
* This returns the pointer to the global timer for the application.

18
smb4k/core/smb4kglobal_p.cpp
Unescape View File

@ -1,5 +1,5 @@
/***************************************************************************
smb4kglobal_p - This is the private helper class of the Smb4KGlobal
smb4kglobal_p - This is the private helper class of the Smb4TDEGlobal
namespace.
-------------------
begin : Di Jul 24 2007
@ -34,7 +34,7 @@
#include "smb4kerror.h"
Smb4KGlobalPrivate::Smb4KGlobalPrivate()
Smb4TDEGlobalPrivate::Smb4TDEGlobalPrivate()
{
m_timer = new TQTimer();
m_timer->start( TIMER_INTERVAL, false );
@ -49,7 +49,7 @@ Smb4KGlobalPrivate::Smb4KGlobalPrivate()
}
Smb4KGlobalPrivate::~Smb4KGlobalPrivate()
Smb4TDEGlobalPrivate::~Smb4TDEGlobalPrivate()
{
rmdir( m_temp_dir.local8Bit() );
@ -60,20 +60,20 @@ Smb4KGlobalPrivate::~Smb4KGlobalPrivate()
}
TQTimer *Smb4KGlobalPrivate::timer()
TQTimer *Smb4TDEGlobalPrivate::timer()
{
return m_timer;
}
Smb4KHomesSharesHandler *Smb4KGlobalPrivate::homesHandler()
Smb4KHomesSharesHandler *Smb4TDEGlobalPrivate::homesHandler()
{
return m_homes_handler ? m_homes_handler :
(m_homes_handler = new Smb4KHomesSharesHandler());
}
Smb4KPasswordHandler *Smb4KGlobalPrivate::passwordHandler()
Smb4KPasswordHandler *Smb4TDEGlobalPrivate::passwordHandler()
{
#ifndef __FreeBSD__
return m_passwd_handler ? m_passwd_handler :
@ -85,14 +85,14 @@ Smb4KPasswordHandler *Smb4KGlobalPrivate::passwordHandler()
}
Smb4KSambaOptionsHandler *Smb4KGlobalPrivate::optionsHandler()
Smb4KSambaOptionsHandler *Smb4TDEGlobalPrivate::optionsHandler()
{
return m_options_handler ? m_options_handler :
(m_options_handler = new Smb4KSambaOptionsHandler());
}
const TQString &Smb4KGlobalPrivate::tempDir()
const TQString &Smb4TDEGlobalPrivate::tempDir()
{
if ( m_temp_dir.isEmpty() )
{
@ -112,7 +112,7 @@ const TQString &Smb4KGlobalPrivate::tempDir()
}
const TQStringList Smb4KGlobalPrivate::homesUsers( const TQString &host )
const TQStringList Smb4TDEGlobalPrivate::homesUsers( const TQString &host )
{
if ( !m_homes_handler )
{

10
smb4k/core/smb4kglobal_p.h
Unescape View File

@ -1,5 +1,5 @@
/***************************************************************************
smb4kglobal_p - This is the private helper class of the Smb4KGlobal
smb4kglobal_p - This is the private helper class of the Smb4TDEGlobal
namespace.
-------------------
begin : Di Jul 24 2007
@ -43,23 +43,23 @@
#include "smb4khomesshareshandler.h"
/**
* This class is a private helper for the Smb4KGlobal namespace.
* This class is a private helper for the Smb4TDEGlobal namespace.
*
* @author Alexander Reinholdt <dustpuppy@users.berlios.de>
*/
class Smb4KGlobalPrivate
class Smb4TDEGlobalPrivate
{
public:
/**
* Constructor
*/
Smb4KGlobalPrivate();
Smb4TDEGlobalPrivate();
/**
* Destructor
*/
~Smb4KGlobalPrivate();
~Smb4TDEGlobalPrivate();
/**
* Returns a pointer to the global timer

6
smb4k/core/smb4khomesshareshandler.cpp
Unescape View File

@ -47,7 +47,7 @@ Smb4KHomesSharesHandler::Smb4KHomesSharesHandler( TQObject *parent, const char *
{
// First we need the directory.
KStandardDirs *stddir = new KStandardDirs();
TQString dir = locateLocal( "data", "smb4k", KGlobal::instance() );
TQString dir = locateLocal( "data", "smb4k", TDEGlobal::instance() );
if ( !stddir->exists( dir ) )
{
@ -161,7 +161,7 @@ const TQStringList &Smb4KHomesSharesHandler::read_names( const TQString &host )
// Clear the old contents of this list:
m_names.clear();
TQFile file( locateLocal( "data", "smb4k/homes_shares", KGlobal::instance() ) );
TQFile file( locateLocal( "data", "smb4k/homes_shares", TDEGlobal::instance() ) );
if ( file.open( IO_ReadOnly ) )
{
@ -228,7 +228,7 @@ void Smb4KHomesSharesHandler::write_names( const TQString &host, const TQStringL
// we can easily modify it:
TQStringList contents;
TQFile file( locateLocal( "data", "smb4k/homes_shares", KGlobal::instance() ) );
TQFile file( locateLocal( "data", "smb4k/homes_shares", TDEGlobal::instance() ) );
if ( file.open( IO_ReadOnly ) )
{

44
smb4k/core/smb4kmounter.cpp
Unescape View File

@ -70,28 +70,28 @@
#include "smb4kshare.h"
#include "smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KMounter::Smb4KMounter( TQObject *parent, const char *name ) : TQObject( parent, name )
{
m_priv = new Smb4KMounterPrivate;
m_proc = new KProcess( this, "MounterProcess" );
m_proc = new TDEProcess( this, "MounterProcess" );
m_proc->setUseShell( true );
m_working = false;
m_queue.setAutoDelete( true );
connect( m_proc, TQT_SIGNAL( processExited( KProcess * ) ),
this, TQT_SLOT( slotProcessExited( KProcess * ) ) );
connect( m_proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
connect( m_proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
connect( kapp, TQT_SIGNAL( shutDown() ),
this, TQT_SLOT( slotShutdown() ) );
@ -158,10 +158,10 @@ void Smb4KMounter::abort()
}
}
KProcess proc;
TDEProcess proc;
proc.setUseShell( true );
proc << TQString( "%1 smb4k_kill %2" ).arg( suid_program ).arg( m_proc->pid() );
proc.start( KProcess::DontCare, KProcess::NoCommunication );
proc.start( TDEProcess::DontCare, TDEProcess::NoCommunication );
}
else
{
@ -985,7 +985,7 @@ void Smb4KMounter::startProcess( int state )
TQApplication::setOverrideCursor( waitCursor );
}
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
@ -1538,19 +1538,19 @@ void Smb4KMounter::timerEvent( TQTimerEvent * )
/////////////////////////////////////////////////////////////////////////////
void Smb4KMounter::slotProcessExited( KProcess * )
void Smb4KMounter::slotProcessExited( TDEProcess * )
{
endProcess();
}
void Smb4KMounter::slotReceivedStdout( KProcess *, char *buf, int len )
void Smb4KMounter::slotReceivedStdout( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
}
void Smb4KMounter::slotReceivedStderr( KProcess *, char *buf, int len )
void Smb4KMounter::slotReceivedStderr( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
}
@ -1652,7 +1652,7 @@ void Smb4KMounter::slotShutdown()
}
}
KProcess proc;
TDEProcess proc;
proc.setUseShell( true );
proc.detach();
@ -1667,7 +1667,7 @@ void Smb4KMounter::slotShutdown()
#else
command.append( TQString( "%1 smb4k_umount " ).arg( suid_program ) );
#endif
command.append( KProcess::quote( (*it)->path() ) );
command.append( TDEProcess::quote( (*it)->path() ) );
command.append( " ; " );
}
else
@ -1677,7 +1677,7 @@ void Smb4KMounter::slotShutdown()
#else
command.append( "smb4k_umount " );
#endif
command.append( KProcess::quote( (*it)->path() ) );
command.append( TDEProcess::quote( (*it)->path() ) );
command.append( " ; " );
}
@ -1685,19 +1685,19 @@ void Smb4KMounter::slotShutdown()
#ifndef __FreeBSD__
command.append( "rmdir --ignore-fail-on-non-empty " );
command.append( KProcess::quote( dir.canonicalPath() ) );
command.append( TDEProcess::quote( dir.canonicalPath() ) );
command.append( " ; " );
command.append( "rmdir --ignore-fail-on-non-empty " );
dir.cdUp();
command.append( KProcess::quote( dir.canonicalPath() ) );
command.append( TDEProcess::quote( dir.canonicalPath() ) );
command.append( " ; " );
#else
command.append( "rmdir " );
command.append( KProcess::quote( dir.canonicalPath() ) );
command.append( TDEProcess::quote( dir.canonicalPath() ) );
command.append( " ; " );
command.append( "rmdir " );
dir.cdUp();
command.append( KProcess::quote( dir.canonicalPath() ) );
command.append( TDEProcess::quote( dir.canonicalPath() ) );
command.append( " ; " );
#endif
}
@ -1710,7 +1710,7 @@ void Smb4KMounter::slotShutdown()
command.truncate( command.length() - 2 );
proc << command;
proc.start( KProcess::DontCare, KProcess::NoCommunication );
proc.start( TDEProcess::DontCare, TDEProcess::NoCommunication );
}
}

10
smb4k/core/smb4kmounter.h
Unescape View File

@ -237,17 +237,17 @@ class Smb4KMounter : public TQObject
/**
* Is called, when the process exits.
*/
void slotProcessExited( KProcess * );
void slotProcessExited( TDEProcess * );
/**
* Is called, if output is received on Stdout.
*/
void slotReceivedStdout( KProcess *, char *buf, int len );
void slotReceivedStdout( TDEProcess *, char *buf, int len );
/**
* Is called, if output is received on Stderr.
*/
void slotReceivedStderr( KProcess *, char *buf, int len );
void slotReceivedStderr( TDEProcess *, char *buf, int len );
/**
* This slot is called by the TDEApplication::shutDown() signal.
@ -292,9 +292,9 @@ class Smb4KMounter : public TQObject
void checkAccessibility( Smb4KShare *share );
/**
* The KProcess object.
* The TDEProcess object.
*/
KProcess *m_proc;
TDEProcess *m_proc;
/**
* The buffer.

18
smb4k/core/smb4kpasswordhandler.cpp
Unescape View File

@ -783,17 +783,17 @@ void Smb4KPasswordHandler::writeToSMBConfFile( Smb4KAuthInfo *authInfo )
{
m_nsmbrc_auth = *authInfo;
KProcess *p = new KProcess();
TDEProcess *p = new TDEProcess();
p->setUseShell( true );
connect( p, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivePassword( KProcess *, char *, int ) ) );
connect( p, TQT_SIGNAL( processExited( KProcess * ) ),
this, TQT_SLOT( slotWritePassword( KProcess * ) ) );
connect( p, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivePassword( TDEProcess *, char *, int ) ) );
connect( p, TQT_SIGNAL( processExited( TDEProcess * ) ),
this, TQT_SLOT( slotWritePassword( TDEProcess * ) ) );
*p << TQString( "smbutil crypt %1" ).arg( m_nsmbrc_auth.password() );
p->start( KProcess::NotifyOnExit, KProcess::AllOutput );
p->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
#endif
@ -831,17 +831,17 @@ void Smb4KPasswordHandler::slotEnableOKButton( const TQString &text )
}
#ifdef __FreeBSD__
void Smb4KPasswordHandler::slotReceivePassword( KProcess *, char *buffer, int buflen )
void Smb4KPasswordHandler::slotReceivePassword( TDEProcess *, char *buffer, int buflen )
{
m_buffer.append( TQString::fromLocal8Bit( buffer, buflen ) );
#else
void Smb4KPasswordHandler::slotReceivePassword( KProcess *, char *, int )
void Smb4KPasswordHandler::slotReceivePassword( TDEProcess *, char *, int )
{
#endif
}
void Smb4KPasswordHandler::slotWritePassword( KProcess *proc )
void Smb4KPasswordHandler::slotWritePassword( TDEProcess *proc )
{
delete proc;

4
smb4k/core/smb4kpasswordhandler.h
Unescape View File

@ -213,14 +213,14 @@ class Smb4KPasswordHandler : public TQObject
*
* @param buflen The length of the buffer
*/
void slotReceivePassword( KProcess *proc, char *buffer, int buflen );
void slotReceivePassword( TDEProcess *proc, char *buffer, int buflen );
/**
* FreeBSD specific: This slot is invoked if the process exited.
*
* @param proc The process that exited
*/
void slotWritePassword( KProcess *proc );
void slotWritePassword( TDEProcess *proc );
private:
/**

30
smb4k/core/smb4kpreviewer.cpp
Unescape View File

@ -40,7 +40,7 @@
#include "smb4ksambaoptionshandler.h"
#include "smb4kerror.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KPreviewer::Smb4KPreviewer( TQObject *parent, const char *name )
@ -52,17 +52,17 @@ Smb4KPreviewer::Smb4KPreviewer( TQObject *parent, const char *name )
m_working = false;
m_proc = new KProcess( this, "PreviewProcess" );
m_proc = new TDEProcess( this, "PreviewProcess" );
m_proc->setUseShell( true );
connect( m_proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( processExited( KProcess* ) ),
this, TQT_SLOT( slotProcessExited( KProcess * ) ) );
connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
}
@ -139,8 +139,8 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * )
// (b) Do not pass the path unquoted, or you'll get a NT_STATUS_OBJECT_NAME_NOT_FOUND
// error message in the case the path is empty.
TQString command;
command.append( TQString( "smbclient //%1/%2 " ).arg( KProcess::quote( m_item->host() ), KProcess::quote( m_item->share() ) ) );
command.append( TQString( " -d1 -W %1 -D %2 " ).arg( KProcess::quote( m_item->workgroup() ), KProcess::quote( m_item->path() ) ) );
command.append( TQString( "smbclient //%1/%2 " ).arg( TDEProcess::quote( m_item->host() ), TDEProcess::quote( m_item->share() ) ) );
command.append( TQString( " -d1 -W %1 -D %2 " ).arg( TDEProcess::quote( m_item->workgroup() ), TDEProcess::quote( m_item->path() ) ) );
command.append( " -c \"ls\" " );
if ( !m_item->ip().isEmpty() )
@ -154,7 +154,7 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * )
if ( !auth->user().isEmpty() )
{
command.append( TQString( " -U %1" ).arg( KProcess::quote( auth->user() ) ) );
command.append( TQString( " -U %1" ).arg( TDEProcess::quote( auth->user() ) ) );
if ( !auth->password().isEmpty() )
{
@ -172,7 +172,7 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * )
TQApplication::setOverrideCursor( waitCursor );
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
@ -180,19 +180,19 @@ void Smb4KPreviewer::timerEvent( TQTimerEvent * )
// TQT_SLOT IMPLEMENTATIONS
/////////////////////////////////////////////////////////////////////////////
void Smb4KPreviewer::slotReceivedStdout( KProcess *, char *buf, int len )
void Smb4KPreviewer::slotReceivedStdout( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
}
void Smb4KPreviewer::slotReceivedStderr( KProcess *, char *buf, int len )
void Smb4KPreviewer::slotReceivedStderr( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
}
void Smb4KPreviewer::slotProcessExited( KProcess * )
void Smb4KPreviewer::slotProcessExited( TDEProcess * )
{
// Disconnect the timer:
if ( m_queue.isEmpty() )

12
smb4k/core/smb4kpreviewer.h
Unescape View File

@ -134,7 +134,7 @@ class Smb4KPreviewer : public TQObject
*
* @param len The length of the buffer
*/
void slotReceivedStdout( KProcess *proc, char *buf, int len );
void slotReceivedStdout( TDEProcess *proc, char *buf, int len );
/**
* This slot receives output from stderr.
@ -145,20 +145,20 @@ class Smb4KPreviewer : public TQObject
*
* @param len The length of the buffer
*/
void slotReceivedStderr( KProcess *proc, char *buf, int len );
void slotReceivedStderr( TDEProcess *proc, char *buf, int len );
/**
* Is called, when the KProcess exited.
* Is called, when the TDEProcess exited.
*
* @param proc The process that exited
*/
void slotProcessExited( KProcess *proc );
void slotProcessExited( TDEProcess *proc );
private:
/**
* The KProcess object
* The TDEProcess object
*/
KProcess *m_proc;
TDEProcess *m_proc;
/**
* The output buffer

42
smb4k/core/smb4kprint.cpp
Unescape View File

@ -46,27 +46,27 @@
#include "smb4kprintinfo.h"
#include "smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KPrint::Smb4KPrint( TQObject *parent, const char *name ) : TQObject( parent, name )
{
m_proc = new KProcess( this, "PrintProcess" );
m_proc = new TDEProcess( this, "PrintProcess" );
m_proc->setUseShell( true );
m_info = NULL;
m_working = false;
connect( m_proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( processExited( KProcess * ) ),
this, TQT_SLOT( slotProcessExited( KProcess * ) ) );
connect( m_proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
}
@ -215,13 +215,13 @@ void Smb4KPrint::printNormal()
command.append( "smbspool 111 "+TQString( getpwuid( getuid() )->pw_name ) );
command.append( " \"Smb4K print job\" "+TQString( "%1" ).arg( m_info->copies() ) );
command.append( " \"\" "+KProcess::quote( m_info->path() ) );
command.append( " \"\" "+TDEProcess::quote( m_info->path() ) );
*m_proc << command;
emit state( PRINT_START );
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
@ -237,13 +237,13 @@ void Smb4KPrint::printDVI()
TQString command;
// First we need the conversion:
command.append( "cd "+KProcess::quote( m_info->path().section( "/", 0, -2 ) )+" && " );
command.append( "dvips -P pdf -o "+temp_file+" "+KProcess::quote( m_info->path().section( "/", -1, -1 ) )+" && " );
command.append( "cd "+TDEProcess::quote( m_info->path().section( "/", 0, -2 ) )+" && " );
command.append( "dvips -P pdf -o "+temp_file+" "+TDEProcess::quote( m_info->path().section( "/", -1, -1 ) )+" && " );
// The actual print command:
command.append( "smbspool 111 "+TQString( getpwuid( getuid() )->pw_name ) );
command.append( " \"Smb4K print job\" "+TQString( "%1" ).arg( m_info->copies() ) );
command.append( " \"\" "+KProcess::quote( temp_file )+" && " );
command.append( " \"\" "+TDEProcess::quote( temp_file )+" && " );
// Clean up:
command.append( "rm -f "+temp_file );
@ -252,7 +252,7 @@ void Smb4KPrint::printDVI()
emit state( PRINT_START );
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
@ -269,13 +269,13 @@ void Smb4KPrint::printText()
// Conversion:
command.append( "enscript --columns=1 --no-header --ps-level=2 " );
command.append( "-o "+KProcess::quote( temp_file )+" " );
command.append( KProcess::quote( m_info->path() )+ " && " );
command.append( "-o "+TDEProcess::quote( temp_file )+" " );
command.append( TDEProcess::quote( m_info->path() )+ " && " );
// The actual print command:
command.append( "smbspool 111 "+TQString( getpwuid( getuid() )->pw_name ) );
command.append( " \"Smb4K print job\" "+TQString( "%1" ).arg( m_info->copies() ) );
command.append( " \"\" "+KProcess::quote( temp_file )+" && " );
command.append( " \"\" "+TDEProcess::quote( temp_file )+" && " );
// Clean up:
command.append( "rm -f "+temp_file );
@ -284,7 +284,7 @@ void Smb4KPrint::printText()
emit state( PRINT_START );
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
@ -292,13 +292,13 @@ void Smb4KPrint::printText()
// TQT_SLOT IMPLEMENTATIONS
/////////////////////////////////////////////////////////////////////////////
void Smb4KPrint::slotReceivedStdout( KProcess *, char *buf, int len )
void Smb4KPrint::slotReceivedStdout( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
}
void Smb4KPrint::slotReceivedStderr( KProcess *, char *buf, int len )
void Smb4KPrint::slotReceivedStderr( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
@ -309,7 +309,7 @@ void Smb4KPrint::slotReceivedStderr( KProcess *, char *buf, int len )
}
void Smb4KPrint::slotProcessExited( KProcess * )
void Smb4KPrint::slotProcessExited( TDEProcess * )
{
bool retry = false;

10
smb4k/core/smb4kprint.h
Unescape View File

@ -106,17 +106,17 @@ class Smb4KPrint : public TQObject
/**
* This slot receives output at stdout.
*/
void slotReceivedStdout( KProcess *, char *buf, int len );
void slotReceivedStdout( TDEProcess *, char *buf, int len );
/**
* This slot receives output at stderr.
*/
void slotReceivedStderr( KProcess *, char *buf, int len );
void slotReceivedStderr( TDEProcess *, char *buf, int len );
/**
* This slot is called when the process exited.
*/
void slotProcessExited( KProcess * );
void slotProcessExited( TDEProcess * );
/**
* This slot is invoked if the print process should be restarted
@ -127,9 +127,9 @@ class Smb4KPrint : public TQObject
private:
/**
* The KProcess object.
* The TDEProcess object.
*/
KProcess *m_proc;
TDEProcess *m_proc;
/**
* The buffer

8
smb4k/core/smb4ksambaoptionshandler.cpp
Unescape View File

@ -48,7 +48,7 @@
#include "smb4kshare.h"
#include "smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KSambaOptionsHandler::Smb4KSambaOptionsHandler( TQObject *parent, const char *name )
@ -56,7 +56,7 @@ Smb4KSambaOptionsHandler::Smb4KSambaOptionsHandler( TQObject *parent, const char
{
// We need the directory.
KStandardDirs *stddir = new KStandardDirs();
TQString dir = locateLocal( "data", "smb4k", KGlobal::instance() );
TQString dir = locateLocal( "data", "smb4k", TDEGlobal::instance() );
if ( !stddir->exists( dir ) )
{
@ -106,7 +106,7 @@ void Smb4KSambaOptionsHandler::read_options()
m_list.clear();
}
TQFile file( locateLocal( "data", "smb4k/custom_options", KGlobal::instance() ) );
TQFile file( locateLocal( "data", "smb4k/custom_options", TDEGlobal::instance() ) );
TQStringList contents;
@ -312,7 +312,7 @@ void Smb4KSambaOptionsHandler::write_options()
#endif
TQFile file( locateLocal( "data", "smb4k/custom_options", KGlobal::instance() ) );
TQFile file( locateLocal( "data", "smb4k/custom_options", TDEGlobal::instance() ) );
if ( !m_list.isEmpty() )
{

74
smb4k/core/smb4kscanner.cpp
Unescape View File

@ -48,7 +48,7 @@
#include "smb4knetworkitems.h"
#include "smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
static bool created_workgroups_list = false;
static bool created_hosts_list = false;
@ -81,21 +81,21 @@ TQObject *parent, const char *name )
// The list was passed to the constructor from outside.
}
m_proc = new KProcess( this, "ScannerMainProcess" );
m_proc = new TDEProcess( this, "ScannerMainProcess" );
m_proc->setUseShell( true );
m_working = false;
m_queue.setAutoDelete( true );
connect( m_proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( processExited( KProcess* ) ),
this, TQT_SLOT( slotProcessExited( KProcess * ) ) );
connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
}
@ -299,11 +299,11 @@ void Smb4KScanner::scanNetwork()
command.append( "net " );
command.append( optionsHandler()->netOptions( Smb4KSambaOptionsHandler::LookupHost,
Smb4KSettings::customMasterBrowser() ) );
command.append( " -U % -S "+KProcess::quote( Smb4KSettings::customMasterBrowser() ) );
command.append( " -U % -S "+TDEProcess::quote( Smb4KSettings::customMasterBrowser() ) );
command.append( " | xargs net " );
command.append( optionsHandler()->netOptions( Smb4KSambaOptionsHandler::Domain,
TQString() ) );
command.append( " -U % -S "+KProcess::quote( Smb4KSettings::customMasterBrowser() )+" -I " );
command.append( " -U % -S "+TDEProcess::quote( Smb4KSettings::customMasterBrowser() )+" -I " );
*m_proc << command;
@ -378,15 +378,15 @@ void Smb4KScanner::scanForWorkgroupMembers( const TQString &workgroup, const TQS
{
command.append( "net "+optionsHandler()->netOptions( Smb4KSambaOptionsHandler::ServerDomain, TQString() ) );
command.append( " -I "+ip );
command.append( " -w "+KProcess::quote( workgroup ) );
command.append( " -S "+KProcess::quote( master ) );
command.append( " -w "+TDEProcess::quote( workgroup ) );
command.append( " -S "+TDEProcess::quote( master ) );
Smb4KAuthInfo authInfo( workgroup, master, TQString() );
(void) passwordHandler()->readAuth( &authInfo );
if ( !authInfo.user().isEmpty() )
{
command.append( TQString( " -U %1" ).arg( KProcess::quote( authInfo.user() ) ) );
command.append( TQString( " -U %1" ).arg( TDEProcess::quote( authInfo.user() ) ) );
if ( !authInfo.password().isEmpty() )
{
@ -400,8 +400,8 @@ void Smb4KScanner::scanForWorkgroupMembers( const TQString &workgroup, const TQS
}
else
{
command.append( "net "+optionsHandler()->netOptions( Smb4KSambaOptionsHandler::LookupHost, KProcess::quote( master ) ) );
command.append( " -S "+KProcess::quote( master )+" -w "+KProcess::quote( workgroup )+" -U % " );
command.append( "net "+optionsHandler()->netOptions( Smb4KSambaOptionsHandler::LookupHost, TDEProcess::quote( master ) ) );
command.append( " -S "+TDEProcess::quote( master )+" -w "+TDEProcess::quote( workgroup )+" -U % " );
// FIXME: Maybe we need to know the shell if the user does not use a
// sh-compatible one...?
command.append( "| xargs -IIPADDR " );
@ -409,15 +409,15 @@ void Smb4KScanner::scanForWorkgroupMembers( const TQString &workgroup, const TQS
command.append( " -c 'echo \"*** "+master+": IPADDR ***\" && " );
command.append( "net "+optionsHandler()->netOptions( Smb4KSambaOptionsHandler::ServerDomain, TQString() ) );
command.append( " -I IPADDR" );
command.append( " -w "+KProcess::quote( workgroup ) );
command.append( " -S "+KProcess::quote( master ) );
command.append( " -w "+TDEProcess::quote( workgroup ) );
command.append( " -S "+TDEProcess::quote( master ) );
Smb4KAuthInfo authInfo( workgroup, master, TQString() );
(void) passwordHandler()->readAuth( &authInfo );
if ( !authInfo.user().isEmpty() )
{
command.append( TQString( " -U %1'" ).arg( KProcess::quote( authInfo.user() ) ) );
command.append( TQString( " -U %1'" ).arg( TDEProcess::quote( authInfo.user() ) ) );
if ( !authInfo.password().isEmpty() )
{
@ -450,16 +450,16 @@ void Smb4KScanner::scanForShares( const TQString &workgroup, const TQString &hos
TQString command;
command = TQString( "net %1 -w %2 -S %3" ).arg( optionsHandler()->netOptions( Smb4KSambaOptionsHandler::Share, host, protocol ) ).arg( KProcess::quote( workgroup ), KProcess::quote( host ) );
command = TQString( "net %1 -w %2 -S %3" ).arg( optionsHandler()->netOptions( Smb4KSambaOptionsHandler::Share, host, protocol ) ).arg( TDEProcess::quote( workgroup ), TDEProcess::quote( host ) );
if ( !ip.isEmpty() )
{
command.append( TQString( " -I %1" ).arg( KProcess::quote( ip ) ) );
command.append( TQString( " -I %1" ).arg( TDEProcess::quote( ip ) ) );
}
if ( !auth->user().isEmpty() )
{
command.append( TQString( " -U %1" ).arg( KProcess::quote( auth->user() ) ) );
command.append( TQString( " -U %1" ).arg( TDEProcess::quote( auth->user() ) ) );
if ( !auth->password().isEmpty() )
{
@ -491,11 +491,11 @@ void Smb4KScanner::scanForInfo( const TQString &workgroup, const TQString &host,
TQString smbclient_options = optionsHandler()->smbclientOptions();
TQString command = TQString( "smbclient -d1 -U guest% -W %1 -L %2" ).arg( KProcess::quote( workgroup ) ).arg( KProcess::quote( host ) );
TQString command = TQString( "smbclient -d1 -U guest% -W %1 -L %2" ).arg( TDEProcess::quote( workgroup ) ).arg( TDEProcess::quote( host ) );
if ( !ip.isEmpty() )
{
command.append( TQString( " -I %1" ).arg( KProcess::quote( ip ) ) );
command.append( TQString( " -I %1" ).arg( TDEProcess::quote( ip ) ) );
}
if ( !smbclient_options.stripWhiteSpace().isEmpty() )
@ -609,7 +609,7 @@ void Smb4KScanner::startProcess( int state )
TQApplication::setOverrideCursor( waitCursor );
}
m_proc->start( KProcess::NotifyOnExit, KProcess::AllOutput );
m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
@ -1590,19 +1590,19 @@ void Smb4KScanner::timerEvent( TQTimerEvent * )
Internal slots.
****************************************************************************/
void Smb4KScanner::slotReceivedStdout( KProcess *, char *buf, int len )
void Smb4KScanner::slotReceivedStdout( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
}
void Smb4KScanner::slotProcessExited( KProcess * )
void Smb4KScanner::slotProcessExited( TDEProcess * )
{
endProcess();
}
void Smb4KScanner::slotReceivedStderr( KProcess *, char *buf, int len )
void Smb4KScanner::slotReceivedStderr( TDEProcess *, char *buf, int len )
{
m_buffer.append( TQString::fromLocal8Bit( buf, len ) );
}
@ -1637,8 +1637,8 @@ void Smb4KScanner::lookupIPAddresses()
command.append( "nmblookup" );
command.append( optionsHandler()->nmblookupOptions() );
command.append( optionsHandler()->winsServer().isEmpty() ? "" : " -R -U "+KProcess::quote( optionsHandler()->winsServer() ) );
command.append( " -- "+KProcess::quote( (*it)->name() )+" | grep '<00>'" );
command.append( optionsHandler()->winsServer().isEmpty() ? "" : " -R -U "+TDEProcess::quote( optionsHandler()->winsServer() ) );
command.append( " -- "+TDEProcess::quote( (*it)->name() )+" | grep '<00>'" );
command.append( " ; " );
continue;
@ -1653,16 +1653,16 @@ void Smb4KScanner::lookupIPAddresses()
if ( start )
{
KProcess *proc = new KProcess( this );
TDEProcess *proc = new TDEProcess( this );
proc->setUseShell( true );
connect( proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedIPAddresses( KProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( processExited( KProcess * ) ),
this, TQT_SLOT( slotIPAddressProcessExited( KProcess * ) ) );
connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedIPAddresses( TDEProcess *, char *, int ) ) );
connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ),
this, TQT_SLOT( slotIPAddressProcessExited( TDEProcess * ) ) );
*proc << command;
proc->start( KProcess::NotifyOnExit, KProcess::Stdout );
proc->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout );
}
}
@ -1671,7 +1671,7 @@ void Smb4KScanner::lookupIPAddresses()
Processes IP addresses if data occurrs on stdout.
****************************************************************************/
void Smb4KScanner::slotReceivedIPAddresses( KProcess *, char *buf, int len )
void Smb4KScanner::slotReceivedIPAddresses( TDEProcess *, char *buf, int len )
{
// WARNING: Do not implement error handling here!!!
@ -1711,7 +1711,7 @@ void Smb4KScanner::slotReceivedIPAddresses( KProcess *, char *buf, int len )
End IP address scan.
****************************************************************************/
void Smb4KScanner::slotIPAddressProcessExited( KProcess *p )
void Smb4KScanner::slotIPAddressProcessExited( TDEProcess *p )
{
delete p;
}

18
smb4k/core/smb4kscanner.h
Unescape View File

@ -339,16 +339,16 @@ class Smb4KScanner : public TQObject
*
* @param len The length of the buffer
*/
void slotReceivedStdout( KProcess *proc,
void slotReceivedStdout( TDEProcess *proc,
char *buf,
int len );
/**
* Is called, when the KProcess exited.
* Is called, when the TDEProcess exited.
*
* @param proc The process that exited
*/
void slotProcessExited( KProcess *proc );
void slotProcessExited( TDEProcess *proc );
/**
* Is called, if something is received on stderr from the main process.
@ -359,7 +359,7 @@ class Smb4KScanner : public TQObject
*
* @param len The length of the buffer
*/
void slotReceivedStderr( KProcess *proc,
void slotReceivedStderr( TDEProcess *proc,
char *buf,
int len );
@ -372,16 +372,16 @@ class Smb4KScanner : public TQObject
*
* @param len The length of the buffer
*/
void slotReceivedIPAddresses( KProcess *proc,
void slotReceivedIPAddresses( TDEProcess *proc,
char *buf,
int len );
/**
* Is called, when the KProcess exited.
* Is called, when the TDEProcess exited.
*
* @param proc The process that exited
*/
void slotIPAddressProcessExited( KProcess *proc );
void slotIPAddressProcessExited( TDEProcess *proc );
private:
@ -436,9 +436,9 @@ class Smb4KScanner : public TQObject
enum TODO{ Workgroups, QueryHost, IPScan, Hosts, Shares, Info, Search, Init, Idle };
/**
* The main KProcess object.
* The main TDEProcess object.
*/
KProcess *m_proc;
TDEProcess *m_proc;
/**
* The buffer for the main process.

32
smb4k/core/smb4ksynchronizer.cpp
Unescape View File

@ -49,7 +49,7 @@
#include "smb4ksynchronizationinfo.h"
#include "smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
bool cancel = false;
@ -57,20 +57,20 @@ bool cancel = false;
Smb4KSynchronizer::Smb4KSynchronizer( TQObject *parent, const char *name )
: TQObject( parent, name )
{
m_proc = new KProcess( this, "SynchronizerProcess" );
m_proc = new TDEProcess( this, "SynchronizerProcess" );
m_proc->setUseShell( true );
m_working = false;
connect( m_proc, TQT_SIGNAL( receivedStdout( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( processExited( KProcess* ) ),
this, TQT_SLOT( slotProcessExited( KProcess * ) ) );
connect( m_proc, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( KProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( KProcess *, char *, int ) ) );
connect( m_proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ),
this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) );
connect( kapp, TQT_SIGNAL( shutDown() ),
this, TQT_SLOT( slotShutdown() ) );
@ -112,16 +112,16 @@ void Smb4KSynchronizer::synchronize( const TQString &source, const TQString &des
command.append( readRsyncOptions() );
command.append( " " );
command.append( KProcess::quote( source ) );
command.append( TDEProcess::quote( source ) );
command.append( " " );
command.append( KProcess::quote( destination ) );
command.append( TDEProcess::quote( destination ) );
*m_proc << command;
// Use KProcess::OwnGroup instead of KProcess::NotifyOnExit here, because
// Use TDEProcess::OwnGroup instead of TDEProcess::NotifyOnExit here, because
// this garantees that the process is indeed killed when using abort().
// See KProcess docs for further information.
m_proc->start( KProcess::OwnGroup, KProcess::AllOutput );
// See TDEProcess docs for further information.
m_proc->start( TDEProcess::OwnGroup, TDEProcess::AllOutput );
}
@ -370,7 +370,7 @@ void Smb4KSynchronizer::abort()
}
void Smb4KSynchronizer::slotProcessExited( KProcess * )
void Smb4KSynchronizer::slotProcessExited( TDEProcess * )
{
m_proc->clearArguments();
@ -381,7 +381,7 @@ void Smb4KSynchronizer::slotProcessExited( KProcess * )
}
void Smb4KSynchronizer::slotReceivedStdout( KProcess *, char *buf, int len )
void Smb4KSynchronizer::slotReceivedStdout( TDEProcess *, char *buf, int len )
{
m_buffer = TQString::fromLocal8Bit( buf, len );
@ -471,7 +471,7 @@ void Smb4KSynchronizer::slotReceivedStdout( KProcess *, char *buf, int len )
void Smb4KSynchronizer::slotReceivedStderr( KProcess *, char *buf, int len )
void Smb4KSynchronizer::slotReceivedStderr( TDEProcess *, char *buf, int len )
{
TQString error_message = TQString::fromLocal8Bit( buf, len );

16
smb4k/core/smb4ksynchronizer.h
Unescape View File

@ -126,14 +126,14 @@ class Smb4KSynchronizer : public TQObject
protected slots:
/**
* Reimplemented from KProcess.
* Reimplemented from TDEProcess.
*
* @param proc The process that exited
*/
void slotProcessExited( KProcess *proc );
void slotProcessExited( TDEProcess *proc );
/**
* Reimplemented from KProcess.
* Reimplemented from TDEProcess.
*
* @param proc The process from which output was received on stdout
*
@ -141,10 +141,10 @@ class Smb4KSynchronizer : public TQObject
*
* @param len The length of the buffer
*/
void slotReceivedStdout( KProcess *proc, char *buf, int len );
void slotReceivedStdout( TDEProcess *proc, char *buf, int len );
/**
* Reimplemented from KProcess.
* Reimplemented from TDEProcess.
*
* @param proc The process from which output was received on stderr
*
@ -152,11 +152,11 @@ class Smb4KSynchronizer : public TQObject
*
* @param len The length of the buffer
*/
void slotReceivedStderr( KProcess *proc, char *buf, int len );
void slotReceivedStderr( TDEProcess *proc, char *buf, int len );
/**
* This slot is connected to TDEApplication::shutDown() signal.
* It aborts the running KProcess if necessary.
* It aborts the running TDEProcess if necessary.
*/
void slotShutdown();
@ -164,7 +164,7 @@ class Smb4KSynchronizer : public TQObject
/**
* The process object for this class.
*/
KProcess *m_proc;
TDEProcess *m_proc;
/**
* This booian is TRUE if the synchronizer is working and FALSE otherwise.

4
smb4k/dialogs/smb4kbookmarkeditor.cpp
Unescape View File

@ -45,7 +45,7 @@
#include "../core/smb4kglobal.h"
#include "../core/smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
@ -69,7 +69,7 @@ Smb4KBookmarkEditor::Smb4KBookmarkEditor( TQWidget *parent, const char *name )
m_view->setRenameable( IPAddress, true );
m_view->setRenameable( Label, true );
m_collection = new KActionCollection( this, "BookmarkEditor_ActionCollection", KGlobal::instance() );
m_collection = new KActionCollection( this, "BookmarkEditor_ActionCollection", TDEGlobal::instance() );
(void) new KAction( i18n( "&Remove" ), "remove", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveClicked() ), m_collection, "remove_bookmark" );

2
smb4k/dialogs/smb4kcustomoptionsdialog.cpp
Unescape View File

@ -44,7 +44,7 @@
#include "../core/smb4knetworkitems.h"
#include "../core/smb4ksettings.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
// FIXME: Maybe introduce a private class here?

2
smb4k/iconview/smb4ksharesiconview_part.cpp
Unescape View File

@ -564,7 +564,7 @@ extern "C"
{
void *init_libsmb4ksharesiconview()
{
KGlobal::locale()->insertCatalogue( "smb4k" );
TDEGlobal::locale()->insertCatalogue( "smb4k" );
return new Smb4KSharesIconViewPartFactory;
}
}

2
smb4k/listview/smb4kshareslistview_part.cpp
Unescape View File

@ -691,7 +691,7 @@ extern "C"
{
void *init_libsmb4kshareslistview()
{
KGlobal::locale()->insertCatalogue( "smb4k" );
TDEGlobal::locale()->insertCatalogue( "smb4k" );
return new Smb4KSharesListViewPartFactory;
}
}

2
smb4k/searchdlg/smb4ksearchdialog_part.cpp
Unescape View File

@ -269,7 +269,7 @@ extern "C"
{
void *init_libsmb4ksearchdialog()
{
KGlobal::locale()->insertCatalogue( "smb4k" );
TDEGlobal::locale()->insertCatalogue( "smb4k" );
return new Smb4KSearchDialogPartFactory;
}
}

2
smb4k/smb4k.cpp
Unescape View File

@ -51,7 +51,7 @@
#include "core/smb4kshare.h"
#include "core/smb4kdefs.h"
using namespace Smb4KGlobal;
using namespace Smb4TDEGlobal;
Smb4KApp::Smb4KApp( TQWidget *parent, const char *name )

Write Preview
Loading…
Cancel
Save