diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
| commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
| tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /kioslave/svn | |
| parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
| download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/svn')
| -rw-r--r-- | kioslave/svn/svnhelper/kio_svn_helper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp index 64258fd9..ec938c39 100644 --- a/kioslave/svn/svnhelper/kio_svn_helper.cpp +++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp @@ -124,7 +124,7 @@ SvnHelper::SvnHelper():TDEApplication() { ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); - KProcess *p = new KProcess; + TDEProcess *p = new TDEProcess; *p << "kompare" << "-n" << "-o" << tmp->name(); p->start(); } else { //else do it with message box @@ -278,7 +278,7 @@ int main(int argc, char **argv) { TDECmdLineArgs::init(argc, argv, "kio_svn_helper", I18N_NOOP("Subversion Helper"), "TDE frontend for SVN", "0.1"); TDECmdLineArgs::addCmdLineOptions( options ); - KGlobal::locale()->setMainCatalogue("kio_svn"); + TDEGlobal::locale()->setMainCatalogue("kio_svn"); TDEApplication::addCmdLineOptions(); if ( TDECmdLineArgs::parsedArgs()->count()==0 ) |