From 25e87d9ccc92b7a4c12518532576f55b11726b26 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Wed, 25 Feb 2004 11:27:48 +0000
Subject: fix most of zecke's comments. Someone should look into the open issues though

(see mail to opie-devel)
---
(limited to 'core')

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
@@ -79,7 +79,6 @@
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 
-#undef HAVE_OPENPTY
 #ifdef HAVE_OPENPTY
 #include <pty.h>
 #endif
@@ -260,12 +259,12 @@ void MyPty::send_bytes(const char* s, int len)
   printf("\n");
 #endif
 
-  ::write(fd, s, len);  
+  ::write(fd, s, len);
 }
 
 /*! indicates that a block of data is received */
 void MyPty::readPty()
-{ 
+{
   char buf[4096];
 
   int len = ::read( fd, buf, 4096 );
@@ -277,7 +276,7 @@ void MyPty::readPty()
      return;
 
   emit block_in(buf,len);
-  
+
 #ifdef VERBOSE_DEBUG
   // verbose debug
   printf("read bytes:\n");
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
@@ -21,7 +21,6 @@
 /* -------------------------------------------------------------------------- */
 // enhancements added by L.J. Potter <ljp@llornkcor.com>
 // enhancements added by Phillip Kuhn
-//#define QT_QWS_OPIE
 
 #include <stdlib.h>
 
@@ -369,8 +368,8 @@ void Konsole::init(const char* _pgm, QStrList & _args)
     fromMenu = FALSE;
     fullscreen = false;
 
-    setCaption( "Konsole" );
-    setIcon( Resource::loadPixmap( "qkonsole/qkonsole" ) );
+    setCaption( tr( "Konsole" ) );
+    setIcon( Resource::loadPixmap( "konsole/Terminal" ) );
 
     Config cfg( "Konsole" );
     cfg.setGroup("Font");
@@ -577,7 +576,7 @@ void Konsole::init(const char* _pgm, QStrList & _args)
     configMenu->insertItem(tr( "Colors") ,colorMenu);
 
     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()) );
 
     //  connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) ));
@@ -879,7 +878,7 @@ void Konsole::changeFontSize(int delta)
     }
 }
 
-int Konsole::findFont(QString name, int size, bool exactMatch)
+int Konsole::findFont(const QString& name, int size, bool exactMatch)
 {
     for(uint i = 0; i < fonts.count(); i++)
     {
@@ -1159,11 +1158,11 @@ void Konsole::doneSession(TEWidget* te, int )
     }
 }
 
-void Konsole::changeTitle(TEWidget* te, QString newTitle )
+void Konsole::changeTitle(TEWidget* te, const QString& newTitle )
 {
     if (te == getTe())
     {
-        setCaption(newTitle + " - QKonsole");
+        setCaption( newTitle + " - " + tr( "Konsole " ) );
     }
 }
 
@@ -1200,8 +1199,8 @@ void Konsole::newSession()
         TESession* se = new TESession(this, te, se_pgm, se_args, "xterm");
         te->currentSession = se;
         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)));
         connect(te, SIGNAL(changeSession(int)), this, SLOT(changeSession(int)));
         connect(te, SIGNAL(newSession()), this, SLOT(newSession()));
@@ -1309,11 +1308,11 @@ void Konsole::switchSession(QWidget* w)
     }
     if (! te->currentSession->Title().isEmpty() )
     {
-        setCaption(te->currentSession->Title() + " - QKonsole");
+        setCaption( te->currentSession->Title() + " - " + tr( "Konsole" ) );
     }
     else
     {
-        setCaption( "Konsole" );
+        setCaption( tr( "Konsole" ) );
     }
     //  colorMenuSelected(te->color_menu_item);
 }
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
@@ -73,7 +73,7 @@ public slots:
 private slots:
     void setDocument(const QString &);
     void doneSession(TEWidget*,int);
-    void changeTitle(TEWidget*,QString);
+    void changeTitle(TEWidget*, const QString&);
     void changeColumns(int);
     void setFont(int);
     //  void fontChanged(int);
@@ -110,7 +110,7 @@ private:
     void setColorPixmaps();
     void setHistory(bool);
     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);
     TEWidget* getTe();
     QStringList commands;
@@ -124,7 +124,7 @@ private:
     class VTFont
     {
     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)
         {
             this->name = name;
             this->font = font;
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
@@ -68,7 +68,7 @@ public slots:
 signals:
 
   void done(TEWidget*, int);
-  void changeTitle(TEWidget*, QString);
+  void changeTitle(TEWidget*, const QString&);
 
 private:
 
--
cgit v0.9.0.2