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 /kcontrol/background/bgrender.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/background/bgrender.cpp')
| -rw-r--r-- | kcontrol/background/bgrender.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 51d114582..2c3da199f 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -53,7 +53,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou m_State = 0; m_isBusyCursor = false; m_enableBusyCursor = false; - m_pDirs = KGlobal::dirs(); + m_pDirs = TDEGlobal::dirs(); m_rSize = m_Size = drawBackgroundPerScreen ? TDEApplication::desktop()->screenGeometry(screen).size() : TDEApplication::desktop()->geometry().size(); m_pProc = 0L; m_Tempfile = 0L; @@ -238,8 +238,8 @@ int KBackgroundRenderer::doBackground(bool quit) delete m_pProc; m_pProc = new KShellProcess; *m_pProc << file; - connect(m_pProc, TQT_SIGNAL(processExited(KProcess *)), - TQT_SLOT(slotBackgroundDone(KProcess *))); + connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)), + TQT_SLOT(slotBackgroundDone(TDEProcess *))); m_pProc->start(KShellProcess::NotifyOnExit); retval = Wait; break; @@ -741,7 +741,7 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP -void KBackgroundRenderer::slotBackgroundDone(KProcess *process) +void KBackgroundRenderer::slotBackgroundDone(TDEProcess *process) { Q_ASSERT(process == m_pProc); m_State |= BackgroundDone; |