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 /kioslave/info | |
| 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/info')
| -rw-r--r-- | kioslave/info/info.cc | 16 | ||||
| -rw-r--r-- | kioslave/info/info.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc index f220da589..4af1f4c63 100644 --- a/kioslave/info/info.cc +++ b/kioslave/info/info.cc @@ -25,7 +25,7 @@ InfoProtocol::InfoProtocol( const TQCString &pool, const TQCString &app ) { kdDebug( 7108 ) << "InfoProtocol::InfoProtocol" << endl; - m_perl = KGlobal::dirs()->findExe( "perl" ); + m_perl = TDEGlobal::dirs()->findExe( "perl" ); m_infoScript = locate( "data", "kio_info/kde-info2html" ); m_infoConf = locate("data", "kio_info/kde-info2html.conf"); @@ -92,21 +92,21 @@ void InfoProtocol::get( const KURL& url ) // extract the path and node from url decodeURL( url ); - TQString path = KGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true); + TQString path = TDEGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true); int revindex = path.findRev('/'); path = path.left(revindex); - TQString cmd = KProcess::quote(m_perl); + TQString cmd = TDEProcess::quote(m_perl); cmd += " "; - cmd += KProcess::quote(m_infoScript); + cmd += TDEProcess::quote(m_infoScript); cmd += " "; - cmd += KProcess::quote(m_infoConf); + cmd += TDEProcess::quote(m_infoConf); cmd += " "; - cmd += KProcess::quote(path); + cmd += TDEProcess::quote(path); cmd += " "; - cmd += KProcess::quote(m_page); + cmd += TDEProcess::quote(m_page); cmd += " "; - cmd += KProcess::quote(m_node); + cmd += TDEProcess::quote(m_node); kdDebug( 7108 ) << "cmd: " << cmd << endl; diff --git a/kioslave/info/info.h b/kioslave/info/info.h index 20c142cf3..068546803 100644 --- a/kioslave/info/info.h +++ b/kioslave/info/info.h @@ -5,7 +5,7 @@ #include <kio/slavebase.h> -class KProcess; +class TDEProcess; class InfoProtocol : public KIO::SlaveBase { |