diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/ebrowsing | |
| 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/ebrowsing')
3 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index 586f947ff..f2e7fb20e 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -50,7 +50,7 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); // Data init - TQStringList charsets = KGlobal::charsets()->availableEncodingNames(); + TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames(); charsets.prepend(i18n("Default")); m_dlg->cbCharset->insertStringList(charsets); diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index 14626580e..8b6da2a99 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -82,11 +82,11 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const m_fullname = TQString::null; - KProcess proc; + TDEProcess proc; proc << helper << host; - connect( &proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), - TQT_SLOT(receiveOutput(KProcess *, char *, int)) ); - if( !proc.start( KProcess::NotifyOnExit, KProcess::Stdout )) + connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) ); + if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout )) return last_result = false; last_host = host; @@ -101,7 +101,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const return last_result; } -void LocalDomainURIFilter::receiveOutput( KProcess *, char *buf, int ) +void LocalDomainURIFilter::receiveOutput( TDEProcess *, char *buf, int ) { m_fullname = TQFile::decodeName( buf ); } diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h index b5154cbc6..9d0c5f26d 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.h @@ -29,7 +29,7 @@ #include <tqregexp.h> class TDEInstance; -class KProcess; +class TDEProcess; /* This filter takes care of hostnames in the local search domain. @@ -59,7 +59,7 @@ class LocalDomainURIFilter : public KURIFilterPlugin, public DCOPObject TQRegExp m_hostPortPattern; private slots: - void receiveOutput( KProcess *, char *, int ); + void receiveOutput( TDEProcess *, char *, int ); }; #endif |