diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:24 -0600 |
| commit | c9f212164b08f3ff5b8f82c78361791da6ea5366 (patch) | |
| tree | d24f8609cb998ab5b023a59347592f05da7046ff /amarok/src/engine | |
| parent | 700293d44659f7b108533d99bcc3ce5c08d6c64e (diff) | |
| download | amarok-c9f212164b08f3ff5b8f82c78361791da6ea5366.tar.gz amarok-c9f212164b08f3ff5b8f82c78361791da6ea5366.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'amarok/src/engine')
| -rw-r--r-- | amarok/src/engine/xine/xine-engine.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/engine/yauap/yauap-engine.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp index ace6bef0..abca1e14 100644 --- a/amarok/src/engine/xine/xine-engine.cpp +++ b/amarok/src/engine/xine/xine-engine.cpp @@ -924,7 +924,7 @@ XineEngine::XineEventListener( void *p, const xine_event_t* xineEvent ) TQString msg = "%1 %2%"; msg = msg.arg( TQString::fromUtf8( pd->description ) ) - .arg( KGlobal::locale()->formatNumber( pd->percent, 0 ) ); + .arg( TDEGlobal::locale()->formatNumber( pd->percent, 0 ) ); TQCustomEvent *e = new TQCustomEvent( 3002 ); e->setData( new TQString( msg ) ); diff --git a/amarok/src/engine/yauap/yauap-engine.cpp b/amarok/src/engine/yauap/yauap-engine.cpp index b3e8f0cd..04c3b6fa 100644 --- a/amarok/src/engine/yauap/yauap-engine.cpp +++ b/amarok/src/engine/yauap/yauap-engine.cpp @@ -397,7 +397,7 @@ yauapEngine::initDbusConnection() helper.clearArguments(); helper << "yauap" << "-noexit"; - if( !helper.start(KProcess::NotifyOnExit, KProcess::All)) + if( !helper.start(TDEProcess::NotifyOnExit, TDEProcess::All)) { debug() << "could not start yauap " << endl; emit statusText( i18n( "could not start yauap" ) ); @@ -473,7 +473,7 @@ yauapEngine::init() m_state = Engine::Idle; - connect(&helper, TQT_SIGNAL(processExited(KProcess*)), TQT_SLOT(yauapProcessExited())); + connect(&helper, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(yauapProcessExited())); if (initDbusConnection()) return true; |