Changeset View
Changeset View
Standalone View
Standalone View
components/shellprivate/interactiveconsole/interactiveconsole.cpp
| Show First 20 Lines • Show All 354 Lines • ▼ Show 20 Line(s) | 350 | { | |||
|---|---|---|---|---|---|
| 355 | } else { | 355 | } else { | ||
| 356 | m_editor->clear(); | 356 | m_editor->clear(); | ||
| 357 | m_editor->setEnabled(false); | 357 | m_editor->setEnabled(false); | ||
| 358 | 358 | | |||
| 359 | if (m_job) { | 359 | if (m_job) { | ||
| 360 | m_job.data()->kill(); | 360 | m_job.data()->kill(); | ||
| 361 | } | 361 | } | ||
| 362 | 362 | | |||
| 363 | m_job = KIO::get(url, KIO::Reload, KIO::HideProgressInfo); | 363 | auto job = KIO::get(url, KIO::Reload, KIO::HideProgressInfo); | ||
| 364 | connect(m_job.data(), SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(scriptFileDataRecvd(KIO::Job*,QByteArray))); | 364 | connect(job, &KIO::TransferJob::data, this, &InteractiveConsole::scriptFileDataRecvd); | ||
| 365 | connect(m_job.data(), &KJob::result, this, &InteractiveConsole::reenableEditor); | 365 | connect(job, &KJob::result, this, &InteractiveConsole::reenableEditor); | ||
| 366 | m_job = job; | ||||
| 366 | } | 367 | } | ||
| 367 | } | 368 | } | ||
| 368 | 369 | | |||
| 369 | void InteractiveConsole::populateTemplatesMenu() | 370 | void InteractiveConsole::populateTemplatesMenu() | ||
| 370 | { | 371 | { | ||
| 371 | m_snippetsMenu->clear(); | 372 | m_snippetsMenu->clear(); | ||
| 372 | 373 | | |||
| 373 | QMap<QString, KService::Ptr> sorted; | 374 | QMap<QString, KService::Ptr> sorted; | ||
| ▲ Show 20 Lines • Show All 116 Lines • ▼ Show 20 Line(s) | 490 | if (m_editorPart) { | |||
| 490 | m_editorPart->saveAs(url); | 491 | m_editorPart->saveAs(url); | ||
| 491 | } else { | 492 | } else { | ||
| 492 | m_editor->setEnabled(false); | 493 | m_editor->setEnabled(false); | ||
| 493 | 494 | | |||
| 494 | if (m_job) { | 495 | if (m_job) { | ||
| 495 | m_job.data()->kill(); | 496 | m_job.data()->kill(); | ||
| 496 | } | 497 | } | ||
| 497 | 498 | | |||
| 498 | m_job = KIO::put(url, -1, KIO::HideProgressInfo); | 499 | auto job = KIO::put(url, -1, KIO::HideProgressInfo); | ||
| 499 | connect(m_job.data(), SIGNAL(dataReq(KIO::Job*,QByteArray&)), this, SLOT(scriptFileDataReq(KIO::Job*,QByteArray&))); | 500 | connect(job, &KIO::TransferJob::dataReq, this, &InteractiveConsole::scriptFileDataReq); | ||
| 500 | connect(m_job.data(), &KJob::result, this, &InteractiveConsole::reenableEditor); | 501 | connect(job, &KJob::result, this, &InteractiveConsole::reenableEditor); | ||
| 502 | m_job = job; | ||||
| 501 | } | 503 | } | ||
| 502 | } | 504 | } | ||
| 503 | 505 | | |||
| 504 | void InteractiveConsole::scriptFileDataReq(KIO::Job *job, QByteArray &data) | 506 | void InteractiveConsole::scriptFileDataReq(KIO::Job *job, QByteArray &data) | ||
| 505 | { | 507 | { | ||
| 506 | Q_ASSERT(m_editor); | 508 | Q_ASSERT(m_editor); | ||
| 507 | 509 | | |||
| 508 | if (!m_job || m_job.data() != job) { | 510 | if (!m_job || m_job.data() != job) { | ||
| ▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines | |||||