1 files changed, 2 insertions, 2 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f0a68cf..70ffec1 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -601,389 +601,389 @@ static void createInputMethodDict()
 
   \sa setInputMethodHint()
 */
 QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget* w )
 {
     if ( inputMethodDict && w )
 	return (InputMethodHint)(int)inputMethodDict->find(w);
     return Normal;
 }
 
 /*!
     \enum QPEApplication::InputMethodHint
 
     \value Normal the application sometimes needs text input (the default).
     \value AlwaysOff the application never needs text input.
     \value AlwaysOn the application always needs text input.
 */
 
 /*!
   Hints to the system that \a w has use for text input methods
   as specified by \a mode.
 
   \sa inputMethodHint()
 */
 void QPEApplication::setInputMethodHint( QWidget* w, InputMethodHint mode )
 {
     createInputMethodDict();
     if ( mode == Normal ) {
 	inputMethodDict->remove(w);
     } else {
 	inputMethodDict->insert(w,(void*)mode);
     }
 }
 
 class HackDialog : public QDialog
 {
 public:
     void acceptIt() { accept(); }
     void rejectIt() { reject(); }
 };
 
 
 void QPEApplication::mapToDefaultAction( QWSKeyEvent *ke, int key )
 {
     // specialised actions for certain widgets. May want to
     // add more stuff here.
     if ( activePopupWidget() && activePopupWidget()->inherits( "QListBox" )
 	 && activePopupWidget()->parentWidget()
 	 && activePopupWidget()->parentWidget()->inherits( "QComboBox" ) )
 	key = Qt::Key_Return;
 
     if ( activePopupWidget() && activePopupWidget()->inherits( "QPopupMenu" ) )
 	key = Qt::Key_Return;
 
     ke->simpleData.keycode = key;
 }
 
 class HackWidget : public QWidget
 {
 public:
     bool needsOk()
     { return (getWState() & WState_Reserved1 ); }
 };
 
 /*!
   \internal
 */
 bool QPEApplication::qwsEventFilter( QWSEvent *e )
 {
     if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
 	if ( qApp->type() != QApplication::GuiServer ) {
 	    QCopEnvelope e("QPE/System", "notBusy(QString)" );
 	    e << d->appName;
 	}
 	d->notbusysent=TRUE;
     }
     if ( type() == GuiServer ) {
 	switch ( e->type ) {
 	    case QWSEvent::Mouse:
 		if ( e->asMouse()->simpleData.state && !QWidget::find(e->window()) )
 		    emit clientMoused();
 	}
     }
     if ( e->type == QWSEvent::Key ) {
 	if ( d->kbgrabber == 1 )
 	    return TRUE;
 	QWSKeyEvent *ke = (QWSKeyEvent *)e;
 	if ( ke->simpleData.keycode == Qt::Key_F33 ) {
 	    // Use special "OK" key to press "OK" on top level widgets
 	    QWidget *active = activeWindow();
 	    QWidget *popup = 0;
 	    if ( active && active->isPopup() ) {
 		popup = active;
 		active = active->parentWidget();
 	    }
 	    if ( active && (int)active->winId() == ke->simpleData.window &&
 		 !active->testWFlags( WStyle_Customize|WType_Popup|WType_Desktop )) {
 		if ( ke->simpleData.is_press ) {
 		    if ( popup )
 			popup->close();
 		    if ( active->inherits( "QDialog" ) ) {
 			HackDialog *d = (HackDialog *)active;
 			d->acceptIt();
 			return TRUE;
 		    } else if ( ((HackWidget *)active)->needsOk() ) {
 			QSignal s;
 			s.connect( active, SLOT( accept() ) );
 			s.activate();
 		    } else {
 			// do the same as with the select key: Map to the default action of the widget:
 			mapToDefaultAction( ke, Qt::Key_Return );
 		    }
 		}
 	    }
 	} else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
 	    // Use special "select" key to do whatever default action a widget has
 	    mapToDefaultAction( ke, Qt::Key_Space );
 	} else if ( ke->simpleData.keycode == Qt::Key_Escape && 
 		    ke->simpleData.is_press ) {
 	    // Escape key closes app if focus on toplevel
 	    QWidget *active = activeWindow();
 	    if ( active && active->testWFlags( WType_TopLevel ) && 
 		 (int)active->winId() == ke->simpleData.window &&
 		 !active->testWFlags( WStyle_Dialog|WStyle_Customize|WType_Popup|WType_Desktop )) {
 		if ( active->inherits( "QDialog" ) ) {
 		    HackDialog *d = (HackDialog *)active;
 		    d->rejectIt();
 		    return TRUE;
 		} else if ( strcmp( argv()[0], "embeddedkonsole") != 0 ) {
 		    active->close();
 		}
 	    }
 	}
 
 #if QT_VERSION < 231
     // Filter out the F4/Launcher key from apps
     // ### The launcher key may not always be F4 on all devices
 	if ( ((QWSKeyEvent *)e)->simpleData.keycode == Qt::Key_F4 )
 	    return TRUE;
 #endif
     }
     if ( e->type == QWSEvent::Focus ) {
 	QWSFocusEvent *fe = (QWSFocusEvent*)e;
 	QWidget* nfw = QWidget::find(e->window());
 	if ( !fe->simpleData.get_focus ) {
 	    QWidget *active = activeWindow();
 	    while ( active && active->isPopup() ) {
 		active->close();
 		active = activeWindow();
 	    }
 	    if ( !nfw && d->kbgrabber == 2 ) {
 		ungrabKeyboard();
 		d->kbregrab = TRUE; // want kb back when we're active
 	    }
 	} else {
 	    // make sure our modal widget is ALWAYS on top
 	    QWidget *topm = activeModalWidget();
 	    if ( topm ) {
 		topm->raise();
 	    }
 	    if ( d->kbregrab ) {
 		grabKeyboard();
 		d->kbregrab = FALSE;
 	    }
 	}
 	if ( fe->simpleData.get_focus && inputMethodDict ) {
 	    InputMethodHint m = inputMethodHint( QWidget::find(e->window()) );
 	    if ( m == AlwaysOff )
 		Global::hideInputMethod();
 	    if ( m == AlwaysOn )
 		Global::showInputMethod();
 	}
     }
     return QApplication::qwsEventFilter( e );
 }
 
 /*!
   Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
     ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     // Need to delete QCopChannels early, since the display will
     // be gone by the time we get to ~QObject().
     delete sysChannel;
     delete pidChannel;
 #endif
     delete d;
 }
 
 /*!
-  Returns <tt>$QPEDIR/</tt>.
+  Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
-    const char *base = getenv( "QPEDIR" );
+    const char *base = getenv( "OPIEDIR" );
     if ( base )
 	return QString( base ) + "/";
 
     return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
 */
 QString QPEApplication::documentDir()
 {
     const char *base = getenv( "HOME" );
     if ( base )
 	return QString( base ) + "/Documents/";
 
     return QString( "../Documents/" );
 }
 
 static int deforient=-1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
     if ( deforient < 0 ) {
 	QString d = getenv("QWS_DISPLAY");
 	if ( d.contains("Rot90") ) {
 	    deforient = 90;
 	} else if ( d.contains("Rot180") ) {
 	    deforient = 180;
 	} else if ( d.contains("Rot270") ) {
 	    deforient = 270;
 	} else {
 	    deforient=0;
 	}
     }
     return deforient;
 }
 
 /*!
   \internal
 */
 void QPEApplication::setDefaultRotation(int r)
 {
     if ( qApp->type() == GuiServer ) {
 	deforient = r;
 	setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(r).latin1(), 1);
     } else {
 	QCopEnvelope("QPE/System", "setDefaultRotation(int)") << r;
     }
 }
 
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
     Config config( "qpe" );
 
     config.setGroup( "Appearance" );
 
     // Widget style
     QString style = config.readEntry( "Style", "Light" );
     internalSetStyle( style );
 
     // Colors
     QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) );
     QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) );
     QPalette pal( btncolor, bgcolor );
     QString color = config.readEntry( "Highlight", "#800000" );
     pal.setColor( QColorGroup::Highlight, QColor(color) );
     color = config.readEntry( "HighlightedText", "#FFFFFF" );
     pal.setColor( QColorGroup::HighlightedText, QColor(color) );
     color = config.readEntry( "Text", "#000000" );
     pal.setColor( QColorGroup::Text, QColor(color) );
     color = config.readEntry( "ButtonText", "#000000" );
     pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor(color) );
     color = config.readEntry( "Base", "#FFFFFF" );
     pal.setColor( QColorGroup::Base, QColor(color) );
 
     pal.setColor( QPalette::Disabled, QColorGroup::Text,
 		  pal.color(QPalette::Active, QColorGroup::Background).dark() );
 
     setPalette( pal, TRUE );
 }
 
 void QPEApplication::systemMessage( const QCString &msg, const QByteArray &data)
 {
 #ifdef Q_WS_QWS
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "applyStyle()" ) {
 	applyStyle();
     } else if ( msg == "setScreenSaverInterval(int)" ) {
 	if ( type() == GuiServer ) {
 	    int time;
 	    stream >> time;
 	    setScreenSaverInterval(time);
 	}
     } else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
 	if ( type() == GuiServer ) {
 	    int t1,t2,t3;
 	    stream >> t1 >> t2 >> t3;
 	    setScreenSaverIntervals(t1,t2,t3);
 	}
     } else if ( msg == "setBacklight(int)" ) {
 	if ( type() == GuiServer ) {
 	    int bright;
 	    stream >> bright;
 	    setBacklight(bright);
 	}
     } else if ( msg == "setDefaultRotation(int)" ) {
 	if ( type() == GuiServer ) {
 	    int r;
 	    stream >> r;
 	    setDefaultRotation(r);
 	}
     } else if ( msg == "shutdown()" ) {
 	if ( type() == GuiServer )
 	    shutdown();
     } else if ( msg == "quit()" ) {
 	if ( type() != GuiServer )
 	    tryQuit();
     } else if ( msg == "forceQuit()" ) {
 	if ( type() != GuiServer )
 	    quit(); 
     } else if ( msg == "restart()" ) {
 	if ( type() == GuiServer )
 	    restart();
     } else if ( msg == "grabKeyboard(QString)" ) {
 	QString who;
 	stream >> who;
 	if ( who.isEmpty() )
 	    d->kbgrabber = 0;
 	else if ( who != d->appName )
 	    d->kbgrabber = 1;
 	else
 	    d->kbgrabber = 2;
     } else if ( msg == "language(QString)" ) {
 	if ( type() == GuiServer ) {
 	    QString l;
 	    stream >> l;
 	    QString cl = getenv("LANG");
 	    if ( cl != l ) {
 		if ( l.isNull() )
 		    unsetenv( "LANG" );
 		else
 		    setenv( "LANG", l.latin1(), 1 );
 		restart();
 	    }
 	}
     } else if ( msg == "timeChange(QString)" ) {
 	QString t;
 	stream >> t;
 	if ( t.isNull() )
 	    unsetenv( "TZ" );
 	else
 	    setenv( "TZ", t.latin1(), 1 );
 	// emit the signal so everyone else knows...
 	emit timeChanged();
     } else if ( msg == "execute(QString)" ) {
 	if ( type() == GuiServer ) {
 	    QString t;
 	    stream >> t;
 	    Global::execute( t );
 	}
     } else if ( msg == "execute(QString,QString)" ) {
 	if ( type() == GuiServer ) {
 	    QString t,d;
 	    stream >> t >> d;
 	    Global::execute( t, d );
 	}
     } else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
 	if ( type() == GuiServer ) {
 	    QDateTime when;
 	    QCString channel, message;
 	    int data;
 	    stream >> when >> channel >> message >> data;
 	    AlarmServer::addAlarm( when, channel, message, data );
 	}
     } else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
 	if ( type() == GuiServer ) {
 	    QDateTime when;
 	    QCString channel, message;
 	    int data;
 	    stream >> when >> channel >> message >> data;
 	    AlarmServer::deleteAlarm( when, channel, message, data );
 	}
     } else if ( msg == "clockChange(bool)" ) {
 	int tmp;
 	stream >> tmp;
 	emit clockChanged( tmp );