From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kcontrol/konqhtml/pluginopts.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kcontrol/konqhtml/pluginopts.cpp') diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 221b2f9ed..c78a63eec 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -292,7 +292,7 @@ void KPluginOptions::scan() } m_nspluginscan = new KProcIO; - TQString scanExe = KGlobal::dirs()->findExe("nspluginscan"); + TQString scanExe = TDEGlobal::dirs()->findExe("nspluginscan"); if (!scanExe) { kdDebug() << "can't find nspluginviewer" << endl; delete m_nspluginscan; @@ -314,7 +314,7 @@ void KPluginOptions::scan() kdDebug() << "Running nspluginscan" << endl; connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(progress(KProcIO*))); - connect(m_nspluginscan, TQT_SIGNAL(processExited(KProcess *)), + connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(scanDone())); connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone())); -- cgit v1.2.1