removed the hack that limited the bad influence of the sticky bug on ipaq, since it is not needed any more. Sticky bug is fixed in 2.4.18-rmk3 hh6

1 files changed, 36 insertions, 36 deletions

diff --git a/inputmethods/keyboard/keyboard.cpp b/inputmethods/keyboard/keyboard.cpp
index a04c45a..0f0b188 100644
--- a/inputmethods/keyboard/keyboard.cpp
+++ b/inputmethods/keyboard/keyboard.cpp
@@ -56,12 +56,12 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
     // on ipaq.
-    struct utsname name;
-    if (uname(&name) != -1)
-      {
-	QString release=name.release;
-	qWarning("System release: %s\n", name.release);
-	if(release.find("embedix",0,TRUE) !=-1)
-	  {
-	    connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
-	  }
-      }
+//    struct utsname name;
+//    if (uname(&name) != -1)
+    //    {
+//	QString release=name.release;
+//	qWarning("System release: %s\n", name.release);
+//	if(release.find("embedix",0,TRUE) !=-1)
+//	  {
+    connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
+//	  }
+    //     }
 }
@@ -121,3 +121,3 @@ void  KeyboardConfig::generateText(const QString &s)
   Format: length, code, length, code, ..., 0
-  
+
   length is measured in half the width of a standard key.
@@ -125,3 +125,3 @@ void  KeyboardConfig::generateText(const QString &s)
   starting with scancode code.
-  
+
   Special keys are hardcoded, one at a time, with length of key
@@ -129,6 +129,6 @@ void  KeyboardConfig::generateText(const QString &s)
   up in specialM[]. (The special keys are not keymappable.)
-  
+
  */
 
-static const uchar * const keyboard_opti[5] = { 
+static const uchar * const keyboard_opti[5] = {
     (const uchar *const) "\001\223\003\240\002\20\002\41\002\26\002\62\002\56\002\45\002\54\003\200\001\223\002\226\002\235\002\234\002\236",
@@ -154,3 +154,3 @@ static const uchar * const keyboard_standard[5] = {
     (const uchar *const)"\004\202\002a\002s\002d\002f\002g\002h\002j\002k\002l\002;\002'\004\203",
-    //CAPS + asdf.. + RETURN 
+    //CAPS + asdf.. + RETURN
 
@@ -159,5 +159,5 @@ static const uchar * const keyboard_standard[5] = {
 
-    (const uchar *const)"\003\205\003\206\022\207\003\206\003\205\002\223\002\212\002\213\002\214" 
+    (const uchar *const)"\003\205\003\206\022\207\003\206\003\205\002\223\002\212\002\213\002\214"
     //CTRL + ALT + SPACE //+ LEFT + DOWN + RIGHT
-    
+
 };
@@ -396,3 +396,3 @@ static const char * const escape_xpm[]={
 
-enum { BSCode = 0x80, TabCode, CapsCode, RetCode, 
+enum { BSCode = 0x80, TabCode, CapsCode, RetCode,
        ShiftCode, CtrlCode, AltCode, SpaceCode, BackSlash,
@@ -437,3 +437,3 @@ static const SpecialMap specialM[] = {
     {	ResetDict,		0,	"R",     NULL },
-   
+
     // number pad stuff
@@ -457,3 +457,3 @@ static int keycode( int i2, int j, const uchar **keyboard )
 	return 0;
-    
+
     const uchar *row = keyboard[j];
@@ -466,3 +466,3 @@ static int keycode( int i2, int j, const uchar **keyboard )
     if ( !*row ) return 0;
-    
+
     int k;
@@ -473,3 +473,3 @@ static int keycode( int i2, int j, const uchar **keyboard )
     }
-    
+
     return k;
@@ -481,3 +481,3 @@ static int keycode( int i2, int j, const uchar **keyboard )
   or next key on current row if \a j < 0.
-  
+
 */
@@ -489,3 +489,3 @@ int Keyboard::getKey( int &w, int j ) {
     static int half = 0;
-    
+
     if ( j >= 0 && j < 5 ) {
@@ -499,3 +499,3 @@ int Keyboard::getKey( int &w, int j ) {
     if ( !row || !*row ) {
-	return 0;    
+	return 0;
     } else if ( row[1] >= 0x80 ) {
@@ -514,3 +514,3 @@ int Keyboard::getKey( int &w, int j ) {
 }
-    
+
 
@@ -542,3 +542,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
     int margin = threeD ? 1 : 0;
-    
+
 //    p.fillRect( 0, , kw-1, keyHeight-2, keycolor_pressed );
@@ -556,3 +556,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
 		const char * const * xpm = NULL;
-		
+
 		if ( k >= 0x80 ) {
@@ -561,3 +561,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
 		    xpm = specialM[k - 0x80].xpm;
-			
+
 		    if ( k == ShiftCode ) {
@@ -570,3 +570,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
 			pressed = alt;
-		    } 
+		    }
 		} else {
@@ -574,3 +574,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
 /*
-		    s = QChar( shift^lock ? QWSServer::keyMap()[k].shift_unicode : 
+		    s = QChar( shift^lock ? QWSServer::keyMap()[k].shift_unicode :
 			       QWSServer::keyMap()[k].unicode);
@@ -623,3 +623,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
 		    }
-	    
+
 		    if ( threeD ) {
@@ -632,3 +632,3 @@ void Keyboard::drawKeyboard( QPainter &p, int key )
 		    p.drawLine( x, y+keyHeight-1, x+kw-1, y+keyHeight-1 );
-	    
+
 		} else {
@@ -691,3 +691,3 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
 		    u = QWSServer::keyMap()[k].shift_unicode;
-		else 
+		else
 		    u = QWSServer::keyMap()[k].unicode;
@@ -777,3 +777,3 @@ void Keyboard::repeat()
 {
-  
+
   repeatTimer->start( 200 );
@@ -800,3 +800,3 @@ QSize Keyboard::sizeHint() const
     	keyHeight += 1;
-    
+
     return QSize( 320, keyHeight * 5 + picks->sizeHint().height() + 1 );