summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/common/global/generic_config.cpp4
-rw-r--r--src/common/global/purl.cpp8
-rw-r--r--src/common/gui/pfile_ext.cpp10
-rw-r--r--src/common/gui/purl_ext.cpp20
-rw-r--r--src/libgui/likeback.cpp6
-rw-r--r--src/libgui/likeback.h6
-rw-r--r--src/libgui/project.cpp2
-rw-r--r--src/libgui/toplevel.cpp2
8 files changed, 29 insertions, 29 deletions
diff --git a/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp
index 6b50ff0..9d951aa 100644
--- a/src/common/global/generic_config.cpp
+++ b/src/common/global/generic_config.cpp
@@ -26,8 +26,8 @@ class GenericConfigPrivate
public:
GenericConfigPrivate(const TQString &group) : _group(group) {}
~GenericConfigPrivate() { kapp->config()->sync(); }
- KConfig &config() {
- KConfig *conf = kapp->config();
+ TDEConfig &config() {
+ TDEConfig *conf = kapp->config();
conf->setGroup(_group);
return *conf;
}
diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp
index c9ff16d..29da212 100644
--- a/src/common/global/purl.cpp
+++ b/src/common/global/purl.cpp
@@ -274,14 +274,14 @@ bool PURL::Base::exists(TQDateTime *lastModified) const
if ( _url.protocol()=="http" ) return httpUrlExists();
#if !defined(NO_KDE)
if (lastModified) {
- KIO::UDSEntry uds;
- if ( !KIO::NetAccess::stat(_url, uds, tqApp->mainWidget()) ) return false;
+ TDEIO::UDSEntry uds;
+ if ( !TDEIO::NetAccess::stat(_url, uds, tqApp->mainWidget()) ) return false;
KFileItem item(uds, _url);
- lastModified->setTime_t(item.time(KIO::UDS_MODIFICATION_TIME));
+ lastModified->setTime_t(item.time(TDEIO::UDS_MODIFICATION_TIME));
return true;
} else {
// assume file exists if ioslave cannot tell...
- return KIO::NetAccess::exists(_url, true, tqApp->mainWidget());
+ return TDEIO::NetAccess::exists(_url, true, tqApp->mainWidget());
}
#else
if (lastModified) lastModified->setTime_t(0);
diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp
index 080421f..f15baf8 100644
--- a/src/common/gui/pfile_ext.cpp
+++ b/src/common/gui/pfile_ext.cpp
@@ -34,13 +34,13 @@ bool PURL::File::close()
else _file->close();
bool ok = (_tmp ? _tmp->status() : _file->status())==IO_Ok;
if ( !_file->name().isEmpty() ) {
- KIO::NetAccess::removeTempFile(_file->name());
+ TDEIO::NetAccess::removeTempFile(_file->name());
_file->setName(TQString());
}
delete _stream;
_stream = 0;
- if ( ok && _tmp && !_url.isEmpty() && !KIO::NetAccess::upload(_tmp->name(), _url.kurl(), tqApp->mainWidget()) ) {
- _error = KIO::NetAccess::lastErrorString();
+ if ( ok && _tmp && !_url.isEmpty() && !TDEIO::NetAccess::upload(_tmp->name(), _url.kurl(), tqApp->mainWidget()) ) {
+ _error = TDEIO::NetAccess::lastErrorString();
ok = false;
_log.sorry(i18n("Could not save file."), errorString());
}
@@ -53,8 +53,8 @@ bool PURL::File::openForRead()
{
close();
TQString tmp;
- if ( !KIO::NetAccess::download(_url.kurl(), tmp, tqApp->mainWidget()) ) {
- _error = KIO::NetAccess::lastErrorString();
+ if ( !TDEIO::NetAccess::download(_url.kurl(), tmp, tqApp->mainWidget()) ) {
+ _error = TDEIO::NetAccess::lastErrorString();
_log.sorry(i18n("Could not open file for reading."), errorString());
return false;
}
diff --git a/src/common/gui/purl_ext.cpp b/src/common/gui/purl_ext.cpp
index df657a7..8e4a255 100644
--- a/src/common/gui/purl_ext.cpp
+++ b/src/common/gui/purl_ext.cpp
@@ -27,8 +27,8 @@ bool PURL::Url::copyTo(const Url &destination, Log::Generic &log) const
// }
//#else
// do not overwrite
- bool ok = KIO::NetAccess::file_copy(_url, destination._url, -1, false, false, tqApp->mainWidget());
- if ( !ok ) log.sorry(i18n("Could not copy file"), KIO::NetAccess::lastErrorString());
+ bool ok = TDEIO::NetAccess::file_copy(_url, destination._url, -1, false, false, tqApp->mainWidget());
+ if ( !ok ) log.sorry(i18n("Could not copy file"), TDEIO::NetAccess::lastErrorString());
return ok;
//#endif
}
@@ -44,12 +44,12 @@ bool PURL::Url::create(Log::Generic &log) const
// }
//#else
// assume file do no exist if ioslave cannot tell...
- if ( KIO::NetAccess::exists(_url, false, tqApp->mainWidget()) ) return true;
+ if ( TDEIO::NetAccess::exists(_url, false, tqApp->mainWidget()) ) return true;
KTempFile tmp;
tmp.setAutoDelete(true);
// do not overwrite
- bool ok = KIO::NetAccess::file_copy(tmp.name(), _url, -1, false, false, tqApp->mainWidget());
- if ( !ok ) log.sorry(i18n("Could not create file"), KIO::NetAccess::lastErrorString());
+ bool ok = TDEIO::NetAccess::file_copy(tmp.name(), _url, -1, false, false, tqApp->mainWidget());
+ if ( !ok ) log.sorry(i18n("Could not create file"), TDEIO::NetAccess::lastErrorString());
//#endif
return ok;
}
@@ -71,8 +71,8 @@ bool PURL::Url::del(Log::Generic &log) const
// return false;
// }
//#else
- bool ok = KIO::NetAccess::del(_url, tqApp->mainWidget());
- if ( !ok ) log.sorry(i18n("Could not delete file."), KIO::NetAccess::lastErrorString());
+ bool ok = TDEIO::NetAccess::del(_url, tqApp->mainWidget());
+ if ( !ok ) log.sorry(i18n("Could not delete file."), TDEIO::NetAccess::lastErrorString());
return ok;
//#endif
}
@@ -103,9 +103,9 @@ bool PURL::Directory::create(Log::Generic &log) const
// }
//#else
// assume dir do no exist if ioslave cannot tell...
- if ( KIO::NetAccess::exists(_url, false, tqApp->mainWidget()) ) return true;
- bool ok = KIO::NetAccess::mkdir(_url, tqApp->mainWidget());
- if ( !ok ) log.sorry(i18n("Could not create directory"), KIO::NetAccess::lastErrorString());
+ if ( TDEIO::NetAccess::exists(_url, false, tqApp->mainWidget()) ) return true;
+ bool ok = TDEIO::NetAccess::mkdir(_url, tqApp->mainWidget());
+ if ( !ok ) log.sorry(i18n("Could not create directory"), TDEIO::NetAccess::lastErrorString());
//#endif
return ok;
}
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index d5af677..db22241 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -195,7 +195,7 @@ TQString LikeBack::s_remotePath = TQString();
TQ_UINT16 LikeBack::s_hostPort = 16;
int LikeBack::s_disabledCount = 0;
LikeBack* LikeBack::s_instance = 0;
-KConfig* LikeBack::s_config = 0;
+TDEConfig* LikeBack::s_config = 0;
TDEAboutData* LikeBack::s_about = 0;
LikeBack* LikeBack::instance()
@@ -415,7 +415,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version)
theVersion.find("cvs", /*index=*/0, /*caseSensitive=*/false) != -1;
}
-void LikeBack::init(KConfig* config, TDEAboutData* about, Button buttons)
+void LikeBack::init(TDEConfig* config, TDEAboutData* about, Button buttons)
{
s_config = config;
s_about = about;
@@ -473,7 +473,7 @@ void LikeBack::endFetchingEmailFrom()
// m_configureEmail->setEnabled(true);
// ### KDE4: why oh why is KEmailSettings in kio?
- KConfig emailConf( TQString::fromLatin1("emaildefaults") );
+ TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
// find out the default profile
emailConf.setGroup(TQString::fromLatin1("Defaults"));
diff --git a/src/libgui/likeback.h b/src/libgui/likeback.h
index fa1e260..7c54e4e 100644
--- a/src/libgui/likeback.h
+++ b/src/libgui/likeback.h
@@ -27,7 +27,7 @@ class TQTextEdit;
class TQToolButton;
class TQPushButton;
class TDEProcess;
-class KConfig;
+class TDEConfig;
class TDEAboutData;
/**
@@ -64,7 +64,7 @@ class LikeBack : public TQWidget
static bool isDevelopmentVersion(const TQString &version = TQString()); /// << @Returns true if version is an alpha/beta/rc/svn/cvs version. Use kapp->aboutData()->version is @p version is empty
static void init(Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if the application version is a development one.
static void init(bool isDevelopmentVersion, Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if @p isDevelopmentVersion is true.
- static void init(KConfig* config, TDEAboutData* about, Button buttons = AllButtons);
+ static void init(TDEConfig* config, TDEAboutData* about, Button buttons = AllButtons);
static TQString activeWindowPath();
static TDEAboutData* about();
public slots:
@@ -96,7 +96,7 @@ class LikeBack : public TQWidget
static WindowListing s_windowListing;
static LikeBack *s_instance;
static int s_disabledCount;
- static KConfig *s_config;
+ static TDEConfig *s_config;
static TDEAboutData *s_about;
};
diff --git a/src/libgui/project.cpp b/src/libgui/project.cpp
index c7a043f..d318438 100644
--- a/src/libgui/project.cpp
+++ b/src/libgui/project.cpp
@@ -27,7 +27,7 @@ bool Project::load(TQString &error)
PURL::Url tmp = _url;
_url = _url.toFileType(PURL::Project);
if ( _url.exists() && XmlDataFile::load(error) ) return true;
- KConfig *config = new KSimpleConfig(tmp.filepath(), false);
+ TDEConfig *config = new KSimpleConfig(tmp.filepath(), false);
config->setGroup("Files");
TQStringList list = config->readListEntry("inputFiles");
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index a9ac10e..c9c64da 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -976,7 +976,7 @@ void MainWindow::showProgress(bool show)
void MainWindow::setTotalProgress(uint nb)
{
- //KIO::Job *job = new KIO::SimpleJob(KURL(), 0, 0, false);
+ //TDEIO::Job *job = new TDEIO::SimpleJob(KURL(), 0, 0, false);
//int id = Observer::self()->newJob(job, true);
//Observer::self()->slotTotalSize(job, total);
//Observer::self()->slotInfoMessage(job, "test");
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-31 14:02:31 +0000