TDE
/
tdenetwork
6
0
Fork 0
Code Issues 7 Pull Requests 2 Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent c48e769eb2
commit f21aaec952
291 changed files with 950 additions and 950 deletions
Show Stats Download Patch File Download Diff File

4
dcoprss/service.cpp
Unescape View File

@ -79,7 +79,7 @@ void RSSService::exit()
void RSSService::loadLinks()
{
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("RSS Links");
const TQStringList links = conf->readListEntry ("links");
TQStringList::ConstIterator it = links.begin();
@ -90,7 +90,7 @@ void RSSService::loadLinks()
void RSSService::saveLinks()
{
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("RSS Links");
TQStringList lst;
TQDictIterator<RSSDocument> itr(m_list);

20
dcoprss/xmlrpciface.cpp
Unescape View File

@ -52,28 +52,28 @@ void Query::call( const TQString &server, const TQString &method,
TQDataStream stream( postData, IO_WriteOnly );
stream.writeRawBytes( xmlMarkup.utf8(), xmlMarkup.length() );
KIO::TransferJob *job = KIO::http_post( KURL( server ), postData, false );
TDEIO::TransferJob *job = TDEIO::http_post( KURL( server ), postData, false );
job->addMetaData( "UserAgent", userAgent );
job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" );
connect( job, TQT_SIGNAL( infoMessage( KIO::Job *, const TQString & ) ),
this, TQT_SLOT( slotInfoMessage( KIO::Job *, const TQString & ) ) );
connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
this, TQT_SLOT( slotData( KIO::Job *, const TQByteArray & ) ) );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
this, TQT_SLOT( slotResult( KIO::Job * ) ) );
connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ),
this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) );
connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
}
void Query::slotInfoMessage( KIO::Job *, const TQString &msg )
void Query::slotInfoMessage( TDEIO::Job *, const TQString &msg )
{
emit infoMessage( msg );
}
void Query::slotData( KIO::Job *, const TQByteArray &data )
void Query::slotData( TDEIO::Job *, const TQByteArray &data )
{
m_buffer.writeBlock( data );
}
void Query::slotResult( KIO::Job *job )
void Query::slotResult( TDEIO::Job *job )
{
Result response;
response.m_server = m_server;

8
dcoprss/xmlrpciface.h
Unescape View File

@ -36,7 +36,7 @@
class TQDomDocument;
class TQDomElement;
namespace KIO
namespace TDEIO
{
class Job;
}
@ -91,9 +91,9 @@ namespace KXMLRPC
void finished( const KXMLRPC::Query::Result &result );
private slots:
void slotInfoMessage( KIO::Job *job, const TQString &msg );
void slotData( KIO::Job *job, const TQByteArray &data );
void slotResult( KIO::Job *job );
void slotInfoMessage( TDEIO::Job *job, const TQString &msg );
void slotData( TDEIO::Job *job, const TQByteArray &data );
void slotResult( TDEIO::Job *job );
private:
bool isMessageResponse( const TQDomDocument &doc ) const;

8
filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
Unescape View File

@ -175,7 +175,7 @@ TQPixmap ShareListViewItem::createPropertyPixmap()
}
KcmSambaConf::KcmSambaConf(TQWidget *parent, const char *name)
: KCModule(parent,name)
: TDECModule(parent,name)
{
_dictMngr = 0L;
_sambaFile = 0L;
@ -1414,8 +1414,8 @@ TQString KcmSambaConf::socketOptions()
int KcmSambaConf::buttons () {
// KCModule::Default|KCModule::Apply|KCModule::Help;
return KCModule::Apply;
// TDECModule::Default|TDECModule::Apply|TDECModule::Help;
return TDECModule::Apply;
}
void KcmSambaConf::configChanged() {
@ -1432,7 +1432,7 @@ TQString KcmSambaConf::quickHelp() const
extern "C"
{
KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *parent, const char *name)
KDE_EXPORT TDECModule *create_KcmSambaConf(TQWidget *parent, const char *name)
{
TDEGlobal::locale()->insertCatalogue("kfileshare");
return new KcmSambaConf(parent, name);

2
filesharing/advanced/kcm_sambaconf/kcmsambaconf.h
Unescape View File

@ -66,7 +66,7 @@ class TQSpinBox;
class DictManager;
class SmbConfConfigWidget;
class KcmSambaConf: public KCModule
class KcmSambaConf: public TDECModule
{
Q_OBJECT

14
filesharing/advanced/kcm_sambaconf/sambafile.cpp
Unescape View File

@ -199,9 +199,9 @@ bool SambaFile::slotApply()
KURL srcURL;
srcURL.setPath( _tempFile->name() );
KIO::FileCopyJob * job = KIO::file_copy( srcURL, url, -1, true );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
this, TQT_SLOT( slotSaveJobFinished ( KIO::Job * ) ) );
TDEIO::FileCopyJob * job = TDEIO::file_copy( srcURL, url, -1, true );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
this, TQT_SLOT( slotSaveJobFinished ( TDEIO::Job * ) ) );
return (job->error()==0);
}
@ -459,12 +459,12 @@ TQString SambaFile::findSambaConf()
return KSambaShare::instance()->smbConfPath();
}
void SambaFile::slotSaveJobFinished( KIO::Job * job ) {
void SambaFile::slotSaveJobFinished( TDEIO::Job * job ) {
delete _tempFile;
_tempFile = 0;
}
void SambaFile::slotJobFinished( KIO::Job * job )
void SambaFile::slotJobFinished( TDEIO::Job * job )
{
if (job->error())
emit canceled( job->errorString() );
@ -488,9 +488,9 @@ bool SambaFile::load()
localPath = tempFile.name();
KURL destURL;
destURL.setPath( localPath );
KIO::FileCopyJob * job = KIO::file_copy( url, destURL, 0600, true, false, true );
TDEIO::FileCopyJob * job = TDEIO::file_copy( url, destURL, 0600, true, false, true );
// emit started( d->m_job );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( KIO::Job * ) ) );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
return true;
} else {
localPath = path;

8
filesharing/advanced/kcm_sambaconf/sambafile.h
Unescape View File

@ -31,7 +31,7 @@
class KSimpleConfig;
class TDEProcess;
class KConfig;
class TDEConfig;
class KTempFile;
class SambaFile;
@ -155,7 +155,7 @@ protected:
private:
void copyConfigs(KConfig* first, KConfig* second);
void copyConfigs(TDEConfig* first, TDEConfig* second);
KTempFile * _tempFile;
public slots:
@ -167,8 +167,8 @@ public slots:
bool slotApply();
protected slots:
void testParmStdOutReceived(TDEProcess *proc, char *buffer, int buflen);
void slotJobFinished( KIO::Job *);
void slotSaveJobFinished( KIO::Job *);
void slotJobFinished( TDEIO::Job *);
void slotSaveJobFinished( TDEIO::Job *);
signals:
void canceled(const TQString &);

2
filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
Unescape View File

@ -76,7 +76,7 @@ void SmbConfConfigWidget::btnPressed() {
return;
}
KConfig config("ksambaplugin");
TDEConfig config("ksambaplugin");
config.setGroup("KSambaKonqiPlugin");
config.writeEntry("smb.conf",smbConf);

2
filesharing/simple/fileshare.cpp
Unescape View File

@ -61,7 +61,7 @@ K_EXPORT_COMPONENT_FACTORY (kcm_fileshare, ShareFactory("kcmfileshare") )
#define FILESHARE_DEBUG 5009
KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQStringList &):
KCModule(ShareFactory::instance(), parent, name)
TDECModule(ShareFactory::instance(), parent, name)
{
TDEGlobal::locale()->insertCatalogue("kfileshare");

2
filesharing/simple/fileshare.h
Unescape View File

@ -28,7 +28,7 @@ class TQBoxLayout;
class ControlCenterGUI;
class TQListViewItem;
class KFileShareConfig : public KCModule
class KFileShareConfig : public TDECModule
{
Q_OBJECT

4
kdict/applet/kdictapplet.cpp
Unescape View File

@ -168,7 +168,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion)));
// restore history and completion list
KConfig *c = config();
TDEConfig *c = config();
c->setGroup("General");
TQStringList list = c->readListEntry("Completion list");
@ -187,7 +187,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
DictApplet::~DictApplet()
{
// save history and completion list
KConfig *c = config();
TDEConfig *c = config();
c->setGroup("General");
TQStringList list = completionObject->items();

4
kdict/options.cpp
Unescape View File

@ -44,7 +44,7 @@
void GlobalData::read()
{
KConfig *config=TDEGlobal::config();
TDEConfig *config=TDEGlobal::config();
// general...
config->setGroup("General");
@ -182,7 +182,7 @@ void GlobalData::read()
void GlobalData::write()
{
KConfig *config=TDEGlobal::config();
TDEConfig *config=TDEGlobal::config();
config->setGroup("General");
config->writeEntry("Lookup_Clipboard",defineClipboard);

2
kdict/queryview.cpp
Unescape View File

@ -53,7 +53,7 @@ SaveHelper::~SaveHelper()
} else
if (tmpFile) { // network location, initiate transaction
tmpFile->close();
if (KIO::NetAccess::upload(tmpFile->name(),url, p_arent) == false)
if (TDEIO::NetAccess::upload(tmpFile->name(),url, p_arent) == false)
KMessageBox::error(global->topLevel, i18n("Unable to save remote file."));
tmpFile->unlink(); // delete temp file
delete tmpFile;

6
kdnssd/ioslave/dnssd.cpp
Unescape View File

@ -130,11 +130,11 @@ bool ZeroConfProtocol::dnssdOK()
{
switch(ServiceBrowser::isAvailable()) {
case ServiceBrowser::Stopped:
error(KIO::ERR_UNSUPPORTED_ACTION,
error(TDEIO::ERR_UNSUPPORTED_ACTION,
i18n("The Zeroconf daemon (mdnsd) is not running."));
return false;
case ServiceBrowser::Unsupported:
error(KIO::ERR_UNSUPPORTED_ACTION,
error(TDEIO::ERR_UNSUPPORTED_ACTION,
i18n("TDE has been built without Zeroconf support."));
return false;
default:
@ -229,7 +229,7 @@ bool ZeroConfProtocol::setConfig(const TQString& type)
else
return true;
}
configData = new KConfig("zeroconf/"+type,false,false,"data");
configData = new TDEConfig("zeroconf/"+type,false,false,"data");
return (configData->readEntry("Type")==type);
}

6
kdnssd/ioslave/dnssd.h
Unescape View File

@ -34,12 +34,12 @@
class TQCString;
using namespace KIO;
using namespace TDEIO;
using namespace DNSSD;
enum UrlType { RootDir, ServiceDir, Service, HelperProtocol, Invalid };
class ZeroConfProtocol : public TQObject, public KIO::SlaveBase
class ZeroConfProtocol : public TQObject, public TDEIO::SlaveBase
{
Q_OBJECT
@ -75,7 +75,7 @@ private:
// last resolved or still being resolved services - acts as one-entry cache
RemoteService *toResolve;
// Config file for service - also acts as one-entry cache
KConfig *configData;
TDEConfig *configData;
// listDir for all domains (zeroconf:/) or one specified (zeroconf://domain/)
bool allDomains;
private slots:

2
kget/dlgAdvanced.cpp
Unescape View File

@ -82,7 +82,7 @@ void DlgAdvanced::applyData()
if (ksettings.b_KonquerorIntegration!=bIsKonquiEnable)
{
ksettings.b_KonquerorIntegration=!ksettings.b_KonquerorIntegration;
KConfig cfg("konquerorrc", false, false);
TDEConfig cfg("konquerorrc", false, false);
cfg.setGroup("HTML Settings");
cfg.writePathEntry("DownloadManager",TQString((bIsKonquiEnable)?"kget":""));
cfg.sync();

8
kget/dlgIndividual.cpp
Unescape View File

@ -208,7 +208,7 @@ DlgIndividual::DlgIndividual(Transfer * _item)
}
void DlgIndividual::setTotalSize(KIO::filesize_t bytes)
void DlgIndividual::setTotalSize(TDEIO::filesize_t bytes)
{
m_iTotalSize = bytes;
}
@ -218,13 +218,13 @@ void DlgIndividual::setPercent(unsigned long percent)
{
m_pProgressBar->setValue(percent);
m_pDockIndividual->setValue(percent);
setCaption(i18n("%1% of %2 - %3").arg(percent).arg(KIO::convertSize(m_iTotalSize)).arg(m_location.fileName()));
setCaption(i18n("%1% of %2 - %3").arg(percent).arg(TDEIO::convertSize(m_iTotalSize)).arg(m_location.fileName()));
}
void DlgIndividual::setProcessedSize(KIO::filesize_t bytes)
void DlgIndividual::setProcessedSize(TDEIO::filesize_t bytes)
{
sizeLabel->setText(i18n("%1 of %2").arg(KIO::convertSize(bytes)).arg(KIO::convertSize(m_iTotalSize)));
sizeLabel->setText(i18n("%1 of %2").arg(TDEIO::convertSize(bytes)).arg(TDEIO::convertSize(m_iTotalSize)));
}

6
kget/dlgIndividual.h
Unescape View File

@ -60,9 +60,9 @@ public:
void enableOpenFile();
public slots:
void setTotalSize(KIO::filesize_t bytes);
void setTotalSize(TDEIO::filesize_t bytes);
void setProcessedSize(KIO::filesize_t bytes);
void setProcessedSize(TDEIO::filesize_t bytes);
void setSpeed(TQString speed);
void setPercent(unsigned long percent);
@ -106,7 +106,7 @@ protected:
bool bKeepDlgOpen;
KIO::filesize_t m_iTotalSize;
TDEIO::filesize_t m_iTotalSize;
bool advanced;
}

2
kget/getfilejob.cpp
Unescape View File

@ -17,7 +17,7 @@
#include "getfilejob.h"
namespace KIO
namespace TDEIO
{

2
kget/getfilejob.h
Unescape View File

@ -21,7 +21,7 @@
#include <kio/jobclasses.h>
namespace KIO
namespace TDEIO
{
class GetFileJob:public FileCopyJob

2
kget/http_defaults.h
Unescape View File

@ -36,7 +36,7 @@
#define DEFAULT_MAX_CACHE_AGE 60*60*24*14 // 14 DAYS
#define DEFAULT_CACHE_EXPIRE 10 // 10 SECS
#define DEFAULT_CLEAN_CACHE_INTERVAL 30*60 // 30 MINS
#define DEFAULT_CACHE_CONTROL KIO::CC_Verify // Verify with remote
#define DEFAULT_CACHE_CONTROL TDEIO::CC_Verify // Verify with remote
#define CACHE_REVISION "7\n" // Cache version
// DEFAULT USER AGENT KEY - ENABLES OS NAME

54
kget/kmainwidget.cpp
Unescape View File

@ -128,7 +128,7 @@ KMainWidget::KMainWidget(bool bStartDocked)
#endif
{
KConfig cfg( "kioslaverc", false, false);
TDEConfig cfg( "kioslaverc", false, false);
cfg.setGroup(TQString());
cfg.writeEntry("AutoResume", true);
cfg.sync();
@ -152,7 +152,7 @@ KMainWidget::KMainWidget(bool bStartDocked)
logFileName += tmp;
lastClipboard = TQApplication::clipboard()->text( TQClipboard::Clipboard ).stripWhiteSpace();
// Load all settings from KConfig
// Load all settings from TDEConfig
ksettings.load();
// Setup log window
@ -414,7 +414,7 @@ void KMainWidget::setupGUI()
statusBar()->insertFixedItem(i18n(" Transfers: %1 ").arg(99), ID_TOTAL_TRANSFERS);
statusBar()->insertFixedItem(i18n(" Files: %1 ").arg(555), ID_TOTAL_FILES);
statusBar()->insertFixedItem(i18n(" Size: %1 KB ").arg("134.56"), ID_TOTAL_SIZE);
statusBar()->insertFixedItem(i18n(" Time: %1 ").arg(KIO::convertSeconds(0)), ID_TOTAL_TIME);
statusBar()->insertFixedItem(i18n(" Time: %1 ").arg(TDEIO::convertSeconds(0)), ID_TOTAL_TIME);
statusBar()->insertFixedItem(i18n(" %1 KB/s ").arg("123.34"), ID_TOTAL_SPEED);
setAutoSaveSettings( "MainWindow", false /*Settings takes care of size & pos & state */ );
@ -548,9 +548,9 @@ void KMainWidget::slotImportTextFile()
if (!filename.isValid())
return;
if (KIO::NetAccess::download(filename, tmpFile, this)) {
if (TDEIO::NetAccess::download(filename, tmpFile, this)) {
list = kFileToString(tmpFile);
KIO::NetAccess::removeTempFile(tmpFile);
TDEIO::NetAccess::removeTempFile(tmpFile);
} else
list = kFileToString(filename.path()); // file not accessible -> give error message
@ -1112,7 +1112,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile)
}
//check if destination already exists
if(KIO::NetAccess::exists(destURL, false, this))
if(TDEIO::NetAccess::exists(destURL, false, this))
{
if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").arg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") )
== KMessageBox::Yes)
@ -1135,7 +1135,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile)
{
// simply delete it, the calling process should have asked if you
// really want to delete (at least khtml does)
if(KIO::NetAccess::exists(destURL, false, this))
if(TDEIO::NetAccess::exists(destURL, false, this))
SafeDelete::deleteFile( destURL );
}
@ -1190,7 +1190,7 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir )
{
destURL.adjustPath( +1 );
destURL.setFileName( fileName );
if(KIO::NetAccess::exists(destURL, false, this))
if(TDEIO::NetAccess::exists(destURL, false, this))
{
if (KMessageBox::warningYesNo(this,i18n("Destination file \n%1\nalready exists.\nDo you want to overwrite it?").arg( destURL.prettyURL()), TQString(), i18n("Overwrite"), i18n("Do Not Overwrite") )
== KMessageBox::Yes)
@ -1249,7 +1249,7 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir )
bool skip_all = false;
bool overwrite_all = false;
it = urls.begin();
KIO::RenameDlg_Result result;
TDEIO::RenameDlg_Result result;
while ( it != urls.end() )
{
@ -1266,32 +1266,32 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir )
(*it).dest.setFileName( fileName );
if( KIO::NetAccess::exists((*it).dest, false, this))
if( TDEIO::NetAccess::exists((*it).dest, false, this))
{
TQString newdest;
if (skip_all)
result = KIO::R_SKIP;
result = TDEIO::R_SKIP;
else if( overwrite_all )
result = KIO::R_OVERWRITE;
result = TDEIO::R_OVERWRITE;
else
{
TQFileInfo finfo( (*it).dest.path() );
TQString caption = i18n( "File Already exists" ) + " - KGet";
result = KIO::open_RenameDlg( caption, (*it).src.url(), (*it).dest.url(), KIO::RenameDlg_Mode(KIO::M_OVERWRITE|KIO::M_SKIP|KIO::M_MULTI), newdest, (KIO::filesize_t) -1, (KIO::filesize_t)finfo.size(), (time_t) -1, (time_t) -1, (time_t) -1, finfo.lastModified().toTime_t());
result = TDEIO::open_RenameDlg( caption, (*it).src.url(), (*it).dest.url(), TDEIO::RenameDlg_Mode(TDEIO::M_OVERWRITE|TDEIO::M_SKIP|TDEIO::M_MULTI), newdest, (TDEIO::filesize_t) -1, (TDEIO::filesize_t)finfo.size(), (time_t) -1, (time_t) -1, (time_t) -1, finfo.lastModified().toTime_t());
}
switch (result)
{
case KIO::R_RENAME:
case TDEIO::R_RENAME:
(*it).dest = KURL::fromPathOrURL( newdest );
break;
case KIO::R_OVERWRITE_ALL:
case TDEIO::R_OVERWRITE_ALL:
overwrite_all = true; //fall through
case KIO::R_OVERWRITE:
case TDEIO::R_OVERWRITE:
urlsToDelete.append( (*it).dest );
break;
case KIO::R_AUTO_SKIP:
case TDEIO::R_AUTO_SKIP:
skip_all = true;
case KIO::R_SKIP: //fall through
case TDEIO::R_SKIP: //fall through
it = urls.erase( it );
continue;
break;
@ -1300,7 +1300,7 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir )
}
if ( !dir_accepted )
break;
} // if(KIO::NetAccess::exists
} // if(TDEIO::NetAccess::exists
++it;
} // while ( it != urls.end() )
} // while ( !dir_accepted )
@ -1921,7 +1921,7 @@ void KMainWidget::slotKonquerorIntegration()
bool bIsKonquiEnable=!ksettings.b_KonquerorIntegration;
ksettings.b_KonquerorIntegration=!ksettings.b_KonquerorIntegration;
KConfig cfg("konquerorrc", false, false);
TDEConfig cfg("konquerorrc", false, false);
cfg.setGroup("HTML Settings");
cfg.writePathEntry("DownloadManager",TQString((bIsKonquiEnable)?"kget":""));
cfg.sync();
@ -2147,7 +2147,7 @@ void KMainWidget::updateStatusBar()
TQString tmpstr;
int totalFiles = 0;
KIO::filesize_t totalSize = 0;
TDEIO::filesize_t totalSize = 0;
int totalSpeed = 0;
unsigned int remTime = 0;
@ -2168,9 +2168,9 @@ void KMainWidget::updateStatusBar()
statusBar()->changeItem(i18n(" Transfers: %1 ").arg(myTransferList->childCount()), ID_TOTAL_TRANSFERS);
statusBar()->changeItem(i18n(" Files: %1 ").arg(totalFiles), ID_TOTAL_FILES);
statusBar()->changeItem(i18n(" Size: %1 ").arg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE);
statusBar()->changeItem(i18n(" Time: %1 ").arg(KIO::convertSeconds(remTime)), ID_TOTAL_TIME);
statusBar()->changeItem(i18n(" %1/s ").arg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED);
statusBar()->changeItem(i18n(" Size: %1 ").arg(TDEIO::convertSize(totalSize)), ID_TOTAL_SIZE);
statusBar()->changeItem(i18n(" Time: %1 ").arg(TDEIO::convertSeconds(remTime)), ID_TOTAL_TIME);
statusBar()->changeItem(i18n(" %1/s ").arg(TDEIO::convertSize(totalSpeed)), ID_TOTAL_SPEED);
//update size for each statusbar field
statusBar()->setItemFixed(ID_TOTAL_TRANSFERS, -1);
statusBar()->setItemFixed(ID_TOTAL_FILES, -1);
@ -2181,9 +2181,9 @@ void KMainWidget::updateStatusBar()
if (kdock) {
tmpstr = i18n("<b>Transfers:</b> %1 ").arg(myTransferList->childCount()) +
i18n("<br /><b>Files:</b> %1 ").arg(totalFiles) +
i18n("<br /><b>Size:</b> %1 ").arg(KIO::convertSize(totalSize)) +
i18n("<br /><b>Time:</b> %1 ").arg(KIO::convertSeconds(remTime)) +
i18n("<br /><b>Speed:</b> %1/s").arg(KIO::convertSize(totalSpeed));
i18n("<br /><b>Size:</b> %1 ").arg(TDEIO::convertSize(totalSize)) +
i18n("<br /><b>Time:</b> %1 ").arg(TDEIO::convertSeconds(remTime)) +
i18n("<br /><b>Speed:</b> %1/s").arg(TDEIO::convertSize(totalSpeed));
kdock->updateToolTip( tmpstr );
//trayicon changes if download is in progress
if (totalSpeed == 0)

2
kget/safedelete.cpp
Unescape View File

@ -21,7 +21,7 @@ bool SafeDelete::deleteFile( const KURL& url )
return false;
}
KIO::NetAccess::del( url, 0L );
TDEIO::NetAccess::del( url, 0L );
return true;
}

6
kget/settings.cpp
Unescape View File

@ -59,7 +59,7 @@ Settings::load()
{
sDebug << "Loading settings" << endl;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
// read system options
config->setGroup("System");
@ -118,7 +118,7 @@ Settings::load()
// read if the integration whith konqueror is enabled
KConfig *cfg = new KConfig("konquerorrc", false, false);
TDEConfig *cfg = new TDEConfig("konquerorrc", false, false);
cfg->setGroup("HTML Settings");
TQString downloadManager=cfg->readPathEntry("DownloadManager");
@ -196,7 +196,7 @@ void Settings::save()
{
sDebug << "Saving settings" << endl;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
// write connection options
config->setGroup("Connection");

42
kget/slave.cpp
Unescape View File

@ -117,8 +117,8 @@ void Slave::run()
case RETR:
mDebug << " FETCHED COMMAND RETR" << endl;
assert(!copyjob);
KIO::Scheduler::checkSlaveOnHold( true );
copyjob = new KIO::GetFileJob(m_src, m_dest);
TDEIO::Scheduler::checkSlaveOnHold( true );
copyjob = new TDEIO::GetFileJob(m_src, m_dest);
Connect();
PostMessage(SLV_RESUMED);
break;
@ -126,8 +126,8 @@ void Slave::run()
case RETR_CACHE:
mDebug << " FETCHED COMMAND RETR_CACHE" << endl;
assert(!copyjob);
KIO::Scheduler::checkSlaveOnHold( true );
copyjob = new KIO::GetFileJob(m_src, m_dest);
TDEIO::Scheduler::checkSlaveOnHold( true );
copyjob = new TDEIO::GetFileJob(m_src, m_dest);
copyjob->addMetaData("cache", "cacheonly");
Connect();
break;
@ -218,23 +218,23 @@ void Slave::Connect()
mDebugIn << endl;
connect(copyjob, TQT_SIGNAL(canceled(KIO::Job *)), TQT_SLOT(slotCanceled(KIO::Job *)));
connect(copyjob, TQT_SIGNAL(connected(KIO::Job *)), TQT_SLOT(slotConnected(KIO::Job *)));
connect(copyjob, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
connect(copyjob, TQT_SIGNAL(canceled(TDEIO::Job *)), TQT_SLOT(slotCanceled(TDEIO::Job *)));
connect(copyjob, TQT_SIGNAL(connected(TDEIO::Job *)), TQT_SLOT(slotConnected(TDEIO::Job *)));
connect(copyjob, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
connect(copyjob, TQT_SIGNAL(totalSize(KIO::Job *, KIO::filesize_t)), TQT_SLOT(slotTotalSize(KIO::Job *, KIO::filesize_t)));
connect(copyjob, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t)), TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
connect(copyjob, TQT_SIGNAL(processedSize(KIO::Job *, KIO::filesize_t)), TQT_SLOT(slotProcessedSize(KIO::Job *, KIO::filesize_t)));
connect(copyjob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t)));
connect(copyjob, TQT_SIGNAL(speed(KIO::Job *, unsigned long)), TQT_SLOT(slotSpeed(KIO::Job *, unsigned long)));
connect(copyjob, TQT_SIGNAL(speed(TDEIO::Job *, unsigned long)), TQT_SLOT(slotSpeed(TDEIO::Job *, unsigned long)));
connect(copyjob, TQT_SIGNAL(infoMessage(KIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(KIO::Job *, const TQString &)));
connect(copyjob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &)));
mDebugOut << endl;
}
void Slave::slotCanceled(KIO::Job *)
void Slave::slotCanceled(TDEIO::Job *)
{
mDebugIn << endl;
@ -242,7 +242,7 @@ void Slave::slotCanceled(KIO::Job *)
mDebugOut << endl;
}
void Slave::slotConnected(KIO::Job *)
void Slave::slotConnected(TDEIO::Job *)
{
mDebugIn << endl;
@ -250,13 +250,13 @@ void Slave::slotConnected(KIO::Job *)
mDebugOut << endl;
}
void Slave::slotResult(KIO::Job * job)
void Slave::slotResult(TDEIO::Job * job)
{
mDebugIn << endl;
assert(copyjob == job);
copyjob=0L;
KIO::Error error=KIO::Error(job->error());
TDEIO::Error error=TDEIO::Error(job->error());
if (!error) {
PostMessage(SLV_FINISHED);
}
@ -270,11 +270,11 @@ void Slave::slotResult(KIO::Job * job)
"</b></font>";
InfoMessage(tmsg);
if (m_parent->retryOnError() && \
((error==KIO::ERR_COULD_NOT_LOGIN) || (error==KIO::ERR_SERVER_TIMEOUT))) {
((error==TDEIO::ERR_COULD_NOT_LOGIN) || (error==TDEIO::ERR_SERVER_TIMEOUT))) {
//Timeout or login error
PostMessage(SLV_ERROR);
}
else if (m_parent->retryOnBroken() && (error==KIO::ERR_CONNECTION_BROKEN)) {
else if (m_parent->retryOnBroken() && (error==TDEIO::ERR_CONNECTION_BROKEN)) {
// Connection Broken
PostMessage(SLV_BROKEN);
}
@ -287,7 +287,7 @@ void Slave::slotResult(KIO::Job * job)
}
void Slave::slotSpeed(KIO::Job *, unsigned long lSpeed)
void Slave::slotSpeed(TDEIO::Job *, unsigned long lSpeed)
{
// mDebugIn<<endl;
PostMessage(SLV_PROGRESS_SPEED, lSpeed);
@ -295,7 +295,7 @@ void Slave::slotSpeed(KIO::Job *, unsigned long lSpeed)
}
void Slave::slotTotalSize(KIO::Job *, KIO::filesize_t _total_size)
void Slave::slotTotalSize(TDEIO::Job *, TDEIO::filesize_t _total_size)
{
mDebugIn << "= " << _total_size << endl;
@ -313,7 +313,7 @@ void Slave::slotTotalSize(KIO::Job *, KIO::filesize_t _total_size)
mDebugOut << endl;
}
void Slave::slotProcessedSize(KIO::Job *, KIO::filesize_t _processed_size)
void Slave::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t _processed_size)
{
// mDebugIn<<endl;
PostMessage(SLV_PROGRESS_SIZE, _processed_size);
@ -321,7 +321,7 @@ void Slave::slotProcessedSize(KIO::Job *, KIO::filesize_t _processed_size)
// mDebugOut<<endl;
}
void Slave::slotInfoMessage(KIO::Job *, const TQString & _msg)
void Slave::slotInfoMessage(TDEIO::Job *, const TQString & _msg)
{
mDebugIn << "MSG=" << _msg << endl;
InfoMessage(_msg);

18
kget/slave.h
Unescape View File

@ -36,7 +36,7 @@
#include "common.h"
namespace KIO
namespace TDEIO
{
class GetFileJob;
}
@ -72,13 +72,13 @@ protected:
virtual void run();
private slots:
void slotCanceled(KIO::Job *);
void slotConnected(KIO::Job *);
void slotResult(KIO::Job *);
void slotTotalSize(KIO::Job *, KIO::filesize_t);
void slotProcessedSize(KIO::Job *, KIO::filesize_t);
void slotSpeed(KIO::Job *, unsigned long);
void slotInfoMessage(KIO::Job *, const TQString &);
void slotCanceled(TDEIO::Job *);
void slotConnected(TDEIO::Job *);
void slotResult(TDEIO::Job *);
void slotTotalSize(TDEIO::Job *, TDEIO::filesize_t);
void slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t);
void slotSpeed(TDEIO::Job *, unsigned long);
void slotInfoMessage(TDEIO::Job *, const TQString &);
private:
void Connect();
@ -98,7 +98,7 @@ private:
TQValueStack < SlaveCommand > stack;
TQWaitCondition worker;
TQMutex mutex;
KIO::GetFileJob * copyjob;
TDEIO::GetFileJob * copyjob;
};

22
kget/transfer.cpp
Unescape View File

@ -259,8 +259,8 @@ void Transfer::setSpeed(unsigned long _speed)
// sDebugIn <<endl;
speed = _speed;
remainingTimeSec = KIO::calculateRemainingSeconds(totalSize, processedSize, speed);
remainingTime = KIO::convertSeconds(remainingTimeSec);
remainingTimeSec = TDEIO::calculateRemainingSeconds(totalSize, processedSize, speed);
remainingTime = TDEIO::convertSeconds(remainingTimeSec);
//sDebugOut <<endl;
}
@ -292,7 +292,7 @@ void Transfer::updateAll()
if (totalSize != 0) {
//logMessage(i18n("Total size is %1 bytes").arg((double)totalSize));
setText(view->lv_total, KIO::convertSize(totalSize));
setText(view->lv_total, TDEIO::convertSize(totalSize));
} else {
//logMessage(i18n("Total size is unknown"));
setText(view->lv_total, i18n("unknown"));
@ -472,7 +472,7 @@ void Transfer::slotRequestRemove()
// delete the partly downloaded file, if any
file.setFileName( dest.fileName() + ".part" ); // ### get it from the job?
if ( KIO::NetAccess::exists( file, false, view ) ) // don't pollute user with warnings
if ( TDEIO::NetAccess::exists( file, false, view ) ) // don't pollute user with warnings
{
SafeDelete::deleteFile( file ); // ### messagebox on failure?
}
@ -544,7 +544,7 @@ void Transfer::slotRequestDelay()
/*
void Transfer::slotCanceled(KIO::Job *)
void Transfer::slotCanceled(TDEIO::Job *)
{
sDebugIn << endl;
@ -575,7 +575,7 @@ void Transfer::slotFinished()
/*
void Transfer::slotRenaming(KIO::Job *, const KURL &, const KURL & to)
void Transfer::slotRenaming(TDEIO::Job *, const KURL &, const KURL & to)
{
sDebugIn << endl;
@ -623,7 +623,7 @@ void Transfer::slotSpeed(unsigned long bytes_per_second)
dlgIndividual->setSpeed(i18n("Stopped"));
} else {
TQString tmps = i18n("%1/s").arg(KIO::convertSize(speed));
TQString tmps = i18n("%1/s").arg(TDEIO::convertSize(speed));
setText(view->lv_speed, tmps);
setText(view->lv_remaining, remainingTime);
if(dlgIndividual)
@ -635,7 +635,7 @@ void Transfer::slotSpeed(unsigned long bytes_per_second)
void Transfer::slotTotalSize(KIO::filesize_t bytes)
void Transfer::slotTotalSize(TDEIO::filesize_t bytes)
{
#ifdef _DEBUG
sDebugIn<<" totalSize is = "<<totalSize << endl;
@ -645,7 +645,7 @@ void Transfer::slotTotalSize(KIO::filesize_t bytes)
totalSize = bytes;
if (totalSize != 0) {
logMessage(i18n("Total size is %1 bytes").arg((double)totalSize,0,'f',0));
setText(view->lv_total, KIO::convertSize(totalSize));
setText(view->lv_total, TDEIO::convertSize(totalSize));
if(dlgIndividual)
{
dlgIndividual->setTotalSize(totalSize);
@ -672,7 +672,7 @@ void Transfer::slotTotalSize(KIO::filesize_t bytes)
void Transfer::slotProcessedSize(KIO::filesize_t bytes)
void Transfer::slotProcessedSize(TDEIO::filesize_t bytes)
{
//sDebug<< ">>>>Entering"<<endl;
@ -688,7 +688,7 @@ void Transfer::slotProcessedSize(KIO::filesize_t bytes)
percent = 99; // what can we say?
totalSize = processedSize;
setText(view->lv_total, KIO::convertSize(totalSize));
setText(view->lv_total, TDEIO::convertSize(totalSize));
if(dlgIndividual)
dlgIndividual->setTotalSize(totalSize);
}

12
kget/transfer.h
Unescape View File

@ -88,11 +88,11 @@ public:
return remainingTimeSec;
}
KIO::filesize_t getTotalSize()const
TDEIO::filesize_t getTotalSize()const
{
return totalSize;
}
KIO::filesize_t getProcessedSize()const
TDEIO::filesize_t getProcessedSize()const
{
return processedSize;
}
@ -183,8 +183,8 @@ public slots:
void slotQueue();
void slotFinished();
void slotTotalSize(KIO::filesize_t bytes);
void slotProcessedSize(KIO::filesize_t);
void slotTotalSize(TDEIO::filesize_t bytes);
void slotProcessedSize(TDEIO::filesize_t);
void slotStartTime(const TQDateTime &);
void slotStop(); // stop all transfers when going offline
@ -212,8 +212,8 @@ private:
// schedule time
TQDateTime startTime;
KIO::filesize_t totalSize;
KIO::filesize_t processedSize;
TDEIO::filesize_t totalSize;
TDEIO::filesize_t processedSize;
int percent;
int speed;

4
kget/transferlist.cpp
Unescape View File

@ -76,7 +76,7 @@ TransferList::TransferList(TQWidget * parent, const char *name)
jobid=1;
// initial layout
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("ListView");
if ( config->readListEntry("ColumnWidths").isEmpty() )
{
@ -229,7 +229,7 @@ void TransferList::readTransfers(const KURL& file)
{
TQString tmpFile;
if (KIO::NetAccess::download(file, tmpFile, (TQWidget*)parent())) {
if (TDEIO::NetAccess::download(file, tmpFile, (TQWidget*)parent())) {
KSimpleConfig config(tmpFile);
config.setGroup("Common");

4
knewsticker/common/configaccess.cpp
Unescape View File

@ -398,12 +398,12 @@ bool ArticleFilter::matches(Article::Ptr a) const
}
ConfigAccess::ConfigAccess()
: m_defaultCfg(new KConfig(TQString(), true, false))
: m_defaultCfg(new TDEConfig(TQString(), true, false))
{
m_cfg = m_defaultCfg;
}
ConfigAccess::ConfigAccess(KConfig *config)
ConfigAccess::ConfigAccess(TDEConfig *config)
: m_cfg(config), m_defaultCfg(0L)
{
m_cfg->setGroup("KNewsTicker");

6
knewsticker/common/configaccess.h
Unescape View File

@ -71,7 +71,7 @@ class ConfigAccess : public ConfigIface
{
public:
ConfigAccess();
ConfigAccess(KConfig *);
ConfigAccess(TDEConfig *);
virtual ~ConfigAccess();
virtual unsigned int interval() const;
@ -128,8 +128,8 @@ class ConfigAccess : public ConfigIface
void reparseConfiguration() { m_cfg->reparseConfiguration(); }
private:
KConfig *m_cfg;
KConfig *m_defaultCfg;
TDEConfig *m_cfg;
TDEConfig *m_defaultCfg;
};
#endif // CONFIGACCESS_H

12
knewsticker/common/newsiconmgr.cpp
Unescape View File

@ -88,10 +88,10 @@ void NewsIconMgr::getIcon(const KURL &url)
TQString::fromLatin1("favicons/%1.png").arg(url.host()))));
}
} else {
KIO::Job *job = KIO::get(url, true, false);
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
TDEIO::Job *job = TDEIO::get(url, true, false);
connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
KIODownload download;
download.url = url;
@ -108,7 +108,7 @@ bool NewsIconMgr::isStdIcon(const TQPixmap &pixmap) const
return false;
}
void NewsIconMgr::slotData(KIO::Job *job, const TQByteArray &data)
void NewsIconMgr::slotData(TDEIO::Job *job, const TQByteArray &data)
{
TQBuffer buf(m_kioDownload[job].data);
buf.open(IO_WriteOnly);
@ -117,7 +117,7 @@ void NewsIconMgr::slotData(KIO::Job *job, const TQByteArray &data)
m_kioDownload[job].dataOffset = buf.at();
}
void NewsIconMgr::slotResult(KIO::Job *job)
void NewsIconMgr::slotResult(TDEIO::Job *job)
{
emit gotIcon(m_kioDownload[job].url, TQPixmap(m_kioDownload[job].data));
m_kioDownload.remove(job);

6
knewsticker/common/newsiconmgr.h
Unescape View File

@ -21,7 +21,7 @@
class DCOPClient;
struct KIODownload;
typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
class NewsIconMgr : public TQObject, public DCOPObject
{
@ -46,8 +46,8 @@ class NewsIconMgr : public TQObject, public DCOPObject
~NewsIconMgr();
private slots:
void slotData(KIO::Job *, const TQByteArray &);
void slotResult(KIO::Job *);
void slotData(TDEIO::Job *, const TQByteArray &);
void slotResult(TDEIO::Job *);
private:
TQString favicon(const KURL &) const;

12
knewsticker/common/xmlnewsaccess.cpp
Unescape View File

@ -59,20 +59,20 @@ void XMLNewsSource::loadFrom(const KURL &url)
m_downloadData = new TQBuffer;
m_downloadData->open(IO_WriteOnly);
KIO::Job *job = KIO::get(url, false, false);
TDEIO::Job *job = TDEIO::get(url, false, false);
job->addMetaData(TQString::fromLatin1("UserAgent"),
TQString::fromLatin1("KNewsTicker v0.2"));
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
}
void XMLNewsSource::slotData(KIO::Job *, const TQByteArray &data)
void XMLNewsSource::slotData(TDEIO::Job *, const TQByteArray &data)
{
m_downloadData->writeBlock(data.data(), data.size());
}
void XMLNewsSource::slotResult(KIO::Job *job)
void XMLNewsSource::slotResult(TDEIO::Job *job)
{
kdDebug(5005) << "XMLNewsSource::slotResult(): Finished downloading data (" << job->error() << ")." << endl;
processData(m_downloadData->buffer(), !job->error());

4
knewsticker/common/xmlnewsaccess.h
Unescape View File

@ -76,8 +76,8 @@ class XMLNewsSource : public TQObject
TQString m_description;
private slots:
void slotData(KIO::Job *, const TQByteArray &);
void slotResult(KIO::Job *);
void slotData(TDEIO::Job *, const TQByteArray &);
void slotResult(TDEIO::Job *);
private:
XMLNewsArticle::List m_articles;

2
knewsticker/knewstickerconfig.h
Unescape View File

@ -23,7 +23,7 @@
class KNewsTickerConfig;
class KNewsTickerConfigWidget;
class KConfig;
class TDEConfig;
class NewsIconMgr;
class ConfigAccess;

2
knewsticker/knewstickerstub/knewstickerstub.cpp
Unescape View File

@ -49,7 +49,7 @@ int main(int argc, char **argv)
DCOPClient *dcopClient = app.dcopClient();
dcopClient->attach();
KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false);
TDEConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false);
ConfigAccess configFrontend(&cfg);
if (args->isSet("addrdf")) {

2
knewsticker/newsscroller.cpp
Unescape View File

@ -185,7 +185,7 @@ void NewsScroller::dropEvent(TQDropEvent* event)
if (!isHeadline(newSourceUrl) && KMessageBox::questionYesNo(this, i18n("<p>Do you really want to add '%1' to"
" the list of news sources?</p>")
.arg(newSourceUrl), TQString(), i18n("Add"), KStdGuiItem::cancel()) == KMessageBox::Yes) {
KConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false);
TDEConfig cfg(TQString::fromLatin1("knewsticker_panelappletrc"), false, false);
ConfigAccess configFrontend(&cfg);
TQStringList newsSources = configFrontend.newsSources();

4
kopete/kopete/addcontactwizard/addcontactwizard.cpp
Unescape View File

@ -128,7 +128,7 @@ AddContactWizard::AddContactWizard( TQWidget *parent, const char *name )
connect( protocolListView, TQT_SIGNAL(spacePressed(TQListViewItem *)), this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *)));
// read sticky settings
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Add Contact Wizard");
bool useKABC = config->readBoolEntry( "UseAddressBook", false );
chkAddressee->setChecked( useKABC );
@ -237,7 +237,7 @@ void AddContactWizard::accept()
delete metaContact;
// write sticky settings
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("Add Contact Wizard");
config->writeEntry( "UseAddressBook", chkAddressee->isChecked() );
config->sync();

4
kopete/kopete/chatwindow/chatmessagepart.cpp
Unescape View File

@ -296,7 +296,7 @@ void ChatMessagePart::slotImportEmoticon()
TQString emo = d->activeElement.getAttribute("src").string();
TQString themeName = KopetePrefs::prefs()->iconTheme();
KIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ));
TDEIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ));
TQFile *fp = new TQFile(TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ) + "/emoticons.xml");
@ -371,7 +371,7 @@ void ChatMessagePart::save()
tempFile.close();
if ( !KIO::NetAccess::move( KURL( tempFile.name() ), saveURL ) )
if ( !TDEIO::NetAccess::move( KURL( tempFile.name() ), saveURL ) )
{
KMessageBox::queuedMessageBox( view(), KMessageBox::Error,
i18n("<qt>Could not open <b>%1</b> for writing.</qt>").arg( saveURL.prettyURL() ), // Message

8
kopete/kopete/chatwindow/chatview.cpp
Unescape View File

@ -834,7 +834,7 @@ void ChatView::messageSentSuccessfully()
void ChatView::saveOptions()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
writeDockConfig ( config, TQString::fromLatin1( "ChatViewDock" ) );
config->setGroup( TQString::fromLatin1( "ChatViewDock" ) );
@ -858,7 +858,7 @@ void ChatView::saveChatSettings()
if ( !mc )
return;
KConfig* config = TDEGlobal::config();
TDEConfig* config = TDEGlobal::config();
TQString contactListGroup = TQString::fromLatin1("chatwindow_") +
mc->metaContactId();
@ -878,7 +878,7 @@ void ChatView::loadChatSettings()
//read settings for metacontact
TQString contactListGroup = TQString::fromLatin1("chatwindow_") +
contacts.first()->metaContact()->metaContactId();
KConfig* config = TDEGlobal::config();
TDEConfig* config = TDEGlobal::config();
config->setGroup( contactListGroup );
bool enableRichText = config->readBoolEntry( "EnableRichText", true );
editPart()->slotSetRichTextEnabled( enableRichText );
@ -889,7 +889,7 @@ void ChatView::loadChatSettings()
void ChatView::readOptions()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
/** THIS IS BROKEN !!! */
//dockManager->readConfig ( config, TQString::fromLatin1("ChatViewDock") );

4
kopete/kopete/chatwindow/kopetechatwindow.cpp
Unescape View File

@ -1031,7 +1031,7 @@ void KopeteChatWindow::readOptions()
{
// load and apply config file settings affecting the appearance of the UI
// kdDebug(14010) << k_funcinfo << endl;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
applyMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) );
config->setGroup( TQString::fromLatin1("ChatWindowSettings") );
m_showFormatToolbar = config->readBoolEntry( TQString::fromLatin1("Show Format Toolbar"), true );
@ -1041,7 +1041,7 @@ void KopeteChatWindow::saveOptions()
{
// kdDebug(14010) << k_funcinfo << endl;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
// saves menubar,toolbar and statusbar setting
saveMainWindowSettings( config, TQString::fromLatin1( "KopeteChatWindow" ) );

4
kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
Unescape View File

@ -304,7 +304,7 @@ bool ChatWindowStyleManager::removeStyle(const TQString &stylePath)
}
// Do the actual deletion of the directory style.
return KIO::NetAccess::del( urlStyle, 0 );
return TDEIO::NetAccess::del( urlStyle, 0 );
}
else
{
@ -319,7 +319,7 @@ ChatWindowStyle *ChatWindowStyleManager::getStyleFromPool(const TQString &styleP
// NOTE: This is a hidden config switch for style developers
// Check in the config if the cache is disabled.
// if the cache is disabled, reload the style everytime it's getted.
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("KopeteStyleDebug");
bool disableCache = config->readBoolEntry("disableStyleCache", false);
if(disableCache)

4
kopete/kopete/chatwindow/kopeteemailwindow.cpp
Unescape View File

@ -175,7 +175,7 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP
else
toggleMode( Send );
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
applyMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) );
d->sendInProgress = false;
@ -195,7 +195,7 @@ KopeteEmailWindow::~KopeteEmailWindow()
emit( closing( this ) );
// saves menubar, toolbar and statusbar setting
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
saveMainWindowSettings( config, TQString::fromLatin1( "KopeteEmailWindow" ) );
config->sync();

4
kopete/kopete/chatwindow/krichtexteditpart.cpp
Unescape View File

@ -300,7 +300,7 @@ void KopeteRichTextEditPart::readConfig()
{
// Don't update config untill we read whole config first
m_configWriteLock = true;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("RichTextEditor");
TQColor tmpColor = TDEGlobalSettings::textColor();
@ -342,7 +342,7 @@ void KopeteRichTextEditPart::writeConfig()
// If true we're still reading the conf write now, so don't write.
if( m_configWriteLock ) return;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("RichTextEditor");
config->writeEntry("Font", mFont );
config->writeEntry("FontSize", mFont.pointSize() );

2
kopete/kopete/config/accounts/kopete_accountconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=personal
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_accountconfig

2
kopete/kopete/config/accounts/kopeteaccountconfig.cpp
Unescape View File

@ -54,7 +54,7 @@ typedef KGenericFactory<KopeteAccountConfig, TQWidget> KopeteAccountConfigFactor
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_accountconfig, KopeteAccountConfigFactory( "kcm_kopete_accountconfig" ) )
KopeteAccountConfig::KopeteAccountConfig( TQWidget *parent, const char * /* name */, const TQStringList &args )
: KCModule( KopeteAccountConfigFactory::instance(), parent, args )
: TDECModule( KopeteAccountConfigFactory::instance(), parent, args )
{
( new TQVBoxLayout( this ) )->setAutoAdd( true );

2
kopete/kopete/config/accounts/kopeteaccountconfig.h
Unescape View File

@ -30,7 +30,7 @@ class KopeteAccountConfigBase;
/**
* @author Olivier Goffart <ogoffart @ kde.org>
*/
class KopeteAccountConfig : public KCModule
class KopeteAccountConfig : public TDECModule
{
Q_OBJECT

14
kopete/kopete/config/appearance/appearanceconfig.cpp
Unescape View File

@ -179,16 +179,16 @@ public:
}
};
// TODO: Someday, this configuration dialog must(not should) use KConfigXT
// TODO: Someday, this configuration dialog must(not should) use TDEConfigXT
AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const TQStringList &args )
: KCModule( KopeteAppearanceConfigFactory::instance(), parent, args )
: TDECModule( KopeteAppearanceConfigFactory::instance(), parent, args )
{
d = new Private;
(new TQVBoxLayout(this))->setAutoAdd(true);
d->mAppearanceTabCtl = new TQTabWidget(this, "mAppearanceTabCtl");
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "ChatWindowSettings" );
// "Emoticons" TAB ==========================================================
@ -629,7 +629,7 @@ void AppearanceConfig::slotInstallChatStyle()
if( !styleToInstall.isEmpty() )
{
TQString stylePath;
if( KIO::NetAccess::download( styleToInstall, stylePath, this ) )
if( TDEIO::NetAccess::download( styleToInstall, stylePath, this ) )
{
int styleInstallReturn = 0;
styleInstallReturn = ChatWindowStyleManager::self()->installStyle( stylePath );
@ -662,7 +662,7 @@ void AppearanceConfig::slotInstallChatStyle()
}
// removeTempFile check if the file is a temp file, so it's ok for local files.
KIO::NetAccess::removeTempFile( stylePath );
TDEIO::NetAccess::removeTempFile( stylePath );
}
}
}
@ -846,14 +846,14 @@ void AppearanceConfig::removeSelectedEmoticonTheme()
return;
KURL themeUrl(TDEGlobal::dirs()->findResource("emoticons", themeName+"/"));
KIO::NetAccess::del(themeUrl, this);
TDEIO::NetAccess::del(themeUrl, this);
updateEmoticonlist();
}
void AppearanceConfig::slotGetEmoticonThemes()
{
KConfig* config = TDEGlobal::config();
TDEConfig* config = TDEGlobal::config();
config->setGroup( "KNewStuff" );
config->writeEntry( "ProvidersUrl",
"http://download.kde.org/khotnewstuff/emoticons-providers.xml" );

2
kopete/kopete/config/appearance/appearanceconfig.h
Unescape View File

@ -27,7 +27,7 @@
* @author Duncan Mac-Vicar P. <duncan@kde.org>
* @author Michaël Larouche <michael.larouche@kdemail.net>
*/
class AppearanceConfig : public KCModule
class AppearanceConfig : public TDECModule
{
Q_OBJECT

2
kopete/kopete/config/appearance/emoticonseditdialog.cpp
Unescape View File

@ -226,7 +226,7 @@ void EmoticonsEditDialog::slotRemoveClicked()
void EmoticonsEditDialog::addEmoticon(TQString emo, TQString text, bool copy)
{
if(copy)
KIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ));
TDEIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ));
KListViewItem *itm = new KListViewItem(mMainWidget->klvEmoticons);
itm->setPixmap(0, TQPixmap(emo));

2
kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=looknfeel
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_appearanceconfig

2
kopete/kopete/config/avdevice/avdeviceconfig.cpp
Unescape View File

@ -44,7 +44,7 @@ typedef KGenericFactory<AVDeviceConfig, TQWidget> KopeteAVDeviceConfigFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_avdeviceconfig, KopeteAVDeviceConfigFactory( "kcm_kopete_avdeviceconfig" ) )
AVDeviceConfig::AVDeviceConfig(TQWidget *parent, const char * name , const TQStringList &args)
: KCModule( KopeteAVDeviceConfigFactory::instance(), parent, args )
: TDECModule( KopeteAVDeviceConfigFactory::instance(), parent, args )
{
kdDebug() << "kopete:config (avdevice): KopeteAVDeviceConfigFactory::instance() called. " << endl;
(new TQVBoxLayout(this))->setAutoAdd(true);

2
kopete/kopete/config/avdevice/avdeviceconfig.h
Unescape View File

@ -37,7 +37,7 @@ class AVDeviceConfig_AudioDevice;
/**
@author Cl<EFBFBD>dio da Silveira Pinheiro
*/
class AVDeviceConfig : public KCModule
class AVDeviceConfig : public TDECModule
{
Q_OBJECT

2
kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=kopete_avdevice
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_avdeviceconfig

6
kopete/kopete/config/behavior/behaviorconfig.cpp
Unescape View File

@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_behaviorconfig, KopeteBehaviorConfigFacto
BehaviorConfig::BehaviorConfig(TQWidget *parent, const char * /* name */, const TQStringList &args) :
KCModule( KopeteBehaviorConfigFactory::instance(), parent, args )
TDECModule( KopeteBehaviorConfigFactory::instance(), parent, args )
{
(new TQVBoxLayout(this))->setAutoAdd(true);
mBehaviorTabCtl = new TQTabWidget(this, "mBehaviorTabCtl");
@ -159,7 +159,7 @@ void BehaviorConfig::save()
// kdDebug(14000) << k_funcinfo << "called." << endl;
KopetePrefs *p = KopetePrefs::prefs();
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
// "General" TAB ============================================================
p->setShowTray(mPrfsGeneral->mShowTrayChk->isChecked());
@ -219,7 +219,7 @@ void BehaviorConfig::load()
{
// kdDebug(14000) << k_funcinfo << "called" << endl;
KopetePrefs *p = KopetePrefs::prefs();
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
awayInstance = Kopete::Away::getInstance();
// "General" TAB ============================================================

2
kopete/kopete/config/behavior/behaviorconfig.h
Unescape View File

@ -32,7 +32,7 @@ class BehaviorConfig_Chat;
class KopeteAwayConfigBaseUI;
class KPluginInfo;
class BehaviorConfig : public KCModule
class BehaviorConfig : public TDECModule
{
Q_OBJECT

2
kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=configure
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_behaviorconfig

2
kopete/kopete/config/identity/kopete_identityconfig.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=identity
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_identityconfig

8
kopete/kopete/config/identity/kopeteidentityconfig.cpp
Unescape View File

@ -85,13 +85,13 @@ public:
typedef KGenericFactory<KopeteIdentityConfig, TQWidget> KopeteIdentityConfigFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_identityconfig, KopeteIdentityConfigFactory( "kcm_kopete_identityconfig" ) )
KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name*/, const TQStringList &args) : KCModule( KopeteIdentityConfigFactory::instance(), parent, args)
KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name*/, const TQStringList &args) : TDECModule( KopeteIdentityConfigFactory::instance(), parent, args)
{
d = new Private;
( new TQVBoxLayout( this ) )->setAutoAdd( true );
d->m_view = new KopeteIdentityConfigBase( this, "KopeteIdentityConfig::m_view" );
// Setup KConfigXT link with GUI.
// Setup TDEConfigXT link with GUI.
addConfig( Kopete::Config::self(), d->m_view );
// Load config
@ -160,7 +160,7 @@ KopeteIdentityConfig::~KopeteIdentityConfig()
void KopeteIdentityConfig::load()
{
KCModule::load();
TDECModule::load();
// Populate the select Identity combo box.
loadIdentities();
@ -181,7 +181,7 @@ void KopeteIdentityConfig::load()
void KopeteIdentityConfig::save()
{
KCModule::save();
TDECModule::save();
saveCurrentIdentity();

2
kopete/kopete/config/identity/kopeteidentityconfig.h
Unescape View File

@ -33,7 +33,7 @@ class KopeteIdentityConfigBase;
/**
* @author Michaël Larouche <shock@shockdev.ca.tc>
*/
class KopeteIdentityConfig : public KCModule
class KopeteIdentityConfig : public TDECModule
{
Q_OBJECT

2
kopete/kopete/contactlist/customnotificationprops.cpp
Unescape View File

@ -40,7 +40,7 @@ CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::Noti
m_item = item;
TQString path = "kopete/eventsrc";
KConfig eventsfile( path, true, false, "data" );
TDEConfig eventsfile( path, true, false, "data" );
m_eventList = eventsfile.groupList();
TQStringList contactSpecificEvents; // we are only interested in events that relate to contacts
TQStringList::Iterator it = m_eventList.begin();

2
kopete/kopete/kopeteapplication.cpp
Unescape View File

@ -118,7 +118,7 @@ void KopeteApplication::slotLoadPlugins()
Kopete::AccountManager::self()->load();
Kopete::ContactList::self()->load();
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
// Parse command-line arguments
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

2
kopete/kopete/kopeteiface.cpp
Unescape View File

@ -35,7 +35,7 @@
KopeteIface::KopeteIface() : DCOPObject( "KopeteIface" )
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("AutoAway");
if (config->readBoolEntry("UseAutoAway", true))

4
kopete/kopete/kopetewindow.cpp
Unescape View File

@ -422,7 +422,7 @@ bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event )
void KopeteWindow::loadOptions()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
toolBar("mainToolBar")->applySettings( config, "ToolBar Settings" );
toolBar("quickSearchBar")->applySettings( config, "QuickSearchBar Settings" );
@ -469,7 +469,7 @@ void KopeteWindow::loadOptions()
void KopeteWindow::saveOptions()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
toolBar("mainToolBar")->saveSettings ( config, "ToolBar Settings" );
toolBar("quickSearchBar")->saveSettings( config, "QuickSearchBar Settings" );

2
kopete/libkopete/PORTING
Unescape View File

@ -32,7 +32,7 @@ Porting from Kopete 0.9 to Kopete 0.10
*) KopeteAccount has been renamed to Kopete::Account
.) Account no longer inerits from PluginDataObject. you can access directly to the config with configGroup()
The config now uses the KConfig cache dirrectly and not internal cache.
The config now uses the TDEConfig cache dirrectly and not internal cache.
.) loaded() has been removed since properties are available dirrectly in the constructor.
.) setAccountId and accountIdChanged has been removed
.) password() setPassword() rememberPassword() has been removed. if the account has a pssword, uses PasswordedAccount

4
kopete/libkopete/avdevice/videodevicepool.cpp
Unescape View File

@ -756,7 +756,7 @@ void VideoDevicePool::loadConfig()
kdDebug(14010) << k_funcinfo << "called" << endl;
if((hasDevices())&&(m_clients==0))
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Video Device Settings");
const TQString currentdevice = config->readEntry("Current Device", TQString());
kdDebug(14010) << k_funcinfo << "Current device: " << currentdevice << endl;
@ -817,7 +817,7 @@ void VideoDevicePool::saveConfig()
kdDebug(14010) << k_funcinfo << "called" << endl;
if(hasDevices())
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Video Device Settings");
/* if(m_modelvector.size())

4
kopete/libkopete/kautoconfig.cpp
Unescape View File

@ -64,7 +64,7 @@ public:
// Widgets to parse
TQPtrList<TQWidget> widgets;
// Name of the group that KConfig should be set to for each widget.
// Name of the group that TDEConfig should be set to for each widget.
TQMap<TQWidget*, TQString> groups;
// Child widgets of widgets to ignore
@ -101,7 +101,7 @@ public:
}
};
KAutoConfig::KAutoConfig(KConfig *kconfig, TQObject *parent,
KAutoConfig::KAutoConfig(TDEConfig *kconfig, TQObject *parent,
const char *name) : TQObject(parent, name), config(kconfig) {
d = new KAutoConfigPrivate();
}

10
kopete/libkopete/kautoconfig.h
Unescape View File

@ -25,7 +25,7 @@
#include "kopete_export.h"
class KConfig;
class TDEConfig;
class TQWidget;
/**
@ -119,12 +119,12 @@ signals:
public:
/**
* Constructor.
* @param kconfig - KConfig to use when retrieving/saving the widgets
* @param kconfig - TDEConfig to use when retrieving/saving the widgets
* that KAutoConfig knows about.
* @param parent - Parent object.
* @param name - Object name.
*/
KAutoConfig( KConfig *kconfig, TQObject *parent=0, const char *name=0 );
KAutoConfig( TDEConfig *kconfig, TQObject *parent=0, const char *name=0 );
/**
* Constructor.
@ -243,9 +243,9 @@ public slots:
protected:
/**
* KConfigBase object used to get/save values.
* TDEConfigBase object used to get/save values.
*/
KConfig *config;
TDEConfig *config;
/**
* Map of the classes and the signals that they emit when changed.
*/

12
kopete/libkopete/kcautoconfigmodule.cpp
Unescape View File

@ -31,7 +31,7 @@ class KCAutoConfigModule::KCAutoConfigModulePrivate
KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, const TQStringList & args )
: KCModule( parent, name, args )
: TDECModule( parent, name, args )
, d( new KCAutoConfigModulePrivate )
{
d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) );
@ -40,7 +40,7 @@ KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, co
}
KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * parent, const TQStringList & args )
: KCModule( instance, parent, args )
: TDECModule( instance, parent, args )
, d( new KCAutoConfigModulePrivate )
{
d->kautoconfig = new KAutoConfig( TQT_TQOBJECT(this) );
@ -50,16 +50,16 @@ KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * paren
KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * parent, const char * name, const TQStringList & args )
: KCModule( parent, name, args ) , d( new KCAutoConfigModulePrivate )
KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config,TQWidget * parent, const char * name, const TQStringList & args )
: TDECModule( parent, name, args ) , d( new KCAutoConfigModulePrivate )
{
d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) );
connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified()));
connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified()));
}
KCAutoConfigModule::KCAutoConfigModule( KConfig *config , TDEInstance * instance, TQWidget * parent, const TQStringList & args )
: KCModule( instance, parent, args )
KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config , TDEInstance * instance, TQWidget * parent, const TQStringList & args )
: TDECModule( instance, parent, args )
, d( new KCAutoConfigModulePrivate )
{
d->kautoconfig = new KAutoConfig( config, TQT_TQOBJECT(this) );

26
kopete/libkopete/kcautoconfigmodule.h
Unescape View File

@ -25,11 +25,11 @@
#include "kopete_export.h"
class KAutoConfig;
class KConfig;
class TDEConfig;
/**
* @short Convenience KCModule for creating config page handled with KAutoConfig
* @short Convenience TDECModule for creating config page handled with KAutoConfig
*
* This class makes it very easy to create a configuration page using KAutoConfig.
* All you need to do is create a class that is derived from KCAutoConfigModule, create your
@ -50,41 +50,41 @@ class KConfig;
* @author Olivier Goffart <ogoffart(@)tisclinet.be>
* @since 3.2
*/
class KOPETE_EXPORT KCAutoConfigModule : public KCModule
class KOPETE_EXPORT KCAutoConfigModule : public TDECModule
{
Q_OBJECT
public:
/**
* Standard KCModule constructor. Use TDEGlobal::config()
* Standard TDECModule constructor. Use TDEGlobal::config()
*/
KCAutoConfigModule( TQWidget * parent = 0, const char * name = 0, const TQStringList & args = TQStringList() );
/**
* Standard KCModule constructor. Use TDEGlobal::config()
* Standard TDECModule constructor. Use TDEGlobal::config()
*/
KCAutoConfigModule( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
/**
* Constructor.
* @param config the KConfig to use
* @param config the TDEConfig to use
* @param instance TDEInstance object for this KCM
* @param parent parent widget
* @param args special arguments for this KCM
*
* @todo document what the args mean (inherited from KCModule?)
* @todo document what the args mean (inherited from TDECModule?)
*/
KCAutoConfigModule(KConfig* config, TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
KCAutoConfigModule(TDEConfig* config, TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
/**
* Constructor, much like the one above, except with
* no instance and with a name.
* @param config the KConfig to use
* @param config the TDEConfig to use
* @param parent parent widget
* @param name name of the object
* @param args special arguments for this KCM
*/
KCAutoConfigModule(KConfig* config, TQWidget * parent = 0, const char * name=0 , const TQStringList & args = TQStringList() );
KCAutoConfigModule(TDEConfig* config, TQWidget * parent = 0, const char * name=0 , const TQStringList & args = TQStringList() );
~KCAutoConfigModule();
@ -114,7 +114,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule
/**
* Reload the config from the configfile.
*
* You can also reimplement this method, but you should always call the parent KCModule::load()
* You can also reimplement this method, but you should always call the parent TDECModule::load()
* be sure you know what you are doing
*/
virtual void load();
@ -122,7 +122,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule
/**
* Save the config to the configfile.
*
* You can also reimplement this method, but you should always call the parent KCModule::save()
* You can also reimplement this method, but you should always call the parent TDECModule::save()
* be sure you know what you are doing
*/
virtual void save();
@ -130,7 +130,7 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule
/**
* Reload the default config
*
* You can also reimplement this method, but you should always call the parent KCModule::defaults()
* You can also reimplement this method, but you should always call the parent TDECModule::defaults()
* be sure you know what you are doing
*/
virtual void defaults();

8
kopete/libkopete/knotification.cpp
Unescape View File

@ -164,8 +164,8 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix )
{
TQString appName = TQString::fromAscii( KNotifyClient::instance()->instanceName() );
KIconLoader iconLoader( appName );
KConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data");
KConfigGroup config( &eventsFile, "!Global!" );
TDEConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data");
TDEConfigGroup config( &eventsFile, "!Global!" );
TQString iconName = config.readEntry( "IconName", appName );
TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small );
TQString title = config.readEntry( "Comment", appName );
@ -313,10 +313,10 @@ KNotification *KNotification::event( const TQString& message , const TQString& t
TQString commandline;
// get config file
KConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data");
TDEConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data");
eventsFile.setGroup(message);
KConfig configFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+".eventsrc" ), true, false);
TDEConfig configFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+".eventsrc" ), true, false);
configFile.setGroup(message);
int present=KNotifyClient::getPresentation(message);

6
kopete/libkopete/kopeteaccount.cpp
Unescape View File

@ -76,7 +76,7 @@ public:
TQTimer suppressStatusTimer;
bool suppressStatusNotification;
Kopete::BlackLister *blackList;
KConfigGroup *configGroup;
TDEConfigGroup *configGroup;
uint connectionTry;
TQString customIcon;
Kopete::OnlineStatus restoreStatus;
@ -86,7 +86,7 @@ public:
Account::Account( Protocol *parent, const TQString &accountId, const char *name )
: TQObject( parent, name ), d( new Private( parent, accountId ) )
{
d->configGroup=new KConfigGroup(TDEGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id ));
d->configGroup=new TDEConfigGroup(TDEGlobal::config(), TQString::fromLatin1( "Account_%1_%2" ).arg( d->protocol->pluginId(), d->id ));
d->excludeconnect = d->configGroup->readBoolEntry( "ExcludeConnect", false );
d->color = d->configGroup->readColorEntry( "Color", &d->color );
@ -202,7 +202,7 @@ TQPixmap Account::accountIcon(const int size) const
return base;
}
KConfigGroup* Kopete::Account::configGroup() const
TDEConfigGroup* Kopete::Account::configGroup() const
{
return d->configGroup;
}

10
kopete/libkopete/kopeteaccount.h
Unescape View File

@ -28,7 +28,7 @@
class TQDomNode;
class KActionMenu;
class KConfigGroup;
class TDEConfigGroup;
namespace Kopete
{
@ -55,7 +55,7 @@ class BlackLister;
* the user tied to this account. You must create this contact in the contructor of your
* account and pass it to @ref setMyself().
*
* All account data is saved to @ref KConfig. This includes the accountId, the autoconnect flag and
* All account data is saved to @ref TDEConfig. This includes the accountId, the autoconnect flag and
* the color. You can save more data using @ref configGroup()
*
* When you create a new account, you have to register it with the account manager by calling
@ -307,14 +307,14 @@ public:
bool isAway() const;
/**
* Return the @ref KConfigGroup used to write and read special properties
* Return the @ref TDEConfigGroup used to write and read special properties
*
* "Protocol", "AccountId" , "Color", "AutoConnect", "Priority", "Enabled" , "Icon" are reserved keyword
* already in use in that group.
*
* for compatibility, try to not use key that start with a uppercase
*/
KConfigGroup *configGroup() const;
TDEConfigGroup *configGroup() const;
/**
* @brief Remove the account from the server.
@ -434,7 +434,7 @@ signals:
private:
/**
* @internal
* Reads the configuration information of the account from KConfig.
* Reads the configuration information of the account from TDEConfig.
*/
void readConfig();

8
kopete/libkopete/kopeteaccountmanager.cpp
Unescape View File

@ -296,7 +296,7 @@ void AccountManager::removeAccount( Account *account )
Protocol *protocol = account->protocol();
KConfigGroup *configgroup = account->configGroup();
TDEConfigGroup *configgroup = account->configGroup();
// Clean up the contact list
TQDictIterator<Kopete::Contact> it( account->contacts() );
@ -346,7 +346,7 @@ void AccountManager::save()
for ( TQPtrListIterator<Account> it( d->accounts ); it.current(); ++it )
{
KConfigBase *config = it.current()->configGroup();
TDEConfigBase *config = it.current()->configGroup();
config->writeEntry( "Protocol", it.current()->protocol()->pluginId() );
config->writeEntry( "AccountId", it.current()->accountId() );
@ -364,7 +364,7 @@ void AccountManager::load()
// and load the required protocols if the account is enabled.
// Don't try to optimize duplicate calls out, the plugin queue is smart enough
// (and fast enough) to handle that without adding complexity here
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) );
for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
{
@ -387,7 +387,7 @@ void AccountManager::slotPluginLoaded( Plugin *plugin )
// Iterate over all groups that start with "Account_" as those are accounts
// and parse them if they are from this protocol
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
TQStringList accountGroups = config->groupList().grep( TQRegExp( TQString::fromLatin1( "^Account_" ) ) );
for ( TQStringList::Iterator it = accountGroups.begin(); it != accountGroups.end(); ++it )
{

4
kopete/libkopete/kopeteaccountmanager.h
Unescape View File

@ -167,13 +167,13 @@ public slots:
/**
* \internal
* Save the account data to KConfig
* Save the account data to TDEConfig
*/
void save();
/**
* \internal
* Load the account data from KConfig
* Load the account data from TDEConfig
*/
void load();

6
kopete/libkopete/kopeteaway.cpp
Unescape View File

@ -145,7 +145,7 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away")
load();
KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQT_SLOT( load() ) );
// Set up the config object
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
/* Load the saved away messages */
config->setGroup("Away Messages");
@ -255,7 +255,7 @@ void Kopete::Away::setGlobalAway(bool status)
void Kopete::Away::save()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
/* Set the away message settings in the Away Messages config group */
config->setGroup("Away Messages");
config->writeEntry("Messages", d->awayMessageList);
@ -267,7 +267,7 @@ void Kopete::Away::save()
void Kopete::Away::load()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("AutoAway");
d->awayTimeout=config->readNumEntry("Timeout", 600);
d->goAvailable=config->readBoolEntry("GoAvailable", true);

2
kopete/libkopete/kopeteaway.h
Unescape View File

@ -150,7 +150,7 @@ private:
* @brief Saves the away messages to disk
*
* This function will save the current list of away messages to the disk
* using KConfig. It is called automatically.
* using TDEConfig. It is called automatically.
*/
void save();

4
kopete/libkopete/kopeteblacklister.cpp
Unescape View File

@ -37,7 +37,7 @@ public:
BlackLister::BlackLister(const TQString &protocolId, const TQString &accountId, TQObject *parent, const char *name)
: TQObject(parent, name), d( new Private )
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
d->owner = accountId;
d->protocol = protocolId;
@ -87,7 +87,7 @@ void BlackLister::removeContact(Contact *contact)
void BlackLister::saveToDisk()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("BlackLister");
config->writeEntry( d->protocol + TQString::fromLatin1("_") + d->owner, d->blacklist );

2
kopete/libkopete/kopeteconfig.kcfgc
Unescape View File

@ -1,7 +1,7 @@
ClassName=Config
File=kopete.kcfg
GlobalEnums=false
Inherits=KConfigSkeleton
Inherits=TDEConfigSkeleton
ItemAccessors=true
MemberVariables=private
Mutators=true

4
kopete/libkopete/kopetemimetypehandler.cpp
Unescape View File

@ -145,7 +145,7 @@ bool MimeTypeHandler::dispatchToHandler( const KURL &url, const TQString &mimeTy
if( !handler->canAcceptRemoteFiles() )
{
TQString file;
if( !KIO::NetAccess::download( url, file, Kopete::UI::Global::mainWidget() ) )
if( !TDEIO::NetAccess::download( url, file, Kopete::UI::Global::mainWidget() ) )
{
TQString sorryText;
if ( url.isLocalFile() )
@ -172,7 +172,7 @@ bool MimeTypeHandler::dispatchToHandler( const KURL &url, const TQString &mimeTy
handler->handleURL( dest );
// for now, local-only handlers have to be synchronous
KIO::NetAccess::removeTempFile( file );
TDEIO::NetAccess::removeTempFile( file );
}
else
{

2
kopete/libkopete/kopetemimetypehandler.h
Unescape View File

@ -60,7 +60,7 @@ public:
/**
* Returns true if this handler can accept remote files direcltly;
* If false, remote files are downloaded via KIO::NetAccess before
* If false, remote files are downloaded via TDEIO::NetAccess before
* being passed to handleURL
*/
bool canAcceptRemoteFiles() const;

34
kopete/libkopete/kopetepassword.cpp
Unescape View File

@ -57,12 +57,12 @@ public:
}
/** Reference count */
int refCount;
/** Group to use for KConfig and KWallet */
/** Group to use for TDEConfig and KWallet */
const TQString configGroup;
/** Is the password being remembered? */
bool remembered;
/** The current password in the KConfig file, or TQString() if no password there */
TQString passwordFromKConfig;
/** The current password in the TDEConfig file, or TQString() if no password there */
TQString passwordFromTDEConfig;
/** The maximum length allowed for this password, or -1 if there is no limit */
uint maximumLength;
/** Is the current password known to be wrong? */
@ -133,9 +133,9 @@ public:
// Before trying to read from the wallet, check if the config file holds a password.
// If so, remove it from the config and set it through KWallet instead.
TQString pwd;
if ( mPassword.d->remembered && !mPassword.d->passwordFromKConfig.isNull() )
if ( mPassword.d->remembered && !mPassword.d->passwordFromTDEConfig.isNull() )
{
pwd = mPassword.d->passwordFromKConfig;
pwd = mPassword.d->passwordFromTDEConfig;
mPassword.set( pwd );
return pwd;
}
@ -143,8 +143,8 @@ public:
if ( mWallet && mWallet->readPassword( mPassword.d->configGroup, pwd ) == 0 && !pwd.isNull() )
return pwd;
if ( mPassword.d->remembered && !mPassword.d->passwordFromKConfig.isNull() )
return mPassword.d->passwordFromKConfig;
if ( mPassword.d->remembered && !mPassword.d->passwordFromTDEConfig.isNull() )
return mPassword.d->passwordFromTDEConfig;
return TQString();
}
@ -276,7 +276,7 @@ public:
if ( mWallet && mWallet->writePassword( mPassword.d->configGroup, mNewPass ) == 0 )
{
mPassword.d->remembered = true;
mPassword.d->passwordFromKConfig = TQString();
mPassword.d->passwordFromTDEConfig = TQString();
mPassword.writeConfig();
return true;
}
@ -294,13 +294,13 @@ public:
"do you want to save the password in the <b>unsafe</b> configuration file instead?</qt>" ),
i18n( "Unable to Store Secure Password" ),
KGuiItem( i18n( "Store &Unsafe" ), TQString::fromLatin1( "unlock" ) ),
TQString::fromLatin1( "KWalletFallbackToKConfig" ) ) != KMessageBox::Continue )
TQString::fromLatin1( "KWalletFallbackToTDEConfig" ) ) != KMessageBox::Continue )
{
return false;
}
}
mPassword.d->remembered = true;
mPassword.d->passwordFromKConfig = mNewPass;
mPassword.d->passwordFromTDEConfig = mNewPass;
mPassword.writeConfig();
return true;
}
@ -339,7 +339,7 @@ public:
kdDebug( 14010 ) << k_funcinfo << " clearing password" << endl;
mPassword.d->remembered = false;
mPassword.d->passwordFromKConfig = TQString();
mPassword.d->passwordFromTDEConfig = TQString();
mPassword.writeConfig();
if ( mWallet )
mWallet->removeEntry( mPassword.d->configGroup );
@ -380,14 +380,14 @@ Kopete::Password &Kopete::Password::operator=( Password &other )
void Kopete::Password::readConfig()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( d->configGroup );
TQString passwordCrypted = config->readEntry( "Password" );
if ( passwordCrypted.isNull() )
d->passwordFromKConfig = TQString();
d->passwordFromTDEConfig = TQString();
else
d->passwordFromKConfig = KStringHandler::obscure( passwordCrypted );
d->passwordFromTDEConfig = KStringHandler::obscure( passwordCrypted );
d->remembered = config->readBoolEntry( "RememberPassword", false );
d->isWrong = config->readBoolEntry( "PasswordIsWrong", false );
@ -395,7 +395,7 @@ void Kopete::Password::readConfig()
void Kopete::Password::writeConfig()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
if(!config->hasGroup(d->configGroup))
{
//### (KOPETE)
@ -409,8 +409,8 @@ void Kopete::Password::writeConfig()
config->setGroup( d->configGroup );
if ( d->remembered && !d->passwordFromKConfig.isNull() )
config->writeEntry( "Password", KStringHandler::obscure( d->passwordFromKConfig ) );
if ( d->remembered && !d->passwordFromTDEConfig.isNull() )
config->writeEntry( "Password", KStringHandler::obscure( d->passwordFromTDEConfig ) );
else
config->deleteEntry( "Password" );

2
kopete/libkopete/kopetepassword.h
Unescape View File

@ -41,7 +41,7 @@ namespace Kopete
* password for a plugin or account object.
*
* If the KWallet is active, passwords will be stored in it, otherwise, they
* will be stored in the KConfig, in a slightly mangled form.
* will be stored in the TDEConfig, in a slightly mangled form.
*/
class KOPETE_EXPORT Password : public TQObject
{

4
kopete/libkopete/kopetepluginmanager.cpp
Unescape View File

@ -258,7 +258,7 @@ void PluginManager::loadAllPlugins()
{
// FIXME: We need session management here - Martijn
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
if ( config->hasGroup( TQString::fromLatin1( "Plugins" ) ) )
{
TQMap<TQString, bool> pluginsMap;
@ -502,7 +502,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /*
{
TQString pluginId = _pluginId;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "Plugins" );
// FIXME: What is this for? This sort of thing is kconf_update's job - Richard

8
kopete/libkopete/kopeteprefs.h
Unescape View File

@ -24,7 +24,7 @@
#include "kopete_export.h"
class KConfig;
class TDEConfig;
class KOPETE_EXPORT KopetePrefs : public TQObject
{
@ -43,14 +43,14 @@ public:
static KopetePrefs *prefs();
/**
* Reads all pref-variables from KConfig
* Reads all pref-variables from TDEConfig
* usually you don't need this as KopetePrefs loads settings
* when an instance is created
*/
void load();
/**
* Stores all pref-variables into KConfig
* Stores all pref-variables into TDEConfig
*/
void save();
@ -237,7 +237,7 @@ private:
*/
static KopetePrefs *s_prefs;
KConfig *config;
TDEConfig *config;
TQString mIconTheme;
bool mUseEmoticons;

2
kopete/libkopete/kopetetask.h
Unescape View File

@ -42,7 +42,7 @@ namespace Kopete
* \endcode
*
* Much of the ideas (and some of the documentation and function names) for this
* class come from KIO::Job.
* class come from TDEIO::Job.
* @author Richard Smith <kde@metafoo.co.uk>
*/
class Task : public TQObject

14
kopete/libkopete/kopetetransfermanager.cpp
Unescape View File

@ -51,14 +51,14 @@ Kopete::FileTransferInfo::FileTransferInfo( Kopete::Contact *contact, const TQS
Kopete::Transfer::Transfer( const Kopete::FileTransferInfo &kfti, const TQString &localFile, bool showProgressInfo)
: KIO::Job(showProgressInfo), mInfo(kfti)
: TDEIO::Job(showProgressInfo), mInfo(kfti)
{
KURL targ; targ.setPath( localFile );
init( targ, showProgressInfo );
}
Kopete::Transfer::Transfer( const Kopete::FileTransferInfo &kfti, const Kopete::Contact *contact, bool showProgressInfo)
: KIO::Job(showProgressInfo), mInfo(kfti)
: TDEIO::Job(showProgressInfo), mInfo(kfti)
{
// TODO: use mInfo.url().fileName() after move to protocol-aware filetransfers
KURL targ; targ.setPath( mInfo.file() );
@ -72,7 +72,7 @@ void Kopete::Transfer::init( const KURL &target, bool showProgressInfo )
if( showProgressInfo )
Observer::self()->slotCopying( this, sourceURL(), destinationURL() );
connect( this, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( slotResultEmitted() ) );
connect( this, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( slotResultEmitted() ) );
setAutoErrorHandlingEnabled( true, 0 );
}
@ -139,7 +139,7 @@ void Kopete::Transfer::slotError( int error, const TQString &errorText )
void Kopete::Transfer::slotResultEmitted()
{
if( error() == KIO::ERR_USER_CANCELED )
if( error() == TDEIO::ERR_USER_CANCELED )
emit transferCanceled();
}
@ -169,7 +169,7 @@ Kopete::Transfer* Kopete::TransferManager::addTransfer( Kopete::Contact *contac
nextID++;
Kopete::FileTransferInfo info(contact, file, size, recipient,di, nextID);
Kopete::Transfer *trans = new Kopete::Transfer(info, contact);
connect(trans, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotComplete(KIO::Job *)));
connect(trans, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotComplete(TDEIO::Job *)));
mTransfersMap.insert(nextID, trans);
return trans;
}
@ -177,7 +177,7 @@ Kopete::Transfer* Kopete::TransferManager::addTransfer( Kopete::Contact *contac
void Kopete::TransferManager::slotAccepted(const Kopete::FileTransferInfo& info, const TQString& filename)
{
Kopete::Transfer *trans = new Kopete::Transfer(info, filename);
connect(trans, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotComplete(KIO::Job *)));
connect(trans, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotComplete(TDEIO::Job *)));
mTransfersMap.insert(info.transferId(), trans);
emit accepted(trans,filename);
}
@ -206,7 +206,7 @@ void Kopete::TransferManager::removeTransfer( unsigned int id )
//we don't need to delete the job, the job get deleted itself
}
void Kopete::TransferManager::slotComplete(KIO::Job *job)
void Kopete::TransferManager::slotComplete(TDEIO::Job *job)
{
Kopete::Transfer *transfer=dynamic_cast<Kopete::Transfer*>(job);
if(!transfer)

6
kopete/libkopete/kopetetransfermanager.h
Unescape View File

@ -118,7 +118,7 @@ signals:
private slots:
void slotAccepted(const Kopete::FileTransferInfo&, const TQString&);
void slotComplete(KIO::Job*);
void slotComplete(TDEIO::Job*);
private:
TransferManager( TQObject *parent );
@ -132,7 +132,7 @@ private:
* A KIO job for a kopete file transfer.
* @author Richard Smith <kopete@metafoo.co.uk>
*/
class KOPETE_EXPORT Transfer : public KIO::Job
class KOPETE_EXPORT Transfer : public TDEIO::Job
{
Q_OBJECT
@ -184,7 +184,7 @@ public slots:
/**
* @brief Inform the job that an error has occurred while transferring the file.
*
* @param error A member of the KIO::Error enumeration indicating what error occurred.
* @param error A member of the TDEIO::Error enumeration indicating what error occurred.
* @param errorText A string to aid understanding of the error, often the offending URL.
*/
void slotError( int error, const TQString &errorText );

2
kopete/libkopete/private/kopeteviewmanager.cpp
Unescape View File

@ -205,7 +205,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi
&& msg.direction() != Kopete::Message::Internal )
{
TQWidget *w=dynamic_cast<TQWidget*>(manager->view(false));
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
if( (!manager->view(false) || !w || manager->view() != d->activeView ||
config->readBoolEntry("EventIfActive", true) || !w->isActiveWindow())

18
kopete/plugins/addbookmarks/addbookmarksplugin.cpp
Unescape View File

@ -75,7 +75,7 @@ void BookmarksPlugin::slotBookmarkURLsInMessage(Kopete::Message & msg)
delete URLsList;
}
void BookmarksPlugin::slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArray &data )
void BookmarksPlugin::slotAddKopeteBookmark( TDEIO::Job *transfer, const TQByteArray &data )
{
TQTextCodec *codec = getPageEncoding( data );
TQString htmlpage = codec->toUnicode( data );
@ -84,21 +84,21 @@ void BookmarksPlugin::slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArr
int pos = rx.search( htmlpage );
KBookmarkManager *mgr = KBookmarkManager::userBookmarksManager();
KBookmarkGroup group = getKopeteFolder();
TQString sender = m_map[(KIO::TransferJob*)transfer].sender;
TQString sender = m_map[(TDEIO::TransferJob*)transfer].sender;
if ( m_settings.useSubfolderForContact( sender ) )
group = getFolder( group, sender );
if( pos == -1 ){
group.addBookmark( mgr, m_map[(KIO::TransferJob*)transfer].url.prettyURL(), m_map[(KIO::TransferJob*)transfer].url.url() );
group.addBookmark( mgr, m_map[(TDEIO::TransferJob*)transfer].url.prettyURL(), m_map[(TDEIO::TransferJob*)transfer].url.url() );
kdDebug( 14501 ) << "failed to extract title from first data chunk" << endl;
}else {
group.addBookmark( mgr, rx.cap( 1 ).simplifyWhiteSpace(),
m_map[(KIO::TransferJob*)transfer].url.url() );
m_map[(TDEIO::TransferJob*)transfer].url.url() );
}
mgr->save();
mgr->emitChanged( group );
m_map.remove( (KIO::TransferJob*)transfer );
m_map.remove( (TDEIO::TransferJob*)transfer );
transfer->kill();
}
@ -129,12 +129,12 @@ void BookmarksPlugin::addKopeteBookmark( const KURL& url, const TQString& sender
// either restrict to http(s) or to KProtocolInfo::protocolClass() == :internet
if( !isURLInGroup( url, group )
&& url.isValid() && url.protocol().startsWith("http") ) {
KIO::TransferJob *transfer;
TDEIO::TransferJob *transfer;
// make asynchronous transfer to avoid GUI freezing due to overloaded web servers
transfer = KIO::get(url, false, false);
transfer = TDEIO::get(url, false, false);
transfer->setInteractive(false);
connect ( transfer, TQT_SIGNAL ( data( KIO::Job *, const TQByteArray & ) ),
this, TQT_SLOT ( slotAddKopeteBookmark( KIO::Job *, const TQByteArray & ) ) );
connect ( transfer, TQT_SIGNAL ( data( TDEIO::Job *, const TQByteArray & ) ),
this, TQT_SLOT ( slotAddKopeteBookmark( TDEIO::Job *, const TQByteArray & ) ) );
m_map[transfer].url = url;
m_map[transfer].sender = sender;
}

4
kopete/plugins/addbookmarks/addbookmarksplugin.h
Unescape View File

@ -36,7 +36,7 @@ private:
KURL url;
TQString sender;
} URLandName;
typedef TQMap<KIO::TransferJob*,URLandName> JobsToURLsMap;
typedef TQMap<TDEIO::TransferJob*,URLandName> JobsToURLsMap;
JobsToURLsMap m_map;
BookmarksPrefsSettings m_settings;
void addKopeteBookmark( const KURL& url, const TQString& sender );
@ -49,7 +49,7 @@ public slots:
void slotReloadSettings();
private slots:
void slotAddKopeteBookmark( KIO::Job *transfer, const TQByteArray &data );
void slotAddKopeteBookmark( TDEIO::Job *transfer, const TQByteArray &data );
};
typedef KGenericFactory<BookmarksPlugin> BookmarksPluginFactory;

10
kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
Unescape View File

@ -27,7 +27,7 @@ typedef KGenericFactory<BookmarksPreferences> BookmarksPreferencesFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_addbookmarks, BookmarksPreferencesFactory("kcm_kopete_addbookmarks") )
BookmarksPreferences::BookmarksPreferences(TQWidget *parent, const char *name, const TQStringList &args)
: KCModule(BookmarksPreferencesFactory::instance(), parent, args)
: TDECModule(BookmarksPreferencesFactory::instance(), parent, args)
{
Q_UNUSED( name );
( new TQVBoxLayout (this) )->setAutoAdd( true );
@ -67,7 +67,7 @@ void BookmarksPreferences::save()
m_settings.setAddBookmarksFromUnknownContacts( p_dialog->m_addUntrusted->isChecked() );
m_settings.save();
emit PreferencesChanged();
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void BookmarksPreferences::slotSetStatusChanged()
@ -77,12 +77,12 @@ void BookmarksPreferences::slotSetStatusChanged()
else
p_dialog->contactList->setEnabled(true);
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
void BookmarksPreferences::slotAddUntrustedChanged()
{
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
void BookmarksPreferences::load()
@ -108,7 +108,7 @@ void BookmarksPreferences::load()
p_dialog->contactList->setSelected( item, true );
}
}
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
#include "addbookmarkspreferences.moc"

2
kopete/plugins/addbookmarks/addbookmarkspreferences.h
Unescape View File

@ -19,7 +19,7 @@
/**
@author Roie Kerstein <sf_kersteinroie@bezeqint.net>
*/
class BookmarksPreferences : public KCModule
class BookmarksPreferences : public TDECModule
{
Q_OBJECT

8
kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
Unescape View File

@ -28,11 +28,11 @@ BookmarksPrefsSettings::~BookmarksPrefsSettings()
void BookmarksPrefsSettings::load()
{
KConfig * configfile = TDEGlobal::config();
TDEConfig * configfile = TDEGlobal::config();
m_isfolderforeachcontact = Always;
m_contactslist.clear();
m_addbookmarksfromunknowns = false;
if( configfile->getConfigState() == KConfigBase::NoAccess ){
if( configfile->getConfigState() == TDEConfigBase::NoAccess ){
kdDebug( 14501 ) << "load: failed to open config file for reading" << endl;
return;
}
@ -48,9 +48,9 @@ void BookmarksPrefsSettings::load()
void BookmarksPrefsSettings::save()
{
KConfig * configfile = TDEGlobal::config();
TDEConfig * configfile = TDEGlobal::config();
if( configfile->getConfigState() != KConfigBase::ReadWrite ){
if( configfile->getConfigState() != TDEConfigBase::ReadWrite ){
kdDebug( 14501 ) << "save: failed to open config file for writing" << endl;
return;
}

2
kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
Unescape View File

@ -112,7 +112,7 @@ Comment[zh_CN]=自动将收到消息中的链接加入书签
Comment[zh_HK]=自動將收到的訊息內的連結加到書籤
Comment[zh_TW]=自動將接收訊息中的連結加入書籤
Icon=konqueror
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_addbookmarks

16
kopete/plugins/alias/aliaspreferences.cpp
Unescape View File

@ -120,7 +120,7 @@ class ProtocolItem : public TQListViewItem
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_alias, AliasPreferencesFactory( "kcm_kopete_alias" ) )
AliasPreferences::AliasPreferences( TQWidget *parent, const char *, const TQStringList &args )
: KCModule( AliasPreferencesFactory::instance(), parent, args )
: TDECModule( AliasPreferencesFactory::instance(), parent, args )
{
( new TQVBoxLayout( this ) )->setAutoAdd( true );
preferencesDialog = new AliasDialogBase( this );
@ -158,7 +158,7 @@ AliasPreferences::~AliasPreferences()
// reload configuration reading it from kopeterc
void AliasPreferences::load()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
if( config->hasGroup( "AliasPlugin" ) )
{
config->setGroup("AliasPlugin");
@ -189,7 +189,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
Kopete::Protocol *protocol = static_cast<Kopete::Protocol*>( plugin );
if( protocol )
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
if( config->hasGroup( "AliasPlugin" ) )
{
config->setGroup("AliasPlugin");
@ -240,7 +240,7 @@ void AliasPreferences::slotPluginLoaded( Kopete::Plugin *plugin )
// save list to kopeterc and creates map out of it
void AliasPreferences::save()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->deleteGroup( TQString::fromLatin1("AliasPlugin") );
config->setGroup( TQString::fromLatin1("AliasPlugin") );
@ -266,7 +266,7 @@ void AliasPreferences::save()
config->writeEntry( "AliasNames", aliases );
config->sync();
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void AliasPreferences::addAlias( TQString &alias, TQString &command, const ProtocolList &p, uint id )
@ -358,7 +358,7 @@ void AliasPreferences::slotAddAlias()
}
}
addAlias( alias, command, protocols );
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
}
@ -457,7 +457,7 @@ void AliasPreferences::slotEditAlias()
delete item;
addAlias( alias, command, selProtocols );
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
}
}
@ -484,7 +484,7 @@ void AliasPreferences::slotDeleteAliases()
aliasMap.erase( i->text(0) );
delete i;
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
save();

2
kopete/plugins/alias/aliaspreferences.h
Unescape View File

@ -21,7 +21,7 @@ class AliasItem;
class AliasDialog;
namespace Kopete { class Plugin; }
class AliasPreferences : public KCModule
class AliasPreferences : public TDECModule
{
Q_OBJECT

2
kopete/plugins/alias/kopete_alias_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=color
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_alias

4
kopete/plugins/autoreplace/autoreplaceconfig.cpp
Unescape View File

@ -30,7 +30,7 @@ AutoReplaceConfig::AutoReplaceConfig()
// reload configuration reading it from kopeterc
void AutoReplaceConfig::load()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "AutoReplace Plugin" );
TQStringList wordsList = config->readListEntry( "WordsToReplace" );
@ -113,7 +113,7 @@ AutoReplaceConfig::WordsToReplace AutoReplaceConfig::map() const
void AutoReplaceConfig::save()
{
KConfig * config = TDEGlobal::config();
TDEConfig * config = TDEGlobal::config();
config->setGroup( "AutoReplace Plugin" );
TQStringList newWords;

2
kopete/plugins/autoreplace/autoreplacepreferences.cpp
Unescape View File

@ -190,7 +190,7 @@ void AutoReplacePreferences::slotSelectionChanged()
void AutoReplacePreferences::slotWidgetModified()
{
emit KCModule::changed( m_wordListChanged || autoConfig()->hasChanged() );
emit TDECModule::changed( m_wordListChanged || autoConfig()->hasChanged() );
}
void AutoReplacePreferences::defaults()

2
kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=color
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_autoreplace

2
kopete/plugins/cryptography/cryptographyplugin.cpp
Unescape View File

@ -94,7 +94,7 @@ CryptographyPlugin::~CryptographyPlugin()
void CryptographyPlugin::loadSettings()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Cryptography Plugin");
mPrivateKeyID = config->readEntry("PGP_private_key");

2
kopete/plugins/cryptography/kopete_cryptography_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=encrypted
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_cryptography

4
kopete/plugins/cryptography/popuppublic.cpp
Unescape View File

@ -194,7 +194,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() );
CBhideid->setChecked( KGpgSettings::hideUserID() );
if (filemode) CBshred->setChecked( KGpgSettings::shredSource() );*/
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Cryptography Plugin");
CBarmor->hide();
@ -467,7 +467,7 @@ void popupPublic::slotprocread(KProcIO *p)
void popupPublic::slotOk()
{
//BEGIN modified for Kopete
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Cryptography Plugin");
config->writeEntry("UntrustedKeys", CBuntrusted->isChecked());

2
kopete/plugins/cryptography/popuppublic.h
Unescape View File

@ -47,7 +47,7 @@ public:
TQStringList untrustedList;
private:
KConfig *config;
TDEConfig *config;
TQButtonGroup *boutonboxoptions;
TQString customOptions;

12
kopete/plugins/highlight/highlightpreferences.cpp
Unescape View File

@ -40,7 +40,7 @@ typedef KGenericFactory<HighlightPreferences> HighlightPreferencesFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_highlight, HighlightPreferencesFactory( "kcm_kopete_highlight" ) )
HighlightPreferences::HighlightPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
: KCModule(HighlightPreferencesFactory::instance(), parent, args)
: TDECModule(HighlightPreferencesFactory::instance(), parent, args)
{
donttouch=true;
( new TQVBoxLayout( this ) )->setAutoAdd( true );
@ -100,13 +100,13 @@ void HighlightPreferences::load()
first=false;
}
donttouch=false;
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void HighlightPreferences::save()
{
m_config->save();
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
@ -190,7 +190,7 @@ void HighlightPreferences::slotRemoveFilter()
m_filterItems.remove(lvi);
delete lvi;
m_config->removeFilter(current);
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
void HighlightPreferences::slotRenameFilter()
@ -209,7 +209,7 @@ void HighlightPreferences::slotRenameFilter()
return;
current->displayName=newname;
lvi->setText(0,newname);
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
@ -237,7 +237,7 @@ void HighlightPreferences::slotSomethingHasChanged()
preferencesDialog->m_soundFN->setEnabled(current->playSound);
current->raiseView=preferencesDialog->m_raise->isChecked();
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
void HighlightPreferences::slotEditRegExp()

2
kopete/plugins/highlight/highlightpreferences.h
Unescape View File

@ -29,7 +29,7 @@ class TQListViewItem;
*@author Olivier Goffart
*/
class HighlightPreferences : public KCModule {
class HighlightPreferences : public TDECModule {
Q_OBJECT
public:

2
kopete/plugins/highlight/kopete_highlight_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=highlight
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_highlight

10
kopete/plugins/history/historypreferences.cpp
Unescape View File

@ -30,7 +30,7 @@ typedef KGenericFactory<HistoryPreferences> HistoryConfigFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_history, HistoryConfigFactory( "kcm_kopete_history" ) )
HistoryPreferences::HistoryPreferences(TQWidget *parent, const char*/*name*/, const TQStringList &args)
: KCModule(HistoryConfigFactory::instance(), parent, args)
: TDECModule(HistoryConfigFactory::instance(), parent, args)
{
kdDebug(14310) << k_funcinfo << "called." << endl;
(new TQVBoxLayout(this))->setAutoAdd(true);
@ -61,7 +61,7 @@ void HistoryPreferences::load()
p->Number_ChatWindow->setValue(HistoryConfig::number_ChatWindow());
p->History_color->setColor(HistoryConfig::history_color());
//p-> HistoryConfig::browserStyle();
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void HistoryPreferences::save()
@ -72,17 +72,17 @@ void HistoryPreferences::save()
HistoryConfig::setNumber_ChatWindow(p->Number_ChatWindow->value());
HistoryConfig::setHistory_color(p->History_color->color());
HistoryConfig::self()->writeConfig();
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void HistoryPreferences::slotModified()
{
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
void HistoryPreferences::slotShowPreviousChanged(bool on)
{
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
#include "historypreferences.moc"

2
kopete/plugins/history/historypreferences.h
Unescape View File

@ -26,7 +26,7 @@ class HistoryPrefsUI;
/**
* @author Stefan Gehn
*/
class HistoryPreferences : public KCModule
class HistoryPreferences : public TDECModule
{
Q_OBJECT

2
kopete/plugins/history/kopete_history_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=history
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_history

2
kopete/plugins/latex/kopete_latex_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=latex
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_latex

2
kopete/plugins/latex/latexplugin.cpp
Unescape View File

@ -180,7 +180,7 @@ void LatexPlugin::slotMessageAboutToSend( Kopete::Message& msg)
Q_UNUSED(msg)
//disabled because to work correctly, we need to find what special has the gif we can send over MSN
#if 0
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("Latex Plugin");
if(!config->readBoolEntry("ParseOutgoing", false))

8
kopete/plugins/latex/latexpreferences.cpp
Unescape View File

@ -31,7 +31,7 @@ typedef KGenericFactory<LatexPreferences> LatexPreferencesFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_latex, LatexPreferencesFactory( "kcm_kopete_latex" ) )
LatexPreferences::LatexPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
: KCModule(LatexPreferencesFactory::instance(), parent, args)
: TDECModule(LatexPreferencesFactory::instance(), parent, args)
{
( new TQVBoxLayout( this ) )->setAutoAdd( true );
m_preferencesDialog = new LatexPrefsUI(this);
@ -55,12 +55,12 @@ void LatexPreferences::load()
// load widgets here
m_preferencesDialog->horizontalDPI->setValue(LatexConfig::self()->horizontalDPI());
m_preferencesDialog->verticalDPI->setValue(LatexConfig::self()->verticalDPI());
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void LatexPreferences::slotModified()
{
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
void LatexPreferences::save()
@ -68,7 +68,7 @@ void LatexPreferences::save()
LatexConfig::self()->setHorizontalDPI(m_preferencesDialog->horizontalDPI->value());
LatexConfig::self()->setVerticalDPI(m_preferencesDialog->verticalDPI->value());
LatexConfig::self()->writeConfig();
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
#include "latexpreferences.moc"

2
kopete/plugins/latex/latexpreferences.h
Unescape View File

@ -28,7 +28,7 @@ class TQListViewItem;
*@author Duncan Mac-Vicar Prett
*/
class LatexPreferences : public KCModule
class LatexPreferences : public TDECModule
{
Q_OBJECT

2
kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
Unescape View File

@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_motionaway

2
kopete/plugins/motionautoaway/motionawayplugin.cpp
Unescape View File

@ -159,7 +159,7 @@ MotionAwayPlugin::~MotionAwayPlugin()
}
void MotionAwayPlugin::loadSettings(){
KConfig *kconfig = TDEGlobal::config();
TDEConfig *kconfig = TDEGlobal::config();
kconfig->setGroup("MotionAway Plugin");
awayTimeout = kconfig->readNumEntry("AwayTimeout", 1);

8
kopete/plugins/motionautoaway/motionawaypreferences.cpp
Unescape View File

@ -31,7 +31,7 @@ typedef KGenericFactory<MotionAwayPreferences> MotionAwayPreferencesFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_motionaway, MotionAwayPreferencesFactory("kcm_kopete_motionaway"))
MotionAwayPreferences::MotionAwayPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
: KCModule(MotionAwayPreferencesFactory::instance(), parent, args)
: TDECModule(MotionAwayPreferencesFactory::instance(), parent, args)
{
// Add actuall widget generated from ui file.
( new TQVBoxLayout( this ) )->setAutoAdd( true );
@ -48,12 +48,12 @@ void MotionAwayPreferences::load()
preferencesDialog->AwayTimeout->setValue(MotionAwayConfig::self()->awayTimeout());
preferencesDialog->BecomeAvailableWithActivity->setChecked(MotionAwayConfig::self()->becomeAvailableWithActivity());
preferencesDialog->VideoDevice->setText(MotionAwayConfig::self()->videoDevice());
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void MotionAwayPreferences::slotWidgetModified()
{
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
void MotionAwayPreferences::save()
@ -62,7 +62,7 @@ void MotionAwayPreferences::save()
MotionAwayConfig::self()->setBecomeAvailableWithActivity(preferencesDialog->BecomeAvailableWithActivity->isChecked());
MotionAwayConfig::self()->setVideoDevice(preferencesDialog->VideoDevice->text());
MotionAwayConfig::self()->writeConfig();
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
#include "motionawaypreferences.moc"

2
kopete/plugins/motionautoaway/motionawaypreferences.h
Unescape View File

@ -26,7 +26,7 @@ class motionawayPrefsUI;
* Preference widget for the Motion Away plugin
* @author Duncan Mac-Vicar P.
*/
class MotionAwayPreferences : public KCModule
class MotionAwayPreferences : public TDECModule
{
Q_OBJECT

2
kopete/plugins/netmeeting/kopete_netmeeting_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=highlight
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_netmeeting

2
kopete/plugins/netmeeting/netmeetinginvitation.cpp
Unescape View File

@ -160,7 +160,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address)
{
//TODO: use TDEProcess
KConfig *config=TDEGlobal::config();
TDEConfig *config=TDEGlobal::config();
config->setGroup("Netmeeting Plugin");
TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);

12
kopete/plugins/netmeeting/netmeetingpreferences.cpp
Unescape View File

@ -40,7 +40,7 @@ typedef KGenericFactory<NetmeetingPreferences> NetmeetingPreferencesFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_netmeeting, NetmeetingPreferencesFactory( "kcm_kopete_netmeeting" ) )
NetmeetingPreferences::NetmeetingPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
: KCModule(NetmeetingPreferencesFactory::instance(), parent, args)
: TDECModule(NetmeetingPreferencesFactory::instance(), parent, args)
{
( new TQVBoxLayout( this ) )->setAutoAdd( true );
preferencesDialog = new NetmeetingPrefsUI(this);
@ -56,24 +56,24 @@ NetmeetingPreferences::~NetmeetingPreferences()
void NetmeetingPreferences::load()
{
KConfig *config=TDEGlobal::config();
TDEConfig *config=TDEGlobal::config();
config->setGroup("Netmeeting Plugin");
preferencesDialog->m_app->setCurrentText(config->readEntry("NetmeetingApplication","ekiga -c callto://%1"));
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void NetmeetingPreferences::save()
{
KConfig *config=TDEGlobal::config();
TDEConfig *config=TDEGlobal::config();
config->setGroup("Netmeeting Plugin");
config->writeEntry("NetmeetingApplication",preferencesDialog->m_app->currentText());
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void NetmeetingPreferences::slotChanged()
{
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
#include "netmeetingpreferences.moc"

2
kopete/plugins/netmeeting/netmeetingpreferences.h
Unescape View File

@ -26,7 +26,7 @@ class NetmeetingPrefsUI;
*@author Olivier Goffart
*/
class NetmeetingPreferences : public KCModule {
class NetmeetingPreferences : public TDECModule {
Q_OBJECT
public:

2
kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=kaboodle
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_nowlistening

2
kopete/plugins/nowlistening/nowlisteningplugin.h
Unescape View File

@ -96,7 +96,7 @@ friend class NowListeningGUIClient;
void slotNewKMM( Kopete::ChatSession* );
/**
* Reacts to the plugin's settings changed signal, originating from the KCModule dispatcher
* Reacts to the plugin's settings changed signal, originating from the TDECModule dispatcher
*/
void slotSettingsChanged();

6
kopete/plugins/nowlistening/nowlisteningpreferences.cpp
Unescape View File

@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_nowlistening, NowListeningPreferencesFact
NowListeningPreferences::NowListeningPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
: KCModule( NowListeningPreferencesFactory::instance(), parent, args )
: TDECModule( NowListeningPreferencesFactory::instance(), parent, args )
{
( new TQVBoxLayout( this ) )->setAutoAdd( true );
preferencesDialog = new NowListeningPrefsUI( this );
@ -63,12 +63,12 @@ NowListeningPreferences::~NowListeningPreferences( )
void NowListeningPreferences::save()
{
KCModule::save();
TDECModule::save();
}
void NowListeningPreferences::load()
{
KCModule::load();
TDECModule::load();
}
void NowListeningPreferences::slotSettingsChanged()

2
kopete/plugins/nowlistening/nowlisteningpreferences.h
Unescape View File

@ -29,7 +29,7 @@ class NowListeningConfig;
*@author Will Stephenson
*/
class NowListeningPreferences : public KCModule
class NowListeningPreferences : public TDECModule
{
Q_OBJECT

4
kopete/plugins/smpppdcs/Changelog.smpppdcs
Unescape View File

@ -16,7 +16,7 @@ Changelog
=========
0.79 (2006/01/25)
* using KConfigXT for configuration
* using TDEConfigXT for configuration
* using dcopidl2cpp stub generated from kinternetiface.h (from kinternet package),
no more own implementation
* experimental implementation of the the KDED-NetworkStatus (not active, yet)
@ -27,7 +27,7 @@ Changelog
* even more speed improvements
0.75 (2006/01/01)
* use of KSocketStream instead of deprecated KExtendedSocket
* use of TDESocketStream instead of deprecated KExtendedSocket
* progressbar while searching for an smpppd on the local network
* automatically found smpppd server is resolved via DNS
* Fixed Bug 111369: better detection of a SMPPPD and no more freeze of Kopete

2
kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=smpppdcs
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_smpppdcs

10
kopete/plugins/smpppdcs/smpppdcspreferences.cpp
Unescape View File

@ -36,7 +36,7 @@ typedef KGenericFactory<SMPPPDCSPreferences> SMPPPDCSPreferencesFactory;
K_EXPORT_COMPONENT_FACTORY(kcm_kopete_smpppdcs, SMPPPDCSPreferencesFactory("kcm_kopete_smpppdcs"))
SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name */, const TQStringList& args)
: KCModule(SMPPPDCSPreferencesFactory::instance(), parent, args), m_ui(NULL) {
: TDECModule(SMPPPDCSPreferencesFactory::instance(), parent, args), m_ui(NULL) {
Kopete::AccountManager * manager = Kopete::AccountManager::self();
(new TQVBoxLayout(this))->setAutoAdd(true);
@ -98,7 +98,7 @@ void SMPPPDCSPreferences::listClicked(TQListViewItem * item)
break;
}
}
emit KCModule::changed(change);
emit TDECModule::changed(change);
}
m_accountMapCur[cli->text(0)].m_on = cli->isOn();
}
@ -149,7 +149,7 @@ void SMPPPDCSPreferences::load()
m_ui->SMPPPDLocation->port->setValue(SMPPPDCSConfig::self()->port());
m_ui->SMPPPDLocation->Password->setText(SMPPPDCSConfig::self()->password());
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void SMPPPDCSPreferences::save()
@ -177,11 +177,11 @@ void SMPPPDCSPreferences::save()
SMPPPDCSConfig::self()->writeConfig();
emit KCModule::changed(false);
emit TDECModule::changed(false);
}
void SMPPPDCSPreferences::slotModified() {
emit KCModule::changed(true);
emit TDECModule::changed(true);
}
#include "smpppdcspreferences.moc"

2
kopete/plugins/smpppdcs/smpppdcspreferences.h
Unescape View File

@ -36,7 +36,7 @@ public:
*
* @author Heiko Sch&auml;fer <heiko@rangun.de>
*/
class SMPPPDCSPreferences : public KCModule {
class SMPPPDCSPreferences : public TDECModule {
Q_OBJECT

2
kopete/plugins/texteffect/kopete_texteffect_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=texteffect
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_texteffect

4
kopete/plugins/texteffect/texteffectconfig.cpp
Unescape View File

@ -30,7 +30,7 @@ TextEffectConfig::TextEffectConfig()
void TextEffectConfig::load()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("TextEffect Plugin");
mColors = config->readListEntry("Colors");
@ -54,7 +54,7 @@ TQStringList TextEffectConfig::defaultColorList()
void TextEffectConfig::save()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup("TextEffect Plugin");
config->writeEntry("Colors", mColors );

6
kopete/plugins/texteffect/texteffectpreferences.cpp
Unescape View File

@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kopete_texteffect, TextEffectPreferencesFactory(
TextEffectPreferences::TextEffectPreferences(TQWidget *parent,
const char* /*name*/,
const TQStringList &args)
: KCModule(TextEffectPreferencesFactory::instance(), parent, args)
: TDECModule(TextEffectPreferencesFactory::instance(), parent, args)
{
( new TQVBoxLayout( this ) )->setAutoAdd( true );
@ -107,7 +107,7 @@ void TextEffectPreferences::load()
// Call parent's save method
KCModule::load();
TDECModule::load();
// Indicate that we have not changed ^_^
emit changed( false );
@ -135,7 +135,7 @@ void TextEffectPreferences::save()
//TextEffectPlugin::plugin()->slotSettingsChanged();
// Call parent's save method
KCModule::save();
TDECModule::save();
// Indicate that we have not changed ^_^
emit changed( false );

2
kopete/plugins/texteffect/texteffectpreferences.h
Unescape View File

@ -28,7 +28,7 @@ class TQStringList;
*@author Olivier Goffart
*/
class TextEffectPreferences : public KCModule {
class TextEffectPreferences : public TDECModule {
Q_OBJECT
public:

2
kopete/plugins/translator/kopete_translator_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=locale
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_translator

24
kopete/plugins/translator/translatorplugin.cpp
Unescape View File

@ -107,7 +107,7 @@ TranslatorPlugin* TranslatorPlugin::pluginStatic_ = 0L;
void TranslatorPlugin::loadSettings()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
int mode = 0;
config->setGroup( "Translator Plugin" );
@ -269,14 +269,14 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ
kdDebug(14308) << k_funcinfo << " URL: " << gurl << endl;
KURL geturl ( gurl );
KIO::TransferJob *job = KIO::get( geturl, false, true );
//job = KIO::http_post( translatorURL, postData, true );
TDEIO::TransferJob *job = TDEIO::get( geturl, false, true );
//job = TDEIO::http_post( translatorURL, postData, true );
//job->addMetaData( "content-type", "application/x-www-form-urlencoded" );
//job->addMetaData( "referrer", "http://www.google.com" );
TQObject::connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) );
TQObject::connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) );
TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
// KIO is async and we use a sync API, so use the processEvents hack to work around that
// FIXME: We need to make the libkopete API async to get rid of this processEvents.
@ -309,10 +309,10 @@ TQString TranslatorPlugin::babelTranslateMessage( const TQString &msg, const TQS
kdDebug( 14308 ) << k_funcinfo << "URL: " << gurl << endl;
KIO::TransferJob *job = KIO::get( geturl, false, true );
TDEIO::TransferJob *job = TDEIO::get( geturl, false, true );
TQObject::connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) );
TQObject::connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) );
TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
// KIO is async and we use a sync API, so use the processEvents hack to work around that
// FIXME: We need to make the libkopete API async to get rid of this processEvents.
@ -381,16 +381,16 @@ void TranslatorPlugin::sendTranslation( Kopete::Message &msg, const TQString &tr
};
}
void TranslatorPlugin::slotDataReceived ( KIO::Job *job, const TQByteArray &data )
void TranslatorPlugin::slotDataReceived ( TDEIO::Job *job, const TQByteArray &data )
{
m_data[ job ] += TQCString( data, data.size() + 1 );
}
void TranslatorPlugin::slotJobDone ( KIO::Job *job )
void TranslatorPlugin::slotJobDone ( TDEIO::Job *job )
{
m_completed[ job ] = true;
TQObject::disconnect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( KIO::Job *, const TQByteArray & ) ) );
TQObject::disconnect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotJobDone( KIO::Job * ) ) );
TQObject::disconnect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
TQObject::disconnect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
}
void TranslatorPlugin::slotSetLanguage()

8
kopete/plugins/translator/translatorplugin.h
Unescape View File

@ -73,8 +73,8 @@ public:
private slots:
void slotIncomingMessage( Kopete::Message& msg );
void slotOutgoingMessage( Kopete::Message& msg );
void slotDataReceived ( KIO::Job *, const TQByteArray &data);
void slotJobDone ( KIO::Job *);
void slotDataReceived ( TDEIO::Job *, const TQByteArray &data);
void slotJobDone ( TDEIO::Job *);
void slotSetLanguage();
void slotSelectionChanged(bool);
void slotNewKMM(Kopete::ChatSession *);
@ -90,8 +90,8 @@ protected:
private:
TQMap< KIO::Job *, TQCString> m_data;
TQMap< KIO::Job *, bool> m_completed;
TQMap< TDEIO::Job *, TQCString> m_data;
TQMap< TDEIO::Job *, bool> m_completed;
KSelectAction* m_actionLanguage;

2
kopete/plugins/webpresence/DESIGN
Unescape View File

@ -6,7 +6,7 @@ Provides a view of the current state of your contact list as a webpage.
How It Does It
Every so often, it writes a file containing a snapshot of who is online and who is not in your contactlist to a location you specify. This can be a local file, an FTP server, a HTTP server, or anywhere else that KIO can access.
Use KIO::NetAccess to upload the files!
Use TDEIO::NetAccess to upload the files!
Getting Info about Local User's Status
Goal is to allow ppl who don't have us on their contactlist to see what our current status is and what our UIN/id is for each protocol. So we need to know (protocol, uin, status).

2
kopete/plugins/webpresence/kopete_webpresence_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
Icon=html
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_webpresence

10
kopete/plugins/webpresence/webpresenceplugin.cpp
Unescape View File

@ -73,7 +73,7 @@ WebPresencePlugin::~WebPresencePlugin()
void WebPresencePlugin::loadSettings()
{
KConfig *kconfig = TDEGlobal::config();
TDEConfig *kconfig = TDEGlobal::config();
kconfig->setGroup( "Web Presence Plugin" );
frequency = kconfig->readNumEntry("UploadFrequency", 15);
@ -196,12 +196,12 @@ void WebPresencePlugin::slotWriteFile()
// upload it to the specified URL
KURL src( m_output->name() );
KIO::FileCopyJob *job = KIO::file_move( src, dest, -1, true, false, false );
connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
TQT_SLOT( slotUploadJobResult( KIO::Job * ) ) );
TDEIO::FileCopyJob *job = TDEIO::file_move( src, dest, -1, true, false, false );
connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
TQT_SLOT( slotUploadJobResult( TDEIO::Job * ) ) );
}
void WebPresencePlugin::slotUploadJobResult( KIO::Job *job )
void WebPresencePlugin::slotUploadJobResult( TDEIO::Job *job )
{
if ( job->error() ) {
kdDebug(14309) << "Error uploading presence info." << endl;

2
kopete/plugins/webpresence/webpresenceplugin.h
Unescape View File

@ -78,7 +78,7 @@ protected slots:
/**
* Called when an upload finished, displays error if needed
*/
void slotUploadJobResult( KIO::Job * );
void slotUploadJobResult( TDEIO::Job * );
/**
* Called to schedule a write, after waiting to see if more changes
* occur (accounts tend to change status together)

4
kopete/plugins/webpresence/webpresencepreferences.cpp
Unescape View File

@ -28,7 +28,7 @@ typedef KGenericFactory<WebPresencePreferences> WebPresencePreferencesFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_kopete_webpresence, WebPresencePreferencesFactory("kcm_kopete_webpresence"))
WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
: KCModule(WebPresencePreferencesFactory::instance(), parent, args)
: TDECModule(WebPresencePreferencesFactory::instance(), parent, args)
{
// Add actuall widget generated from ui file.
( new TQVBoxLayout( this ) )->setAutoAdd( true );
@ -46,7 +46,7 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n
void WebPresencePreferences::widgetModified()
{
emit KCModule::changed(kautoconfig->hasChanged());
emit TDECModule::changed(kautoconfig->hasChanged());
}
void WebPresencePreferences::save()

2
kopete/plugins/webpresence/webpresencepreferences.h
Unescape View File

@ -27,7 +27,7 @@ class KAutoConfig;
* Preference widget for the Now Listening plugin, copied from the Cryptography plugin
* @author Olivier Goffart
*/
class WebPresencePreferences : public KCModule {
class WebPresencePreferences : public TDECModule {
Q_OBJECT

12
kopete/protocols/gadu/gaduaccount.cpp
Unescape View File

@ -88,7 +88,7 @@ public:
TQTimer* exportTimer_;
bool exportUserlist;
KConfigGroup* config;
TDEConfigGroup* config;
Kopete::OnlineStatus status;
TQValueList<unsigned int> servers;
KGaduLoginParams loginInfo;
@ -940,14 +940,14 @@ GaduAccount::slotExportContactsListToFile()
(*tempStream) << list.data();
tempFile.close();
bool res = KIO::NetAccess::upload(
bool res = TDEIO::NetAccess::upload(
tempFile.name() ,
p->saveListDialog->selectedURL() ,
Kopete::UI::Global::mainWidget()
);
if ( !res ) {
// say it failed
error( KIO::NetAccess::lastErrorString(), i18n( "Save Contacts List Failed" ) );
error( TDEIO::NetAccess::lastErrorString(), i18n( "Save Contacts List Failed" ) );
}
}
@ -977,12 +977,12 @@ GaduAccount::slotImportContactsFromFile()
if ( p->loadListDialog->exec() == TQDialog::Accepted ) {
url = p->loadListDialog->selectedURL();
kdDebug(14100) << "a:" << url << "\nb:" << oname << endl;
if ( KIO::NetAccess::download( url, oname, Kopete::UI::Global::mainWidget() ) ) {
if ( TDEIO::NetAccess::download( url, oname, Kopete::UI::Global::mainWidget() ) ) {
TQFile tempFile( oname );
if ( tempFile.open( IO_ReadOnly ) ) {
list = tempFile.readAll();
tempFile.close();
KIO::NetAccess::removeTempFile( oname );
TDEIO::NetAccess::removeTempFile( oname );
// and store it
kdDebug( 14100 ) << "loaded list:" << endl;
kdDebug( 14100 ) << list << endl;
@ -996,7 +996,7 @@ GaduAccount::slotImportContactsFromFile()
}
else {
// say, it failed misourably
error( KIO::NetAccess::lastErrorString(),
error( TDEIO::NetAccess::lastErrorString(),
i18n( "Contacts List Load Has Failed" ) );
}

18
kopete/protocols/gadu/gadudcctransaction.cpp
Unescape View File

@ -271,7 +271,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c
else {
// overwrite by default
if ( localFile_.open( IO_ReadWrite ) == FALSE ) {
transfer->slotError ( KIO::ERR_COULD_NOT_WRITE, fileName );
transfer->slotError ( TDEIO::ERR_COULD_NOT_WRITE, fileName );
closeDCC();
deleteLater ();
return;
@ -280,7 +280,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c
dccSock_->file_fd = localFile_.handle();
}
connect ( transfer, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) );
connect ( transfer, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) );
// reenable notifiers
enableNotifiers( dccSock_->check );
@ -290,7 +290,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c
void
GaduDCCTransaction::slotTransferResult()
{
if ( transfer_->error() == KIO::ERR_USER_CANCELED ) {
if ( transfer_->error() == TDEIO::ERR_USER_CANCELED ) {
closeDCC();
deleteLater();
}
@ -405,24 +405,24 @@ GaduDCCTransaction::watcher() {
switch( dccEvent->event.dcc_error ) {
case GG_ERROR_DCC_REFUSED:
transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "Connection to peer was refused; it possibly does not listen for incoming connections." ) );
transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "Connection to peer was refused; it possibly does not listen for incoming connections." ) );
break;
case GG_ERROR_DCC_EOF:
transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File transfer transaction was not agreed by peer." ) );
transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File transfer transaction was not agreed by peer." ) );
break;
case GG_ERROR_DCC_HANDSHAKE:
transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File-transfer handshake failure." ) );
transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File-transfer handshake failure." ) );
break;
case GG_ERROR_DCC_FILE:
transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "File transfer had problems with the file." ) );
transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "File transfer had problems with the file." ) );
break;
case GG_ERROR_DCC_NET:
transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "There was network error during file transfer." ) );
transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "There was network error during file transfer." ) );
break;
default:
transfer_->slotError( KIO::ERR_SLAVE_DEFINED, i18n( "Unknown File-Transfer error." ) );
transfer_->slotError( TDEIO::ERR_SLAVE_DEFINED, i18n( "Unknown File-Transfer error." ) );
break;
}
}

2
kopete/protocols/groupwise/gwbytestream.cpp
Unescape View File

@ -113,7 +113,7 @@ void KNetworkByteStream::slotConnectionClosed ()
if ( mClosing )
{
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << "..by ourselves!" << endl;
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->KSocketBase::errorString( socket()->error() ) << "\"" << endl;
kdDebug( GROUPWISE_DEBUG_GLOBAL ) << "socket error is \"" << socket()->TDESocketBase::errorString( socket()->error() ) << "\"" << endl;
emit connectionClosed ();
}
else

4
kopete/protocols/groupwise/gwconnector.cpp
Unescape View File

@ -30,7 +30,7 @@ KNetworkConnector::KNetworkConnector ( TQObject *parent, const char */*name*/ )
{
kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << "New KNetwork connector." << endl;
mErrorCode = KNetwork::KSocketBase::NoError;
mErrorCode = KNetwork::TDESocketBase::NoError;
mByteStream = new KNetworkByteStream ( this );
@ -58,7 +58,7 @@ void KNetworkConnector::connectToServer ( const TQString &server )
* For XMPP 1.0, we need to enable this!
*/
mErrorCode = KNetwork::KSocketBase::NoError;
mErrorCode = KNetwork::TDESocketBase::NoError;
if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) )
{

2
kopete/protocols/groupwise/ui/gweditaccountwidget.cpp
Unescape View File

@ -55,7 +55,7 @@ GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete
else
{
// look for a default server and port setting
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("GroupWise Messenger");
m_preferencesDialog->m_server->setText( config->readEntry( "DefaultServer" ) );
m_preferencesDialog->m_port->setValue( config->readNumEntry( "DefaultPort", 8300 ) );

4
kopete/protocols/irc/ircaccount.cpp
Unescape View File

@ -115,7 +115,7 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
currentHost = 0;
KConfigGroup *config = configGroup();
TDEConfigGroup *config = configGroup();
TQString networkName = netName;
if (networkName.isNull())
@ -402,7 +402,7 @@ const TQStringList IRCAccount::connectCommands() const
void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages,
int informationReplies, int errorMessages )
{
KConfigGroup *config = configGroup();
TDEConfigGroup *config = configGroup();
config->writeEntry( "ServerNotices", serverNotices );
config->writeEntry( "ServerMessages", serverMessages );
config->writeEntry( "InformationReplies", informationReplies );

2
kopete/protocols/irc/irccontactmanager.cpp
Unescape View File

@ -70,7 +70,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou
TQString timeoutPath = locate( "config", "kioslaverc" );
if( !timeoutPath.isEmpty() )
{
KConfig config( timeoutPath );
TDEConfig config( timeoutPath );
socketTimeout = config.readNumEntry( "ReadTimeout", 15 ) * 1000;
}

12
kopete/protocols/irc/irctransferhandler.cpp
Unescape View File

@ -138,14 +138,14 @@ void IRCTransferHandler::connectKopeteTransfer(Kopete::Transfer *kt, KIRC::Trans
// connect(kt, TQT_SIGNAL(destroyed()),
// t, TQT_SLOT(slotKopeteTransferDestroyed()));
connect(kt, TQT_SIGNAL(result(KIO::Job *)),
this , TQT_SLOT(kioresult(KIO::Job *)));
connect(kt, TQT_SIGNAL(result(TDEIO::Job *)),
this , TQT_SLOT(kioresult(TDEIO::Job *)));
t->initiate();
}
}
void IRCTransferHandler::kioresult(KIO::Job *job)
void IRCTransferHandler::kioresult(TDEIO::Job *job)
{
Kopete::Transfer *kt= (Kopete::Transfer *)job; // FIXME: move to *_cast
if(!kt)
@ -158,9 +158,9 @@ void IRCTransferHandler::kioresult(KIO::Job *job)
{
case 0: // 0 means no error
break;
case KIO::ERR_USER_CANCELED:
case TDEIO::ERR_USER_CANCELED:
kdDebug(14120) << k_funcinfo << "User canceled transfer." << endl;
// KIO::buildErrorString form error don't provide a result string ...
// TDEIO::buildErrorString form error don't provide a result string ...
// if (t->)
// kt->userAbort(i18n("User canceled transfer."));
// else
@ -168,7 +168,7 @@ void IRCTransferHandler::kioresult(KIO::Job *job)
break;
default:
kdDebug(14120) << k_funcinfo << "Transfer halted:" << kt->error() << endl;
// kt->userAbort(KIO::buildErrorString(kt->error(), kt->fileName()));
// kt->userAbort(TDEIO::buildErrorString(kt->error(), kt->fileName()));
break;
}
}

2
kopete/protocols/irc/irctransferhandler.h
Unescape View File

@ -47,7 +47,7 @@ private slots:
void transferAccepted(Kopete::Transfer *kt, const TQString&file);
void transferRefused(const Kopete::FileTransferInfo &info);
void kioresult(KIO::Job *job);
void kioresult(TDEIO::Job *job);
private:
IRCTransferHandler();

12
kopete/protocols/irc/libkirc/ksslsocket.cpp
Unescape View File

@ -194,7 +194,7 @@ void KSSLSocket::showInfoDialog()
TQDataStream arg(data, IO_WriteOnly);
arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData;
d->dcc->call("kio_uiserver", "UIServer",
"showSSLInfoDialog(TQString,KIO::MetaData)", data, ignoretype, ignore);
"showSSLInfoDialog(TQString,TDEIO::MetaData)", data, ignoretype, ignore);
}
}
@ -217,14 +217,14 @@ TQString KSSLSocket::metaData( const TQString &key )
}
/*
I basically copied the below from tcpKIO::SlaveBase.hpp, with some modificaions and formatting.
I basically copied the below from tcpTDEIO::SlaveBase.hpp, with some modificaions and formatting.
* Copyright (C) 2000 Alex Zepeda <zipzippy@sonic.net
* Copyright (C) 2001-2003 George Staikos <staikos@kde.org>
* Copyright (C) 2001 Dawit Alemayehu <adawit@kde.org>
*/
int KSSLSocket::messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text, const TQString &caption,
const TQString &buttonYes, const TQString &buttonNo )
{
kdDebug(14120) << "messageBox " << type << " " << text << " - " << caption << buttonYes << buttonNo << endl;
@ -371,7 +371,7 @@ int KSSLSocket::verifyCertificate()
TQString msg = i18n("The IP address of the host %1 "
"does not match the one the "
"certificate was issued to.");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel,
msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
@ -381,7 +381,7 @@ int KSSLSocket::verifyCertificate()
{
TQString msg = i18n("The server certificate failed the "
"authenticity test (%1).");
result = messageBox( KIO::SlaveBase::WarningYesNoCancel,
result = messageBox( TDEIO::SlaveBase::WarningYesNoCancel,
msg.arg(ourHost),
i18n("Server Authentication"),
i18n("&Details"),
@ -400,7 +400,7 @@ int KSSLSocket::verifyCertificate()
rc = 1;
cp = KSSLCertificateCache::Accept;
doAddHost = true;
result = messageBox( KIO::SlaveBase::WarningYesNo,
result = messageBox( TDEIO::SlaveBase::WarningYesNo,
i18n("Would you like to accept this "
"certificate forever without "
"being prompted?"),

2
kopete/protocols/irc/libkirc/ksslsocket.h
Unescape View File

@ -58,7 +58,7 @@ class KSSLSocket : public KExtendedSocket
private:
int verifyCertificate();
int messageBox( KIO::SlaveBase::MessageBoxType type, const TQString &text,
int messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQString &text,
const TQString &caption, const TQString &buttonYes, const TQString &buttonNo );

4
kopete/protocols/irc/ui/irceditaccountwidget.cpp
Unescape View File

@ -75,7 +75,7 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident
autoShowServerWindow->setChecked( account()->configGroup()->readBoolEntry("AutoShowServerWindow") );
autoConnect->setChecked( static_cast<Kopete::Account*>(account())->excludeConnect() );
KConfigGroup *config = account()->configGroup();
TDEConfigGroup *config = account()->configGroup();
serverNotices->setCurrentItem( config->readNumEntry( "ServerNotices", IRCAccount::ServerWindow ) - 1 );
serverMessages->setCurrentItem( config->readNumEntry( "ServerMessages", IRCAccount::ServerWindow ) - 1 );
@ -208,7 +208,7 @@ void IRCEditAccountWidget::slotAddCtcp()
TQString IRCEditAccountWidget::generateAccountId( const TQString &network )
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
TQString nextId = network;
uint accountNumber = 1;

30
kopete/protocols/jabber/jabberaccount.cpp
Unescape View File

@ -793,50 +793,50 @@ void JabberAccount::handleStreamError (int streamError, int streamCondition, int
case XMPP::ClientStream::ErrConnection:
switch(connectorCode)
{
case KNetwork::KSocketBase::LookupFailure:
case KNetwork::TDESocketBase::LookupFailure:
errorClass = Kopete::Account::InvalidHost;
errorCondition = i18n("Host not found.");
break;
case KNetwork::KSocketBase::AddressInUse:
case KNetwork::TDESocketBase::AddressInUse:
errorCondition = i18n("Address is already in use.");
break;
case KNetwork::KSocketBase::AlreadyCreated:
case KNetwork::TDESocketBase::AlreadyCreated:
errorCondition = i18n("Cannot recreate the socket.");
break;
case KNetwork::KSocketBase::AlreadyBound:
case KNetwork::TDESocketBase::AlreadyBound:
errorCondition = i18n("Cannot bind the socket again.");
break;
case KNetwork::KSocketBase::AlreadyConnected:
case KNetwork::TDESocketBase::AlreadyConnected:
errorCondition = i18n("Socket is already connected.");
break;
case KNetwork::KSocketBase::NotConnected:
case KNetwork::TDESocketBase::NotConnected:
errorCondition = i18n("Socket is not connected.");
break;
case KNetwork::KSocketBase::NotBound:
case KNetwork::TDESocketBase::NotBound:
errorCondition = i18n("Socket is not bound.");
break;
case KNetwork::KSocketBase::NotCreated:
case KNetwork::TDESocketBase::NotCreated:
errorCondition = i18n("Socket has not been created.");
break;
case KNetwork::KSocketBase::WouldBlock:
case KNetwork::TDESocketBase::WouldBlock:
errorCondition = i18n("Socket operation would block. You should not see this error, please use \"Report Bug\" from the Help menu.");
break;
case KNetwork::KSocketBase::ConnectionRefused:
case KNetwork::TDESocketBase::ConnectionRefused:
errorCondition = i18n("Connection refused.");
break;
case KNetwork::KSocketBase::ConnectionTimedOut:
case KNetwork::TDESocketBase::ConnectionTimedOut:
errorCondition = i18n("Connection timed out.");
break;
case KNetwork::KSocketBase::InProgress:
case KNetwork::TDESocketBase::InProgress:
errorCondition = i18n("Connection attempt already in progress.");
break;
case KNetwork::KSocketBase::NetFailure:
case KNetwork::TDESocketBase::NetFailure:
errorCondition = i18n("Network failure.");
break;
case KNetwork::KSocketBase::NotSupported:
case KNetwork::TDESocketBase::NotSupported:
errorCondition = i18n("Operation is not supported.");
break;
case KNetwork::KSocketBase::Timeout:
case KNetwork::TDESocketBase::Timeout:
errorCondition = i18n("Socket timed out.");
break;
default:

4
kopete/protocols/jabber/jabberbasecontact.cpp
Unescape View File

@ -646,7 +646,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
TQString tempPhotoPath = 0;
// Downalod photo from URI.
if( !KIO::NetAccess::download( vCard.photoURI(), tempPhotoPath, 0) )
if( !TDEIO::NetAccess::download( vCard.photoURI(), tempPhotoPath, 0) )
{
KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget (), KMessageBox::Sorry, i18n( "Downloading of Jabber contact photo failed!" ) );
return;
@ -656,7 +656,7 @@ void JabberBaseContact::setPropertiesFromVCard ( const XMPP::VCard &vCard )
contactPhoto = TQImage( tempPhotoPath );
KIO::NetAccess::removeTempFile( tempPhotoPath );
TDEIO::NetAccess::removeTempFile( tempPhotoPath );
}
// Save the image to the disk, then set the property.

4
kopete/protocols/jabber/jabberconnector.cpp
Unescape View File

@ -27,7 +27,7 @@ JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ )
{
kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "New Jabber connector." << endl;
mErrorCode = KNetwork::KSocketBase::NoError;
mErrorCode = KNetwork::TDESocketBase::NoError;
mByteStream = new JabberByteStream ( this );
@ -54,7 +54,7 @@ void JabberConnector::connectToServer ( const TQString &server )
* For XMPP 1.0, we need to enable this!
*/
mErrorCode = KNetwork::KSocketBase::NoError;
mErrorCode = KNetwork::TDESocketBase::NoError;
if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) )
{

18
kopete/protocols/jabber/jabberfiletransfer.cpp
Unescape View File

@ -90,7 +90,7 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, JabberBaseConta
contact->contactId (),
Kopete::FileTransferInfo::Outgoing );
connect ( mKopeteTransfer, TQT_SIGNAL ( result ( KIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
mXMPPTransfer = mAccount->client()->fileTransferManager()->createTransfer ();
@ -182,13 +182,13 @@ void JabberFileTransfer::slotIncomingTransferAccepted ( Kopete::Transfer *transf
if ( !couldOpen )
{
transfer->slotError ( KIO::ERR_COULD_NOT_WRITE, fileName );
transfer->slotError ( TDEIO::ERR_COULD_NOT_WRITE, fileName );
deleteLater ();
}
else
{
connect ( mKopeteTransfer, TQT_SIGNAL ( result ( KIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) );
connect ( mXMPPTransfer, TQT_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQT_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) );
connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) );
mXMPPTransfer->accept ( offset, length );
@ -211,7 +211,7 @@ void JabberFileTransfer::slotTransferRefused ( const Kopete::FileTransferInfo &t
void JabberFileTransfer::slotTransferResult ()
{
if ( mKopeteTransfer->error () == KIO::ERR_USER_CANCELED )
if ( mKopeteTransfer->error () == TDEIO::ERR_USER_CANCELED )
{
kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Transfer with " << mXMPPTransfer->peer().full () << " has been canceled." << endl;
mXMPPTransfer->close ();
@ -227,31 +227,31 @@ void JabberFileTransfer::slotTransferError ( int errorCode )
{
case XMPP::FileTransfer::ErrReject:
// user rejected the transfer request
mKopeteTransfer->slotError ( KIO::ERR_ACCESS_DENIED,
mKopeteTransfer->slotError ( TDEIO::ERR_ACCESS_DENIED,
mXMPPTransfer->peer().full () );
break;
case XMPP::FileTransfer::ErrNeg:
// unable to negotiate a suitable connection for the file transfer with the user
mKopeteTransfer->slotError ( KIO::ERR_COULD_NOT_LOGIN,
mKopeteTransfer->slotError ( TDEIO::ERR_COULD_NOT_LOGIN,
mXMPPTransfer->peer().full () );
break;
case XMPP::FileTransfer::ErrConnect:
// could not connect to the user
mKopeteTransfer->slotError ( KIO::ERR_COULD_NOT_CONNECT,
mKopeteTransfer->slotError ( TDEIO::ERR_COULD_NOT_CONNECT,
mXMPPTransfer->peer().full () );
break;
case XMPP::FileTransfer::ErrStream:
// data stream was disrupted, probably cancelled
mKopeteTransfer->slotError ( KIO::ERR_CONNECTION_BROKEN,
mKopeteTransfer->slotError ( TDEIO::ERR_CONNECTION_BROKEN,
mXMPPTransfer->peer().full () );
break;
default:
// unknown error
mKopeteTransfer->slotError ( KIO::ERR_UNKNOWN,
mKopeteTransfer->slotError ( TDEIO::ERR_UNKNOWN,
mXMPPTransfer->peer().full () );
break;
}

32
kopete/protocols/jabber/kioslave/jabberdisco.cpp
Unescape View File

@ -33,7 +33,7 @@
#include "jabberclient.h"
JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket )
: KIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket )
: TDEIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket )
{
kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl;
@ -106,7 +106,7 @@ void JabberDiscoProtocol::openConnection ()
{
case JabberClient::NoTLS:
// no SSL support, at the connecting stage this means the problem is client-side
error ( KIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) );
error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) );
break;
case JabberClient::Ok:
@ -184,7 +184,7 @@ void JabberDiscoProtocol::slotHandleTLSWarning ( int validityResult )
{
kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Handling TLS warning..." << endl;
if ( messageBox ( KIO::SlaveBase::WarningContinueCancel,
if ( messageBox ( TDEIO::SlaveBase::WarningContinueCancel,
i18n ( "The server certificate is invalid. Do you want to continue? " ),
i18n ( "Certificate Warning" ) ) == KMessageBox::Continue )
{
@ -207,7 +207,7 @@ void JabberDiscoProtocol::slotClientError ( JabberClient::ErrorCode errorCode )
{
case JabberClient::NoTLS:
default:
error ( KIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) );
error ( TDEIO::ERR_UPGRADE_REQUIRED, i18n ( "TLS" ) );
closeConnection ();
break;
}
@ -252,33 +252,33 @@ void JabberDiscoProtocol::slotQueryFinished ()
if (!task->success ())
{
error ( KIO::ERR_COULD_NOT_READ, "" );
error ( TDEIO::ERR_COULD_NOT_READ, "" );
return;
}
XMPP::DiscoList::const_iterator itemsEnd = task->items().end ();
for (XMPP::DiscoList::const_iterator it = task->items().begin (); it != itemsEnd; ++it)
{
KIO::UDSAtom atom;
KIO::UDSEntry entry;
TDEIO::UDSAtom atom;
TDEIO::UDSEntry entry;
atom.m_uds = KIO::UDS_NAME;
atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = (*it).jid().userHost ();
entry.prepend ( atom );
atom.m_uds = KIO::UDS_SIZE;
atom.m_uds = TDEIO::UDS_SIZE;
atom.m_long = 0;
entry.prepend ( atom );
atom.m_uds = KIO::UDS_LINK_DEST;
atom.m_uds = TDEIO::UDS_LINK_DEST;
atom.m_str = (*it).name ();
entry.prepend ( atom );
atom.m_uds = KIO::UDS_MIME_TYPE;
atom.m_uds = TDEIO::UDS_MIME_TYPE;
atom.m_str = "inode/directory";
entry.prepend ( atom );
atom.m_uds = KIO::UDS_SIZE;
atom.m_uds = TDEIO::UDS_SIZE;
atom.m_long = 0;
entry.prepend ( atom );
@ -286,7 +286,7 @@ void JabberDiscoProtocol::slotQueryFinished ()
}
listEntry ( KIO::UDSEntry(), true );
listEntry ( TDEIO::UDSEntry(), true );
finished ();
@ -314,7 +314,7 @@ void JabberDiscoProtocol::slotCSError ( int errorCode )
{
kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Incorrect password, retrying." << endl;
KIO::AuthInfo authInfo;
TDEIO::AuthInfo authInfo;
authInfo.username = m_user;
authInfo.password = m_password;
if ( openPassDlg ( authInfo, i18n ( "The login details are incorrect. Do you want to try again?" ) ) )
@ -327,13 +327,13 @@ void JabberDiscoProtocol::slotCSError ( int errorCode )
else
{
closeConnection ();
error ( KIO::ERR_COULD_NOT_AUTHENTICATE, "" );
error ( TDEIO::ERR_COULD_NOT_AUTHENTICATE, "" );
}
}
else
{
closeConnection ();
error ( KIO::ERR_CONNECTION_BROKEN, "" );
error ( TDEIO::ERR_CONNECTION_BROKEN, "" );
}
}

2
kopete/protocols/jabber/kioslave/jabberdisco.h
Unescape View File

@ -33,7 +33,7 @@
class JabberClient;
class JabberDiscoProtocol : public TQObject, public KIO::SlaveBase
class JabberDiscoProtocol : public TQObject, public TDEIO::SlaveBase
{
Q_OBJECT

4
kopete/protocols/jabber/ui/dlgjabbervcard.cpp
Unescape View File

@ -475,7 +475,7 @@ void dlgJabberVCard::slotSelectPhoto()
if( !filePath.isLocalFile() )
{
if( !KIO::NetAccess::download( filePath, path, this ) )
if( !TDEIO::NetAccess::download( filePath, path, this ) )
{
KMessageBox::queuedMessageBox( this, KMessageBox::Sorry, i18n( "Downloading of Jabber contact photo failed!" ) );
return;
@ -536,7 +536,7 @@ void dlgJabberVCard::slotSelectPhoto()
"Make sure that you have selected a correct image file</qt>" ) );
}
if( remoteFile )
KIO::NetAccess::removeTempFile( path );
TDEIO::NetAccess::removeTempFile( path );
}
void dlgJabberVCard::slotClearPhoto()

10
kopete/protocols/jabber/ui/jabberchooseserver.cpp
Unescape View File

@ -46,10 +46,10 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch
mMainWidget->listServers->setLeftMargin ( 0 );
// retrieve server list
mTransferJob = KIO::get ( "http://www.jabber.org/servers.xml" );
mTransferJob = TDEIO::get ( "http://www.jabber.org/servers.xml" );
connect ( mTransferJob, TQT_SIGNAL ( result ( KIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( KIO::Job* ) ) );
connect ( mTransferJob, TQT_SIGNAL ( data ( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( KIO::Job*, const TQByteArray& ) ) );
connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) );
connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) );
connect ( mMainWidget->listServers, TQT_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotSetSelection ( int ) ) );
connect ( mMainWidget->listServers, TQT_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotOk () ) );
@ -90,7 +90,7 @@ void JabberChooseServer::slotSetSelection ( int row )
}
void JabberChooseServer::slotTransferData ( KIO::Job */*job*/, const TQByteArray &data )
void JabberChooseServer::slotTransferData ( TDEIO::Job */*job*/, const TQByteArray &data )
{
unsigned oldSize = xmlServerList.size ();
@ -103,7 +103,7 @@ void JabberChooseServer::slotTransferData ( KIO::Job */*job*/, const TQByteArray
}
void JabberChooseServer::slotTransferResult ( KIO::Job *job )
void JabberChooseServer::slotTransferResult ( TDEIO::Job *job )
{
if ( job->error () || mTransferJob->isErrorPage () )

8
kopete/protocols/jabber/ui/jabberchooseserver.h
Unescape View File

@ -26,7 +26,7 @@
class JabberRegisterAccount;
class DlgJabberChooseServer;
namespace KIO
namespace TDEIO
{
class Job;
class TransferJob;
@ -49,14 +49,14 @@ public:
private slots:
void slotOk ();
void slotCancel ();
void slotTransferData ( KIO::Job *job, const TQByteArray &data );
void slotTransferResult ( KIO::Job *job );
void slotTransferData ( TDEIO::Job *job, const TQByteArray &data );
void slotTransferResult ( TDEIO::Job *job );
void slotSetSelection ( int row );
private:
DlgJabberChooseServer *mMainWidget;
JabberRegisterAccount *mParentWidget;
KIO::TransferJob *mTransferJob;
TDEIO::TransferJob *mTransferJob;
TQByteArray xmlServerList;
int mSelectedRow;

2
kopete/protocols/msn/config/kopete_msn_config.desktop
Unescape View File

@ -1,7 +1,7 @@
[Desktop Entry]
Icon=msn_protocol
Type=Service
ServiceTypes=KCModule
ServiceTypes=TDECModule
X-TDE-ModuleType=Library
X-TDE-Library=kopete_msn

6
kopete/protocols/msn/incomingtransfer.cpp
Unescape View File

@ -109,7 +109,7 @@ void IncomingTransfer::acknowledged()
TQFile *destination = new TQFile(m_transfer->destinationURL().path());
if(!destination->open(IO_WriteOnly))
{
m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
m_transfer->slotError(TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
m_transfer = 0l;
error();
@ -240,7 +240,7 @@ void IncomingTransfer::processMessage(const Message& message)
if(wouldListen)
{
// Create a listening socket for direct file transfer.
m_listener = new KServerSocket("", "");
m_listener = new TDEServerSocket("", "");
m_listener->setResolutionEnabled(true);
// Create the callback that will try to accept incoming connections.
TQObject::connect(m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(slotAccept()));
@ -297,7 +297,7 @@ void IncomingTransfer::processMessage(const Message& message)
// The transfer has been canceled remotely.
if(m_transfer){
// Inform the user of the file transfer cancelation.
m_transfer->slotError(KIO::ERR_ABORTED, i18n("File transfer canceled."));
m_transfer->slotError(TDEIO::ERR_ABORTED, i18n("File transfer canceled."));
}
// Remove the partially received file.
m_file->remove();

4
kopete/protocols/msn/incomingtransfer.h
Unescape View File

@ -21,7 +21,7 @@
#include "dispatcher.h"
namespace KNetwork{
class KServerSocket;
class TDEServerSocket;
}
/**
@ -51,7 +51,7 @@ namespace P2P{
virtual void processMessage(const Message& message);
KTempFile *m_tempFile;
KNetwork::KServerSocket *m_listener;
KNetwork::TDEServerSocket *m_listener;
};
}

4
kopete/protocols/msn/msnaccount.cpp
Unescape View File

@ -85,7 +85,7 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" );
KConfigGroup *config=configGroup();
TDEConfigGroup *config=configGroup();
m_blockList = config->readListEntry( "blockList" ) ;
m_allowList = config->readListEntry( "allowList" ) ;
@ -744,7 +744,7 @@ void MSNAccount::slotNewContactList()
m_blockList.clear();
m_reverseList.clear();
m_groupList.clear();
KConfigGroup *config=configGroup();
TDEConfigGroup *config=configGroup();
config->writeEntry( "blockList" , TQString() ) ;
config->writeEntry( "allowList" , TQString() );
config->writeEntry( "reverseList" , TQString() );

6
kopete/protocols/msn/msnchatsession.cpp
Unescape View File

@ -173,7 +173,7 @@ void MSNChatSession::createChat( const TQString &handle,
this, TQT_SLOT( slotSwitchBoardClosed() ) );
connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ),
this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) );
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if(config->readBoolEntry( "SendTypingNotification" , true) )
{
@ -223,7 +223,7 @@ void MSNChatSession::slotUserJoined( const TQString &handle, const TQString &pub
if(!m_messagesQueue.empty() || !m_invitations.isEmpty())
sendMessageQueue();
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( members().count()==1 && config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() && !c->hasProperty(Kopete::Global::Properties::self()->photo().key()))
slotRequestPicture();
@ -584,7 +584,7 @@ void MSNChatSession::slotDisplayPictureChanged()
}
else
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( config->readNumEntry( "DownloadPicture", 1 ) >= 1 && !c->object().isEmpty() )
slotRequestPicture();

6
kopete/protocols/msn/msncontact.cpp
Unescape View File

@ -674,13 +674,13 @@ void MSNContact::setDisplayPicture(KTempFile *f)
// but the custom emoticon code is to deeply merged in the display picture code while it could be separated.
TQString newlocation=locateLocal( "appdata", "msnpictures/"+ contactId().lower().replace(TQRegExp("[./~]"),"-") +".png" ) ;
KIO::Job *j=KIO::file_move( KURL::fromPathOrURL( f->name() ) , KURL::fromPathOrURL( newlocation ) , -1, true /*overwrite*/ , false /*resume*/ , false /*showProgressInfo*/ );
TDEIO::Job *j=TDEIO::file_move( KURL::fromPathOrURL( f->name() ) , KURL::fromPathOrURL( newlocation ) , -1, true /*overwrite*/ , false /*resume*/ , false /*showProgressInfo*/ );
f->setAutoDelete(false);
delete f;
//let the time to KIO to copy the file
connect(j, TQT_SIGNAL(result(KIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() ));
connect(j, TQT_SIGNAL(result(TDEIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() ));
}
void MSNContact::slotEmitDisplayPictureChanged()
@ -700,7 +700,7 @@ void MSNContact::setObject(const TQString &obj)
removeProperty( Kopete::Global::Properties::self()->photo() ) ;
emit displayPictureChanged();
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( config->readNumEntry( "DownloadPicture", 2 ) >= 2 && !obj.isEmpty()
&& account()->myself()->onlineStatus().status() != Kopete::OnlineStatus::Invisible )

14
kopete/protocols/msn/msnfiletransfersocket.cpp
Unescape View File

@ -155,7 +155,7 @@ void MSNFileTransferSocket::slotSocketClosed()
if(m_kopeteTransfer)
{
if( (m_downsize!=m_size || m_downsize==0 ) )
m_kopeteTransfer->slotError( KIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
m_kopeteTransfer->slotError( TDEIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
else
m_kopeteTransfer->slotComplete();
}
@ -192,7 +192,7 @@ void MSNFileTransferSocket::setKopeteTransfer(Kopete::Transfer *kt)
void MSNFileTransferSocket::listen(int port)
{
m_server = new KServerSocket();
m_server = new TDEServerSocket();
TQObject::connect( m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotAcceptConnection()));
m_server->setAddress(TQString::number(port));
@ -210,7 +210,7 @@ void MSNFileTransferSocket::slotAcceptConnection()
if(!accept(m_server))
{
if( m_kopeteTransfer)
m_kopeteTransfer->slotError( KIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
m_kopeteTransfer->slotError( TDEIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
emit done(this);
}
}
@ -222,7 +222,7 @@ void MSNFileTransferSocket::slotTimer()
kdDebug(14140) << "MSNFileTransferSocket::slotTimer: timeout "<< endl;
if( m_kopeteTransfer)
{
m_kopeteTransfer->slotError( KIO::ERR_CONNECTION_BROKEN , i18n( "Connection timed out" ) );
m_kopeteTransfer->slotError( TDEIO::ERR_CONNECTION_BROKEN , i18n( "Connection timed out" ) );
}
MSNChatSession* manager=dynamic_cast<MSNChatSession*>(m_contact->manager());
@ -248,7 +248,7 @@ void MSNFileTransferSocket::abort()
m_downsize=m_size; //we don't want to send data anymore;
}
//the timer wait one second, the time to send the CCL or the binary header
//retarding the disconnection keep away from a crash. (in KIO::Job::emitResult when `delete this`)
//retarding the disconnection keep away from a crash. (in TDEIO::Job::emitResult when `delete this`)
TQTimer::singleShot( 1000, this, TQT_SLOT(disconnect()) );
ready=false;
}
@ -410,7 +410,7 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg)
{
MSNInvitation::parseInvitation(msg);
if( m_kopeteTransfer)
m_kopeteTransfer->slotError( KIO::ERR_ABORTED , i18n( "The remote user aborted" ) );
m_kopeteTransfer->slotError( TDEIO::ERR_ABORTED , i18n( "The remote user aborted" ) );
emit done(this);
}
@ -447,7 +447,7 @@ void MSNFileTransferSocket::slotFileTransferAccepted(Kopete::Transfer *trans, co
else
{
if( m_kopeteTransfer)
m_kopeteTransfer->slotError( KIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
m_kopeteTransfer->slotError( TDEIO::ERR_UNKNOWN , i18n( "An unknown error occurred" ) );
emit done(this);
}

4
kopete/protocols/msn/msnfiletransfersocket.h
Unescape View File

@ -26,7 +26,7 @@
class TQFile;
namespace KNetwork {
class KServerSocket;
class TDEServerSocket;
}
namespace Kopete { class Transfer; }
@ -108,7 +108,7 @@ private:
TQString m_fileName;
Kopete::Transfer* m_kopeteTransfer;
TQFile *m_file ;
KNetwork::KServerSocket *m_server;
KNetwork::TDEServerSocket *m_server;
bool ready;

12
kopete/protocols/msn/msnsecureloginhandler.cpp
Unescape View File

@ -39,16 +39,16 @@ void MSNSecureLoginHandler::login()
{
// Retrive the login server.
// Do a reload and don't show the progress.
KIO::Job *getLoginServer = KIO::get(KURL("https://nexus.passport.com/rdr/pprdr.asp"), true, false);
TDEIO::Job *getLoginServer = TDEIO::get(KURL("https://nexus.passport.com/rdr/pprdr.asp"), true, false);
getLoginServer->addMetaData("cookies", "manual");
getLoginServer->addMetaData("cache", "reload");
getLoginServer->addMetaData("PropagateHttpHeader", "true");
connect(getLoginServer, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotLoginServerReceived(KIO::Job* )));
connect(getLoginServer, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotLoginServerReceived(TDEIO::Job* )));
}
void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob)
{
if(!loginJob->error())
{
@ -67,7 +67,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
TQString authURL = "https://" + loginUrl;
KIO::Job *authJob = KIO::get(KURL(authURL), true, false);
TDEIO::Job *authJob = TDEIO::get(KURL(authURL), true, false);
authJob->addMetaData("cookies", "manual");
TQString authRequest = "Authorization: Passport1.4 "
@ -86,7 +86,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
authJob->addMetaData("cookies", "manual");
authJob->addMetaData("cache", "reload");
connect(authJob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotTweenerReceived(KIO::Job* )));
connect(authJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotTweenerReceived(TDEIO::Job* )));
}
else
{
@ -96,7 +96,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(KIO::Job *loginJob)
}
}
void MSNSecureLoginHandler::slotTweenerReceived(KIO::Job *authJob)
void MSNSecureLoginHandler::slotTweenerReceived(TDEIO::Job *authJob)
{
if(!authJob->error())
{

8
kopete/protocols/msn/msnsecureloginhandler.h
Unescape View File

@ -19,7 +19,7 @@
#include <tqobject.h>
namespace KIO
namespace TDEIO
{
class Job;
class MetaData;
@ -51,11 +51,11 @@ signals:
void loginFailed();
private slots:
void slotLoginServerReceived(KIO::Job *);
void slotLoginServerReceived(TDEIO::Job *);
/**
* We have received our ticket to login.
*/
void slotTweenerReceived(KIO::Job *);
void slotTweenerReceived(TDEIO::Job *);
private:
/**
@ -71,7 +71,7 @@ private:
*/
TQString m_authentification;
void displayMetaData(KIO::MetaData data);
void displayMetaData(TDEIO::MetaData data);
};
#endif

12
kopete/protocols/msn/msnsocket.cpp
Unescape View File

@ -175,17 +175,17 @@ void MSNSocket::setOnlineStatus( MSNSocket::OnlineStatus status )
void MSNSocket::slotSocketError( int error )
{
kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->KSocketBase::errorString() << ")" << endl;
kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->TDESocketBase::errorString() << ")" << endl;
if(!KSocketBase::isFatalError(error))
if(!TDESocketBase::isFatalError(error))
return;
//we only care about fatal error
TQString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" );
if ( error == KSocketBase::LookupFailure )
if ( error == TDESocketBase::LookupFailure )
errormsg += i18n( "Unable to lookup %1" ).arg( m_socket->peerResolver().nodeName() );
else
errormsg += m_socket->KSocketBase::errorString() ;
errormsg += m_socket->TDESocketBase::errorString() ;
//delete m_socket;
m_socket->deleteLater();
@ -910,7 +910,7 @@ bool MSNSocket::useHttpMethod() const
return m_useHttp;
}
bool MSNSocket::accept( KServerSocket *server )
bool MSNSocket::accept( TDEServerSocket *server )
{
if ( m_socket )
{
@ -952,7 +952,7 @@ TQString MSNSocket::getLocalIP()
if ( !m_socket )
return TQString();
const KSocketAddress address = m_socket->localAddress();
const TDESocketAddress address = m_socket->localAddress();
TQString ip = address.nodeName();

4
kopete/protocols/msn/msnsocket.h
Unescape View File

@ -32,7 +32,7 @@
namespace KNetwork {
class KBufferedSocket;
class KServerSocket;
class TDEServerSocket;
}
class MimeMessage;
@ -201,7 +201,7 @@ protected:
* Used in MSNFileTransferSocket
*/
virtual void bytesReceived( const TQByteArray & );
bool accept( KNetwork::KServerSocket * );
bool accept( KNetwork::TDEServerSocket * );
void sendBytes( const TQByteArray &data );
const TQString &server() { return m_server; }

6
kopete/protocols/msn/msnswitchboardsocket.cpp
Unescape View File

@ -419,7 +419,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
else if( type== "text/x-mms-emoticon" || type== "text/x-mms-animemoticon")
{
// TODO remove Displatcher.
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( config->readBoolEntry( "useCustomEmoticons", true ) )
{
@ -466,7 +466,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes )
if(!m_clientcapsSent)
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
TQString JabberID;
@ -667,7 +667,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg )
}
#endif
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
if ( config->readBoolEntry( "exportEmoticons", false ) )
{

6
kopete/protocols/msn/outgoingtransfer.cpp
Unescape View File

@ -208,7 +208,7 @@ void OutgoingTransfer::processMessage(const Message& message)
if(m_transfer)
{
// Inform the user of the file transfer cancelation.
m_transfer->slotError(KIO::ERR_ABORTED, i18n("File transfer canceled."));
m_transfer->slotError(TDEIO::ERR_ABORTED, i18n("File transfer canceled."));
}
}
// Dispose of this transfer context.
@ -315,7 +315,7 @@ void OutgoingTransfer::processMessage(const Message& message)
if(m_transfer)
{
// Inform the user of the file transfer cancelation.
m_transfer->slotError(KIO::ERR_ABORTED, i18n("File transfer canceled."));
m_transfer->slotError(TDEIO::ERR_ABORTED, i18n("File transfer canceled."));
}
if(m_file && m_file->isOpen()){
@ -401,7 +401,7 @@ void OutgoingTransfer::slotRead()
void OutgoingTransfer::slotSocketError(int)
{
kdDebug(14140) << k_funcinfo << m_socket->KSocketBase::errorString() << endl;
kdDebug(14140) << k_funcinfo << m_socket->TDESocketBase::errorString() << endl;
// If an error has occurred, try to connect
// to another available peer endpoint.
// If there are no more available endpoints,

2
kopete/protocols/msn/p2p.cpp
Unescape View File

@ -372,7 +372,7 @@ void TransferContext::abort()
kdDebug(14140) << k_funcinfo << endl;
if(m_transfer)
{
if(m_transfer->error() == KIO::ERR_ABORTED)
if(m_transfer->error() == TDEIO::ERR_ABORTED)
{
switch(m_direction)
{

8
kopete/protocols/msn/ui/msneditaccountwidget.cpp
Unescape View File

@ -105,7 +105,7 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account
// default fields
if ( account )
{
KConfigGroup * config=account->configGroup();
TDEConfigGroup * config=account->configGroup();
d->ui->m_login->setText( account->accountId() );
d->ui->m_password->load( &static_cast<MSNAccount *>(account)->password() );
@ -198,7 +198,7 @@ Kopete::Account * MSNEditAccountWidget::apply()
if ( !account() )
setAccount( new MSNAccount( d->protocol, d->ui->m_login->text() ) );
KConfigGroup *config=account()->configGroup();
TDEConfigGroup *config=account()->configGroup();
account()->setExcludeConnect( d->ui->m_autologin->isChecked() );
d->ui->m_password->save( &static_cast<MSNAccount *>(account())->password() );
@ -332,7 +332,7 @@ void MSNEditAccountWidget::slotSelectImage()
return;
if( !filePath.isLocalFile() ) {
if(!KIO::NetAccess::download( filePath, path, this )) {
if(!TDEIO::NetAccess::download( filePath, path, this )) {
KMessageBox::sorry( this, i18n( "Downloading of display image failed" ), i18n( "MSN Plugin" ) );
return;
}
@ -355,7 +355,7 @@ void MSNEditAccountWidget::slotSelectImage()
KMessageBox::sorry( this, i18n( "<qt>An error occurred when trying to change the display picture.<br>"
"Make sure that you have selected a correct image file</qt>" ), i18n( "MSN Plugin" ) );
}
if( remoteFile ) KIO::NetAccess::removeTempFile( path );
if( remoteFile ) TDEIO::NetAccess::removeTempFile( path );
}
void MSNEditAccountWidget::slotOpenRegister()

12
kopete/protocols/msn/webcam.cpp
Unescape View File

@ -54,7 +54,7 @@ Webcam::Webcam(Who who, const TQString& to, Dispatcher *parent, TQ_UINT32 sessio
m_mimic=0L;
m_widget=0L;
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
// Read the configuration to get the number of frame per second to send
@ -509,7 +509,7 @@ TQString Webcam::xml(uint session , uint rid)
TQString port = TQString::number(getAvailablePort());
m_listener = new KServerSocket(port, this) ;
m_listener = new TDEServerSocket(port, this) ;
return "<" + who + "><version>2.0</version><rid>"+TQString::number(rid)+"</rid><udprid>"+TQString::number(rid+1)+"</udprid><session>"+TQString::number(session)+"</session><ctypes>0</ctypes><cpu>2931</cpu>" +
"<tcp><tcpport>"+port+"</tcpport>\t\t\t\t\t\t\t\t <tcplocalport>"+port+"</tcplocalport>\t\t\t\t\t\t\t\t <tcpexternalport>"+port+"</tcpexternalport>"+ip+"</tcp>"+
@ -519,7 +519,7 @@ TQString Webcam::xml(uint session , uint rid)
int Webcam::getAvailablePort()
{
KConfig *config = TDEGlobal::config();
TDEConfig *config = TDEGlobal::config();
config->setGroup( "MSN" );
TQString basePort=config->readEntry("WebcamPort");
if(basePort.isEmpty() || basePort == "0" )
@ -531,14 +531,14 @@ int Webcam::getAvailablePort()
// try to find an available port
//
KServerSocket *ss = new KServerSocket();
TDEServerSocket *ss = new TDEServerSocket();
ss->setFamily(KResolver::InetFamily);
bool found = false;
unsigned int port = firstport;
for( ; port <= lastport; ++port) {
ss->setAddress( TQString::number( port ) );
bool success = ss->listen();
if( found = ( success && ss->error() == KSocketBase::NoError ) )
if( found = ( success && ss->error() == TDESocketBase::NoError ) )
break;
ss->close();
}
@ -805,7 +805,7 @@ void Webcam::slotSocketClosed()
void Webcam::slotSocketError(int errorCode)
{
KBufferedSocket *socket=const_cast<KBufferedSocket*>(static_cast<const KBufferedSocket*>(sender()));
kdDebug(14140) << k_funcinfo << socket << " - " << errorCode << " : " << socket->KSocketBase::errorString() << endl;
kdDebug(14140) << k_funcinfo << socket << " - " << errorCode << " : " << socket->TDESocketBase::errorString() << endl;
//sendBYEMessage();
}

4
kopete/protocols/msn/webcam.h
Unescape View File

@ -18,7 +18,7 @@
#if MSN_WEBCAM
namespace KNetwork{ class KServerSocket; class KBufferedSocket; }
namespace KNetwork{ class TDEServerSocket; class KBufferedSocket; }
class MimicWrapper;
class TQLabel;
@ -54,7 +54,7 @@ class Webcam : public TransferContext
int getAvailablePort();
KNetwork::KServerSocket *m_listener;
KNetwork::TDEServerSocket *m_listener;
KNetwork::KBufferedSocket *m_webcamSocket;
enum WebcamStatus { wsNegotiating , wsConnecting, wsConnected, wsTransfer } ;

2
kopete/protocols/oscar/liboscar/oscarbytestream.cpp
Unescape View File

@ -102,7 +102,7 @@ void KNetworkByteStream::slotConnectionClosed()
if ( mClosing )
{
kdDebug( 14151 ) << "..by ourselves!" << endl;
kdDebug( 14151 ) << "socket error is " << socket()->KSocketBase::errorString( socket()->error() ) << endl;
kdDebug( 14151 ) << "socket error is " << socket()->TDESocketBase::errorString( socket()->error() ) << endl;
emit connectionClosed ();
}
else

4
kopete/protocols/oscar/liboscar/oscarconnector.cpp
Unescape View File

@ -29,7 +29,7 @@ KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ )
{
kdDebug( 14151 ) << k_funcinfo << "New KNetwork connector." << endl;
mErrorCode = KNetwork::KSocketBase::NoError;
mErrorCode = KNetwork::TDESocketBase::NoError;
mByteStream = new KNetworkByteStream( this );
@ -49,7 +49,7 @@ void KNetworkConnector::connectToServer( const TQString &server )
Q_ASSERT( !mHost.isNull() );
Q_ASSERT( mPort );
mErrorCode = KNetwork::KSocketBase::NoError;
mErrorCode = KNetwork::TDESocketBase::NoError;
if ( !mByteStream->connect ( mHost, TQString::number ( mPort ) ) )
{

22
kopete/protocols/oscar/oscarversionupdater.cpp
Unescape View File

@ -66,15 +66,15 @@ bool OscarVersionUpdater::update( unsigned int stamp )
{
mVersionData.resize( 0 );
KConfigGroup config( TDEGlobal::config(), "Oscar" );
TDEConfigGroup config( TDEGlobal::config(), "Oscar" );
TQString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" );
mTransferJob = KIO::get ( url );
mTransferJob = TDEIO::get ( url );
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl;
connect ( mTransferJob, TQT_SIGNAL ( result ( KIO::Job* ) ),
this, TQT_SLOT ( slotTransferResult ( KIO::Job* ) ) );
connect ( mTransferJob, TQT_SIGNAL ( data ( KIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT ( slotTransferData ( KIO::Job*, const TQByteArray& ) ) );
connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ),
this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) );
connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ),
this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) );
}
return isUpdating;
}
@ -87,7 +87,7 @@ unsigned int OscarVersionUpdater::stamp() const
void OscarVersionUpdater::initICQVersionInfo()
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
KConfigGroup config( TDEGlobal::config(), "ICQVersion" );
TDEConfigGroup config( TDEGlobal::config(), "ICQVersion" );
mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" );
mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 );
@ -104,7 +104,7 @@ void OscarVersionUpdater::initAIMVersionInfo()
{
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
KConfigGroup config( TDEGlobal::config(), "AIMVersion" );
TDEConfigGroup config( TDEGlobal::config(), "AIMVersion" );
mAIMVersion.clientString = config.readEntry( "ClientString", "AOL Instant Messenger (SM), version 5.1.3036/WIN32" );
mAIMVersion.clientId = config.readEntry( "ClientId", "0x0109" ).toUShort( 0, 0 );
@ -144,7 +144,7 @@ void OscarVersionUpdater::printDebug()
kdDebug(OSCAR_RAW_DEBUG) << "************************************************" << endl;
}
void OscarVersionUpdater::slotTransferData ( KIO::Job */*job*/, const TQByteArray &data )
void OscarVersionUpdater::slotTransferData ( TDEIO::Job */*job*/, const TQByteArray &data )
{
unsigned oldSize = mVersionData.size();
mVersionData.resize ( oldSize + data.size() );
@ -153,7 +153,7 @@ void OscarVersionUpdater::slotTransferData ( KIO::Job */*job*/, const TQByteArra
kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Data size " << mVersionData.size() << endl;
}
void OscarVersionUpdater::slotTransferResult ( KIO::Job *job )
void OscarVersionUpdater::slotTransferResult ( TDEIO::Job *job )
{
bool bUpdate = false;
if ( job->error() || mTransferJob->isErrorPage() )
@ -264,7 +264,7 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElem
void OscarVersionUpdater::storeVersionInfo( const TQString& group, const Oscar::ClientVersion& version ) const
{
kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Storing version info to group: " << group << endl;
KConfigGroup config( TDEGlobal::config(), group );
TDEConfigGroup config( TDEGlobal::config(), group );
config.writeEntry( "ClientString", version.clientString );
config.writeEntry( "ClientId", version.clientId );

10
kopete/protocols/oscar/oscarversionupdater.h
Unescape View File

@ -21,7 +21,7 @@
#include <oscartypes.h>
namespace KIO
namespace TDEIO
{
class Job;
class TransferJob;
@ -85,15 +85,15 @@ public:
void printDebug();
private slots:
void slotTransferData( KIO::Job *job, const TQByteArray &data );
void slotTransferResult( KIO::Job *job );
void slotTransferData( TDEIO::Job *job, const TQByteArray &data );
void slotTransferResult( TDEIO::Job *job );
private:
void parseDocument( TQDomDocument& doc );
bool parseVersion( Oscar::ClientVersion& version, TQDomElement& element );
/**
* Store version info structure to KConfigGroup
* Store version info structure to TDEConfigGroup
* @param group is the group name.
* @param version is version info structure.
*/
@ -111,7 +111,7 @@ private:
Oscar::ClientVersion mICQVersion;
Oscar::ClientVersion mAIMVersion;
KIO::TransferJob *mTransferJob;
TDEIO::TransferJob *mTransferJob;
TQByteArray mVersionData;
unsigned int mStamp;

4
kopete/protocols/sms/services/gsmlib.cpp
Unescape View File

@ -306,7 +306,7 @@ void GSMLib::saveConfig()
{
if( m_account != NULL )
{
KConfigGroup* c = m_account->configGroup();
TDEConfigGroup* c = m_account->configGroup();
c->writeEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), m_device);
}
@ -318,7 +318,7 @@ void GSMLib::loadConfig()
if( m_account != NULL )
{
TQString temp;
KConfigGroup* c = m_account->configGroup();
TDEConfigGroup* c = m_account->configGroup();
temp = c->readEntry(TQString("%1:%2").arg("GSMLib").arg("Device"), TQString());
if( temp != TQString() )

4
kopete/protocols/sms/services/smsclient.cpp
Unescape View File

@ -58,7 +58,7 @@ void SMSClient::send(const Kopete::Message& msg)
m_msg = msg;
KConfigGroup* c = m_account->configGroup();
TDEConfigGroup* c = m_account->configGroup();
TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"));
if (provider.isNull())
@ -133,7 +133,7 @@ void SMSClient::savePreferences()
if (prefWidget != 0L && m_account != 0L)
{
KConfigGroup* c = m_account->configGroup();
TDEConfigGroup* c = m_account->configGroup();
c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), prefWidget->program->url());
c->writeEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), prefWidget->configDir->url());

2
kopete/protocols/sms/smseditaccountwidget.cpp
Unescape View File

@ -98,7 +98,7 @@ Kopete::Account* SMSEditAccountWidget::apply()
if (service)
service->setAccount(account());
KConfigGroup *c = account()->configGroup();
TDEConfigGroup *c = account()->configGroup();
c->writeEntry("ServiceName", preferencesDialog->serviceName->currentText());
c->writeEntry("SubEnable", preferencesDialog->subEnable->isChecked() ? "true" : "false");
c->writeEntry("SubCode", preferencesDialog->subCode->text());

2
kopete/protocols/yahoo/libkyahoo/client.cpp
Unescape View File

@ -231,7 +231,7 @@ void Client::streamError( int error )
if( error == ClientStream::ErrConnection && m_connector ) // Ask Connector in this case
{
d->error = m_connector->errorCode();
d->errorString = KSocketBase::errorString( (KSocketBase::SocketError)d->error );
d->errorString = TDESocketBase::errorString( (TDESocketBase::SocketError)d->error );
}
else if( d->stream )
{

28
kopete/protocols/yahoo/libkyahoo/logintask.cpp
Unescape View File

@ -214,20 +214,20 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed)
TQByteArray encodedUrl;
TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed);
KURL tokenUrl(fullUrl);
KIO::Job* job = KIO::get(tokenUrl, true, false);
connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
this, TQT_SLOT(handleAuthSixteenStage1Data(KIO::Job*, const TQByteArray&)));
connect(job, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(handleAuthSixteenStage1Result(KIO::Job*)));
TDEIO::Job* job = TDEIO::get(tokenUrl, true, false);
connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
this, TQT_SLOT(handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray&)));
connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(handleAuthSixteenStage1Result(TDEIO::Job*)));
}
void LoginTask::handleAuthSixteenStage1Data(KIO::Job* job, const TQByteArray& data)
void LoginTask::handleAuthSixteenStage1Data(TDEIO::Job* job, const TQByteArray& data)
{
kdDebug(YAHOO_RAW_DEBUG) << "data:" << data << endl;
m_stage1Data.append(data);
}
void LoginTask::handleAuthSixteenStage1Result(KIO::Job* job)
void LoginTask::handleAuthSixteenStage1Result(TDEIO::Job* job)
{
int responseNumber = -1;
TQString token;
@ -294,20 +294,20 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token)
m_stage2Data = TQString();
TQString fullUrl = YahooLoginUrl.arg(token);
KURL loginUrl(fullUrl);
KIO::Job* job = KIO::get(loginUrl, true, false);
connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
this, TQT_SLOT(handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray&)));
connect(job, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(handleAuthSixteenStage2Result(KIO::Job*)));
TDEIO::Job* job = TDEIO::get(loginUrl, true, false);
connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
this, TQT_SLOT(handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray&)));
connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(handleAuthSixteenStage2Result(TDEIO::Job*)));
}
void LoginTask::handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray& data)
void LoginTask::handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray& data)
{
kdDebug(YAHOO_RAW_DEBUG) << "data:" << data << endl;
m_stage2Data.append(data);
}
void LoginTask::handleAuthSixteenStage2Result(KIO::Job* job)
void LoginTask::handleAuthSixteenStage2Result(TDEIO::Job* job)
{
TQString crumb;
int responseNumber = -1;

10
kopete/protocols/yahoo/libkyahoo/logintask.h
Unescape View File

@ -27,7 +27,7 @@
class TQString;
class YMSGTransfer;
namespace KIO
namespace TDEIO
{
class Job;
}
@ -68,10 +68,10 @@ protected:
void sendAuthSixteenStage2(const TQString& token);
void sendAuthSixteenStage3(const TQString& cryptString);
protected slots:
void handleAuthSixteenStage1Data(KIO::Job*, const TQByteArray& data);
void handleAuthSixteenStage1Result(KIO::Job*);
void handleAuthSixteenStage2Data(KIO::Job*, const TQByteArray& data);
void handleAuthSixteenStage2Result(KIO::Job*);
void handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray& data);
void handleAuthSixteenStage1Result(TDEIO::Job*);
void handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray& data);
void handleAuthSixteenStage2Result(TDEIO::Job*);
signals:
void haveSessionID( uint );

4
kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
Unescape View File

@ -91,7 +91,7 @@ void ModifyYABTask::connectFailed( int i)
{
m_socket->close();
client()->notifyError( i18n( "An error occurred while saving the address book entry." ),
TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
TQString( "%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error );
}
void ModifyYABTask::connectSucceeded()
@ -118,7 +118,7 @@ void ModifyYABTask::connectSucceeded()
kdDebug(YAHOO_RAW_DEBUG) << "Upload Successful. Waiting for confirmation..." << endl;
else
{
client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->KSocketBase::errorString(), Client::Error );
client()->notifyError( i18n( "An error occurred while saving the address book entry." ), m_socket->TDESocketBase::errorString(), Client::Error );
setError();
return;
}

4
kopete/protocols/yahoo/libkyahoo/modifyyabtask.h
Unescape View File

@ -21,7 +21,7 @@
#include "task.h"
#include "yabentry.h"
namespace KIO {
namespace TDEIO {
class Job;
class TransferJob;
}
@ -53,7 +53,7 @@ private slots:
void connectFailed( int );
void slotRead();
private:
KIO::TransferJob *m_transferJob;
TDEIO::TransferJob *m_transferJob;
KNetwork::KBufferedSocket *m_socket;
TQString m_postData;
TQString m_data;

26
kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
Unescape View File

@ -52,14 +52,14 @@ void ReceiveFileTask::onGo()
m_file = new TQFile( m_localUrl.path() );
if( !m_file->open( IO_WriteOnly ) )
{
emit error( m_transferId, KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") );
emit error( m_transferId, TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") );
setError();
delete t;
return;
}
m_transferJob = KIO::get( m_remoteUrl, false, false );
TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
m_transferJob = TDEIO::get( m_remoteUrl, false, false );
TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) );
TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
delete t;
break;
case FileTransfer7Accept:
@ -120,7 +120,7 @@ bool ReceiveFileTask::forMe( const Transfer *transfer ) const
return false;
}
void ReceiveFileTask::slotData( KIO::Job *job, const TQByteArray& data )
void ReceiveFileTask::slotData( TDEIO::Job *job, const TQByteArray& data )
{
Q_UNUSED( job );
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
@ -130,17 +130,17 @@ void ReceiveFileTask::slotData( KIO::Job *job, const TQByteArray& data )
m_file->writeBlock( data.data() , data.size() );
}
void ReceiveFileTask::slotComplete( KIO::Job *job )
void ReceiveFileTask::slotComplete( TDEIO::Job *job )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
if( m_file )
m_file->close();
if ( job->error () || transfer->isErrorPage () )
{
emit error( m_transferId, KIO::ERR_ABORTED, i18n("An error occurred while downloading the file.") );
emit error( m_transferId, TDEIO::ERR_ABORTED, i18n("An error occurred while downloading the file.") );
setError();
}
else
@ -171,7 +171,7 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer )
m_file = new TQFile( m_localUrl.path() );
if( !m_file->open( IO_WriteOnly ) )
{
emit error( m_transferId, KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") );
emit error( m_transferId, TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Could not open file for writing.") );
setError();
return;
}
@ -187,17 +187,17 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer )
send( t );
// The server expects a HTTP HEAD command prior to the GET
m_mimetypeJob = KIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
m_mimetypeJob = TDEIO::mimetype(TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
.arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false);
m_mimetypeJob->addMetaData("cookies", "manual");
m_mimetypeJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; C=%3;")
.arg(client()->tCookie()).arg(client()->yCookie()).arg(client()->cCookie()) );
m_transferJob = KIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
m_transferJob = TDEIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4")
.arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false );
TQObject::connect( m_transferJob, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
TQObject::connect( m_transferJob, TQT_SIGNAL( data( KIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) );
TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
m_transferJob->addMetaData("cookies", "manual");
m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;")
.arg(client()->tCookie()).arg(client()->yCookie()) );

10
kopete/protocols/yahoo/libkyahoo/receivefiletask.h
Unescape View File

@ -22,7 +22,7 @@
class TQString;
class TQFile;
namespace KIO {
namespace TDEIO {
class Job;
class TransferJob;
class MimetypeJob;
@ -62,8 +62,8 @@ signals:
void error( unsigned int, int, const TQString & );
private slots:
void slotData( KIO::Job *job, const TQByteArray &data );
void slotComplete( KIO::Job *job );
void slotData( TDEIO::Job *job, const TQByteArray &data );
void slotComplete( TDEIO::Job *job );
void canceled( unsigned int );
private:
@ -74,8 +74,8 @@ private:
TQString m_fileName;
TQString m_userId;
TQFile *m_file;
KIO::TransferJob *m_transferJob;
KIO::MimetypeJob *m_mimetypeJob;
TDEIO::TransferJob *m_transferJob;
TDEIO::MimetypeJob *m_mimetypeJob;
unsigned int m_transferId;
unsigned int m_transmitted;
Type m_type;

6
kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
Unescape View File

@ -186,7 +186,7 @@ void SendFileTask::parseTransferAccept(const Transfer *transfer)
void SendFileTask::connectFailed( int i )
{
TQString err = KSocketBase::errorString(m_socket->error());
TQString err = TDESocketBase::errorString(m_socket->error());
kdDebug(YAHOO_RAW_DEBUG) << i << ": " << err << endl;
emit error( m_transferId, i, err );
setError();
@ -227,7 +227,7 @@ void SendFileTask::connectSucceeded()
if( !m_socket->writeBlock( buffer, buffer.size() ) )
{
emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() );
emit error( m_transferId, m_socket->error(), m_socket->TDESocketBase::errorString() );
m_socket->close();
}
else
@ -255,7 +255,7 @@ void SendFileTask::transmitData()
if( written != read )
{
kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << "Upload Failed!" << endl;
emit error( m_transferId, m_socket->error(), m_socket->KSocketBase::errorString() );
emit error( m_transferId, m_socket->error(), m_socket->TDESocketBase::errorString() );
setError();
return;
}

4
kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
Unescape View File

@ -74,9 +74,9 @@ void SendPictureTask::initiateUpload()
void SendPictureTask::connectFailed( int i)
{
kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString() << endl;
kdDebug(YAHOO_RAW_DEBUG) << i << ": " << static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString() << endl;
client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->KSocketBase::errorString()), Client::Error );
client()->notifyError(i18n("The picture was not successfully uploaded"), TQString("%1 - %2").arg(i).arg(static_cast<const KBufferedSocket*>( sender() )->TDESocketBase::errorString()), Client::Error );
setError();
}

2
kopete/protocols/yahoo/libkyahoo/sendpicturetask.h
Unescape View File

@ -21,7 +21,7 @@
class TQString;
class TQFile;
namespace KIO {
namespace TDEIO {
class Job;
class TransferJob;
}

4
kopete/protocols/yahoo/libkyahoo/webcamtask.cpp
Unescape View File

@ -195,9 +195,9 @@ void WebcamTask::slotConnectionStage2Established()
void WebcamTask::slotConnectionFailed( int error )
{
KStreamSocket* socket = const_cast<KStreamSocket*>( dynamic_cast<const KStreamSocket*>( sender() ) );
kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->KSocketBase::errorString() << endl;
kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection to the user " << socketMap[socket].sender << " failed. Error " << error << " - " << socket->TDESocketBase::errorString() << endl;
client()->notifyError( i18n("Webcam connection to the user %1 could not be established.\n\nPlease relogin and try again.")
.arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->KSocketBase::errorString()), Client::Error );
.arg(socketMap[socket].sender), TQString("%1 - %2").arg(error).arg( socket->TDESocketBase::errorString()), Client::Error );
socketMap.remove( socket );
socket->deleteLater();
}

10
kopete/protocols/yahoo/libkyahoo/yabtask.cpp
Unescape View File

@ -97,21 +97,21 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision )
TQString url = TQString::fromLatin1("http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=%1&tags=short&rt=%2&prog-ver=%3")
.arg( lastMerge ).arg( lastRemoteRevision ).arg( YMSG_PROGRAM_VERSION_STRING );
m_transferJob = KIO::get( url , false, false );
m_transferJob = TDEIO::get( url , false, false );
m_transferJob->addMetaData("cookies", "manual");
m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;")
.arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) );
connect( m_transferJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray & ) ) );
connect( m_transferJob, TQT_SIGNAL( result( KIO::Job *) ), this, TQT_SLOT( slotResult( KIO::Job* ) ) );
connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
}
void YABTask::slotData( KIO::Job* /*job*/, const TQByteArray &info )
void YABTask::slotData( TDEIO::Job* /*job*/, const TQByteArray &info )
{
kdDebug(YAHOO_RAW_DEBUG) ;
m_data += info;
}
void YABTask::slotResult( KIO::Job* job )
void YABTask::slotResult( TDEIO::Job* job )
{
if( job->error () || m_transferJob->isErrorPage () )
{

8
kopete/protocols/yahoo/libkyahoo/yabtask.h
Unescape View File

@ -23,7 +23,7 @@
class YMSGTransfer;
namespace KIO {
namespace TDEIO {
class Job;
class TransferJob;
}
@ -50,10 +50,10 @@ protected:
virtual bool forMe( const Transfer* transfer ) const;
void parseContactDetails( YMSGTransfer* t );
private slots:
void slotData( KIO::Job*, const TQByteArray & );
void slotResult( KIO::Job* );
void slotData( TDEIO::Job*, const TQByteArray & );
void slotResult( TDEIO::Job* );
private:
KIO::TransferJob *m_transferJob;
TDEIO::TransferJob *m_transferJob;
TQString m_data;
};

16
kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
Unescape View File

@ -43,14 +43,14 @@ YahooBuddyIconLoader::~YahooBuddyIconLoader()
void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int checksum )
{
kdDebug(YAHOO_RAW_DEBUG) << k_funcinfo << url << endl;
KIO::TransferJob *transfer;
TDEIO::TransferJob *transfer;
TQString Url = url.url();
TQString ext = Url.left( Url.findRev( "?" ) );
ext = ext.right( ext.length() - ext.findRev( "." ) );
transfer = KIO::get( url, false, false );
connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
transfer = TDEIO::get( url, false, false );
connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) );
connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
m_jobs[transfer].url = url;
m_jobs[transfer].who = who;
@ -58,11 +58,11 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch
}
void YahooBuddyIconLoader::slotData( KIO::Job *job, const TQByteArray& data )
void YahooBuddyIconLoader::slotData( TDEIO::Job *job, const TQByteArray& data )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
// FIXME need to check
//m_jobs[transfer].icon.append( data );
@ -71,11 +71,11 @@ void YahooBuddyIconLoader::slotData( KIO::Job *job, const TQByteArray& data )
memcpy( m_jobs[transfer].icon.data() + oldsize, data.data(), data.size() );
}
void YahooBuddyIconLoader::slotComplete( KIO::Job *job )
void YahooBuddyIconLoader::slotComplete( TDEIO::Job *job )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
if ( job->error () || transfer->isErrorPage () )
{

8
kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.h
Unescape View File

@ -26,7 +26,7 @@
class KJob;
class Client;
namespace KIO {
namespace TDEIO {
class Job;
class TransferJob;
}
@ -66,11 +66,11 @@ signals:
void fetchedBuddyIcon( const TQString &who, const TQByteArray &icon, int checksum );
private slots:
void slotData( KIO::Job *job, const TQByteArray &data );
void slotComplete( KIO::Job *job );
void slotData( TDEIO::Job *job, const TQByteArray &data );
void slotComplete( TDEIO::Job *job );
private:
typedef TQMap< KIO::TransferJob *, IconLoadJob > TransferJobMap;
typedef TQMap< TDEIO::TransferJob *, IconLoadJob > TransferJobMap;
TransferJobMap m_jobs;
Client *m_client;
};

2
kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp
Unescape View File

@ -99,7 +99,7 @@ void KNetworkByteStream::slotConnectionClosed()
if ( mClosing )
{
kdDebug( 14181 ) << "..by ourselves!" << endl;
kdDebug( 14181 ) << "socket error is " << socket()->KSocketBase::errorString() << endl;
kdDebug( 14181 ) << "socket error is " << socket()->TDESocketBase::errorString() << endl;
emit connectionClosed ();
}
else

26
kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
Unescape View File

@ -89,49 +89,49 @@ void YahooChatTask::onGo()
void YahooChatTask::getYahooChatCategories()
{
kdDebug(YAHOO_RAW_DEBUG) ;
KIO::TransferJob *transfer;
TDEIO::TransferJob *transfer;
transfer = KIO::get( KURL("http://insider.msg.yahoo.com/ycontent/?chatcat=0"), false, false );
transfer = TDEIO::get( KURL("http://insider.msg.yahoo.com/ycontent/?chatcat=0"), false, false );
transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)");
transfer->addMetaData( "no-cache", "true" );
transfer->addMetaData( "cookies", "manual" );
transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) );
connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( KIO::Job* ) ) );
connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( TDEIO::Job* ) ) );
connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
}
void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category )
{
kdDebug(YAHOO_RAW_DEBUG) << "Category Id: " << category.id << endl;
KIO::TransferJob *transfer;
TDEIO::TransferJob *transfer;
transfer = KIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false );
transfer = TDEIO::get( KURL(TQString("http://insider.msg.yahoo.com/ycontent/?chatroom_%1=0").arg( category.id )), false, false );
transfer->addMetaData( "UserAgent", "Mozilla/4.0 (compatible; MSIE 5.5)");
transfer->addMetaData( "no-cache", "true" );
transfer->addMetaData( "cookies", "manual" );
transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) );
connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( KIO::Job* ) ) );
connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( TDEIO::Job* ) ) );
connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
m_jobs[ transfer ].category = category;
}
void YahooChatTask::slotData( KIO::Job *job, const TQByteArray& data)
void YahooChatTask::slotData( TDEIO::Job *job, const TQByteArray& data)
{
kdDebug(YAHOO_RAW_DEBUG) ;
// FIXME (same)
//m_jobs[job].data.append( data );
}
void YahooChatTask::slotCategoriesComplete( KIO::Job *job )
void YahooChatTask::slotCategoriesComplete( TDEIO::Job *job )
{
kdDebug(YAHOO_RAW_DEBUG) ;
KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
if ( job->error () || transfer->isErrorPage () )
{
@ -147,11 +147,11 @@ void YahooChatTask::slotCategoriesComplete( KIO::Job *job )
m_jobs.remove( transfer );
}
void YahooChatTask::slotChatRoomsComplete( KIO::Job *job )
void YahooChatTask::slotChatRoomsComplete( TDEIO::Job *job )
{
kdDebug(YAHOO_RAW_DEBUG) ;
KIO::TransferJob *transfer = static_cast< KIO::TransferJob * >(job);
TDEIO::TransferJob *transfer = static_cast< TDEIO::TransferJob * >(job);
if ( job->error () || transfer->isErrorPage () )
{

10
kopete/protocols/yahoo/libkyahoo/yahoochattask.h
Unescape View File

@ -26,7 +26,7 @@
class TQDomDocument;
class YMSGTransfer;
namespace KIO {
namespace TDEIO {
class Job;
}
@ -76,11 +76,11 @@ private:
void parseLogout( YMSGTransfer * );
private slots:
void slotData( KIO::Job *, const TQByteArray & );
void slotCategoriesComplete( KIO::Job * );
void slotChatRoomsComplete( KIO::Job * );
void slotData( TDEIO::Job *, const TQByteArray & );
void slotCategoriesComplete( TDEIO::Job * );
void slotChatRoomsComplete( TDEIO::Job * );
private:
TQMap< KIO::Job *, YahooChatJob > m_jobs;
TQMap< TDEIO::Job *, YahooChatJob > m_jobs;
TQValueList< Yahoo::ChatRoom > m_pendingJoins;
bool m_loggedIn;
};

4
kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp
Unescape View File

@ -30,7 +30,7 @@ KNetworkConnector::KNetworkConnector( TQObject *parent )
{
kdDebug( YAHOO_RAW_DEBUG ) << "New KNetwork connector." << endl;
mErrorCode = KNetwork::KSocketBase::NoError;
mErrorCode = KNetwork::TDESocketBase::NoError;
mByteStream = new KNetworkByteStream( this );
@ -51,7 +51,7 @@ void KNetworkConnector::connectToServer( const TQString &server )
Q_ASSERT( !mHost.isNull() );
Q_ASSERT( mPort );
mErrorCode = KNetwork::KSocketBase::NoError;
mErrorCode = KNetwork::TDESocketBase::NoError;
if ( !mByteStream->connect( mHost, TQString::number (mPort) ) )
{

8
kopete/protocols/yahoo/yahooaccount.cpp
Unescape View File

@ -698,7 +698,7 @@ void YahooAccount::sendFile( YahooContact *to, const KURL &url )
url.fileName(), file.size(), to->userId(), Kopete::FileTransferInfo::Outgoing );
m_session->sendFile( transfer->info().transferId(), to->userId(), TQString(), url );
TQObject::connect( transfer, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFileTransferResult( KIO::Job * )) );
TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) );
m_fileTransfers.insert( transfer->info().transferId(), transfer );
}
@ -1541,7 +1541,7 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS
m_session->receiveFile( transfer->info().transferId(), transfer->info().contact()->contactId(), transfer->info().internalId(), fileName );
m_fileTransfers.insert( transfer->info().transferId(), transfer );
TQObject::connect( transfer, TQT_SIGNAL(result( KIO::Job * )), this, TQT_SLOT(slotFileTransferResult( KIO::Job * )) );
TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) );
if( m_pendingFileTransfers.empty() )
{
@ -1601,7 +1601,7 @@ void YahooAccount::slotFileTransferError( unsigned int transferId, int error, co
m_fileTransfers.remove( transferId );
}
void YahooAccount::slotFileTransferResult( KIO::Job *job )
void YahooAccount::slotFileTransferResult( TDEIO::Job *job )
{
kdDebug(YAHOO_GEN_DEBUG) ;
const Kopete::Transfer *t = dynamic_cast< const Kopete::Transfer * >( job );
@ -1609,7 +1609,7 @@ void YahooAccount::slotFileTransferResult( KIO::Job *job )
if( !t )
return;
if( t->error() == KIO::ERR_USER_CANCELED )
if( t->error() == TDEIO::ERR_USER_CANCELED )
{
m_session->cancelFileTransfer( t->info().transferId() );
m_fileTransfers.remove( t->info().transferId() );

4
kopete/protocols/yahoo/yahooaccount.h
Unescape View File

@ -57,7 +57,7 @@ class FileTransferInfo;
class Client;
struct YABEntry;
class KJob;
namespace KIO{
namespace TDEIO{
class Job;
}
@ -244,7 +244,7 @@ protected slots:
void slotFileTransferComplete( unsigned int id );
void slotFileTransferError( unsigned int id, int error, const TQString &desc );
void slotFileTransferBytesProcessed( unsigned int id, unsigned int bytes );
void slotFileTransferResult( KIO::Job * );
void slotFileTransferResult( TDEIO::Job * );
void slotError( int level );
private:

10
kopete/protocols/yahoo/yahooverifyaccount.cpp
Unescape View File

@ -58,12 +58,12 @@ void YahooVerifyAccount::setUrl( KURL url )
{
mFile = new KTempFile( locateLocal( "tmp", url.fileName() ) );
mFile->setAutoDelete( true );
KIO::TransferJob *transfer = KIO::get( url, false, false );
connect( transfer, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( slotComplete( KIO::Job* ) ) );
connect( transfer, TQT_SIGNAL( data( KIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( KIO::Job*, const TQByteArray& ) ) );
TDEIO::TransferJob *transfer = TDEIO::get( url, false, false );
connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) );
connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
}
void YahooVerifyAccount::slotData( KIO::Job */*job*/, const TQByteArray& data )
void YahooVerifyAccount::slotData( TDEIO::Job */*job*/, const TQByteArray& data )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
@ -71,7 +71,7 @@ void YahooVerifyAccount::slotData( KIO::Job */*job*/, const TQByteArray& data )
mFile->file()->writeBlock( data.data() , data.size() );
}
void YahooVerifyAccount::slotComplete( KIO::Job */*job*/ )
void YahooVerifyAccount::slotComplete( TDEIO::Job */*job*/ )
{
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;

4
kopete/protocols/yahoo/yahooverifyaccount.h
Unescape View File

@ -48,8 +48,8 @@ protected slots:
virtual void slotClose();
virtual void slotApply();
public slots:
void slotData( KIO::Job *job, const TQByteArray& data );
void slotComplete( KIO::Job *job );
void slotData( TDEIO::Job *job, const TQByteArray& data );
void slotComplete( TDEIO::Job *job );
};
#endif

4
kpf/src/ErrorMessageConfigDialog.cpp
Unescape View File

@ -90,7 +90,7 @@ namespace KPF
TQString pattern(i18n("%1 %2"));
KConfig config(Config::name());
TDEConfig config(Config::name());
config.setGroup("ErrorMessageOverrideFiles");
@ -130,7 +130,7 @@ namespace KPF
void
ErrorMessageConfigDialog::accept()
{
KConfig config(Config::name());
TDEConfig config(Config::name());
config.setGroup("ErrorMessageOverrideFiles");

2
kpf/src/PropertiesDialogPlugin.cpp
Unescape View File

@ -661,7 +661,7 @@ namespace KPF
{
TQString noWarningKey("DoNotWarnAboutSharingDirectoriesViaHTTP");
KConfig * config(TDEGlobal::config());
TDEConfig * config(TDEGlobal::config());
if (config->readBoolEntry(noWarningKey, false))
return true;

2
kpf/src/Response.cpp
Unescape View File

@ -120,7 +120,7 @@ namespace KPF
{
TQString contentType = "Content-Type: text/html; charset=utf-8\r\n";
KConfig config(Config::name());
TDEConfig config(Config::name());
config.setGroup("General");

4
kpf/src/WebServer.cpp
Unescape View File

@ -585,7 +585,7 @@ namespace KPF
WebServer::loadConfig()
{
kpfDebug << "WebServer(" << d->root << "): Loading configuration" << endl;
KConfig c(Config::name());
TDEConfig c(Config::name());
c.setGroup(Config::key(Config::GroupPrefix) + d->root);
@ -623,7 +623,7 @@ namespace KPF
WebServer::saveConfig()
{
kpfDebug << "WebServer(" << d->root << "): Saving configuration" << endl;
KConfig c(Config::name());
TDEConfig c(Config::name());
c.setGroup(Config::key(Config::GroupPrefix) + d->root);

4
kpf/src/WebServerManager.cpp
Unescape View File

@ -108,7 +108,7 @@ namespace KPF
void
WebServerManager::loadConfig()
{
KConfig config(Config::name());
TDEConfig config(Config::name());
config.setGroup("General");
@ -128,7 +128,7 @@ namespace KPF
void
WebServerManager::saveConfig() const
{
KConfig config(Config::name());
TDEConfig config(Config::name());
config.setGroup("General");

12
kppp/ChangeLog
Unescape View File

@ -270,7 +270,7 @@
* connect.cpp: skip setting the volume if command is empty
* switched from KWizard to QWizard
* adaption to new KConfig iterators
* adaption to new TDEConfig iterators
* partly switched to KStandardDirs
1999-05-07 Harri Porten <porten@kde.org>
@ -643,7 +643,7 @@
1998-12-22 Harri Porten <porten@kde.org>
* pppdata.cpp: Give users upgrading from KDE 1.0 instructions how
to modify their kppprc if it is owned by root (KConfig bug back then).
to modify their kppprc if it is owned by root (TDEConfig bug back then).
1998-12-21 Mario Weilguni <mweilguni@kde.org>
@ -915,7 +915,7 @@
* modem.cpp: disentangled Modem class from other Widgets, i.e.
removed the Multiple Inheritance I introduced earlier.
Drawback: another global pointer :(
* main.cpp: since KConfig neglects the real user id when creating
* main.cpp: since TDEConfig neglects the real user id when creating
config files we have to give kppprc back to the user ourself.
* connect.cpp: pass something more useful to parseModemSpeed()
* removed lots of unused/redundant code and variables
@ -1188,7 +1188,7 @@
1998-06-02 Harri Porten <porten@tu-harburg.de>
* pppdata.cpp: removed workaround, since KConfig fix is in place now
* pppdata.cpp: removed workaround, since TDEConfig fix is in place now
Mon Jun 1 16:13:06 1998 Mario Weilguni <mweilguni@kde.org>
@ -1208,7 +1208,7 @@ Mon May 18 19:51:56 1998 Mario Weilguni <mweilguni@kde.org>
1998-05-15 Harri Porten <porten@tu-harburg.de>
* pppdata.cpp: temporary workaround for KConfig bug concerning
* pppdata.cpp: temporary workaround for TDEConfig bug concerning
lists without a trailing separator
Fri May 15 22:27:02 1998 Mario Weilguni <mweilguni@kde.org>
@ -1659,7 +1659,7 @@ Thu Dec 25 11:46:34 1997 Bernd Johannes Wuebben <wuebben@petit.cornell.edu>
* Added new script keywords: PwPrompt and ID
* Added ID and Password LineEdits on the main dialog window
* KConfig transition is now complete, one more time the data
* TDEConfig transition is now complete, one more time the data
storage format has changed. ( Hopefully the last time )
* All sorts of little cosmetic changes

2
kppp/HISTORY
Unescape View File

@ -11,7 +11,7 @@ of kppp.
kppp 0.6 Nov 26 97:
The data savings scheme has been switched over to to the use of KConfig.
The data savings scheme has been switched over to to the use of TDEConfig.
I consider kppp virtually free of any ezppp code. I challenge anyone
who doubts this to verify my claim by doing a 'diff' on the sources.

2
kppp/kpppwidget.cpp
Unescape View File

@ -197,7 +197,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name )
if(setup_b->sizeHint().width() > minw)
minw = setup_b->sizeHint().width();
if(gpppdata.access() != KConfig::ReadWrite)
if(gpppdata.access() != TDEConfig::ReadWrite)
setup_b->setEnabled(false);
help_b = new KPushButton(KStdGuiItem::help(), this);

4
kppp/modemdb.cpp
Unescape View File

@ -202,7 +202,7 @@ void ModemDatabase::loadModem(const TQString &key, CharDict &dict) {
void ModemDatabase::load() {
modemDB = new KConfig("DB/modemDB.rc", 0);
modemDB = new TDEConfig("DB/modemDB.rc", 0);
lvendors = new TQStringList;
modems.setAutoDelete(true);
@ -238,7 +238,7 @@ void ModemDatabase::load() {
}
void ModemDatabase::save(KConfig *) {
void ModemDatabase::save(TDEConfig *) {
}
#include "modemdb.moc"

6
kppp/modemdb.h
Unescape View File

@ -39,7 +39,7 @@
#include <tqstringlist.h>
#include <tqdict.h>
#include <tqptrlist.h>
class KConfig;
class TDEConfig;
class TQListBox;
typedef TQDict<TQString> CharDict;
@ -52,7 +52,7 @@ public:
const TQStringList *vendors();
TQStringList *models(TQString vendor);
void save(KConfig *);
void save(TDEConfig *);
private:
void load();
@ -61,7 +61,7 @@ private:
TQStringList *lvendors;
KConfig *modemDB;
TDEConfig *modemDB;
};

2
kppp/pppdata.cpp
Unescape View File

@ -58,7 +58,7 @@ bool PPPData::open() {
config = kapp->config();
if (config->getConfigState() == KConfig::NoAccess) {
if (config->getConfigState() == TDEConfig::NoAccess) {
KMessageBox::error(0L,
i18n("The application-specific config file could not "
"be opened in either read-write or read-only mode.\n"

4
kppp/pppdata.h
Unescape View File

@ -37,7 +37,7 @@
#include "kpppconfig.h"
class KConfig;
class TDEConfig;
// string lengths
@ -491,7 +491,7 @@ public:
private:
TQString passwd;
KConfig* config; // configuration object
TDEConfig* config; // configuration object
int accounthighcount; // index of highest account
int caccount; // index of the current account
int modemhighcount; // index of highest modem

2
krdc/hostpreferences.cpp
Unescape View File

@ -38,7 +38,7 @@ HostPreferences *HostPreferences::instance()
return m_instance;
}
HostPref::HostPref(KConfig *conf, const TQString &host, const TQString &type) :
HostPref::HostPref(TDEConfig *conf, const TQString &host, const TQString &type) :
m_host(host),
m_type(type),
m_config(conf) {

8
krdc/hostpreferences.h
Unescape View File

@ -24,16 +24,16 @@
#include "smartptr.h"
class HostPreferences;
class KConfig;
class TDEConfig;
class HostPref {
protected:
friend class HostPreferences;
TQString m_host;
TQString m_type;
KConfig *m_config;
TDEConfig *m_config;
HostPref(KConfig *conf, const TQString &host, const TQString &type);
HostPref(TDEConfig *conf, const TQString &host, const TQString &type);
virtual void load() = 0;
virtual void setDefaults() = 0;
@ -77,7 +77,7 @@ public:
private:
HostPreferences();
KConfig *m_config;
TDEConfig *m_config;
static HostPreferences *m_instance;
};

2
krdc/rdp/rdphostpref.cpp
Unescape View File

@ -23,7 +23,7 @@
const TQString RdpHostPref::RdpType = "RDP";
RdpHostPref::RdpHostPref(KConfig *conf, const TQString &host, const TQString &type) :
RdpHostPref::RdpHostPref(TDEConfig *conf, const TQString &host, const TQString &type) :
HostPref(conf, host, type),
m_width(0),
m_height(0),

2
krdc/rdp/rdphostpref.h
Unescape View File

@ -105,7 +105,7 @@ class RdpHostPref : public HostPref
public:
static const TQString RdpType;
RdpHostPref(KConfig *conf, const TQString &host=TQString(),
RdpHostPref(TDEConfig *conf, const TQString &host=TQString(),
const TQString &type=TQString());
virtual ~RdpHostPref();

2
krdc/vnc/vnchostpref.cpp
Unescape View File

@ -21,7 +21,7 @@
const TQString VncHostPref::VncType = "VNC";
VncHostPref::VncHostPref(KConfig *conf, const TQString &host, const TQString &type) :
VncHostPref::VncHostPref(TDEConfig *conf, const TQString &host, const TQString &type) :
HostPref(conf, host, type),
m_quality(0),
m_useKWallet(true),

2
krdc/vnc/vnchostpref.h
Unescape View File

@ -36,7 +36,7 @@ protected:
public:
static const TQString VncType;
VncHostPref(KConfig *conf, const TQString &host=TQString(),
VncHostPref(TDEConfig *conf, const TQString &host=TQString(),
const TQString &type=TQString());
virtual ~VncHostPref();

2
krfb/kcm_krfb/kcm_krfb.cpp
Unescape View File

@ -54,7 +54,7 @@ extern "C" {
KcmKRfb::KcmKRfb(TQWidget *p, const char *name, const TQStringList &) :
KCModule(KcmKRfbFactory::instance(), p, name),
TDECModule(KcmKRfbFactory::instance(), p, name),
m_configuration(KRFB_CONFIGURATION_MODE) {
m_confWidget = new ConfigurationWidget(this);

2
krfb/kcm_krfb/kcm_krfb.h
Unescape View File

@ -25,7 +25,7 @@
#include "configurationwidget.h"
#include "../krfb/configuration.h"
class KcmKRfb : public KCModule {
class KcmKRfb : public TDECModule {
Q_OBJECT
private:

16
krfb/kinetd/kinetd.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <fcntl.h>
PortListener::PortListener(KService::Ptr s,
KConfig *config,
TDEConfig *config,
KServiceRegistry *srvreg) :
m_port(-1),
m_serviceRegistered(false),
@ -63,7 +63,7 @@ bool PortListener::acquirePort() {
delete m_socket;
}
m_port = m_portBase;
m_socket = new KServerSocket(m_port, false);
m_socket = new TDEServerSocket(m_port, false);
while (!m_socket->bindAndListen()) {
m_port++;
if (m_port >= (m_portBase+m_autoPortRange)) {
@ -75,10 +75,10 @@ bool PortListener::acquirePort() {
return false;
}
delete m_socket;
m_socket = new KServerSocket(m_port, false);
m_socket = new TDEServerSocket(m_port, false);
}
connect(m_socket, TQT_SIGNAL(accepted(KSocket*)),
TQT_SLOT(accepted(KSocket*)));
connect(m_socket, TQT_SIGNAL(accepted(TDESocket*)),
TQT_SLOT(accepted(TDESocket*)));
bool s = m_registerService;
bool sd =m_dnssdRegister;
@ -201,9 +201,9 @@ void PortListener::loadConfig(KService::Ptr s) {
m_registerService);
}
void PortListener::accepted(KSocket *sock) {
void PortListener::accepted(TDESocket *sock) {
TQString host, port;
KSocketAddress *ksa = KExtendedSocket::peerAddress(sock->socket());
TDESocketAddress *ksa = KExtendedSocket::peerAddress(sock->socket());
if ((!ksa) || !ksa->address()) {
delete sock;
return;
@ -413,7 +413,7 @@ PortListener::~PortListener() {
KInetD::KInetD(TQCString &n) :
KDEDModule(n)
{
m_config = new KConfig("kinetdrc");
m_config = new TDEConfig("kinetdrc");
m_srvreg = new KServiceRegistry();
if (!m_srvreg->available()) {
kdDebug(7021) << "SLP not available"<< endl;

10
krfb/kinetd/kinetd.h
Unescape View File

@ -56,10 +56,10 @@ private:
TQDateTime m_slpLifetimeEnd;
TQString m_uuid;
KServerSocket *m_socket;
TDEServerSocket *m_socket;
TDEProcess m_process;
KConfig *m_config;
TDEConfig *m_config;
KServiceRegistry *m_srvreg;
DNSSD::PublicService *m_dnssdreg;
@ -70,7 +70,7 @@ private:
void setServiceRegistrationEnabledInternal(bool enabled);
public:
PortListener(KService::Ptr s, KConfig *c, KServiceRegistry *srvreg);
PortListener(KService::Ptr s, TDEConfig *c, KServiceRegistry *srvreg);
~PortListener();
bool acquirePort();
@ -89,7 +89,7 @@ public:
void refreshRegistration();
private slots:
void accepted(KSocket*);
void accepted(TDESocket*);
};
class KInetD : public KDEDModule {
@ -179,7 +179,7 @@ k_dcop:
void setPortRetryTimer(bool retry);
void setReregistrationTimer();
KConfig *m_config;
TDEConfig *m_config;
KServiceRegistry *m_srvreg;
TQPtrList<PortListener> m_portListeners;
TQTimer m_expirationTimer;

34
krfb/krfb/configuration.cc
Unescape View File

@ -52,12 +52,12 @@ Configuration::Configuration(krfb_mode mode) :
kinetdRef("kded", "kinetd")
{
kinetdRef.setDCOPClient(TDEApplication::dcopClient());
loadFromKConfig();
loadFromTDEConfig();
saveToDialogs();
doKinetdConf();
connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()",
"updateKConfig()", false );
"updateTDEConfig()", false );
connect(invMngDlg.newPersonalInvitationButton, TQT_SIGNAL(clicked()),
TQT_SLOT(showPersonalInvitationDialog()));
connect(invMngDlg.newEmailInvitationButton, TQT_SIGNAL(clicked()), TQT_SLOT(inviteEmail()));
@ -88,9 +88,9 @@ Configuration::~Configuration() {
save();
}
void Configuration::updateKConfig()
void Configuration::updateTDEConfig()
{
loadFromKConfig();
loadFromTDEConfig();
}
void Configuration::setKInetdEnabled(bool enabled) {
@ -159,9 +159,9 @@ void Configuration::doKinetdConf() {
}
}
void Configuration::loadFromKConfig() {
void Configuration::loadFromTDEConfig() {
KConfig c("krfbrc");
TDEConfig c("krfbrc");
allowUninvitedFlag = c.readBoolEntry("allowUninvited", false);
enableSLPFlag = c.readBoolEntry("enableSLP", true);
askOnConnectFlag = c.readBoolEntry("confirmUninvitedConnection", true);
@ -187,9 +187,9 @@ void Configuration::loadFromKConfig() {
}
void Configuration::saveToKConfig() {
void Configuration::saveToTDEConfig() {
KConfig c("krfbrc");
TDEConfig c("krfbrc");
c.writeEntry("confirmUninvitedConnection", askOnConnectFlag);
c.writeEntry("allowDesktopControl", allowDesktopControlFlag);
c.writeEntry("allowUninvited", allowUninvitedFlag);
@ -225,13 +225,13 @@ void Configuration::saveToDialogs() {
}
void Configuration::save() {
saveToKConfig();
saveToTDEConfig();
saveToDialogs();
doKinetdConf();
}
void Configuration::update() {
loadFromKConfig();
loadFromTDEConfig();
saveToDialogs();
}
@ -253,7 +253,7 @@ void Configuration::invalidateOldInvitations() {
void Configuration::refreshTimeout() {
unsigned int invNum = invitationList.size();
loadFromKConfig();
loadFromTDEConfig();
saveToDialogs();
if (invNum != invitationList.size())
emit invitationNumChanged(invitationList.size());
@ -363,7 +363,7 @@ void Configuration::setDisableXShm(bool disable) {
////////////// invitation manage dialog //////////////////////////
void Configuration::showManageInvitationsDialog() {
loadFromKConfig();
loadFromTDEConfig();
saveToDialogs();
invMngDlg.exec();
}
@ -378,14 +378,14 @@ void Configuration::invMngDlgDeleteOnePressed() {
else
it++;
}
saveToKConfig();
saveToTDEConfig();
doKinetdConf();
emit invitationNumChanged(invitationList.size());
}
void Configuration::invMngDlgDeleteAllPressed() {
invitationList.clear();
saveToKConfig();
saveToTDEConfig();
doKinetdConf();
emit invitationNumChanged(invitationList.size());
}
@ -395,13 +395,13 @@ void Configuration::invMngDlgDeleteAllPressed() {
void Configuration::showInvitationDialog() {
invDlg.exec();
emit invitationFinished();
saveToKConfig();
saveToTDEConfig();
}
////////////// personal invitation dialog //////////////////////////
void Configuration::showPersonalInvitationDialog() {
loadFromKConfig();
loadFromTDEConfig();
Invitation inv = createInvitation();
save();
emit invitationNumChanged(invitationList.size());
@ -433,7 +433,7 @@ void Configuration::inviteEmail() {
if (r == KMessageBox::Cancel)
return;
loadFromKConfig();
loadFromTDEConfig();
Invitation inv = createInvitation();
save();
emit invitationNumChanged(invitationList.size());

6
krfb/krfb/configuration.h
Unescape View File

@ -91,9 +91,9 @@ public slots:
void inviteEmail();
private:
void loadFromKConfig();
void loadFromTDEConfig();
void loadFromDialogs();
void saveToKConfig();
void saveToTDEConfig();
void saveToDialogs();
Invitation createInvitation();
void closeInvDlg();
@ -129,7 +129,7 @@ private:
k_dcop:
// Connected to the DCOP signal
void updateKConfig();
void updateTDEConfig();
private slots:
void refreshTimeout();

4
krfb/krfb/invitation.cc
Unescape View File

@ -70,7 +70,7 @@ Invitation::Invitation(const Invitation &x) :
m_viewItem(0) {
}
Invitation::Invitation(KConfig* config, int num) {
Invitation::Invitation(TDEConfig* config, int num) {
m_password = cryptStr(config->readEntry(TQString("password%1").arg(num), ""));
m_creationTime = config->readDateTimeEntry(TQString("creation%1").arg(num));
m_expirationTime = config->readDateTimeEntry(TQString("expiration%1").arg(num));
@ -92,7 +92,7 @@ Invitation &Invitation::operator= (const Invitation&x) {
return *this;
}
void Invitation::save(KConfig *config, int num) const {
void Invitation::save(TDEConfig *config, int num) const {
config->writeEntry(TQString("password%1").arg(num), cryptStr(m_password));
config->writeEntry(TQString("creation%1").arg(num), m_creationTime);
config->writeEntry(TQString("expiration%1").arg(num), m_expirationTime);

4
krfb/krfb/invitation.h
Unescape View File

@ -34,7 +34,7 @@ class Invitation {
public:
Invitation();
~Invitation();
Invitation(KConfig* config, int num);
Invitation(TDEConfig* config, int num);
Invitation(const Invitation &x);
Invitation &operator= (const Invitation&x);
@ -45,7 +45,7 @@ public:
void setViewItem(KListViewItem*);
KListViewItem* getViewItem() const;
void save(KConfig *config, int num) const;
void save(TDEConfig *config, int num) const;
private:
TQString m_password;
TQDateTime m_creationTime;

2
krfb/krfb/rfbcontroller.cc
Unescape View File

@ -720,7 +720,7 @@ enum rfbNewClientAction RFBController::handleNewClient(rfbClientPtr cl)
cl->negotiationFinishedHook = negotiationFinishedHook;
TQString host, port;
KSocketAddress *ksa = KExtendedSocket::peerAddress(socket);
TDESocketAddress *ksa = KExtendedSocket::peerAddress(socket);
if (ksa) {
hostent *he = 0;
KInetSocketAddress *kisa = (KInetSocketAddress*) ksa;

14
ksirc/FilterRuleEditor.cpp
Unescape View File

@ -77,7 +77,7 @@ void FilterRuleEditor::newRule()
void FilterRuleEditor::OkPressed()
{
int number, after;
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
if(filter->InsertButton->isEnabled()){
number = kConfig->readNumEntry("Rules", 0) + 1;
@ -120,7 +120,7 @@ void FilterRuleEditor::OkPressed()
void FilterRuleEditor::updateListBox(int citem )
{
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int number = kConfig->readNumEntry("Rules", 0);
filter->RuleList->clear();
@ -142,7 +142,7 @@ void FilterRuleEditor::updateListBox(int citem )
void FilterRuleEditor::moveRule(int from, int to)
{
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
TQString src;
TQString dest;
@ -169,7 +169,7 @@ void FilterRuleEditor::deleteRule()
int number = filter->RuleList->currentItem();
if( number >= 0){
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int max = kConfig->readNumEntry("Rules");
for(int i = number+2; i <= max; i++){
@ -185,7 +185,7 @@ void FilterRuleEditor::deleteRule()
void FilterRuleEditor::newHighlight(int i)
{
i++;
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
TQString key;
key.sprintf("name-%d", i);
@ -201,7 +201,7 @@ void FilterRuleEditor::newHighlight(int i)
void FilterRuleEditor::raiseRule()
{
int item = filter->RuleList->currentItem();
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int max = kConfig->readNumEntry("Rules");
if(item > 0){
@ -215,7 +215,7 @@ void FilterRuleEditor::raiseRule()
void FilterRuleEditor::lowerRule()
{
int item = filter->RuleList->currentItem();
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int max = kConfig->readNumEntry("Rules");
if(item < max-1){

4
ksirc/KSOpenkSirc/open_ksirc.cpp
Unescape View File

@ -63,7 +63,7 @@ open_ksirc::open_ksirc
}
// Add current ones
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("ServerList");
CheckB_StorePassword->setChecked( conf->readBoolEntry("StorePasswords") );
TQStringList recent = conf->readListEntry("RecentServers");
@ -276,7 +276,7 @@ void open_ksirc::clickConnect()
TQString port;
TQString script;
Server *serv;
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
hide();

4
ksirc/KSPrefs/page_autoconnect.cpp
Unescape View File

@ -43,7 +43,7 @@ PageAutoConnect::~PageAutoConnect()
void PageAutoConnect::saveConfig()
{
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("AutoConnect");
TQStringList servers;
@ -92,7 +92,7 @@ void PageAutoConnect::saveConfig()
void PageAutoConnect::readConfig()
{
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("AutoConnect");
TQStringList servers = conf->readListEntry("Servers");
servers.sort();

4
ksirc/KSPrefs/page_colors.cpp
Unescape View File

@ -87,7 +87,7 @@ void PageColors::saveConfig()
ksopts->mircColors = allowMIRCColorsCB->isChecked();
ksopts->colourTheme = themeLB->currentText();
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
TQDictIterator<KSOColors> it(m_dcol);
TQStringList names;
for(; it.current(); ++it){
@ -158,7 +158,7 @@ void PageColors::readConfig( const KSOColors *opts )
allowKSircColorsCB->setChecked( opts->ksircColors );
allowMIRCColorsCB->setChecked( opts->mircColors );
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("ColourSchemes");
themeLB->clear();
TQStringList names = conf->readListEntry("Names");

4
ksirc/KSPrefs/page_rmbmenu.cpp
Unescape View File

@ -24,7 +24,7 @@ PageRMBMenu::PageRMBMenu( TQWidget *parent, const char *name ) : PageRMBMenuBase
{
UserControlMenu *ucm;
UserControlMenu::parseKConfig();
UserControlMenu::parseTDEConfig();
commandLB->clear();
for(ucm = UserControlMenu::UserMenu.first();
@ -65,7 +65,7 @@ PageRMBMenu::~PageRMBMenu()
void PageRMBMenu::saveConfig()
{
UserControlMenu::writeKConfig();
UserControlMenu::writeTDEConfig();
}
void PageRMBMenu::readConfig( const KSORMBMenu * )

4
ksirc/KSPrefs/page_servchan.cpp
Unescape View File

@ -37,7 +37,7 @@ void PageServChan::saveConfig()
if(!txt.isNull())
sLB << txt;
}
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("ServerList");
conf->writeEntry("RecentServers", sLB);
@ -53,7 +53,7 @@ void PageServChan::saveConfig()
void PageServChan::readConfig( const KSOServChan * )
{
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("ServerList");
TQStringList recent = conf->readListEntry("RecentServers");
recent.sort();

6
ksirc/KSTicker/ksticker.cpp
Unescape View File

@ -30,7 +30,7 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f)
pic = new TQPixmap(); // create pic map here, resize it later though.
// pic->setBackgroundMode(TransparentMode);
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("KSTicker");
bScrollConstantly = conf->readNumEntry("ScollConst", FALSE);
@ -445,7 +445,7 @@ void KSTicker::scrollConstantly()
popup->setItemChecked(iScrollItem, bScrollConstantly);
if(bScrollConstantly == TRUE)
startTicker();
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("KSTicker");
conf->writeEntry("ScollConst", bScrollConstantly);
conf->sync();
@ -456,7 +456,7 @@ void KSTicker::updateFont(const TQFont &font){
setFixedHeight((fontMetrics().height()+fontMetrics().descent()*2)*pHeight);
resize(fontMetrics().width("X")*chars,
(fontMetrics().height()+fontMetrics().descent())*pHeight);
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("KSTicker");
conf->writeEntry("Font", font);
conf->sync();

2
ksirc/KSTicker/ksttest.cpp
Unescape View File

@ -13,7 +13,7 @@
#include "ksttest.h"
#include "../ksopts.h"
KConfig *kConfig;
TDEConfig *kConfig;
StdInTicker::StdInTicker()
: KSTicker()

8
ksirc/NewWindowDialog.cpp
Unescape View File

@ -35,16 +35,16 @@ NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * par
connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )),
this, TQT_SLOT( slotTextChanged( const TQString &)));
KConfig *kConfig = kapp->config();
KConfigGroupSaver saver(kConfig, "Recent");
TDEConfig *kConfig = kapp->config();
TDEConfigGroupSaver saver(kConfig, "Recent");
m_combo->setHistoryItems(kConfig->readListEntry("Channels"));
slotTextChanged( m_combo->lineEdit()->text());
}
NewWindowDialog::~NewWindowDialog()
{
KConfig *kConfig = kapp->config();
KConfigGroupSaver saver(kConfig, "Recent");
TDEConfig *kConfig = kapp->config();
TDEConfigGroupSaver saver(kConfig, "Recent");
kConfig->writeEntry("Channels", m_combo->historyItems());
}

4
ksirc/dccNew.cpp
Unescape View File

@ -69,7 +69,7 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick )
}
cbNicks->setCurrentText(nick);
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("dccNew");
bool chatChecked = kConfig->readBoolEntry("chatChecked", false);
@ -123,7 +123,7 @@ void dccNew::fileSendClicked()
void dccNew::sendClicked()
{
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("dccNew");
kConfig->writeEntry("chatChecked",rbChat->isChecked());
int type = Chat;

4
ksirc/ksircprocess.cpp
Unescape View File

@ -141,7 +141,7 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa
// Setup the environment for KSirc
TQString qsNick, qsRealname, qsUserID, qsAltNick;
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("StartUp");
qsNick = ksopts->serv(kss).nick;
qsAltNick = ksopts->serv(kss).altNick;
@ -583,7 +583,7 @@ void KSircProcess::filters_update()
cur = it.current();
}
}
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("FilterRules");
int max = kConfig->readNumEntry("Rules", 0);
for(int number = 1; number <= max; number++){

4
ksirc/ksopts.cpp
Unescape View File

@ -140,7 +140,7 @@ KSOChannel::KSOChannel()
void KSOptions::load( int sections )
{
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup( "ServerController" );
geometry = conf->readRectEntry( "Size" );
@ -355,7 +355,7 @@ void KSOptions::load( int sections )
void KSOptions::save( int sections )
{
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
if ( sections & General )
{

2
ksirc/ksview.cpp
Unescape View File

@ -96,7 +96,7 @@ void KSircView::saveURL( const TQString &url )
if ( dlg->exec() ) {
KURL destURL( dlg->selectedURL() );
if ( destURL.isValid() ) {
KIO::Job *job = KIO::copy( kurl, destURL );
TDEIO::Job *job = TDEIO::copy( kurl, destURL );
job->setAutoErrorHandlingEnabled( true );
}
}

4
ksirc/mditoplevel.cpp
Unescape View File

@ -45,7 +45,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name)
connect( m_tab, TQT_SIGNAL( showContexMenu(TQWidget *, const TQPoint &) ),
this, TQT_SLOT( slotShowContexMenu(TQWidget *, const TQPoint &) ) );
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup("MDI");
TQSize s( 600, 360 );
resize(config->readSizeEntry( "TopLevelSize", &s ));
@ -62,7 +62,7 @@ MDITopLevel::~MDITopLevel()
{
kdDebug(5008) << "~MDITopLevel in" << endl;
KConfig *config = kapp->config();
TDEConfig *config = kapp->config();
config->setGroup( "MDI" );
config->writeEntry( "TopLevelSize", this->size() );
config->sync();

24
ksirc/servercontroller.cpp
Unescape View File

@ -383,7 +383,7 @@ void servercontroller::font_update(const TQFont &font)
ksopts->defaultFont = font;
/* configChange(); */
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("GlobalOptions");
kConfig->sync();
TQApplication::setFont( font, true, "KSirc::TextView" );
@ -581,7 +581,7 @@ void servercontroller::slot_filters_update()
emit ServMessage(TQString(), ServCommand::updateFilters, TQString());
}
void servercontroller::saveGlobalProperties(KConfig *ksc)
void servercontroller::saveGlobalProperties(TDEConfig *ksc)
{
// ksc hos the K Session config
// ksp == current KSircProcess
@ -608,9 +608,9 @@ void servercontroller::saveGlobalProperties(KConfig *ksc)
desktops << TQString::number( ( *sessionInfoIt ).desktop );
}
KConfigGroup( ksc, "KSircSession" ).writeEntry( it.key(), channels );
KConfigGroup( ksc, "KSircSessionPort" ).writeEntry( it.key(), port );
KConfigGroup( ksc, "KSircSessionDesktopNumbers" ).writeEntry( it.key(), desktops );
TDEConfigGroup( ksc, "KSircSession" ).writeEntry( it.key(), channels );
TDEConfigGroup( ksc, "KSircSessionPort" ).writeEntry( it.key(), port );
TDEConfigGroup( ksc, "KSircSessionDesktopNumbers" ).writeEntry( it.key(), desktops );
}
ksc->setGroup("ServerController");
@ -619,7 +619,7 @@ void servercontroller::saveGlobalProperties(KConfig *ksc)
ksc->setGroup(group);
}
void servercontroller::readGlobalProperties(KConfig *ksc)
void servercontroller::readGlobalProperties(TDEConfig *ksc)
{
TQString group = ksc->group();
@ -636,13 +636,13 @@ void servercontroller::readGlobalProperties(KConfig *ksc)
while(it != keyMap.end()) {
TQString server = it.key();
TQString port = KConfigGroup( ksc, "KSircSessionPort" ).readEntry( server );
TQString port = TDEConfigGroup( ksc, "KSircSessionPort" ).readEntry( server );
// debug("%s", it.key().latin1());
KSircServer kss(server, port);
new_ksircprocess( kss ); // sets up proc_list
TQStringList channels = ksc->readListEntry( server );
TQStringList desktops = KConfigGroup( ksc, "KSircSessionDesktopNumbers" ).readListEntry( server );
TQStringList desktops = TDEConfigGroup( ksc, "KSircSessionDesktopNumbers" ).readListEntry( server );
for(uint i = 0; i < channels.count(); i++){
@ -739,8 +739,8 @@ void servercontroller::saveDockingStatus()
if ( we_are_exiting ) // we are hidden by closeEvent
return;
// KConfig *kConfig = kapp->config();
// KConfigGroupSaver s( kConfig, "ServerController" );
// TDEConfig *kConfig = kapp->config();
// TDEConfigGroupSaver s( kConfig, "ServerController" );
// kConfig->writeEntry("Docked", !isVisible());
// kConfig->sync();
}
@ -838,7 +838,7 @@ void servercontroller::do_autoconnect()
kdDebug(5008) << "Doing AUTOCONNECT" << endl;
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("AutoConnect");
TQStringList servers = conf->readListEntry("Servers");
servers.sort();
@ -923,7 +923,7 @@ void servercontroller::start_autoconnect() {
void servercontroller::start_autoconnect_check() {
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup("AutoConnect");
TQStringList servers = conf->readListEntry("Servers");

4
ksirc/servercontroller.h
Unescape View File

@ -208,8 +208,8 @@ protected:
virtual void closeEvent( TQCloseEvent * );
void saveDockingStatus();
void saveGlobalProperties(KConfig *);
void readGlobalProperties(KConfig *);
void saveGlobalProperties(TDEConfig *);
void readGlobalProperties(TDEConfig *);
private:
void saveSessionConfig();

10
ksirc/toplevel.cpp
Unescape View File

@ -289,7 +289,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
clearWindow();
if(isPrivateChat()){
KConfig conf("ksirc/winlog/" + channelInfo.server() + "-" + channelInfo.channel(),
TDEConfig conf("ksirc/winlog/" + channelInfo.server() + "-" + channelInfo.channel(),
false, false, "data");
TQString group = "Message-History";
@ -419,7 +419,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
*/
if(user_menu == 0)
user_menu = UserControlMenu::parseKConfig();
user_menu = UserControlMenu::parseTDEConfig();
user_controls = new TQPopupMenu(this);
kmenu->insertItem(i18n("&Users"), user_controls);
@ -562,7 +562,7 @@ KSircTopLevel::~KSircTopLevel()
}
KConfig conf("ksirc/winlog/" + channelInfo().server() +
TDEConfig conf("ksirc/winlog/" + channelInfo().server() +
"-" + channelInfo().channel(),
false, false, "data");
TQString group = "Message-History";
@ -1672,9 +1672,9 @@ void KSircTopLevel::saveCurrLog()
temp.close();
#if KDE_IS_VERSION(3,1,92)
KIO::NetAccess::upload(temp.name(), url, this);
TDEIO::NetAccess::upload(temp.name(), url, this);
#else
KIO::NetAccess::upload(temp.name(), url);
TDEIO::NetAccess::upload(temp.name(), url);
#endif
}

8
ksirc/usercontrolmenu.cpp
Unescape View File

@ -23,14 +23,14 @@ UserControlMenu::~UserControlMenu()
{
}
TQPtrList<UserControlMenu> *UserControlMenu::parseKConfig()
TQPtrList<UserControlMenu> *UserControlMenu::parseTDEConfig()
{
// Reset the UserMenu to nothing before we start.
UserMenu.clear();
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("UserMenu");
int items = kConfig->readNumEntry("Number");
if(items == 0){
@ -129,9 +129,9 @@ TQPtrList<UserControlMenu> *UserControlMenu::parseKConfig()
}
void UserControlMenu::writeKConfig()
void UserControlMenu::writeTDEConfig()
{
KConfig *kConfig = kapp->config();
TDEConfig *kConfig = kapp->config();
kConfig->setGroup("UserMenu");
int items = (int) UserMenu.count();

4
ksirc/usercontrolmenu.h
Unescape View File

@ -21,8 +21,8 @@ class UserControlMenu {
static TQPtrList<UserControlMenu> UserMenu;
static TQPtrList<UserControlMenu> *parseKConfig();
static void writeKConfig();
static TQPtrList<UserControlMenu> *parseTDEConfig();
static void writeTDEConfig();
/**
* title in the popup menu

2
ktalkd/kcmktalkd/answmachpage.cpp
Unescape View File

@ -31,7 +31,7 @@
KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name,
KSimpleConfig *_config)
: KCModule (parent, name)
: TDECModule (parent, name)
{
if (!_config) {
delete_config = true;

2
ktalkd/kcmktalkd/answmachpage.h
Unescape View File

@ -39,7 +39,7 @@
class KSimpleConfig;
class KAnswmachPageConfig : public KCModule
class KAnswmachPageConfig : public TDECModule
{
Q_OBJECT

2
ktalkd/kcmktalkd/forwmachpage.cpp
Unescape View File

@ -28,7 +28,7 @@
KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name,
KSimpleConfig *_config)
: KCModule (parent, name)
: TDECModule (parent, name)
{
if (!_config) {
delete_config = true;

2
ktalkd/kcmktalkd/forwmachpage.h
Unescape View File

@ -39,7 +39,7 @@
class KSimpleConfig;
class KForwmachPageConfig : public KCModule
class KForwmachPageConfig : public TDECModule
{
Q_OBJECT

10
ktalkd/kcmktalkd/main.cpp
Unescape View File

@ -31,7 +31,7 @@
#include <tqlayout.h>
KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name)
: KCModule(parent, name)
: TDECModule(parent, name)
{
config = new KSimpleConfig("ktalkdrc");
announceconfig = new KSimpleConfig("ktalkannouncerc");
@ -88,22 +88,22 @@ void KTalkdConfigModule::resizeEvent(TQResizeEvent *)
extern "C"
{
KDE_EXPORT KCModule *create_ktalkd(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_ktalkd(TQWidget *parent, const char *)
{
return new KTalkdConfigModule(parent, "kcmktalkd");
}
KDE_EXPORT KCModule *create_ktalkd_answmach(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_ktalkd_answmach(TQWidget *parent, const char *)
{
return new KAnswmachPageConfig(parent, "kcmktalkd");
}
KDE_EXPORT KCModule *create_ktalkd_sound(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_ktalkd_sound(TQWidget *parent, const char *)
{
return new KSoundPageConfig(parent, "kcmktalkd");
}
KDE_EXPORT KCModule *create_ktalkd_forwmach(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_ktalkd_forwmach(TQWidget *parent, const char *)
{
return new KForwmachPageConfig(parent, "kcmktalkd");
}

2
ktalkd/kcmktalkd/main.h
Unescape View File

@ -32,7 +32,7 @@ class KSoundPageConfig;
class KAnswmachPageConfig;
class KForwmachPageConfig;
class KTalkdConfigModule : public KCModule
class KTalkdConfigModule : public TDECModule
{
Q_OBJECT

2
ktalkd/kcmktalkd/soundpage.cpp
Unescape View File

@ -46,7 +46,7 @@
KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name,
KSimpleConfig *_config, KSimpleConfig *_announceconfig)
: KCModule (parent, name)
: TDECModule (parent, name)
{
if (!_config) {
delete_config = true;

2
ktalkd/kcmktalkd/soundpage.h
Unescape View File

@ -43,7 +43,7 @@ class TQLabel;
class TQListBox;
class TQPushButton;
class KSoundPageConfig : public KCModule
class KSoundPageConfig : public TDECModule
{
Q_OBJECT

14
ktalkd/ktalkd/readcfg++.cpp
Unescape View File

@ -77,9 +77,9 @@ int booleanresult(const char * s)
}
/* User configuration file, ktalkdrc in localconfigdir(). */
KConfig * ktalkdcfg = 0;
TDEConfig * ktalkdcfg = 0;
/* User config file for talk announces, ktalkannouncerc in localconfigdir(). */
KConfig * ktkanncfg = 0;
TDEConfig * ktkanncfg = 0;
/* Initiate user-config-file reading. */
int init_user_config(const char * l_name)
@ -102,18 +102,18 @@ ktalk_debug("%s",pw->pw_dir);
endpwent();
ktalk_debug("%s","endpwent");
//WABA: New KConfig should be able to handle this gracefully:
//WABA: New TDEConfig should be able to handle this gracefully:
if (stat(TQFile::encodeName(tkannFileName),&buf)!=-1) {
// check if it exists, 'cause otherwise it would be created empty with
// root as owner !
ktkanncfg = new KConfig(tkannFileName);
ktkanncfg = new TDEConfig(tkannFileName);
ktkanncfg -> setGroup("ktalkannounce");
ktkanncfg -> setDollarExpansion(true);
} else ktkanncfg = 0L;
if (stat(TQFile::encodeName(cfgFileName),&buf)!=-1) {
// check if it exists, 'cause otherwise it would be created empty with
// root as owner !
ktalkdcfg = new KConfig(cfgFileName);
ktalkdcfg = new TDEConfig(cfgFileName);
ktalkdcfg -> setGroup("ktalkd");
ktalkdcfg -> setDollarExpansion(true);
ktalk_debug("User config file ok");
@ -133,7 +133,7 @@ ktalk_debug("%s","done");
int read_user_config(const char * key, char * result, int max)
{
KConfig * cfg;
TDEConfig * cfg;
if (!strncmp(key,"Sound",5))
// Any key starting with Sound is in ktalkannouncerc
// talkprg is there too, but we don't care about it here
@ -185,7 +185,7 @@ int process_config_file(void)
// Has to be done, for any $TDEBINDIR in ktalkdrc.
setenv("TDEBINDIR", TQFile::encodeName(ktalkdlg_dir), 0/*don't overwrite*/);
KConfig * syscfg = new KConfig( "ktalkdrc" );
TDEConfig * syscfg = new TDEConfig( "ktalkdrc" );
syscfg -> setGroup("ktalkd");
syscfg -> setDollarExpansion(true);

2
ktalkd/ktalkd/talkd.cpp
Unescape View File

@ -350,7 +350,7 @@ main(int argc, char *argv[])
socklen_t sz = sizeof(sn);
int do_debug=0, do_badpackets=0, ch;
new TDEInstance("ktalkd"); // for KConfig and friends
new TDEInstance("ktalkd"); // for TDEConfig and friends
ktable = new KTalkdTable();
/* make sure we're a daemon */

2
ktalkd/ktalkdlg/ktalkdlg.cpp
Unescape View File

@ -118,7 +118,7 @@ int main (int argc, char **argv)
printf("#\n");
fflush(stdout);
KConfig *cfg = new KConfig ( "ktalkannouncerc" );
TDEConfig *cfg = new TDEConfig ( "ktalkannouncerc" );
cfg->setGroup ("ktalkannounce");
bool bSound = cfg->readNumEntry ("Sound", 0);

2
lanbrowsing/kcmlisa/kcmkiolan.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <kdialog.h>
IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent)
:KCModule(parent)
:TDECModule(parent)
,m_config(config,false,true)
{
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());

4
lanbrowsing/kcmlisa/kcmkiolan.h
Unescape View File

@ -28,7 +28,7 @@
class TQCheckBox;
class TQLineEdit;
class IOSlaveSettings:public KCModule
class IOSlaveSettings:public TDECModule
{
Q_OBJECT
@ -40,7 +40,7 @@ class IOSlaveSettings:public KCModule
signals:
void changed();
protected:
KConfig m_config;
TDEConfig m_config;
TQCheckBox *m_shortHostnames;
TQCheckBox *m_rlanSidebar;
PortSettingsBar *m_ftpSettings;

2
lanbrowsing/kcmlisa/kcmlisa.cpp
Unescape View File

@ -49,7 +49,7 @@
#include <kdebug.h>
LisaSettings::LisaSettings(const TQString& config, TQWidget *parent)
: KCModule(parent, "kcmlanbrowser")
: TDECModule(parent, "kcmlanbrowser")
,m_config(config,false,true)
,m_wizard(0)
,m_configFilename(config)

4
lanbrowsing/kcmlisa/kcmlisa.h
Unescape View File

@ -34,7 +34,7 @@ class KRestrictedLine;
class KEditListBox;
class SetupWizard;
class LisaSettings:public KCModule
class LisaSettings:public TDECModule
{
Q_OBJECT
@ -51,7 +51,7 @@ class LisaSettings:public KCModule
void saveDone(TDEProcess *); // called after the tdesud returns (on save)
void suggestSettings();
protected:
KConfig m_config;
TDEConfig m_config;
TQPushButton *m_autoSetup;
TQCheckBox *m_useNmblookup;
TQCheckBox *m_sendPings;

2
lanbrowsing/kcmlisa/kcmreslisa.cpp
Unescape View File

@ -37,7 +37,7 @@
#include <keditlistbox.h>
ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent)
: KCModule(parent)
: TDECModule(parent)
,m_config(config,false,true)
,m_kiolanConfig("kio_lanrc",false,true)
,m_advancedSettingsButton(0)

6
lanbrowsing/kcmlisa/kcmreslisa.h
Unescape View File

@ -32,7 +32,7 @@ class KEditListBox;
class KDialogBase;
class KRestrictedLine;
class ResLisaSettings:public KCModule
class ResLisaSettings:public TDECModule
{
Q_OBJECT
@ -46,8 +46,8 @@ class ResLisaSettings:public KCModule
protected slots:
void suggestSettings();
protected:
KConfig m_config;
KConfig m_kiolanConfig;
TDEConfig m_config;
TDEConfig m_kiolanConfig;
TQPushButton* m_advancedSettingsButton;
TQPushButton* m_suggestSettings;
TQCheckBox* m_useNmblookup;

6
lanbrowsing/kcmlisa/main.cpp
Unescape View File

@ -33,15 +33,15 @@
extern "C"
{
KDE_EXPORT KCModule *create_lisa(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_lisa(TQWidget *parent, const char *)
{
return new LisaSettings("/etc/lisarc", parent);
}
KDE_EXPORT KCModule *create_reslisa(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_reslisa(TQWidget *parent, const char *)
{
return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", parent);
}
KDE_EXPORT KCModule *create_kiolan(TQWidget *parent, const char *)
KDE_EXPORT TDECModule *create_kiolan(TQWidget *parent, const char *)
{
return new IOSlaveSettings("kio_lanrc", parent);
}

46
lanbrowsing/kio_lan/kio_lan.cpp
Unescape View File

@ -56,7 +56,7 @@
#define PORTSETTINGS_PROVIDE 1
#define PORTSETTINGS_DISABLE 2
using namespace KIO;
using namespace TDEIO;
#ifndef SHUT_RDWR
#define SHUT_RDWR 2
@ -94,7 +94,7 @@ LANProtocol::LANProtocol(int isLanIoslave, const TQCString &pool, const TQCStrin
,m_maxAge(15*60)
,m_isLanIoslave(isLanIoslave?true:false)
{
KConfig *config=TDEGlobal::config();
TDEConfig *config=TDEGlobal::config();
m_protocolInfo[KIOLAN_FTP].enabled=config->readNumEntry("Support_FTP",PORTSETTINGS_CHECK);
m_protocolInfo[KIOLAN_HTTP].enabled=config->readNumEntry("Support_HTTP",PORTSETTINGS_CHECK);
@ -232,7 +232,7 @@ int LANProtocol::lanReadDataFromServer()
kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl;
UDSAtom atom;
atom.m_uds = KIO::UDS_NAME;
atom.m_uds = TDEIO::UDS_NAME;
if (m_shortHostnames)
{
if (inet_addr(tmpName)!=-1)
@ -248,14 +248,14 @@ int LANProtocol::lanReadDataFromServer()
atom.m_str = tmpName;
entry.append( atom );
atom.m_uds = KIO::UDS_SIZE;
atom.m_uds = TDEIO::UDS_SIZE;
atom.m_long = 1024;
entry.append(atom);
atom.m_uds = KIO::UDS_ACCESS;
atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
//atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
entry.append(atom);
atom.m_uds = KIO::UDS_FILE_TYPE;
atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = S_IFDIR; // it is always a directory
entry.append( atom );
listEntry(entry,false);
@ -407,7 +407,7 @@ int LANProtocol::rlanReadDataFromServer()
kdDebug(7101)<<"RLANProtocol::readDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl;
UDSAtom atom;
atom.m_uds = KIO::UDS_NAME;
atom.m_uds = TDEIO::UDS_NAME;
if (m_shortHostnames)
{
if (inet_addr(tmpName)!=-1)
@ -422,14 +422,14 @@ int LANProtocol::rlanReadDataFromServer()
else
atom.m_str = tmpName;
entry.append( atom );
atom.m_uds = KIO::UDS_SIZE;
atom.m_uds = TDEIO::UDS_SIZE;
atom.m_long = 1024;
entry.append(atom);
atom.m_uds = KIO::UDS_ACCESS;
atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
//atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
entry.append(atom);
atom.m_uds = KIO::UDS_FILE_TYPE;
atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = S_IFDIR; // it is always a directory
entry.append( atom );
listEntry(entry,false);
@ -510,20 +510,20 @@ int LANProtocol::checkHost(const TQString& host)
kdDebug(7101)<<"LAN::checkHost(): Host ["<<hostUpper<<"] Service ["<<m_protocolInfo[i].name<<"]"<<endl;
UDSAtom atom;
// name
atom.m_uds = KIO::UDS_NAME;
atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = m_protocolInfo[i].name;
entry.append( atom );
// size
atom.m_uds = KIO::UDS_SIZE;
atom.m_uds = TDEIO::UDS_SIZE;
atom.m_long = 1024;
entry.append(atom);
// access permissions
atom.m_uds = KIO::UDS_ACCESS;
atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
//atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
entry.append(atom);
// file type
atom.m_uds = KIO::UDS_FILE_TYPE;
atom.m_uds = TDEIO::UDS_FILE_TYPE;
if (strcmp(m_protocolInfo[i].name,"HTTP")==0)
{
// normal file -- if we called stat(2) on this,
@ -532,7 +532,7 @@ int LANProtocol::checkHost(const TQString& host)
entry.append(atom);
// also define the mime-type for this file
atom.m_uds = KIO::UDS_MIME_TYPE;
atom.m_uds = TDEIO::UDS_MIME_TYPE;
atom.m_str="text/html";
entry.append( atom );
}
@ -544,7 +544,7 @@ int LANProtocol::checkHost(const TQString& host)
entry.append(atom);
// also set the mime-type
atom.m_uds = KIO::UDS_MIME_TYPE;
atom.m_uds = TDEIO::UDS_MIME_TYPE;
atom.m_str="inode/directory";
entry.append( atom );
}
@ -732,14 +732,14 @@ void LANProtocol::stat( const KURL & url)
UDSEntry entry;
UDSAtom atom;
atom.m_uds = KIO::UDS_NAME;
atom.m_uds = TDEIO::UDS_NAME;
atom.m_str = url.path();
entry.append( atom );
atom.m_uds = KIO::UDS_SIZE;
atom.m_uds = TDEIO::UDS_SIZE;
atom.m_long = 1024;
entry.append(atom);
atom.m_uds = KIO::UDS_ACCESS;
atom.m_uds = TDEIO::UDS_ACCESS;
atom.m_long = S_IRUSR | S_IRGRP | S_IROTH ;
//atom.m_long = S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
entry.append(atom);
@ -749,20 +749,20 @@ void LANProtocol::stat( const KURL & url)
TQStringList pathList=TQStringList::split( "/",path);
if ((pathList.count()==2) && (pathList[1].upper()=="HTTP"))
{
atom.m_uds = KIO::UDS_FILE_TYPE;
atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long=S_IFREG;
entry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
atom.m_uds = TDEIO::UDS_MIME_TYPE;
atom.m_str="text/html";
//kdDebug(7101)<<"LANProtocol::stat: http is reg file"<<endl;
entry.append( atom );
}
else
{
atom.m_uds = KIO::UDS_FILE_TYPE;
atom.m_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = S_IFDIR; // it is always a directory
entry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
atom.m_uds = TDEIO::UDS_MIME_TYPE;
atom.m_str="inode/directory";
//kdDebug(7101)<<"LANProtocol::stat: is dir"<<endl;
entry.append( atom );

2
lanbrowsing/kio_lan/kio_lan.h
Unescape View File

@ -55,7 +55,7 @@ struct HostInfo
int services[KIOLAN_MAX];
};
class LANProtocol : public KIO::TCPSlaveBase
class LANProtocol : public TDEIO::TCPSlaveBase
{
public:
LANProtocol (int isLanIoSlave, const TQCString &pool, const TQCString &app );

12
librss/image.cpp
Unescape View File

@ -110,18 +110,18 @@ void Image::getPixmap()
d->pixmapBuffer = new TQBuffer;
d->pixmapBuffer->open(IO_WriteOnly);
KIO::Job *job = KIO::get(d->url, false, false);
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotResult(KIO::Job *)));
TDEIO::Job *job = TDEIO::get(d->url, false, false);
connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
}
void Image::slotData(KIO::Job *, const TQByteArray &data)
void Image::slotData(TDEIO::Job *, const TQByteArray &data)
{
d->pixmapBuffer->writeBlock(data.data(), data.size());
}
void Image::slotResult(KIO::Job *job)
void Image::slotResult(TDEIO::Job *job)
{
TQPixmap pixmap;
if (!job->error())

6
librss/image.h
Unescape View File

@ -17,7 +17,7 @@
class TQDomNode;
namespace KIO
namespace TDEIO
{
class Job;
}
@ -160,8 +160,8 @@ namespace RSS
void gotPixmap(const TQPixmap &pixmap);
private slots:
void slotData(KIO::Job *job, const TQByteArray &data);
void slotResult(KIO::Job *job);
void slotData(TDEIO::Job *job, const TQByteArray &data);
void slotResult(TDEIO::Job *job);
private:
struct Private;

18
librss/loader.cpp
Unescape View File

@ -64,12 +64,12 @@ void FileRetriever::retrieveData(const KURL &url)
d->buffer = new TQBuffer;
d->buffer->open(IO_WriteOnly);
KIO::Job *job = KIO::get(url, false, false);
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_SLOT(slotResult(KIO::Job *)));
connect(job, TQT_SIGNAL(permanentRedirection(KIO::Job *, const KURL &, const KURL &)),
TQT_SLOT(slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &)));
TDEIO::Job *job = TDEIO::get(url, false, false);
connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
connect(job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
}
int FileRetriever::errorCode() const
@ -77,12 +77,12 @@ int FileRetriever::errorCode() const
return d->lastError;
}
void FileRetriever::slotData(KIO::Job *, const TQByteArray &data)
void FileRetriever::slotData(TDEIO::Job *, const TQByteArray &data)
{
d->buffer->writeBlock(data.data(), data.size());
}
void FileRetriever::slotResult(KIO::Job *job)
void FileRetriever::slotResult(TDEIO::Job *job)
{
TQByteArray data = d->buffer->buffer();
data.detach();
@ -94,7 +94,7 @@ void FileRetriever::slotResult(KIO::Job *job)
emit dataRetrieved(data, d->lastError == 0);
}
void FileRetriever::slotPermanentRedirection(KIO::Job *, const KURL &, const KURL &newUrl)
void FileRetriever::slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &newUrl)
{
emit permanentRedirection(newUrl);
}

8
librss/loader.h
Unescape View File

@ -17,7 +17,7 @@ class KURL;
#include <tqobject.h>
namespace KIO
namespace TDEIO
{
class Job;
}
@ -129,9 +129,9 @@ namespace RSS
void permanentRedirection(const KURL &url);
private slots:
void slotData(KIO::Job *job, const TQByteArray &data);
void slotResult(KIO::Job *job);
void slotPermanentRedirection(KIO::Job *job, const KURL &fromUrl,
void slotData(TDEIO::Job *job, const TQByteArray &data);
void slotResult(TDEIO::Job *job);
void slotPermanentRedirection(TDEIO::Job *job, const KURL &fromUrl,
const KURL &toUrl);
private:

2
wifi/kcmwifi/kcmwifi.cpp
Unescape View File

@ -43,7 +43,7 @@ typedef KGenericFactory < KCMWifi, TQWidget > KWiFiFactory;
K_EXPORT_COMPONENT_FACTORY (kcm_wifi, KWiFiFactory("kcmwifi") )
KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &)
: KCModule (parent, name)
: TDECModule (parent, name)
{
tabs = new TQTabWidget (this, "tabs");

2
wifi/kcmwifi/kcmwifi.h
Unescape View File

@ -30,7 +30,7 @@ class MainConfig;
class TQTabWidget;
class KProcIO;
class KCMWifi : public KCModule
class KCMWifi : public TDECModule
{
Q_OBJECT

4
wifi/kcmwifi/wificonfig.cpp
Unescape View File

@ -115,7 +115,7 @@ IfConfig::IfConfig()
powerModeList << "All" << "UnicastOnly" << "MulticastOnly";
}
void IfConfig::load( KConfig *config, int i )
void IfConfig::load( TDEConfig *config, int i )
{
TQString entry;
@ -148,7 +148,7 @@ void IfConfig::load( KConfig *config, int i )
m_wakeupPeriod = config->readNumEntry( "WakeupPeriod", 20 );
}
void IfConfig::save( KConfig *config, int i )
void IfConfig::save( TDEConfig *config, int i )
{
TQString group = TQString( "Configuration %1" ).arg( i+1 );
config->setGroup( group );

6
wifi/kcmwifi/wificonfig.h
Unescape View File

@ -25,7 +25,7 @@
#include "kcmwifi.h"
class KConfig;
class TDEConfig;
class KSimpleConfig;
enum KeyStates { EMPTY=0, INVALID=1, HEX_64=2, HEX_128=3, HEX_256=4, STRING_64=5, STRING_128=6, STRING_256=7 };
@ -58,8 +58,8 @@ class IfConfig
enum PowerMode { AllPackets=0, UnicastOnly, MulticastOnly };
enum CryptoMode { Open=0, Restricted };
void load( KConfig *config, int i );
void save( KConfig *config, int i );
void load( TDEConfig *config, int i );
void save( TDEConfig *config, int i );
TQString speedAsString();
TQString wifimodeAsString();

26
wifi/kwifimanager.cpp
Unescape View File

@ -83,7 +83,7 @@ DCOPObject("dcop_interface"), KMainWindow (0, name), device(0), m_shuttingDown(f
device = new Interface_wireless_wirelessextensions (ignoreInterfaces);
//This setting gets here from the kdeglobals config
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
if (config->hasGroup("System Tray"))
config->setGroup("System Tray");
m_iconSize=config->readNumEntry("systrayIconWidth", 22);
@ -110,7 +110,7 @@ DCOPObject("dcop_interface"), KMainWindow (0, name), device(0), m_shuttingDown(f
connect (tricorder_trigger, TQT_SIGNAL (timeout ()), this,
TQT_SLOT (tricorder_beep ()));
connect (trayicon, TQT_SIGNAL (quitSelected ()), this, TQT_SLOT (slotFileQuit ()));
slotToggleTric(); //set to value saved by KConfig
slotToggleTric(); //set to value saved by TDEConfig
setAutoSaveSettings();
kapp->setMainWidget(this);
@ -301,7 +301,7 @@ KWiFiManagerApp::slotChangeTrayIcon ()
void
KWiFiManagerApp::initActions ()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
if (config->hasGroup("General"))
config->setGroup("General");
fileDisableRadio = new KToggleAction (i18n ("&Disable Radio"), 0, TQT_TQOBJECT(this),
@ -313,19 +313,19 @@ KWiFiManagerApp::initActions ()
TQT_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation");
settingsUseAlternateCalc->setChecked( config->readBoolEntry("useAlternateStrengthCalculation") );
slotToggleStrengthCalc(); //set to value saved by KConfig
slotToggleStrengthCalc(); //set to value saved by TDEConfig
settingsShowStatsNoise =
new KToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise");
settingsShowStatsNoise->setChecked( config->readBoolEntry("showStatsNoise") );
slotShowStatsNoise(); //set to value saved by KConfig
slotShowStatsNoise(); //set to value saved by TDEConfig
settingsShowStrengthNumber = new KToggleAction (i18n ("&Show Strength Number in System Tray"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray");
settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") );
slotToggleShowStrengthNumber (); //set to value saved by KConfig
slotToggleShowStrengthNumber (); //set to value saved by TDEConfig
KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), actionCollection ());
@ -402,7 +402,7 @@ KWiFiManagerApp::initView ()
void
KWiFiManagerApp::slotToggleShowStrengthNumber ()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("General");
config->writeEntry( "showStrengthNumberInTray", settingsShowStrengthNumber->isChecked() );
if (settingsShowStrengthNumber->isChecked()) { showStrength = true; }
@ -488,7 +488,7 @@ KWiFiManagerApp::slotDisablePowerProcessExited()
void
KWiFiManagerApp::slotToggleTric ()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("General");
config->writeEntry( "acousticScanning", settingsAcousticScanning->isChecked() );
if (settingsAcousticScanning->isChecked())
@ -503,7 +503,7 @@ KWiFiManagerApp::slotToggleTric ()
void KWiFiManagerApp::slotToggleStrengthCalc ()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("General");
config->writeEntry( "useAlternateStrengthCalculation", settingsUseAlternateCalc->isChecked() );
useAlternateStrengthCalc = settingsUseAlternateCalc->isChecked();
@ -511,7 +511,7 @@ void KWiFiManagerApp::slotToggleStrengthCalc ()
void KWiFiManagerApp::slotToggleStayInSystray ()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("General");
config->writeEntry( "stayInSystrayOnClose", settingsStayInSystrayOnClose->isChecked() );
}
@ -541,7 +541,7 @@ KWiFiManagerApp::tricorder_beep ()
void
KWiFiManagerApp::slotShowStatsNoise ()
{
KConfig* config = kapp->config();
TDEConfig* config = kapp->config();
config->setGroup("General");
config->writeEntry( "showStatsNoise", settingsShowStatsNoise->isChecked() );
showStatsNoise = settingsShowStatsNoise->isChecked();
@ -562,7 +562,7 @@ KWiFiManagerApp::slotStartConfigEditor ()
startConf.start (TDEProcess::DontCare);
}
void KWiFiManagerApp::saveProperties( KConfig* conf)
void KWiFiManagerApp::saveProperties( TDEConfig* conf)
{
m_startDocked = !isVisible();
conf->writeEntry( "startDocked", m_startDocked );
@ -570,7 +570,7 @@ void KWiFiManagerApp::saveProperties( KConfig* conf)
conf->sync();
}
void KWiFiManagerApp::readProperties( KConfig* conf)
void KWiFiManagerApp::readProperties( TDEConfig* conf)
{
m_startDocked = conf->readBoolEntry( "startDocked", false );
if (m_startDocked)

4
wifi/kwifimanager.h
Unescape View File

@ -107,8 +107,8 @@ public:
void slotDisablePowerProcessExited();
virtual bool queryClose();
virtual bool queryExit();
virtual void readProperties( KConfig* );
virtual void saveProperties( KConfig* );
virtual void readProperties( TDEConfig* );
virtual void saveProperties( TDEConfig* );
private:
void initActions ();
void initView ();

2
wifi/kwireless/kwireless.h
Unescape View File

@ -40,7 +40,7 @@ protected:
void resizeEvent(TQResizeEvent *);
private:
KConfig *ksConfig;
TDEConfig *ksConfig;
KWireLessWidget *widget;
};

Write Preview
Loading…
Cancel
Save