summaryrefslogtreecommitdiffstats
path: root/ktouch/src
diff options
context:
space:
mode:
Diffstat (limited to 'ktouch/src')
-rw-r--r--ktouch/src/ktouch.cpp10
-rw-r--r--ktouch/src/ktouch.h4
-rw-r--r--ktouch/src/ktouchcolorscheme.cpp8
-rw-r--r--ktouch/src/ktouchkeyboard.cpp16
-rw-r--r--ktouch/src/ktouchkeyboardwidget.cpp6
-rw-r--r--ktouch/src/ktouchlecture.cpp16
-rw-r--r--ktouch/src/ktouchstatisticsdata.cpp8
7 files changed, 34 insertions, 34 deletions
diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp
index d9ee9d9c..278ad3fe 100644
--- a/ktouch/src/ktouch.cpp
+++ b/ktouch/src/ktouch.cpp
@@ -420,9 +420,9 @@ void KTouch::trainingStatistics() {
void KTouch::optionsPreferences() {
trainingPause();
- if ( KConfigDialog::showDialog( "settings" ) ) return;
- // KConfigDialog didn't find an instance of this dialog, so lets create it :
- KConfigDialog* dialog = new KConfigDialog( this, "settings", Prefs::self() );
+ if ( TDEConfigDialog::showDialog( "settings" ) ) return;
+ // TDEConfigDialog didn't find an instance of this dialog, so lets create it :
+ TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", Prefs::self() );
m_pageGeneral = new KTouchPrefGeneralLayout(0, "General");
dialog->addPage(m_pageGeneral, i18n("General Options"), "style");
m_pageTraining = new KTouchPrefTrainingLayout(0, "Training");
@@ -542,7 +542,7 @@ void KTouch::resizeEvent(TQResizeEvent * event) {
// Will be called when this app is restored due to session management.
// This function only stored the temperary data of the last session. All permanent
// settings should be handled by the KTouchConfiguration object.
-void KTouch::readProperties(KConfig *config) {
+void KTouch::readProperties(TDEConfig *config) {
kdDebug() << "[KTouch::readProperties] Reading session data..." << endl;
// TODO : Session management rewrite
config->setGroup("TrainingState");
@@ -575,7 +575,7 @@ void KTouch::readProperties(KConfig *config) {
// ----------------------------------------------------------------------------
// Will be called when the app should save its state for session management purposes.
-void KTouch::saveProperties(KConfig *config) {
+void KTouch::saveProperties(TDEConfig *config) {
kdDebug() << "[KTouch::saveProperties] Saving session data..." << endl;
// We are going down because of session management (most likely because of
// KDE logout). Let's save the current status so that we can restore it
diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h
index 5a79450f..85697d59 100644
--- a/ktouch/src/ktouch.h
+++ b/ktouch/src/ktouch.h
@@ -121,9 +121,9 @@ class KTouch : public KMainWindow {
private:
// *** BEGIN - Session management ***
/// Will be called when this app is restored due to session management.
- void readProperties(KConfig *config);
+ void readProperties(TDEConfig *config);
/// Will be called when the app should save its state for session management purposes.
- void saveProperties(KConfig *config);
+ void saveProperties(TDEConfig *config);
// *** END - Session management ***
/// Initialises the program during a normal startup
diff --git a/ktouch/src/ktouchcolorscheme.cpp b/ktouch/src/ktouchcolorscheme.cpp
index 4104fe14..35def758 100644
--- a/ktouch/src/ktouchcolorscheme.cpp
+++ b/ktouch/src/ktouchcolorscheme.cpp
@@ -147,12 +147,12 @@ bool KTouchColorScheme::readList(TQWidget * window, const KURL& url) {
//kdDebug() << "[KTouchColorScheme::readList] " << endl;
//kdDebug() << " url = '" << url.url() << "'" << endl;
TQString tmp_file;
- bool result = KIO::NetAccess::download(url, tmp_file, window);
+ bool result = TDEIO::NetAccess::download(url, tmp_file, window);
if (result) {
// Ok, that was successful, try to parse the XML doc now
TQFile infile(tmp_file);
if ( !infile.open( IO_ReadOnly ) ) {
- KIO::NetAccess::removeTempFile(tmp_file);
+ TDEIO::NetAccess::removeTempFile(tmp_file);
return false; // Bugger it... couldn't open it...
}
TQDomDocument doc;
@@ -170,7 +170,7 @@ bool KTouchColorScheme::readList(TQWidget * window, const KURL& url) {
}
}
- KIO::NetAccess::removeTempFile(tmp_file);
+ TDEIO::NetAccess::removeTempFile(tmp_file);
return result;
}
@@ -211,7 +211,7 @@ bool KTouchColorScheme::writeList(TQWidget * window, const KURL& url) {
outfile.close();
// if we have a temporary file, we still need to upload it
if (temp) {
- KIO::NetAccess::upload(tmp_file, url, window);
+ TDEIO::NetAccess::upload(tmp_file, url, window);
delete temp;
}
return true;
diff --git a/ktouch/src/ktouchkeyboard.cpp b/ktouch/src/ktouchkeyboard.cpp
index 476a8502..8d9fd4b9 100644
--- a/ktouch/src/ktouchkeyboard.cpp
+++ b/ktouch/src/ktouchkeyboard.cpp
@@ -41,7 +41,7 @@ bool KTouchKeyboard::load(TQWidget * window, const KURL& url) {
TQString target;
bool result = false;
//kdDebug() << "[KTouchKeyboard::load] " << url << endl;
- if (KIO::NetAccess::download(url, target, window)) {
+ if (TDEIO::NetAccess::download(url, target, window)) {
// Ok, that was successful, store the lectureURL and read the file
TQFile infile(target);
if ( !infile.open( IO_ReadOnly ) )
@@ -49,7 +49,7 @@ bool KTouchKeyboard::load(TQWidget * window, const KURL& url) {
TQTextStream in( &infile );
result = read(in);
};
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
return result;
}
// ----------------------------------------------------------------------------
@@ -60,7 +60,7 @@ bool KTouchKeyboard::loadXML(TQWidget * window, const KURL& url) {
// File is only downloaded if not local, otherwise it's just opened
TQString target;
bool result = false;
- if (KIO::NetAccess::download(url, target, window)) {
+ if (TDEIO::NetAccess::download(url, target, window)) {
// Ok, that was successful, store the lectureURL and read the file
TQFile infile(target);
if ( !infile.open( IO_ReadOnly ) )
@@ -69,7 +69,7 @@ bool KTouchKeyboard::loadXML(TQWidget * window, const KURL& url) {
doc.setContent( &infile );
result = read(doc);
}
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
return result;
}
// ----------------------------------------------------------------------------
@@ -103,7 +103,7 @@ bool KTouchKeyboard::saveXML(TQWidget * window, const KURL& url) const {
outfile.close();
// if we have a temporary file, we still need to upload it
if (temp) {
- KIO::NetAccess::upload(tmpFile, url, window);
+ TDEIO::NetAccess::upload(tmpFile, url, window);
delete temp;
}
return true;
@@ -347,10 +347,10 @@ void KTouchKeyboard::updateConnections() {
bool KTouchKeyboard::loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg) {
TQString target;
- if (KIO::NetAccess::download(url, target, window)) {
+ if (TDEIO::NetAccess::download(url, target, window)) {
TQString msg;
bool result = readKeyboard(target, msg);
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
if (!result && errorMsg!=NULL)
*errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg;
return result;
@@ -401,7 +401,7 @@ void KTouchKeyboard::saveKeyboard(TQWidget * window, const KURL& url) {
}
if (temp) {
- KIO::NetAccess::upload(tmpFile, url, window);
+ TDEIO::NetAccess::upload(tmpFile, url, window);
temp->unlink();
delete temp;
}
diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp
index 99cc63cc..c5c1e88f 100644
--- a/ktouch/src/ktouchkeyboardwidget.cpp
+++ b/ktouch/src/ktouchkeyboardwidget.cpp
@@ -46,10 +46,10 @@ KTouchKeyboardWidget::KTouchKeyboardWidget(TQWidget *parent)
bool KTouchKeyboardWidget::loadKeyboard(TQWidget * window, const KURL& url, TQString* errorMsg) {
TQString target;
- if (KIO::NetAccess::download(url, target, window)) {
+ if (TDEIO::NetAccess::download(url, target, window)) {
TQString msg;
bool result = readKeyboard(target, msg);
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
if (!result && errorMsg!=NULL)
*errorMsg = i18n("Could not read the keyboard layout file '%1'. ").arg(url.url()) + msg;
return result;
@@ -100,7 +100,7 @@ void KTouchKeyboardWidget::saveKeyboard(TQWidget * window, const KURL& url) {
}
if (temp) {
- KIO::NetAccess::upload(tmpFile, url, window);
+ TDEIO::NetAccess::upload(tmpFile, url, window);
temp->unlink();
delete temp;
}
diff --git a/ktouch/src/ktouchlecture.cpp b/ktouch/src/ktouchlecture.cpp
index 610c583a..40a86007 100644
--- a/ktouch/src/ktouchlecture.cpp
+++ b/ktouch/src/ktouchlecture.cpp
@@ -27,17 +27,17 @@ bool KTouchLecture::load(TQWidget * window, const KURL& url) {
// File is only downloaded if not local, otherwise it's just opened
TQString target;
bool result = false;
- if (KIO::NetAccess::download(url, target, window)) {
+ if (TDEIO::NetAccess::download(url, target, window)) {
// Ok, that was successful, store the lectureURL and read the file
TQFile infile(target);
if ( !infile.open( IO_ReadOnly ) ) {
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
return false; // Bugger it... couldn't open it...
}
TQTextStream in( &infile );
result = readLecture(in);
};
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
return result;
}
// ----------------------------------------------------------------------------
@@ -47,18 +47,18 @@ bool KTouchLecture::loadXML(TQWidget * window, const KURL& url) {
// File is only downloaded if not local, otherwise it's just opened
TQString target;
bool result = false;
- if (KIO::NetAccess::download(url, target, window)) {
+ if (TDEIO::NetAccess::download(url, target, window)) {
// Ok, that was successful, store the lectureURL and read the file
TQFile infile(target);
if ( !infile.open( IO_ReadOnly ) ) {
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
return false; // Bugger it... couldn't open it...
}
TQDomDocument doc;
doc.setContent( &infile );
result = readLecture(doc);
}
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
return result;
}
// ----------------------------------------------------------------------------
@@ -92,7 +92,7 @@ bool KTouchLecture::saveXML(TQWidget * window, const KURL& url) const {
outfile.close();
// if we have a temporary file, we still need to upload it
if (temp) {
- KIO::NetAccess::upload(tmpFile, url, window);
+ TDEIO::NetAccess::upload(tmpFile, url, window);
delete temp;
}
return true;
@@ -270,7 +270,7 @@ bool KTouchLecture::save(TQWidget * window, const KURL& url) const {
outfile.close();
// if we have a temporary file, we still need to upload it
if (temp) {
- KIO::NetAccess::upload(tmpFile, url, window);
+ TDEIO::NetAccess::upload(tmpFile, url, window);
delete temp;
}
return true;
diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp
index 80c92bef..88171722 100644
--- a/ktouch/src/ktouchstatisticsdata.cpp
+++ b/ktouch/src/ktouchstatisticsdata.cpp
@@ -452,11 +452,11 @@ bool KTouchStatisticsData::read(TQWidget * window, const KURL& url) {
// File is only downloaded if not local, otherwise it's just opened
TQString target;
bool result = false;
- if (KIO::NetAccess::download(url, target, window)) {
+ if (TDEIO::NetAccess::download(url, target, window)) {
// Ok, that was successful, store the lectureURL and read the file
TQFile infile(target);
if ( !infile.open( IO_ReadOnly ) ) {
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
return false; // Bugger it... couldn't open it...
}
TQDomDocument doc;
@@ -471,7 +471,7 @@ bool KTouchStatisticsData::read(TQWidget * window, const KURL& url) {
#endif // COMPRESSED_XML_STATISTICS
result = readStats(doc);
}
- KIO::NetAccess::removeTempFile(target);
+ TDEIO::NetAccess::removeTempFile(target);
return result;
}
// ----------------------------------------------------------------------------
@@ -513,7 +513,7 @@ bool KTouchStatisticsData::write(TQWidget * window, const KURL& url) const {
// if we have a temporary file, we still need to upload it
if (temp) {
- KIO::NetAccess::upload(tmpFile, url, window);
+ TDEIO::NetAccess::upload(tmpFile, url, window);
delete temp;
}
return true;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 22:30:55 +0000