From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- tdeprint/tdeprintfax/conffax.cpp | 4 ++-- tdeprint/tdeprintfax/confgeneral.cpp | 4 ++-- tdeprint/tdeprintfax/confsystem.cpp | 4 ++-- tdeprint/tdeprintfax/faxab.cpp | 4 ++-- tdeprint/tdeprintfax/faxctrl.cpp | 10 +++++----- tdeprint/tdeprintfax/tdeprintfax.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tdeprint/tdeprintfax') diff --git a/tdeprint/tdeprintfax/conffax.cpp b/tdeprint/tdeprintfax/conffax.cpp index e36916b83..97d5e036a 100644 --- a/tdeprint/tdeprintfax/conffax.cpp +++ b/tdeprint/tdeprintfax/conffax.cpp @@ -61,7 +61,7 @@ ConfFax::ConfFax(TQWidget *parent, const char *name) void ConfFax::load() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Fax"); TQString v = conf->readEntry("Page", TDEGlobal::locale()->pageSize() == TQPrinter::A4 ? "a4" : "letter"); if (v == "letter") m_pagesize->setCurrentItem(1); @@ -73,7 +73,7 @@ void ConfFax::load() void ConfFax::save() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Fax"); conf->writeEntry("Resolution", (m_resolution->currentItem() == 0 ? "High" : "Low")); conf->writeEntry("Page", (m_pagesize->currentItem() == 0 ? "a4" : (m_pagesize->currentItem() == 1 ? "letter" : "legal"))); diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp index be3025e65..0526ee684 100644 --- a/tdeprint/tdeprintfax/confgeneral.cpp +++ b/tdeprint/tdeprintfax/confgeneral.cpp @@ -69,7 +69,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) void ConfGeneral::load() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Personal"); m_name->setText(conf->readEntry("Name", getenv("USER"))); m_number->setText(conf->readEntry("Number")); @@ -80,7 +80,7 @@ void ConfGeneral::load() void ConfGeneral::save() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Personal"); conf->writeEntry("Name", m_name->text()); conf->writeEntry("Number", m_number->text()); diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp index a116af180..e1171962a 100644 --- a/tdeprint/tdeprintfax/confsystem.cpp +++ b/tdeprint/tdeprintfax/confsystem.cpp @@ -97,7 +97,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name) void ConfSystem::load() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("System"); m_commands << conf->readPathEntry("EFax", defaultCommand(efax_default_cmd)); m_commands << conf->readPathEntry("HylaFax", defaultCommand(hylafax_default_cmd)); @@ -130,7 +130,7 @@ void ConfSystem::load() void ConfSystem::save() { m_commands[ m_current ] = m_command->text(); - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("System"); if (m_commands[EFAX_ID] != defaultCommand(efax_default_cmd)) conf->writePathEntry("EFax", m_commands[EFAX_ID]); diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index c9b183b27..fd0073b7a 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/tdeprint/tdeprintfax/faxab.cpp @@ -60,7 +60,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name) l2->addWidget(m_ok, 0); l2->addWidget(m_cancel, 0); - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup( "General" ); TQSize defsize( 400, 200 ); resize( conf->readSizeEntry( "ABSize", &defsize ) ); @@ -71,7 +71,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name) FaxAB::~FaxAB() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup( "General" ); conf->writeEntry( "ABSize", size() ); } diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index 7e70a5e71..2c8faffc6 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -75,14 +75,14 @@ char const* pageSizeText(int size) */ static TQString pageSize() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("Fax"); return conf->readEntry("Page", pageSizeText(TDEGlobal::locale()->pageSize())); } static TQString stripNumber( const TQString& s ) { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup( "Personal" ); // removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools) @@ -193,7 +193,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa // unquote variables (they will be replaced with quoted values later) TQValueStack stack; - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); TQString cmd = s; @@ -426,7 +426,7 @@ void FaxCtrl::slotProcessExited(TDEProcess*) TQString FaxCtrl::faxCommand() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("System"); TQString sys = conf->readPathEntry("System", "efax"); TQString cmd; @@ -576,7 +576,7 @@ void FaxCtrl::addLog(const TQString& s, bool isTitle) TQString FaxCtrl::faxSystem() { - KConfig *conf = TDEGlobal::config(); + TDEConfig *conf = TDEGlobal::config(); conf->setGroup("System"); TQString s = conf->readEntry("System", "efax"); s[0] = s[0].upper(); diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 047b4cb3c..95266a95b 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -274,7 +274,7 @@ void KdeprintFax::slotKab() void KdeprintFax::addURL(KURL url) { TQString target; - if (KIO::NetAccess::download(url,target,this)) + if (TDEIO::NetAccess::download(url,target,this)) { m_files->insertItem(KMimeType::pixmapForURL(url,0,KIcon::Small),target); actionCollection()->action("file_remove")->setEnabled(true); -- cgit v1.2.1