Changeset View
Changeset View
Standalone View
Standalone View
addons/textfilter/plugin_katetextfilter.cpp
Show First 20 Lines • Show All 198 Lines • ▼ Show 20 Line(s) | |||||
199 | { | 199 | { | ||
200 | m_strFilterOutput.clear(); | 200 | m_strFilterOutput.clear(); | ||
201 | m_stderrOutput.clear(); | 201 | m_stderrOutput.clear(); | ||
202 | 202 | | |||
203 | if (!m_pFilterProcess) | 203 | if (!m_pFilterProcess) | ||
204 | { | 204 | { | ||
205 | m_pFilterProcess = new KProcess; | 205 | m_pFilterProcess = new KProcess; | ||
206 | 206 | | |||
207 | connect (m_pFilterProcess, SIGNAL(readyReadStandardOutput()), | 207 | connect(m_pFilterProcess, &KProcess::readyReadStandardOutput, this, &PluginKateTextFilter::slotFilterReceivedStdout); | ||
208 | this, SLOT(slotFilterReceivedStdout())); | | |||
209 | 208 | | |||
210 | connect (m_pFilterProcess, SIGNAL(readyReadStandardError()), | 209 | connect(m_pFilterProcess, &KProcess::readyReadStandardError, this, &PluginKateTextFilter::slotFilterReceivedStderr); | ||
211 | this, SLOT(slotFilterReceivedStderr())); | | |||
212 | 210 | | |||
213 | connect (m_pFilterProcess, SIGNAL(finished(int,QProcess::ExitStatus)), | 211 | connect(m_pFilterProcess, static_cast<void (KProcess::*)(int, KProcess::ExitStatus)>(&KProcess::finished), this, &PluginKateTextFilter::slotFilterProcessExited); | ||
214 | this, SLOT(slotFilterProcessExited(int,QProcess::ExitStatus))); | | |||
215 | } | 212 | } | ||
216 | m_pFilterProcess->setOutputChannelMode( | 213 | m_pFilterProcess->setOutputChannelMode( | ||
217 | mergeOutput ? KProcess::MergedChannels : KProcess::SeparateChannels | 214 | mergeOutput ? KProcess::MergedChannels : KProcess::SeparateChannels | ||
218 | ); | 215 | ); | ||
219 | 216 | | |||
220 | slipInFilter(*m_pFilterProcess, *kv, filter); | 217 | slipInFilter(*m_pFilterProcess, *kv, filter); | ||
221 | } | 218 | } | ||
222 | 219 | | |||
Show All 37 Lines | 256 | { | |||
260 | // setup right xml gui data | 257 | // setup right xml gui data | ||
261 | KXMLGUIClient::setComponentName(QStringLiteral("textfilter"), i18n("Text Filter")); | 258 | KXMLGUIClient::setComponentName(QStringLiteral("textfilter"), i18n("Text Filter")); | ||
262 | setXMLFile(QStringLiteral("ui.rc")); | 259 | setXMLFile(QStringLiteral("ui.rc")); | ||
263 | 260 | | |||
264 | // create our one and only action | 261 | // create our one and only action | ||
265 | QAction* a = actionCollection()->addAction(QStringLiteral("edit_filter")); | 262 | QAction* a = actionCollection()->addAction(QStringLiteral("edit_filter")); | ||
266 | a->setText(i18n("Filter Te&xt...")); | 263 | a->setText(i18n("Filter Te&xt...")); | ||
267 | actionCollection()->setDefaultShortcut(a, Qt::CTRL + Qt::Key_Backslash); | 264 | actionCollection()->setDefaultShortcut(a, Qt::CTRL + Qt::Key_Backslash); | ||
268 | connect(a, SIGNAL(triggered(bool)), plugin, SLOT(slotEditFilter())); | 265 | connect(a, &QAction::triggered, plugin, &PluginKateTextFilter::slotEditFilter); | ||
269 | 266 | | |||
270 | // register us at the UI | 267 | // register us at the UI | ||
271 | mainwindow->guiFactory()->addClient(this); | 268 | mainwindow->guiFactory()->addClient(this); | ||
272 | } | 269 | } | ||
273 | 270 | | |||
274 | PluginViewKateTextFilter::~PluginViewKateTextFilter() | 271 | PluginViewKateTextFilter::~PluginViewKateTextFilter() | ||
275 | { | 272 | { | ||
276 | // remove us from the UI again | 273 | // remove us from the UI again | ||
277 | m_mainWindow->guiFactory()->removeClient (this); | 274 | m_mainWindow->guiFactory()->removeClient (this); | ||
278 | } | 275 | } | ||
279 | 276 | | |||
280 | // required for TextFilterPluginFactory vtable | 277 | // required for TextFilterPluginFactory vtable | ||
281 | #include "plugin_katetextfilter.moc" | 278 | #include "plugin_katetextfilter.moc" |