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/media/medianotifier | |
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/media/medianotifier')
-rw-r--r-- | kioslave/media/medianotifier/medianotifier.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp index d02f1c4b5..94ee0e8c2 100644 --- a/kioslave/media/medianotifier/medianotifier.cpp +++ b/kioslave/media/medianotifier/medianotifier.cpp @@ -199,7 +199,7 @@ bool MediaNotifier::execAutorun( const KFileItem &medium, const TQString &path, // confirmed its execution the autostart file MUST be executed // with the current working directory ( CWD ) set to the root // directory of the medium. - KProcess proc; + TDEProcess proc; proc << "sh" << autorunFile; proc.setWorkingDirectory( path ); proc.start(); @@ -313,7 +313,7 @@ extern "C" { KDE_EXPORT KDEDModule *create_medianotifier(const TQCString &name) { - KGlobal::locale()->insertCatalogue("kay"); + TDEGlobal::locale()->insertCatalogue("kay"); return new MediaNotifier(name); } } |