diff --git a/konsole/TEPty.cpp b/konsole/TEPty.cpp index eb357769..b2159fe0 100644 --- a/konsole/TEPty.cpp +++ b/konsole/TEPty.cpp @@ -194,7 +194,7 @@ void TEPty::send_string(const char* s) void TEPty::writeReady() { - pendingSendJobs.remove(pendingSendJobs.begin()); + pendingSendJobs.erase(pendingSendJobs.begin()); m_bufferFull = false; doSendJobs(); } diff --git a/konsole/TEWidget.cpp b/konsole/TEWidget.cpp index 0084e012..4189d002 100644 --- a/konsole/TEWidget.cpp +++ b/konsole/TEWidget.cpp @@ -2134,7 +2134,7 @@ void TEWidget::styleChange(QStyle &) void TEWidget::dragEnterEvent(QDragEnterEvent* e) { - e->accept(Q3TextDrag::canDecode(e) || + e->setAccepted(Q3TextDrag::canDecode(e) || K3URLDrag::canDecode(e)); } diff --git a/konsole/konsole.cpp b/konsole/konsole.cpp index 69c19ebb..de108816 100644 --- a/konsole/konsole.cpp +++ b/konsole/konsole.cpp @@ -2277,7 +2277,7 @@ void Konsole::enterURL(const QString& URL, const QString&) KRun::shellQuote(newtext); te->emitText("cd "+newtext+"\r"); } - else if (URL.contains("://", true)) { + else if (URL.contains("://")) { KUrl u(URL); newtext = u.protocol(); bool isSSH = (newtext == "ssh"); diff --git a/settings/schemaeditor.cpp b/settings/schemaeditor.cpp index 19c8a301..87311bdb 100644 --- a/settings/schemaeditor.cpp +++ b/settings/schemaeditor.cpp @@ -419,21 +419,21 @@ void SchemaEditor::saveCurrent() scol.sprintf("color %2d %3d %3d %3d %2d %1d # %s", i, color[i].red(), color[i].green(), color[i].blue(), transparent[i], bold[i], - (const char *) colorCombo->text(i).toUtf8()); + (const char *) colorCombo->itemText(i).toUtf8()); else if (type[i] == 1) scol.sprintf("sysfg %2d %2d %1d # %s", i, transparent[i], bold[i], - (const char *) colorCombo->text(i).toUtf8()); + (const char *) colorCombo->itemText(i).toUtf8()); else if (type[i] == 2) scol.sprintf("sysbg %2d %2d %1d # %s", i, transparent[i], bold[i], - (const char *) colorCombo->text(i).toUtf8()); + (const char *) colorCombo->itemText(i).toUtf8()); else { int ch, cs, cv; color[i].getHsv(&ch, &cs, &cv); scol.sprintf("rcolor %1d %3d %3d %2d %1d # %s", i, cs, cv, transparent[i], bold[i], - (const char *) colorCombo->text(i).toUtf8()); + (const char *) colorCombo->itemText(i).toUtf8()); } t << scol << endl; }