summaryrefslogtreecommitdiffstats
path: root/filesharing
diff options
context:
space:
mode:
Diffstat (limited to 'filesharing')
-rw-r--r--filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp2
-rw-r--r--filesharing/advanced/kcm_sambaconf/kcminterface.ui.h2
-rw-r--r--filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp2
-rw-r--r--filesharing/advanced/kcm_sambaconf/sambafile.cpp24
-rw-r--r--filesharing/advanced/kcm_sambaconf/sambafile.h4
-rw-r--r--filesharing/advanced/kcm_sambaconf/share.ui.h2
-rw-r--r--filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp18
-rw-r--r--filesharing/advanced/kcm_sambaconf/smbpasswdfile.h4
-rw-r--r--filesharing/advanced/nfs/nfsfile.cpp6
-rw-r--r--filesharing/advanced/propsdlgplugin/propertiespage.cpp10
-rw-r--r--filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp6
-rw-r--r--filesharing/simple/fileshare.cpp18
-rw-r--r--filesharing/simple/groupconfigdlg.cpp12
-rw-r--r--filesharing/simple/krichtextlabel.cpp4
14 files changed, 57 insertions, 57 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index 09252315..2006e1a0 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -68,7 +68,7 @@ HiddenListViewItem::HiddenListViewItem( TQListView *parent, KFileItem *fi, bool
setPixmap( COL_NAME, fi->pixmap(KIcon::SizeSmall));
setText( COL_NAME, fi->text() );
- setText( COL_SIZE, KGlobal::locale()->formatNumber( fi->size(), 0));
+ setText( COL_SIZE, TDEGlobal::locale()->formatNumber( fi->size(), 0));
setText( COL_DATE, fi->timeString() );
setText( COL_PERM, fi->permissionsString() );
setText( COL_OWNER, fi->user() );
diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h
index 55b9df14..b90c47d5 100644
--- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h
+++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui.h
@@ -59,7 +59,7 @@ void KcmInterface::securityLevelCombo_activated( int i )
void KcmInterface::KURLLabel1_leftClickedURL()
{
- KProcess* p = new KProcess();
+ TDEProcess* p = new TDEProcess();
*p << "konqueror";
*p << "man:smb.conf";
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index fcf691da..42b56fa0 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -1434,7 +1434,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *parent, const char *name)
{
- KGlobal::locale()->insertCatalogue("kfileshare");
+ TDEGlobal::locale()->insertCatalogue("kfileshare");
return new KcmSambaConf(parent, name);
}
}
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
index 4703716b..3a865c62 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp
@@ -170,7 +170,7 @@ bool SambaFile::slotApply()
KURL url(path);
if (KURL(path).isLocalFile()) {
- KProcess proc;
+ TDEProcess proc;
kdDebug(5009) << "SambaFile::slotApply: is local file!" << endl;
TQString suCommand=TQString("cp %1 %2; rm %3")
@@ -179,7 +179,7 @@ bool SambaFile::slotApply()
.arg(_tempFile->name());
proc << "tdesu" << "-d" << suCommand;
- if (! proc.start(KProcess::Block)) {
+ if (! proc.start(TDEProcess::Block)) {
kdDebug(5009) << "SambaFile::slotApply: saving to " << path << " failed!" << endl;
//KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").arg(path));
delete _tempFile;
@@ -341,18 +341,18 @@ int SambaFile::getSambaVersion() {
if (_sambaVersion > -1)
return _sambaVersion;
- KProcess testParam;
+ TDEProcess testParam;
testParam << "testparm";
testParam << "-V";
_parmOutput = TQString("");
_sambaVersion = 2;
- connect( &testParam, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
- this, TQT_SLOT(testParmStdOutReceived(KProcess*,char*,int)));
+ connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int)));
- if (testParam.start(KProcess::Block,KProcess::Stdout)) {
+ if (testParam.start(TDEProcess::Block,TDEProcess::Stdout)) {
if (_parmOutput.find("3") > -1)
_sambaVersion = 3;
}
@@ -369,7 +369,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload)
return _testParmValues;
- KProcess testParam;
+ TDEProcess testParam;
testParam << "testparm";
testParam << "-s";
@@ -380,10 +380,10 @@ SambaShare* SambaFile::getTestParmValues(bool reload)
testParam << "/dev/null";
_parmOutput = TQString("");
- connect( &testParam, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
- this, TQT_SLOT(testParmStdOutReceived(KProcess*,char*,int)));
+ connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int)));
- if (testParam.start(KProcess::Block,KProcess::Stdout))
+ if (testParam.start(TDEProcess::Block,TDEProcess::Stdout))
{
parseParmStdOutput();
} else
@@ -392,7 +392,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload)
return _testParmValues;
}
-void SambaFile::testParmStdOutReceived(KProcess *, char *buffer, int buflen)
+void SambaFile::testParmStdOutReceived(TDEProcess *, char *buffer, int buflen)
{
_parmOutput+=TQString::fromLatin1(buffer,buflen);
}
@@ -429,7 +429,7 @@ void SambaFile::parseParmStdOutput()
}
// we are only interested in the global section
- if (section != KGlobal::staticQString("global"))
+ if (section != TDEGlobal::staticQString("global"))
continue;
// parameter
diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.h b/filesharing/advanced/kcm_sambaconf/sambafile.h
index 3d4f0a4d..3696b220 100644
--- a/filesharing/advanced/kcm_sambaconf/sambafile.h
+++ b/filesharing/advanced/kcm_sambaconf/sambafile.h
@@ -30,7 +30,7 @@
class KSimpleConfig;
-class KProcess;
+class TDEProcess;
class KConfig;
class KTempFile;
@@ -166,7 +166,7 @@ public slots:
**/
bool slotApply();
protected slots:
- void testParmStdOutReceived(KProcess *proc, char *buffer, int buflen);
+ void testParmStdOutReceived(TDEProcess *proc, char *buffer, int buflen);
void slotJobFinished( KIO::Job *);
void slotSaveJobFinished( KIO::Job *);
diff --git a/filesharing/advanced/kcm_sambaconf/share.ui.h b/filesharing/advanced/kcm_sambaconf/share.ui.h
index edcb2f7c..4e0d73e6 100644
--- a/filesharing/advanced/kcm_sambaconf/share.ui.h
+++ b/filesharing/advanced/kcm_sambaconf/share.ui.h
@@ -249,7 +249,7 @@ void KcmShareDlg::storeDosAttributesChk_toggled( bool b)
void KcmShareDlg::buttonHelp_clicked()
{
- KProcess* p = new KProcess();
+ TDEProcess* p = new TDEProcess();
*p << "konqueror";
*p << "man:smb.conf";
p->start();
diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
index 8286cdf3..50bf2713 100644
--- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp
@@ -112,15 +112,15 @@ SambaUserList SmbPasswdFile::getSambaUserList()
}
bool SmbPasswdFile::executeSmbpasswd(const TQStringList & args) {
- KProcess p;
+ TDEProcess p;
p << "smbpasswd" << args;
- connect( &p, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
- this, TQT_SLOT(smbpasswdStdOutReceived(KProcess*,char*,int)));
+ connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int)));
_smbpasswdOutput = "";
- bool result = p.start(KProcess::Block,KProcess::Stdout);
+ bool result = p.start(TDEProcess::Block,TDEProcess::Stdout);
if (result)
{
@@ -136,17 +136,17 @@ bool SmbPasswdFile::executeSmbpasswd(const TQStringList & args) {
**/
bool SmbPasswdFile::addUser(const SambaUser & user,const TQString & password)
{
- KProcess p;
+ TDEProcess p;
p << "smbpasswd" << "-a" << user.name;
p << password;
- connect( &p, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),
- this, TQT_SLOT(smbpasswdStdOutReceived(KProcess*,char*,int)));
+ connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+ this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int)));
_smbpasswdOutput = "";
- bool result = p.start(KProcess::Block,KProcess::Stdout);
+ bool result = p.start(TDEProcess::Block,TDEProcess::Stdout);
if (result)
{
@@ -173,7 +173,7 @@ bool SmbPasswdFile::changePassword(const SambaUser & user, const TQString & newP
}
-void SmbPasswdFile::smbpasswdStdOutReceived(KProcess *, char *buffer, int buflen)
+void SmbPasswdFile::smbpasswdStdOutReceived(TDEProcess *, char *buffer, int buflen)
{
_smbpasswdOutput+=TQString::fromLatin1(buffer,buflen);
}
diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h
index 14ae0102..df737994 100644
--- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h
+++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.h
@@ -38,7 +38,7 @@
#include <kurl.h>
class SambaFile;
-class KProcess;
+class TDEProcess;
/**
* Simple class to store a Samba User
@@ -136,7 +136,7 @@ protected:
TQString _smbpasswdOutput;
protected slots:
- void smbpasswdStdOutReceived(KProcess*,char*,int);
+ void smbpasswdStdOutReceived(TDEProcess*,char*,int);
};
#endif
diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp
index 9a1c787b..58c62ca8 100644
--- a/filesharing/advanced/nfs/nfsfile.cpp
+++ b/filesharing/advanced/nfs/nfsfile.cpp
@@ -241,8 +241,8 @@ bool NFSFile::save()
KProcIO proc;
TQString command = TQString("cp %1 %2")
- .arg(KProcess::quote( tempFile.name() ))
- .arg(KProcess::quote( _url.path() ));
+ .arg(TDEProcess::quote( tempFile.name() ))
+ .arg(TDEProcess::quote( _url.path() ));
if (restartNFSServer)
command +=";exportfs -ra";
@@ -250,7 +250,7 @@ bool NFSFile::save()
if (!TQFileInfo(_url.path()).isWritable() )
proc<<"tdesu" << "-d" << "-c"<<command;
- if (!proc.start(KProcess::Block, true)) {
+ if (!proc.start(TDEProcess::Block, true)) {
return false;
}
diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
index 6042b9e7..91ce79d3 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp
+++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
@@ -211,20 +211,20 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool
if (nfsNeedsKDEsu) {
nfsFile->saveTo(nfsTempFile.name());
command += TQString("cp %1 %2;exportfs -ra;")
- .arg(KProcess::quote( nfsTempFile.name() ))
- .arg(KProcess::quote( nfsFileName ));
+ .arg(TDEProcess::quote( nfsTempFile.name() ))
+ .arg(TDEProcess::quote( nfsFileName ));
}
if (sambaNeedsKDEsu) {
sambaFile->saveTo(sambaTempFile.name());
command += TQString("cp %1 %2;")
- .arg(KProcess::quote( sambaTempFile.name() ))
- .arg(KProcess::quote( sambaFileName ));
+ .arg(TDEProcess::quote( sambaTempFile.name() ))
+ .arg(TDEProcess::quote( sambaFileName ));
}
proc<<"tdesu" << "-d" << "-c"<<command;
- if (!proc.start(KProcess::Block, true)) {
+ if (!proc.start(TDEProcess::Block, true)) {
kdDebug(FILESHARE_DEBUG) << "PropertiesPage::save: tdesu command failed" << endl;
return false;
}
diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
index 2af403f5..59155329 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
@@ -49,7 +49,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
const char *, const TQStringList & )
: KPropsDlgPlugin(dlg), d(0)
{
- KGlobal::locale()->insertCatalogue("kfileshare");
+ TDEGlobal::locale()->insertCatalogue("kfileshare");
if (KFileShare::shareMode() == KFileShare::Simple) {
kdDebug(5009) << "PropsDlgSharePlugin: Sharing mode is simple. Aborting." << endl;
@@ -100,9 +100,9 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
void PropsDlgSharePlugin::slotConfigureFileSharing()
{
- KProcess proc;
+ TDEProcess proc;
proc << KStandardDirs::findExe("tdesu") << locate("exe", "kcmshell") << "fileshare";
- proc.start( KProcess::DontCare );
+ proc.start( TDEProcess::DontCare );
}
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 5b796823..15007fdb 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") )
KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &):
KCModule(ShareFactory::instance(), parent, name)
{
- KGlobal::locale()->insertCatalogue("kfileshare");
+ TDEGlobal::locale()->insertCatalogue("kfileshare");
TQBoxLayout* layout = new TQVBoxLayout(this,0,
KDialog::spacingHint());
@@ -221,18 +221,18 @@ void KFileShareConfig::load()
}
bool KFileShareConfig::addGroupAccessesToFile(const TQString & file) {
- KProcess chgrp;
+ TDEProcess chgrp;
chgrp << "chgrp" << m_fileShareGroup << file;
- KProcess chmod;
+ TDEProcess chmod;
chmod << "chmod" << "g=rw" << file;
- if (!chgrp.start(KProcess::Block) && chgrp.normalExit()) {
+ if (!chgrp.start(TDEProcess::Block) && chgrp.normalExit()) {
kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::addGroupAccessesToFile: chgrp failed" << endl;
return false;
}
- if(!chmod.start(KProcess::Block) && chmod.normalExit()) {
+ if(!chmod.start(TDEProcess::Block) && chmod.normalExit()) {
kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::addGroupAccessesToFile: chmod failed" << endl;
return false;
}
@@ -242,18 +242,18 @@ bool KFileShareConfig::addGroupAccessesToFile(const TQString & file) {
}
bool KFileShareConfig::removeGroupAccessesFromFile(const TQString & file) {
- KProcess chgrp;
+ TDEProcess chgrp;
chgrp << "chgrp" << "root" << file;
- KProcess chmod;
+ TDEProcess chmod;
chmod << "chmod" << "g=r" << file;
- if (!chgrp.start(KProcess::Block) && chgrp.normalExit()) {
+ if (!chgrp.start(TDEProcess::Block) && chgrp.normalExit()) {
kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::removeGroupAccessesFromFile: chgrp failed" << endl;
return false;
}
- if(!chmod.start(KProcess::Block) && chmod.normalExit()) {
+ if(!chmod.start(TDEProcess::Block) && chmod.normalExit()) {
kdDebug(FILESHARE_DEBUG) << "KFileShareConfig::removeGroupAccessesFromFile: chmod failed" << endl;
return false;
}
diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp
index a57d0f79..86173f2b 100644
--- a/filesharing/simple/groupconfigdlg.cpp
+++ b/filesharing/simple/groupconfigdlg.cpp
@@ -222,9 +222,9 @@ void GroupConfigDlg::slotOk() {
}
bool userMod(const TQString & user, const TQValueList<KUserGroup> & groups) {
- KProcess proc;
+ TDEProcess proc;
proc << "usermod" << "-G" << groupListToString(groups) << user;
- return proc.start(KProcess::Block) && proc.normalExit();
+ return proc.start(TDEProcess::Block) && proc.normalExit();
}
void GroupConfigDlg::slotRemoveUser() {
@@ -381,9 +381,9 @@ bool GroupConfigDlg::deleteGroup(const TQString & s) {
return false;
}
- KProcess proc;
+ TDEProcess proc;
proc << "groupdel" << s;
- bool result = proc.start(KProcess::Block) && proc.normalExit();
+ bool result = proc.start(TDEProcess::Block) && proc.normalExit();
if (!result) {
KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").arg(s));
}
@@ -402,9 +402,9 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) {
return false;
//debug("CreateFileShareGroup: "+s);
- KProcess proc;
+ TDEProcess proc;
proc << "groupadd" << s;
- bool result = proc.start(KProcess::Block) && proc.normalExit();
+ bool result = proc.start(TDEProcess::Block) && proc.normalExit();
if (!result) {
KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").arg(s));
} else {
diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp
index 499577b0..0df5a95f 100644
--- a/filesharing/simple/krichtextlabel.cpp
+++ b/filesharing/simple/krichtextlabel.cpp
@@ -40,14 +40,14 @@ static TQString qrichtextify( const TQString& text )
KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
setAlignment( TQt::WordBreak );
setText(text);
}
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
- m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
+ m_defaultWidth = TQMIN(400, TDEGlobalSettings::desktopGeometry(this).width()*2/5);
setAlignment( TQt::WordBreak );
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 11:03:19 +0000