diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
commit | f8069e2ea048f2657cc417d83820576ec55c181b (patch) | |
tree | cbc5bf540866934a91e0f33b260fc7a25e191fad /kapptemplate | |
parent | e6aaa3624cc6179b82a9bfff1760e742a669064c (diff) | |
download | tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kapptemplate')
-rw-r--r-- | kapptemplate/ChangeLog | 2 | ||||
-rw-r--r-- | kapptemplate/kapp/app.cpp | 8 | ||||
-rw-r--r-- | kapptemplate/kapp/app.h | 6 | ||||
-rw-r--r-- | kapptemplate/kpartapp/app.cpp | 4 | ||||
-rw-r--r-- | kapptemplate/kpartapp/app.h | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/kapptemplate/ChangeLog b/kapptemplate/ChangeLog index 8cb9b55a..e1cde76a 100644 --- a/kapptemplate/ChangeLog +++ b/kapptemplate/ChangeLog @@ -26,7 +26,7 @@ Jul-30-2001 - Kurt Granroth Jul-06-2001 - Kurt Granroth o Fixed 'configure toolbar' in part app template - o KIONetAccess is now (and has been for some time) KIO::NetAccess + o KIONetAccess is now (and has been for some time) TDEIO::NetAccess Jul-05-2001 - Kurt Granroth (v1.0.6) o KPartApp's part should be in it's own directory. Did it ever work diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index f7888c47..7f69e8e8 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -72,7 +72,7 @@ void ${APP_NAME}::load(const KURL& url) #if 0 // download the contents - if (KIO::NetAccess::download(url, target)) + if (TDEIO::NetAccess::download(url, target)) { // set our caption setCaption(url.prettyURL()); @@ -81,7 +81,7 @@ void ${APP_NAME}::load(const KURL& url) loadFile(target); // and remove the temp file - KIO::NetAccess::removeTempFile(target); + TDEIO::NetAccess::removeTempFile(target); } #endif @@ -107,7 +107,7 @@ void ${APP_NAME}::setupActions() actionCollection(), "custom_action"); } -void ${APP_NAME}::saveProperties(KConfig *config) +void ${APP_NAME}::saveProperties(TDEConfig *config) { // the 'config' object points to the session managed // config file. anything you write here will be available @@ -122,7 +122,7 @@ void ${APP_NAME}::saveProperties(KConfig *config) } } -void ${APP_NAME}::readProperties(KConfig *config) +void ${APP_NAME}::readProperties(TDEConfig *config) { // the 'config' object points to the session managed // config file. this function is automatically called whenever diff --git a/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h index 170b431e..7c80c0f2 100644 --- a/kapptemplate/kapp/app.h +++ b/kapptemplate/kapp/app.h @@ -55,14 +55,14 @@ protected: * This function is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This function is called when this app is restored. The KConfig + * This function is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); private slots: diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index d62e0883..77beb4fc 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -91,14 +91,14 @@ void ${APP_NAME}::setupActions() KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } -void ${APP_NAME}::saveProperties(KConfig* /*config*/) +void ${APP_NAME}::saveProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored } -void ${APP_NAME}::readProperties(KConfig* /*config*/) +void ${APP_NAME}::readProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. this function is automatically called whenever diff --git a/kapptemplate/kpartapp/app.h b/kapptemplate/kpartapp/app.h index 0310dd81..deb38136 100644 --- a/kapptemplate/kpartapp/app.h +++ b/kapptemplate/kpartapp/app.h @@ -43,14 +43,14 @@ protected: * This method is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This method is called when this app is restored. The KConfig + * This method is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); private slots: void fileNew(); |