Browse Source

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

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
f21aaec952
100 changed files with 337 additions and 337 deletions
  1. +2
    -2
      dcoprss/service.cpp
  2. +10
    -10
      dcoprss/xmlrpciface.cpp
  3. +4
    -4
      dcoprss/xmlrpciface.h
  4. +4
    -4
      filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
  5. +1
    -1
      filesharing/advanced/kcm_sambaconf/kcmsambaconf.h
  6. +7
    -7
      filesharing/advanced/kcm_sambaconf/sambafile.cpp
  7. +4
    -4
      filesharing/advanced/kcm_sambaconf/sambafile.h
  8. +1
    -1
      filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
  9. +1
    -1
      filesharing/simple/fileshare.cpp
  10. +1
    -1
      filesharing/simple/fileshare.h
  11. +2
    -2
      kdict/applet/kdictapplet.cpp
  12. +2
    -2
      kdict/options.cpp
  13. +1
    -1
      kdict/queryview.cpp
  14. +3
    -3
      kdnssd/ioslave/dnssd.cpp
  15. +3
    -3
      kdnssd/ioslave/dnssd.h
  16. +1
    -1
      kget/dlgAdvanced.cpp
  17. +4
    -4
      kget/dlgIndividual.cpp
  18. +3
    -3
      kget/dlgIndividual.h
  19. +1
    -1
      kget/getfilejob.cpp
  20. +1
    -1
      kget/getfilejob.h
  21. +1
    -1
      kget/http_defaults.h
  22. +27
    -27
      kget/kmainwidget.cpp
  23. +1
    -1
      kget/safedelete.cpp
  24. +3
    -3
      kget/settings.cpp
  25. +21
    -21
      kget/slave.cpp
  26. +9
    -9
      kget/slave.h
  27. +11
    -11
      kget/transfer.cpp
  28. +6
    -6
      kget/transfer.h
  29. +2
    -2
      kget/transferlist.cpp
  30. +2
    -2
      knewsticker/common/configaccess.cpp
  31. +3
    -3
      knewsticker/common/configaccess.h
  32. +6
    -6
      knewsticker/common/newsiconmgr.cpp
  33. +3
    -3
      knewsticker/common/newsiconmgr.h
  34. +6
    -6
      knewsticker/common/xmlnewsaccess.cpp
  35. +2
    -2
      knewsticker/common/xmlnewsaccess.h
  36. +1
    -1
      knewsticker/knewstickerconfig.h
  37. +1
    -1
      knewsticker/knewstickerstub/knewstickerstub.cpp
  38. +1
    -1
      knewsticker/newsscroller.cpp
  39. +2
    -2
      kopete/kopete/addcontactwizard/addcontactwizard.cpp
  40. +2
    -2
      kopete/kopete/chatwindow/chatmessagepart.cpp
  41. +4
    -4
      kopete/kopete/chatwindow/chatview.cpp
  42. +2
    -2
      kopete/kopete/chatwindow/kopetechatwindow.cpp
  43. +2
    -2
      kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
  44. +2
    -2
      kopete/kopete/chatwindow/kopeteemailwindow.cpp
  45. +2
    -2
      kopete/kopete/chatwindow/krichtexteditpart.cpp
  46. +1
    -1
      kopete/kopete/config/accounts/kopete_accountconfig.desktop
  47. +1
    -1
      kopete/kopete/config/accounts/kopeteaccountconfig.cpp
  48. +1
    -1
      kopete/kopete/config/accounts/kopeteaccountconfig.h
  49. +7
    -7
      kopete/kopete/config/appearance/appearanceconfig.cpp
  50. +1
    -1
      kopete/kopete/config/appearance/appearanceconfig.h
  51. +1
    -1
      kopete/kopete/config/appearance/emoticonseditdialog.cpp
  52. +1
    -1
      kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
  53. +1
    -1
      kopete/kopete/config/avdevice/avdeviceconfig.cpp
  54. +1
    -1
      kopete/kopete/config/avdevice/avdeviceconfig.h
  55. +1
    -1
      kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
  56. +3
    -3
      kopete/kopete/config/behavior/behaviorconfig.cpp
  57. +1
    -1
      kopete/kopete/config/behavior/behaviorconfig.h
  58. +1
    -1
      kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
  59. +1
    -1
      kopete/kopete/config/identity/kopete_identityconfig.desktop
  60. +4
    -4
      kopete/kopete/config/identity/kopeteidentityconfig.cpp
  61. +1
    -1
      kopete/kopete/config/identity/kopeteidentityconfig.h
  62. +1
    -1
      kopete/kopete/contactlist/customnotificationprops.cpp
  63. +1
    -1
      kopete/kopete/kopeteapplication.cpp
  64. +1
    -1
      kopete/kopete/kopeteiface.cpp
  65. +2
    -2
      kopete/kopete/kopetewindow.cpp
  66. +1
    -1
      kopete/libkopete/PORTING
  67. +2
    -2
      kopete/libkopete/avdevice/videodevicepool.cpp
  68. +2
    -2
      kopete/libkopete/kautoconfig.cpp
  69. +5
    -5
      kopete/libkopete/kautoconfig.h
  70. +6
    -6
      kopete/libkopete/kcautoconfigmodule.cpp
  71. +13
    -13
      kopete/libkopete/kcautoconfigmodule.h
  72. +4
    -4
      kopete/libkopete/knotification.cpp
  73. +3
    -3
      kopete/libkopete/kopeteaccount.cpp
  74. +5
    -5
      kopete/libkopete/kopeteaccount.h
  75. +4
    -4
      kopete/libkopete/kopeteaccountmanager.cpp
  76. +2
    -2
      kopete/libkopete/kopeteaccountmanager.h
  77. +3
    -3
      kopete/libkopete/kopeteaway.cpp
  78. +1
    -1
      kopete/libkopete/kopeteaway.h
  79. +2
    -2
      kopete/libkopete/kopeteblacklister.cpp
  80. +1
    -1
      kopete/libkopete/kopeteconfig.kcfgc
  81. +2
    -2
      kopete/libkopete/kopetemimetypehandler.cpp
  82. +1
    -1
      kopete/libkopete/kopetemimetypehandler.h
  83. +17
    -17
      kopete/libkopete/kopetepassword.cpp
  84. +1
    -1
      kopete/libkopete/kopetepassword.h
  85. +2
    -2
      kopete/libkopete/kopetepluginmanager.cpp
  86. +4
    -4
      kopete/libkopete/kopeteprefs.h
  87. +1
    -1
      kopete/libkopete/kopetetask.h
  88. +7
    -7
      kopete/libkopete/kopetetransfermanager.cpp
  89. +3
    -3
      kopete/libkopete/kopetetransfermanager.h
  90. +1
    -1
      kopete/libkopete/private/kopeteviewmanager.cpp
  91. +9
    -9
      kopete/plugins/addbookmarks/addbookmarksplugin.cpp
  92. +2
    -2
      kopete/plugins/addbookmarks/addbookmarksplugin.h
  93. +5
    -5
      kopete/plugins/addbookmarks/addbookmarkspreferences.cpp
  94. +1
    -1
      kopete/plugins/addbookmarks/addbookmarkspreferences.h
  95. +4
    -4
      kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
  96. +1
    -1
      kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
  97. +8
    -8
      kopete/plugins/alias/aliaspreferences.cpp
  98. +1
    -1
      kopete/plugins/alias/aliaspreferences.h
  99. +1
    -1
      kopete/plugins/alias/kopete_alias_config.desktop
  100. +2
    -2
      kopete/plugins/autoreplace/autoreplaceconfig.cpp

+ 2
- 2
dcoprss/service.cpp 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);


+ 10
- 10
dcoprss/xmlrpciface.cpp 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;


+ 4
- 4
dcoprss/xmlrpciface.h 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;


+ 4
- 4
filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp 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);


+ 1
- 1
filesharing/advanced/kcm_sambaconf/kcmsambaconf.h View File

@@ -66,7 +66,7 @@ class TQSpinBox;
class DictManager;
class SmbConfConfigWidget;

class KcmSambaConf: public KCModule
class KcmSambaConf: public TDECModule
{
Q_OBJECT


+ 7
- 7
filesharing/advanced/kcm_sambaconf/sambafile.cpp 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;


+ 4
- 4
filesharing/advanced/kcm_sambaconf/sambafile.h 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 &);


+ 1
- 1
filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp View File

@@ -76,7 +76,7 @@ void SmbConfConfigWidget::btnPressed() {
return;
}

KConfig config("ksambaplugin");
TDEConfig config("ksambaplugin");
config.setGroup("KSambaKonqiPlugin");
config.writeEntry("smb.conf",smbConf);


+ 1
- 1
filesharing/simple/fileshare.cpp 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");



+ 1
- 1
filesharing/simple/fileshare.h View File

@@ -28,7 +28,7 @@ class TQBoxLayout;
class ControlCenterGUI;
class TQListViewItem;

class KFileShareConfig : public KCModule
class KFileShareConfig : public TDECModule
{
Q_OBJECT


+ 2
- 2
kdict/applet/kdictapplet.cpp 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();


+ 2
- 2
kdict/options.cpp 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);


+ 1
- 1
kdict/queryview.cpp 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;


+ 3
- 3
kdnssd/ioslave/dnssd.cpp 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);
}



+ 3
- 3
kdnssd/ioslave/dnssd.h 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:


+ 1
- 1
kget/dlgAdvanced.cpp 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();


+ 4
- 4
kget/dlgIndividual.cpp 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)));
}




+ 3
- 3
kget/dlgIndividual.h 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;
}


+ 1
- 1
kget/getfilejob.cpp View File

@@ -17,7 +17,7 @@

#include "getfilejob.h"

namespace KIO
namespace TDEIO
{




+ 1
- 1
kget/getfilejob.h View File

@@ -21,7 +21,7 @@
#include <kio/jobclasses.h>


namespace KIO
namespace TDEIO
{

class GetFileJob:public FileCopyJob


+ 1
- 1
kget/http_defaults.h 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


+ 27
- 27
kget/kmainwidget.cpp 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)


+ 1
- 1
kget/safedelete.cpp 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;
}



+ 3
- 3
kget/settings.cpp 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");


+ 21
- 21
kget/slave.cpp 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);


+ 9
- 9
kget/slave.h 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;

};



+ 11
- 11
kget/transfer.cpp 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);
}


+ 6
- 6
kget/transfer.h 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;


+ 2
- 2
kget/transferlist.cpp 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");


+ 2
- 2
knewsticker/common/configaccess.cpp 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");


+ 3
- 3
knewsticker/common/configaccess.h 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

+ 6
- 6
knewsticker/common/newsiconmgr.cpp 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);


+ 3
- 3
knewsticker/common/newsiconmgr.h 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;


+ 6
- 6
knewsticker/common/xmlnewsaccess.cpp 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());


+ 2
- 2
knewsticker/common/xmlnewsaccess.h 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;


+ 1
- 1
knewsticker/knewstickerconfig.h View File

@@ -23,7 +23,7 @@

class KNewsTickerConfig;
class KNewsTickerConfigWidget;
class KConfig;
class TDEConfig;
class NewsIconMgr;
class ConfigAccess;



+ 1
- 1
knewsticker/knewstickerstub/knewstickerstub.cpp 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")) {


+ 1
- 1
knewsticker/newsscroller.cpp 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();



+ 2
- 2
kopete/kopete/addcontactwizard/addcontactwizard.cpp 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();


+ 2
- 2
kopete/kopete/chatwindow/chatmessagepart.cpp 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


+ 4
- 4
kopete/kopete/chatwindow/chatview.cpp 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") );


+ 2
- 2
kopete/kopete/chatwindow/kopetechatwindow.cpp 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" ) );


+ 2
- 2
kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp 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)


+ 2
- 2
kopete/kopete/chatwindow/kopeteemailwindow.cpp 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();



+ 2
- 2
kopete/kopete/chatwindow/krichtexteditpart.cpp 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() );


+ 1
- 1
kopete/kopete/config/accounts/kopete_accountconfig.desktop 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


+ 1
- 1
kopete/kopete/config/accounts/kopeteaccountconfig.cpp 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 );


+ 1
- 1
kopete/kopete/config/accounts/kopeteaccountconfig.h View File

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


+ 7
- 7
kopete/kopete/config/appearance/appearanceconfig.cpp 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" );


+ 1
- 1
kopete/kopete/config/appearance/appearanceconfig.h 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


+ 1
- 1
kopete/kopete/config/appearance/emoticonseditdialog.cpp 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));


+ 1
- 1
kopete/kopete/config/appearance/kopete_appearanceconfig.desktop 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


+ 1
- 1
kopete/kopete/config/avdevice/avdeviceconfig.cpp 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);


+ 1
- 1
kopete/kopete/config/avdevice/avdeviceconfig.h View File

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


+ 1
- 1
kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop 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


+ 3
- 3
kopete/kopete/config/behavior/behaviorconfig.cpp 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 ============================================================


+ 1
- 1
kopete/kopete/config/behavior/behaviorconfig.h View File

@@ -32,7 +32,7 @@ class BehaviorConfig_Chat;
class KopeteAwayConfigBaseUI;
class KPluginInfo;

class BehaviorConfig : public KCModule
class BehaviorConfig : public TDECModule
{
Q_OBJECT


+ 1
- 1
kopete/kopete/config/behavior/kopete_behaviorconfig.desktop 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


+ 1
- 1
kopete/kopete/config/identity/kopete_identityconfig.desktop 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


+ 4
- 4
kopete/kopete/config/identity/kopeteidentityconfig.cpp 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();



+ 1
- 1
kopete/kopete/config/identity/kopeteidentityconfig.h 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


+ 1
- 1
kopete/kopete/contactlist/customnotificationprops.cpp 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();


+ 1
- 1
kopete/kopete/kopeteapplication.cpp 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();


+ 1
- 1
kopete/kopete/kopeteiface.cpp 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))


+ 2
- 2
kopete/kopete/kopetewindow.cpp 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" );


+ 1
- 1
kopete/libkopete/PORTING 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


+ 2
- 2
kopete/libkopete/avdevice/videodevicepool.cpp 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())


+ 2
- 2
kopete/libkopete/kautoconfig.cpp 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();
}


+ 5
- 5
kopete/libkopete/kautoconfig.h 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.