diff options
Diffstat (limited to 'kalarm/alarmcalendar.cpp')
-rw-r--r-- | kalarm/alarmcalendar.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index f17cd7495..1e64b046b 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -90,7 +90,7 @@ AlarmCalendar* AlarmCalendar::mCalendars[NCALS] = { 0, 0, 0, 0 }; */ bool AlarmCalendar::initialiseCalendars() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup(TQString::fromLatin1("General")); TQString activeKey = TQString::fromLatin1("Calendar"); TQString expiredKey = TQString::fromLatin1("ExpiredCalendar"); @@ -150,7 +150,7 @@ bool AlarmCalendar::initialiseCalendars() * Create an alarm calendar instance. * If 'configKey' is non-null, the calendar will be converted to ICal format. */ -AlarmCalendar* AlarmCalendar::createCalendar(CalID type, KConfig* config, TQString& writePath, const TQString& configKey) +AlarmCalendar* AlarmCalendar::createCalendar(CalID type, TDEConfig* config, TQString& writePath, const TQString& configKey) { static TQRegExp vcsRegExp(TQString::fromLatin1("\\.vcs$")); static TQString ical = TQString::fromLatin1(".ics"); @@ -266,7 +266,7 @@ bool AlarmCalendar::open() // Check for file's existence, assuming that it does exist when uncertain, // to avoid overwriting it. - if (!KIO::NetAccess::exists(mUrl, true, MainWindow::mainMainWindow())) + if (!TDEIO::NetAccess::exists(mUrl, true, MainWindow::mainMainWindow())) { // The calendar file doesn't yet exist, so create it if (create()) @@ -318,7 +318,7 @@ int AlarmCalendar::load() kdDebug(5950) << "AlarmCalendar::load(): " << mUrl.prettyURL() << endl; TQString tmpFile; - if (!KIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow())) + if (!TDEIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::load(): Load failure" << endl; KMessageBox::error(0, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL())); @@ -331,9 +331,9 @@ int AlarmCalendar::load() if (!loaded) { // Check if the file is zero length - KIO::NetAccess::removeTempFile(tmpFile); - KIO::UDSEntry uds; - KIO::NetAccess::stat(mUrl, uds, MainWindow::mainMainWindow()); + TDEIO::NetAccess::removeTempFile(tmpFile); + TDEIO::UDSEntry uds; + TDEIO::NetAccess::stat(mUrl, uds, MainWindow::mainMainWindow()); KFileItem fi(uds, mUrl); if (!fi.size()) return 0; // file is zero length @@ -346,7 +346,7 @@ int AlarmCalendar::load() return -1; } if (!mLocalFile.isEmpty()) - KIO::NetAccess::removeTempFile(mLocalFile); // removes it only if it IS a temporary file + TDEIO::NetAccess::removeTempFile(mLocalFile); // removes it only if it IS a temporary file mLocalFile = tmpFile; CalendarCompat::fix(*mCalendar, mLocalFile); // convert events to current KAlarm format for when calendar is saved @@ -389,7 +389,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!mICalUrl.isLocalFile()) { - if (!KIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow())) + if (!TDEIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed.\n"; KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL())); @@ -403,7 +403,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) // Save the change in the config file. if (!mConfigKey.isNull()) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup(TQString::fromLatin1("General")); config->writePathEntry(mConfigKey, mICalUrl.path()); config->sync(); @@ -424,7 +424,7 @@ void AlarmCalendar::close() { if (!mLocalFile.isEmpty()) { - KIO::NetAccess::removeTempFile(mLocalFile); // removes it only if it IS a temporary file + TDEIO::NetAccess::removeTempFile(mLocalFile); // removes it only if it IS a temporary file mLocalFile = ""; } if (mCalendar) @@ -474,7 +474,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) } else { - if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow())) + if (!TDEIO::NetAccess::download(url, filename, MainWindow::mainMainWindow())) { kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl; KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL())); @@ -561,7 +561,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent) templat->saveCal(); } if (!local) - KIO::NetAccess::removeTempFile(filename); + TDEIO::NetAccess::removeTempFile(filename); return success; } @@ -615,7 +615,7 @@ void AlarmCalendar::convertToICal() { if (!mConfigKey.isNull()) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup(TQString::fromLatin1("General")); config->writePathEntry(mConfigKey, mICalUrl.path()); config->sync(); |