diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/privacy | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/privacy')
| -rw-r--r-- | kcontrol/privacy/kprivacymanager.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/privacy/privacy.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index 257dc6e27..e8da79f48 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -110,9 +110,9 @@ bool KPrivacyManager::clearFormCompletion() const bool KPrivacyManager::clearWebCache() const { - KProcess process; + TDEProcess process; process << "kio_http_cache_cleaner" << "--clear-all"; - return process.start(KProcess::DontCare); + return process.start(TDEProcess::DontCare); } bool KPrivacyManager::clearRecentDocuments() const @@ -143,7 +143,7 @@ bool KPrivacyManager::clearWebHistory() bool KPrivacyManager::clearFavIcons() { - TQDir favIconDir(KGlobal::dirs()->saveLocation( "cache", "favicons/" )); + TQDir favIconDir(TDEGlobal::dirs()->saveLocation( "cache", "favicons/" )); favIconDir.setFilter( TQDir::Files ); TQStringList entries = favIconDir.entryList(); diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index bc25083a6..55b4246cb 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -311,7 +311,7 @@ extern "C" KDE_EXPORT KCModule *create_privacy(TQWidget *parent, const char * /*name*/) { - KGlobal::locale()->insertCatalogue("privacy"); + TDEGlobal::locale()->insertCatalogue("privacy"); return new Privacy(parent, "Privacy"); } } |