Committing in .

Modified Files:
	configure mkipks addressbook/Makefile.in
	addressbook/addressbook.pro calc2/calc.pro
	calc2/binary/binary.pro calc2/simple/simple.pro
	calculator/Makefile.in calculator/calculator.pro
	cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
	citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
	clock/clock.pro datebook/Makefile.in datebook/datebook.pro
	dictionary/dictionary.pro doc/qcop.doc doc/start.doc
	embeddedkonsole/Makefile.in
	embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
	example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
	filebrowser/Makefile.in filebrowser/filebrowser.pro
	freetype/freetype.pro go/Makefile.in go/go.pro
	helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
	inputmethods/handwriting/Makefile.in
	inputmethods/handwriting/handwriting.pro
	inputmethods/keyboard/Makefile.in
	inputmethods/keyboard/keyboard.pro
	inputmethods/pickboard/Makefile.in
	inputmethods/pickboard/pickboard.pro
	inputmethods/unikeyboard/Makefile.in
	inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
	keypebble/keypebble.pro library/Makefile.in library/global.cpp
	library/library.pro library/qpeapplication.cpp
	mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
	minesweep/Makefile.in minesweep/minesweep.pro
	mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
	mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
	mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
	mpegplayer/libmpeg3/libmpeg3.pro
	mpegplayer/libmpeg3/audio/Makefile
	mpegplayer/libmpeg3/video/Makefile
	mpegplayer/wavplugin/Makefile.in
	mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
	netsetup/README netsetup/netsetup.pro
	netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
	netsetup/lan/Makefile.in netsetup/lan/lan.pro
	parashoot/Makefile.in parashoot/parashoot.pro
	qasteroids/Makefile.in qasteroids/qasteroids.pro
	qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
	qipkg/qipkg.pro scripts/q_functions
	settings/appearance/Makefile.in
	settings/appearance/appearance.pro
	settings/language/Makefile.in settings/language/language.pro
	settings/light-and-power/Makefile.in
	settings/light-and-power/light-and-power.pro
	settings/rotation/Makefile.in settings/rotation/rotation.pro
	settings/security/Makefile.in settings/security/security.pro
	settings/sound/Makefile.in settings/sound/sound.pro
	settings/systemtime/Makefile.in
	settings/systemtime/systemtime.pro showimg/Makefile.in
	showimg/showimg.pro single/Makefile.in single/single.pro
	snake/Makefile.in snake/snake.pro solitaire/Makefile.in
	solitaire/solitaire.pro spreadsheet/Makefile.in
	spreadsheet/spreadsheet.pro sysinfo/Makefile.in
	sysinfo/sysinfo.pro tableviewer/tableviewer.pro
	taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
	taskbar/batteryapplet/Makefile.in
	taskbar/batteryapplet/batteryapplet.pro
	taskbar/clipboardapplet/clipboardapplet.pro
	taskbar/clockapplet/Makefile.in
	taskbar/clockapplet/clockapplet.pro
	taskbar/netmonapplet/Makefile.in
	taskbar/netmonapplet/netmonapplet.pro
	taskbar/volumeapplet/Makefile.in
	taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
	tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
	todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
	website/htdocs/build.html website/htdocs/development.html
	website/htdocs/refman/qcop.html
	website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
	wordgame/wordgame.pro
Log Message:
	Changed QPEDIR to OPIEDIR in .pro files, and documentation,
	and regenerated all Makefile.in's that were affected.

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
@@ -697,197 +697,197 @@ bool QPEApplication::qwsEventFilter( QWSEvent *e )
 		 !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;