diff --git a/konsole/session.cpp b/konsole/session.cpp index b3aa8047..94e1157f 100644 --- a/konsole/session.cpp +++ b/konsole/session.cpp @@ -102,7 +102,7 @@ void TESession::ptyError() // FIXME: sh->error() is always empty if ( sh->error().isEmpty() ) KMessageBox::error( te->topLevelWidget(), - i18n("Konsole is unable to open a PTY (pseudo teletype). It is likely that this is due to an incorrect configuration of the PTY devices. Konsole needs to have read/write access to the PTY devices."), + i18n("Konsole is unable to open a PTY (pseudo teletype). It is likely that this is due to an incorrect configuration of the PTY devices. Konsole needs to have read/write access to the PTY devices."), i18n("A Fatal Error Has Occurred") ); else KMessageBox::error(te->topLevelWidget(), sh->error()); @@ -150,7 +150,7 @@ void TESession::run() QDir::setCurrent(initial_cwd); sh->setXonXoff(xon_xoff); - int result = sh->run(QFile::encodeName(pgm), args, term.toLatin1(), + int result = sh->run(QFile::encodeName(pgm), args, term.toLatin1(), winId, add_to_utmp, ("DCOPRef("+appId+",konsole)").toLatin1(), ("DCOPRef("+appId+","+sessionId+")").toLatin1()); @@ -196,7 +196,7 @@ void TESession::setUserTitle( int what, const QString &caption ) cwd=caption; cwd=cwd.replace( QRegExp("^~"), QDir::homePath() ); emit openURLRequest(cwd); - } + } if (what == 32) { // change icon via \033]32;Icon\007 iconName = caption; te->update(); @@ -409,7 +409,7 @@ void TESession::setEncodingNo(int index) { encoding_no = index; } - + void TESession::setKeymapNo(int kn) { em->setKeymap(kn); @@ -780,7 +780,7 @@ void TESession::setSize(QSize size) { if ((size.width() <= 1) || (size.height() <= 1)) return; - + emit resizeSession(this, size); } diff --git a/settings/schemaeditor.cpp b/settings/schemaeditor.cpp index b68a1891..02263d4d 100644 --- a/settings/schemaeditor.cpp +++ b/settings/schemaeditor.cpp @@ -62,8 +62,8 @@ class SchemaListBoxText : public Q3ListBoxText }; -SchemaEditor::SchemaEditor(QWidget * parent, const char *name) -:SchemaDialog(parent, name) +SchemaEditor::SchemaEditor(QWidget * parent) +:SchemaDialog(parent) { schMod= false; loaded = false; diff --git a/settings/schemaeditor.h b/settings/schemaeditor.h index 46224ae6..f11a35f5 100644 --- a/settings/schemaeditor.h +++ b/settings/schemaeditor.h @@ -33,10 +33,10 @@ class KSharedPixmap; /** SchemaEditor is the base class of the porject */ class SchemaEditor : public SchemaDialog { - Q_OBJECT + Q_OBJECT public: /** constructor */ - SchemaEditor(QWidget* parent=0, const char *name=0); + SchemaEditor(QWidget* parent=0); /** destructor */ ~SchemaEditor(); @@ -51,12 +51,12 @@ class SchemaEditor : public SchemaDialog public Q_SLOTS: void slotColorChanged(int); - void imageSelect(); + void imageSelect(); void slotTypeChanged(int); void readSchema(int); void saveCurrent(); void removeCurrent(); - void previewLoaded(bool l); + void previewLoaded(bool l); void getList(); private Q_SLOTS: void show(); @@ -71,7 +71,7 @@ class SchemaEditor : public SchemaDialog QVector bold; QPixmap pix; KSharedPixmap *spix; - QString defaultSchema; + QString defaultSchema; bool loaded; bool schemaLoaded; bool change;