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

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
remotes/gitea/gg-tdeadmin-kcron
Timothy Pearson 12 years ago
parent 5f444a9ea9
commit 555ea1c7f3
27 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File

2
kcron/ktapp.h
Unescape View File

@ -251,7 +251,7 @@ private:
/**
* Configuration object of the application.
*/
KConfig* config;
TDEConfig* config;
/**
* Main GUI view/working area.

4
kdat/KDatMainWindow.cpp
Unescape View File

@ -1309,14 +1309,14 @@ void KDatMainWindow::configureUI( Tape* tape )
_fileMenu->setItemEnabled( _fileMenu->idAt( 10 ), TapeManager::instance()->getMountedTape() && !TapeDrive::instance()->isReadOnly() );
}
void KDatMainWindow::readProperties( KConfig* config )
void KDatMainWindow::readProperties( TDEConfig* config )
{
TQValueList<int> sizes;
sizes << config->readNumEntry( "panner", 50 );
_panner->setSizes( sizes );
}
void KDatMainWindow::saveProperties( KConfig* config )
void KDatMainWindow::saveProperties( TDEConfig* config )
{
config->writeEntry( "panner", _panner->sizes().first());
}

4
kdat/KDatMainWindow.h
Unescape View File

@ -133,8 +133,8 @@ private slots:
// 2002-01-24 LEW
protected:
virtual void readProperties( KConfig* config );
virtual void saveProperties( KConfig* config );
virtual void readProperties( TDEConfig* config );
virtual void saveProperties( TDEConfig* config );
public:
/**

4
kdat/Options.h
Unescape View File

@ -21,7 +21,7 @@
#include <tqobject.h>
class KConfig;
class TDEConfig;
/**
* @short The central repository for user preferences.
@ -29,7 +29,7 @@ class KConfig;
class Options : public TQObject {
Q_OBJECT
KConfig* _config;
TDEConfig* _config;
int _defaultTapeSize;
int _tapeBlockSize;
TQString _tapeDevice;

6
knetworkconf/knetworkconf/knetworkconfmodule.cpp
Unescape View File

@ -24,7 +24,7 @@
KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQStringList list*/)
: KCModule(parent,name)
: TDECModule(parent,name)
{
TQVBoxLayout *top = new TQVBoxLayout(this);
@ -40,7 +40,7 @@ KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQS
}
connect(conf,TQT_SIGNAL(networkStateChanged(bool)),TQT_SLOT(configChanged(bool)));
setButtons(KCModule::Apply|KCModule::Help);
setButtons(TDECModule::Apply|TDECModule::Help);
}
KNetworkConfModule::~KNetworkConfModule()
@ -66,7 +66,7 @@ void KNetworkConfModule::save()
/*
int KNetworkConfModule::buttons()
{
return KCModule::Ok|KCModule::Apply|KCModule::Help;
return TDECModule::Ok|TDECModule::Apply|TDECModule::Help;
}
*/
bool KNetworkConfModule::useRootOnlyMsg() const

2
knetworkconf/knetworkconf/knetworkconfmodule.h
Unescape View File

@ -22,7 +22,7 @@
#include <kaboutdata.h>
#include <kcmodule.h>
class KNetworkConfModule : public KCModule
class KNetworkConfModule : public TDECModule
{
Q_OBJECT

2
knetworkconf/knetworkconf/main.cpp
Unescape View File

@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmo
extern "C"
{
KDE_EXPORT KCModule *create_knetworkconfmodule(TQWidget *parent, const char *name)
KDE_EXPORT TDECModule *create_knetworkconfmodule(TQWidget *parent, const char *name)
{
TDEGlobal::locale()->insertCatalogue("knetworkconf");
return new KNetworkConfModule(parent, name);

40
kpackage/kio.cpp
Unescape View File

@ -34,16 +34,16 @@ Kio::Kio()
bool Kio::download(const KURL & from, const TQString & to)
{
KIO::Job *iojob = KIO::file_copy(from, to);
connect( iojob, TQT_SIGNAL( result(KIO::Job*) ),
TQT_SLOT( slotIOJobFinished( KIO::Job* )));
TDEIO::Job *iojob = TDEIO::file_copy(from, to);
connect( iojob, TQT_SIGNAL( result(TDEIO::Job*) ),
TQT_SLOT( slotIOJobFinished( TDEIO::Job* )));
// missing modal widget hack here.
// I'd recommend using KIO::NetAccess instead (David).
// I'd recommend using TDEIO::NetAccess instead (David).
kapp->enter_loop();
return worked;
}
void Kio::slotIOJobFinished( KIO::Job * job)
void Kio::slotIOJobFinished( TDEIO::Job * job)
{
worked = (job->error() == 0);
kapp->exit_loop();
@ -68,18 +68,18 @@ bool Kiod::listDir(const TQString &url, const TQString &fname, bool subdirs)
if (file->open(IO_WriteOnly)) {
delete fileT;
fileT = new TQTextStream(file);
KIO::ListJob *job;
TDEIO::ListJob *job;
if (!subdirs)
job = KIO::listDir( url );
job = TDEIO::listDir( url );
else
job = KIO::listRecursive( url, false);
job = TDEIO::listRecursive( url, false);
kdDebug() << "started " << job << " " << subdirs << endl;
TQObject::connect( job, TQT_SIGNAL( entries( KIO::Job*, const KIO::UDSEntryList& ) ),
TQT_SLOT( slotListEntries( KIO::Job*, const KIO::UDSEntryList& ) ) );
TQObject::connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
TQT_SLOT( slotFinished( KIO::Job* ) ) );
TQObject::connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
TQT_SLOT( slotListEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
kapp->enter_loop();
@ -92,21 +92,21 @@ bool Kiod::listDir(const TQString &url, const TQString &fname, bool subdirs)
return FALSE;
}
void Kiod::slotListEntries( KIO::Job *, const KIO::UDSEntryList& entries )
void Kiod::slotListEntries( TDEIO::Job *, const TDEIO::UDSEntryList& entries )
{
long size = 0;
TQString text;
KIO::UDSEntryList::ConstIterator entryIt = entries.begin();
TDEIO::UDSEntryList::ConstIterator entryIt = entries.begin();
for (; entryIt != entries.end(); ++entryIt) {
//kdDebug() << "listDir " << dynamic_cast<KIO::ListJob*>(job)->url() << endl;
for (KIO::UDSEntry::ConstIterator it = (*entryIt).begin();
//kdDebug() << "listDir " << dynamic_cast<TDEIO::ListJob*>(job)->url() << endl;
for (TDEIO::UDSEntry::ConstIterator it = (*entryIt).begin();
it != (*entryIt).end(); it++ )
{
if ( (*it).m_uds == KIO::UDS_SIZE )
if ( (*it).m_uds == TDEIO::UDS_SIZE )
size = (*it).m_long;
else if ( (*it).m_uds == KIO::UDS_NAME )
else if ( (*it).m_uds == TDEIO::UDS_NAME )
text = (*it).m_str;
}
*fileT << text << "\n" << size << "\n";
@ -114,9 +114,9 @@ void Kiod::slotListEntries( KIO::Job *, const KIO::UDSEntryList& entries )
}
}
void Kiod::slotFinished( KIO::Job *job )
void Kiod::slotFinished( TDEIO::Job *job )
{
//kdDebug() << "finished" << " " << job << " " << dynamic_cast<KIO::ListJob*>(job)->url() << endl;
//kdDebug() << "finished" << " " << job << " " << dynamic_cast<TDEIO::ListJob*>(job)->url() << endl;
worked = (job->error() == 0);
kapp->exit_loop();
}

6
kpackage/kio.h
Unescape View File

@ -51,7 +51,7 @@ private:
bool worked;
private slots:
void slotIOJobFinished( KIO::Job *job );
void slotIOJobFinished( TDEIO::Job *job );
};
class Kiod: public TQObject
@ -71,7 +71,7 @@ private:
bool worked;
private slots:
void slotListEntries( KIO::Job *, const KIO::UDSEntryList& );
void slotFinished( KIO::Job *);
void slotListEntries( TDEIO::Job *, const TDEIO::UDSEntryList& );
void slotFinished( TDEIO::Job *);
};
#endif

10
kpackage/kpackage.cpp
Unescape View File

@ -64,7 +64,7 @@
extern Opts *opts;
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
KPKG::KPKG(KConfig *_config)
KPKG::KPKG(TDEConfig *_config)
: KMainWindow(0)
{
kpackage = new KPACKAGE(_config, this);
@ -251,7 +251,7 @@ void KPKG::writeSettings(){
kpackage->management->writePSeparator();
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");
@ -279,13 +279,13 @@ void KPKG::clearDCache(){
cacheObj::clearDCache();
}
void KPKG::saveProperties(KConfig *config )
void KPKG::saveProperties(TDEConfig *config )
{
config->writePathEntry("Name", kpackage->save_url.url());
}
void KPKG::readProperties(KConfig *config)
void KPKG::readProperties(TDEConfig *config)
{
TQString entry = config->readPathEntry("Name"); // no default
if (entry.isNull())
@ -302,7 +302,7 @@ bool KPKG::queryClose() {
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
KPACKAGE::KPACKAGE(KConfig *_config, TQWidget *parent)
KPACKAGE::KPACKAGE(TDEConfig *_config, TQWidget *parent)
: TQWidget(parent)
{

14
kpackage/kpackage.h
Unescape View File

@ -43,7 +43,7 @@
class KFileDialog;
class KProgress;
class TQFrame;
class KConfig;
class TDEConfig;
class TQLabel;
class Search;
class FindF;
@ -67,7 +67,7 @@ class KPACKAGE : public TQWidget
///////////// METHODS ------------------------------------------------------
public:
KPACKAGE(KConfig *_config, TQWidget *parent);
KPACKAGE(TDEConfig *_config, TQWidget *parent);
// Constructor
~KPACKAGE();
@ -182,7 +182,7 @@ public:
enum { Management, Installation } ;
// Widget modes
KConfig *config;
TDEConfig *config;
// pointer to kconfig object
managementWidget *management;
@ -237,7 +237,7 @@ class KPKG : public KMainWindow
public:
KPKG(KConfig *_config);
KPKG(TDEConfig *_config);
// Constructor
void add_recent_file(const TQString &newfile);
@ -246,8 +246,8 @@ public:
void writeSettings();
// write config settings
void saveProperties(KConfig *config);
void readProperties(KConfig *config);
void saveProperties(TDEConfig *config);
void readProperties(TDEConfig *config);
// save and read restart sstate
void disableMenu();
@ -260,7 +260,7 @@ public:
Options *optiondialog;
// Options dialog
KConfig *config ;
TDEConfig *config ;
// Saved config information
void disableNext();

6
kpackage/kplview.cpp
Unescape View File

@ -525,7 +525,7 @@ void KpTreeList::stackRemove(KpTreeListItem *pack)
////////////////////////////////////////////////////////////////
void KpTreeList::writeTreeType()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");
@ -534,7 +534,7 @@ void KpTreeList::writeTreeType()
void KpTreeList::readTreeType()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");
@ -551,7 +551,7 @@ void KpTreeList::writeTreeConfig()
void KpTreeList::readTreeConfig()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
restoreLayout(config, "Tree");

4
kpackage/managementWidget.cpp
Unescape View File

@ -218,7 +218,7 @@ void managementWidget::setupWidgets()
////////////////////////////////////////////////////////////////
void managementWidget::writePSeparator()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");
@ -228,7 +228,7 @@ void managementWidget::writePSeparator()
void managementWidget::readPSeparator()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");

6
kpackage/options.cpp
Unescape View File

@ -389,7 +389,7 @@ Opts::~Opts()
void Opts::readSettings(const TQString &initHost)
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");
@ -428,7 +428,7 @@ void Opts::readSettings(const TQString &initHost)
void Opts::readLaterSettings()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");
int i;
@ -442,7 +442,7 @@ void Opts::readLaterSettings()
void Opts::writeSettings()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");

4
kpackage/pkgOptions.cpp
Unescape View File

@ -322,7 +322,7 @@ void pkgOptions::keepToggle(bool kp)
{
// kdDebug() << "KEEP " << kp << "\n";
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");
config->writeEntry("keepIWin", kp);
@ -332,7 +332,7 @@ void pkgOptions::keepToggle(bool kp)
void pkgOptions::getKeep()
{
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Kpackage");
keep = config->readBoolEntry("keepIWin", true);
kdDebug() << "getKEEP " << keep << "\n";

12
kpackage/updateLoc.cpp
Unescape View File

@ -432,7 +432,7 @@ void pdUpdateLoc::applyS(LcacheObj *slist)
{
TQString t,pn,cn,pv,prev,opts;
cacheObj *CObj;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup(interName);
cn = interface->head;
@ -466,7 +466,7 @@ void pdUpdateLoc::readSettings()
{
TQString pv, pn;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup(interName);
@ -489,7 +489,7 @@ void pdUpdateLoc::writeSettings()
{
TQString pv, pn;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup(interName);
if (haveBase) {
@ -577,7 +577,7 @@ cUpdateLoc::~cUpdateLoc()
{
TQString t,pn,cn,pv,prev,opts;
cacheObj *CObj;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup(interName);
cn = interface->head;
@ -601,7 +601,7 @@ void cUpdateLoc::readSettings()
{
TQString pv, pn;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup(interName);
@ -623,7 +623,7 @@ void cUpdateLoc::writeSettings()
{
TQString pv, pn;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup(interName);

4
ksysv/ksv_conf.h
Unescape View File

@ -23,7 +23,7 @@
#include "ksv_core.h"
class KConfig;
class TDEConfig;
class KSVConfig
{
@ -125,7 +125,7 @@ private:
TQString mRunlevelPath;
bool mShowLog;
bool mConfigured;
KConfig* mConfig;
TDEConfig* mConfig;
int mPanningFactor;
TQColor mNewNormalColor, mNewSelectedColor;

20
kuser/editDefaults.cpp
Unescape View File

@ -37,8 +37,8 @@
#include "passwordpolicy.h"
#include "misc.h"
editDefaults::editDefaults( KConfigSkeleton *config, TQWidget *parent, const char *name ) :
KConfigDialog( parent, name, config, IconList,
editDefaults::editDefaults( TDEConfigSkeleton *config, TQWidget *parent, const char *name ) :
TDEConfigDialog( parent, name, config, IconList,
Default|Ok|Apply|Cancel|Help, Ok, true )
{
KTabWidget *page1 = new KTabWidget( this );
@ -105,12 +105,12 @@ void editDefaults::slotQueryClicked()
kdDebug() << "sendQuery url: " << _url.prettyURL() << endl;
mLdif.startParsing();
KIO::Job *job = KIO::get( _url, true, false );
TDEIO::Job *job = TDEIO::get( _url, true, false );
// job->addMetaData("no-auth-prompt","true");
connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( loadData( KIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( loadResult( KIO::Job* ) ) );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( loadResult( TDEIO::Job* ) ) );
mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true );
mProg->progressBar()->setValue( 0 );
@ -135,7 +135,7 @@ void editDefaults::slotQueryClicked()
kdDebug() << "domQueryx" << endl;
}
void editDefaults::loadData( KIO::Job*, const TQByteArray& d )
void editDefaults::loadData( TDEIO::Job*, const TQByteArray& d )
{
KABC::LDIF::ParseVal ret;
@ -168,10 +168,10 @@ void editDefaults::loadData( KIO::Job*, const TQByteArray& d )
} while ( ret != KABC::LDIF::MoreData );
}
void editDefaults::loadResult( KIO::Job* job)
void editDefaults::loadResult( TDEIO::Job* job)
{
int error = job->error();
if ( error && error != KIO::ERR_USER_CANCELED )
if ( error && error != TDEIO::ERR_USER_CANCELED )
mErrorMsg = job->errorString();
else
mErrorMsg = "";

10
kuser/editDefaults.h
Unescape View File

@ -29,7 +29,7 @@
class LdapSamba;
namespace KABC { class LdapConfigWidget; }
namespace KIO { class Job; }
namespace TDEIO { class Job; }
typedef struct SambaDomain {
TQString name;
@ -37,11 +37,11 @@ typedef struct SambaDomain {
uint ridbase;
};
class editDefaults : public KConfigDialog {
class editDefaults : public TDEConfigDialog {
Q_OBJECT
public:
editDefaults( KConfigSkeleton *config, TQWidget* parent, const char * name = 0 );
editDefaults( TDEConfigSkeleton *config, TQWidget* parent, const char * name = 0 );
private:
KProgressDialog *mProg;
LdapSamba *page3c;
@ -53,8 +53,8 @@ private:
SambaDomain mDomain;
private slots:
void slotQueryClicked();
void loadData( KIO::Job*, const TQByteArray& d );
void loadResult( KIO::Job* job);
void loadData( TDEIO::Job*, const TQByteArray& d );
void loadResult( TDEIO::Job* job);
};
#endif // _KU_EDITDEFAULTS_H_

26
kuser/kgroupldap.cpp
Unescape View File

@ -82,7 +82,7 @@ TQString KGroupLDAP::getRDN( KU::KGroup *group )
}
}
void KGroupLDAP::result( KIO::Job *job )
void KGroupLDAP::result( TDEIO::Job *job )
{
delete mProg;
mCancel = false;
@ -100,7 +100,7 @@ void KGroupLDAP::result( KIO::Job *job )
}
}
void KGroupLDAP::data( KIO::Job*, const TQByteArray& data )
void KGroupLDAP::data( TDEIO::Job*, const TQByteArray& data )
{
if ( data.size() ) {
mParser.setLDIF( data );
@ -169,11 +169,11 @@ bool KGroupLDAP::reload()
mCancel = true;
ldif = "";
KIO::Job *job = KIO::get( mUrl, true, false );
connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( result( KIO::Job* ) ) );
TDEIO::Job *job = TDEIO::get( mUrl, true, false );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( result( TDEIO::Job* ) ) );
mProg->exec();
if ( mCancel ) job->kill();
@ -192,16 +192,16 @@ bool KGroupLDAP::dbcommit()
ldif = "";
mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true );
KIO::Job *job = KIO::put( mUrl, -1, false, false, false );
connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
this, TQT_SLOT( putData( KIO::Job*, TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( result( KIO::Job* ) ) );
TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false );
connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
this, TQT_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( result( TDEIO::Job* ) ) );
mProg->exec();
return( mOk );
}
void KGroupLDAP::putData( KIO::Job*, TQByteArray& data )
void KGroupLDAP::putData( TDEIO::Job*, TQByteArray& data )
{
ModIt mit = mMod.begin();

6
kuser/kgroupldap.h
Unescape View File

@ -43,9 +43,9 @@ public:
virtual bool dbcommit();
private slots:
void data( KIO::Job*, const TQByteArray& );
void putData( KIO::Job *job, TQByteArray& data );
void result( KIO::Job* );
void data( TDEIO::Job*, const TQByteArray& );
void putData( TDEIO::Job *job, TQByteArray& data );
void result( TDEIO::Job* );
private:
KABC::LDIF mParser;
KABC::LDAPUrl mUrl;

4
kuser/kuser.cpp
Unescape View File

@ -748,9 +748,9 @@ int KU::KUser::removeHome()
if (!stat(TQFile::encodeName(p_dir), &sb))
if (S_ISDIR(sb.st_mode) && sb.st_uid == p_uid) {
if (!KIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) {
if (!TDEIO::NetAccess::del(KURL::fromPathOrURL(p_dir))) {
KMessageBox::error( 0, i18n("Cannot remove home folder %1.\nError: %2")
.arg(p_dir).arg(KIO::NetAccess::lastErrorString()) );
.arg(p_dir).arg(TDEIO::NetAccess::lastErrorString()) );
}
} else {
KMessageBox::error( 0, i18n("Removal of home folder %1 failed (uid = %2, gid = %3).").arg(p_dir).arg(sb.st_uid).arg(sb.st_gid) );

26
kuser/kuserldap.cpp
Unescape View File

@ -76,7 +76,7 @@ KUserLDAP::~KUserLDAP()
mUsers.clear();
}
void KUserLDAP::result( KIO::Job *job )
void KUserLDAP::result( TDEIO::Job *job )
{
delete mProg;
mCancel = false;
@ -94,7 +94,7 @@ void KUserLDAP::result( KIO::Job *job )
}
}
void KUserLDAP::data( KIO::Job *, const TQByteArray& data )
void KUserLDAP::data( TDEIO::Job *, const TQByteArray& data )
{
if ( data.size() ) {
mParser.setLDIF( data );
@ -247,11 +247,11 @@ bool KUserLDAP::reload()
mAdv = 1;
ldif = "";
KIO::Job *job = KIO::get( mUrl, true, false );
connect( job, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( KIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( result( KIO::Job* ) ) );
TDEIO::Job *job = TDEIO::get( mUrl, true, false );
connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( result( TDEIO::Job* ) ) );
// job->addMetaData( "SERVER_CTRL0", "1.2.840.113556.1.4.473 true: uidNumber");
mProg->exec();
if ( mCancel ) job->kill();
@ -609,16 +609,16 @@ bool KUserLDAP::dbcommit()
mAddUser = 0; mDelUser = 0; mUser = 0;
mProg = new KProgressDialog( 0, "", i18n("LDAP Operation"), "", true );
KIO::Job *job = KIO::put( mUrl, -1, false, false, false );
connect( job, TQT_SIGNAL( dataReq( KIO::Job*, TQByteArray& ) ),
this, TQT_SLOT( putData( KIO::Job*, TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
this, TQT_SLOT( result( KIO::Job* ) ) );
TDEIO::Job *job = TDEIO::put( mUrl, -1, false, false, false );
connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
this, TQT_SLOT( putData( TDEIO::Job*, TQByteArray& ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
this, TQT_SLOT( result( TDEIO::Job* ) ) );
mProg->exec();
return( mOk );
}
void KUserLDAP::putData( KIO::Job *, TQByteArray& data )
void KUserLDAP::putData( TDEIO::Job *, TQByteArray& data )
{
ModIt mit = mMod.begin();

6
kuser/kuserldap.h
Unescape View File

@ -43,9 +43,9 @@ public:
virtual bool dbcommit();
private slots:
void data( KIO::Job*, const TQByteArray& );
void putData( KIO::Job *job, TQByteArray& data );
void result( KIO::Job* );
void data( TDEIO::Job*, const TQByteArray& );
void putData( TDEIO::Job *job, TQByteArray& data );
void result( TDEIO::Job* );
private:
KABC::LDIF mParser;
KABC::LDAPUrl mUrl;

2
kuser/kuserprefs.kcfgc
Unescape View File

@ -5,7 +5,7 @@ SetUserTexts=true
#
# Singleton=false
#
# Inherits=KConfigSkeleton
# Inherits=TDEConfigSkeleton
#
# IncludeFiles=libtdepim/kpimprefs.h
#

4
lilo-config/kde/kcontrol.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <unistd.h>
KControl::KControl(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
TQVBoxLayout *layout=new TQVBoxLayout(this);
m=new MainWidget(this, name);
@ -79,7 +79,7 @@ void KControl::configChanged() // SLOT
extern "C"
{
KDE_EXPORT KCModule *create_lilo(TQWidget *parent, const char *name)
KDE_EXPORT TDECModule *create_lilo(TQWidget *parent, const char *name)
{
return new KControl(parent, "kcmlilo");
}

2
lilo-config/kde/kcontrol.h
Unescape View File

@ -36,7 +36,7 @@
class TDEAboutData;
class KControl: public KCModule {
class KControl: public TDECModule {
Q_OBJECT
public:

Write Preview
Loading…
Cancel
Save