author | mickeyl <mickeyl> | 2004-02-25 11:27:48 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-02-25 11:27:48 (UTC) |
commit | 25e87d9ccc92b7a4c12518532576f55b11726b26 (patch) (side-by-side diff) | |
tree | 39c21854f8b6845736126a05f2cc89e552484881 /core/apps/embeddedkonsole | |
parent | 50aef52b265bc8c8e5e5c6a871affe94142d74fb (diff) | |
download | opie-25e87d9ccc92b7a4c12518532576f55b11726b26.zip opie-25e87d9ccc92b7a4c12518532576f55b11726b26.tar.gz opie-25e87d9ccc92b7a4c12518532576f55b11726b26.tar.bz2 |
fix most of zecke's comments. Someone should look into the open issues though
(see mail to opie-devel)
-rw-r--r-- | core/apps/embeddedkonsole/MyPty.cpp | 7 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 21 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.h | 6 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/session.h | 2 |
4 files changed, 17 insertions, 19 deletions
diff --git a/core/apps/embeddedkonsole/MyPty.cpp b/core/apps/embeddedkonsole/MyPty.cpp index e7d8274..5a8519a 100644 --- a/core/apps/embeddedkonsole/MyPty.cpp +++ b/core/apps/embeddedkonsole/MyPty.cpp @@ -81,3 +81,2 @@ -#undef HAVE_OPENPTY #ifdef HAVE_OPENPTY @@ -262,3 +261,3 @@ void MyPty::send_bytes(const char* s, int len) - ::write(fd, s, len); + ::write(fd, s, len); } @@ -267,3 +266,3 @@ void MyPty::send_bytes(const char* s, int len) void MyPty::readPty() -{ +{ char buf[4096]; @@ -279,3 +278,3 @@ void MyPty::readPty() emit block_in(buf,len); - + #ifdef VERBOSE_DEBUG diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index b8f009d..1c613a9 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp @@ -23,3 +23,2 @@ // enhancements added by Phillip Kuhn -//#define QT_QWS_OPIE @@ -371,4 +370,4 @@ void Konsole::init(const char* _pgm, QStrList & _args) - setCaption( "Konsole" ); - setIcon( Resource::loadPixmap( "qkonsole/qkonsole" ) ); + setCaption( tr( "Konsole" ) ); + setIcon( Resource::loadPixmap( "konsole/Terminal" ) ); @@ -579,3 +578,3 @@ void Konsole::init(const char* _pgm, QStrList & _args) sessionList = new QPopupMenu(this); - sessionList-> insertItem ( Resource::loadPixmap ( "qkonsole/qkonsole" ), tr( "new session" ), this, + sessionList-> insertItem ( Resource::loadPixmap ( "konsole/Terminal" ), tr( "new session" ), this, SLOT(newSession()) ); @@ -881,3 +880,3 @@ void Konsole::changeFontSize(int delta) -int Konsole::findFont(QString name, int size, bool exactMatch) +int Konsole::findFont(const QString& name, int size, bool exactMatch) { @@ -1161,3 +1160,3 @@ void Konsole::doneSession(TEWidget* te, int ) -void Konsole::changeTitle(TEWidget* te, QString newTitle ) +void Konsole::changeTitle(TEWidget* te, const QString& newTitle ) { @@ -1165,3 +1164,3 @@ void Konsole::changeTitle(TEWidget* te, QString newTitle ) { - setCaption(newTitle + " - QKonsole"); + setCaption( newTitle + " - " + tr( "Konsole " ) ); } @@ -1202,4 +1201,4 @@ void Konsole::newSession() connect( se, SIGNAL(done(TEWidget*,int)), this, SLOT(doneSession(TEWidget*,int)) ); - connect( se, SIGNAL(changeTitle(TEWidget*,QString)), this, - SLOT(changeTitle(TEWidget*,QString)) ); + connect( se, SIGNAL(changeTitle(TEWidget*,const QString&)), this, + SLOT(changeTitle(TEWidget*,const QString&)) ); connect(te, SIGNAL(changeFontSize(int)), this, SLOT(changeFontSize(int))); @@ -1311,3 +1310,3 @@ void Konsole::switchSession(QWidget* w) { - setCaption(te->currentSession->Title() + " - QKonsole"); + setCaption( te->currentSession->Title() + " - " + tr( "Konsole" ) ); } @@ -1315,3 +1314,3 @@ void Konsole::switchSession(QWidget* w) { - setCaption( "Konsole" ); + setCaption( tr( "Konsole" ) ); } diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h index 37babbb..e163cb8 100644 --- a/core/apps/embeddedkonsole/konsole.h +++ b/core/apps/embeddedkonsole/konsole.h @@ -75,3 +75,3 @@ private slots: void doneSession(TEWidget*,int); - void changeTitle(TEWidget*,QString); + void changeTitle(TEWidget*, const QString&); void changeColumns(int); @@ -112,3 +112,3 @@ private: void setColors(QColor foreground, QColor background); - int findFont(QString name, int size, bool exact = false); + int findFont(const QString& name, int size, bool exact = false); QSize calcSize(int columns, int lines); @@ -126,3 +126,3 @@ private: public: - VTFont(QString name, QFont& font, QString family, int familyNum, int size) + VTFont(const QString& name, QFont& font, const QString& family, int familyNum, int size) { diff --git a/core/apps/embeddedkonsole/session.h b/core/apps/embeddedkonsole/session.h index f399e96..a4b33e2 100644 --- a/core/apps/embeddedkonsole/session.h +++ b/core/apps/embeddedkonsole/session.h @@ -70,3 +70,3 @@ signals: void done(TEWidget*, int); - void changeTitle(TEWidget*, QString); + void changeTitle(TEWidget*, const QString&); |