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 /kioslave/cgi | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/cgi')
| -rw-r--r-- | kioslave/cgi/cgi.cpp | 2 | ||||
| -rw-r--r-- | kioslave/cgi/cgi.h | 2 | ||||
| -rw-r--r-- | kioslave/cgi/kcmcgi/kcmcgi.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp index 0181c066a..e527c2db4 100644 --- a/kioslave/cgi/cgi.cpp +++ b/kioslave/cgi/cgi.cpp @@ -156,7 +156,7 @@ void CgiProtocol::get( const KURL& url ) } else { kdDebug(7124) << "Cmd: " << cmd << endl; - fd = popen( TQFile::encodeName(KProcess::quote( cmd )).data(), "r" ); + fd = popen( TQFile::encodeName(TDEProcess::quote( cmd )).data(), "r" ); if ( !fd ) { kdDebug(7124) << "Error running '" << cmd << "'" << endl; diff --git a/kioslave/cgi/cgi.h b/kioslave/cgi/cgi.h index fbfba7a91..908b6bc99 100644 --- a/kioslave/cgi/cgi.h +++ b/kioslave/cgi/cgi.h @@ -22,7 +22,7 @@ #include <kio/slavebase.h> -class KProcess; +class TDEProcess; /*! This class implements an ioslave for viewing CGI script output without the diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp index 9c8a8df5e..a5c0181c5 100644 --- a/kioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp @@ -35,7 +35,7 @@ extern "C" { KDE_EXPORT KCModule *create_cgi( TQWidget *parent, const char * ) { - KGlobal::locale()->insertCatalogue("kcmcgi"); + TDEGlobal::locale()->insertCatalogue("kcmcgi"); return new KCMCgi( parent, "kcmcgi" ); } } |