diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kdepasswd | |
| 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 'kdepasswd')
| -rw-r--r-- | kdepasswd/kcm/chfacedlg.cpp | 2 | ||||
| -rw-r--r-- | kdepasswd/kcm/main.cpp | 10 | ||||
| -rw-r--r-- | kdepasswd/kcm/main.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kdepasswd/kcm/chfacedlg.cpp b/kdepasswd/kcm/chfacedlg.cpp index 8344164db..512b7e55f 100644 --- a/kdepasswd/kcm/chfacedlg.cpp +++ b/kdepasswd/kcm/chfacedlg.cpp @@ -45,7 +45,7 @@ #include <kurl.h> #include "chfacedlg.h" -#include "settings.h" // KConfigXT +#include "settings.h" // TDEConfigXT diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index fc58dcea7..bc763243d 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_useraccount, Factory("useraccount") ) KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name, const TQStringList &) - : KCModule( parent, name) + : TDECModule( parent, name) { TQVBoxLayout *topLayout = new TQVBoxLayout(this); _mw = new MainWidget(this); @@ -192,13 +192,13 @@ void KCMUserAccount::load() _mw->btnChangeFace->setPixmap( _facePixmap ); } - KCModule::load(); /* KConfigXT */ + TDECModule::load(); /* TDEConfigXT */ } void KCMUserAccount::save() { - KCModule::save(); /* KConfigXT */ + TDECModule::save(); /* TDEConfigXT */ /* Save KDE's homebrewn settings */ _kes->setSetting( KEMailSettings::RealName, _mw->leRealname->text() ); @@ -305,9 +305,9 @@ bool KCMUserAccount::eventFilter(TQObject *, TQEvent *e) if (url) { TQString pixPath; - KIO::NetAccess::download(*url, pixPath, this); + TDEIO::NetAccess::download(*url, pixPath, this); changeFace( TQPixmap( pixPath ) ); - KIO::NetAccess::removeTempFile(pixPath); + TDEIO::NetAccess::removeTempFile(pixPath); delete url; } return true; diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h index 4ca6c77f9..a2b8b5ba9 100644 --- a/kdepasswd/kcm/main.h +++ b/kdepasswd/kcm/main.h @@ -34,7 +34,7 @@ class Config; /** * Please see the README */ -class KCMUserAccount : public KCModule +class KCMUserAccount : public TDECModule { Q_OBJECT |