diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/tdm | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/tdm')
| -rw-r--r-- | kcontrol/tdm/main.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/main.h | 2 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/tdm/tdm-users.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 8348a617b..13a0af19a 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -79,7 +79,7 @@ KURL *decodeImgDrop(TQDropEvent *e, TQWidget *wdg) KSimpleConfig *config; TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(TDMFactory::instance(), parent, name) + : TDECModule(TDMFactory::instance(), parent, name) , minshowuid(0) , maxshowuid(0) , updateOK(false) diff --git a/kcontrol/tdm/main.h b/kcontrol/tdm/main.h index d613f9c4e..dbfb936dc 100644 --- a/kcontrol/tdm/main.h +++ b/kcontrol/tdm/main.h @@ -36,7 +36,7 @@ class TDMUsersWidget; class TDMConvenienceWidget; class KBackground; -class TDModule : public KCModule +class TDModule : public TDECModule { Q_OBJECT diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index bcd7517aa..e549b38a1 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -431,7 +431,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) if(!url->isLocalFile()) { pixurl.setPath(TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/pics/" + url->fileName()); - KIO::NetAccess::copy(*url, pixurl, parentWidget()); + TDEIO::NetAccess::copy(*url, pixurl, parentWidget()); istmp = true; } else { pixurl = *url; @@ -440,7 +440,7 @@ void TDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) // By now url should be "file:/..." if (!setLogo(pixurl.path())) { - KIO::NetAccess::del(pixurl, parentWidget()); + TDEIO::NetAccess::del(pixurl, parentWidget()); TQString msg = i18n("There was an error loading the image:\n" "%1\n" "It will not be saved.") diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index 3be482a17..d2fbcf002 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -346,9 +346,9 @@ void TDMUsersWidget::userButtonDropEvent(TQDropEvent *e) KURL *url = decodeImgDrop(e, this); if (url) { TQString pixpath; - KIO::NetAccess::download(*url, pixpath, parentWidget()); + TDEIO::NetAccess::download(*url, pixpath, parentWidget()); changeUserPix( pixpath ); - KIO::NetAccess::removeTempFile(pixpath); + TDEIO::NetAccess::removeTempFile(pixpath); delete url; } } |