summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-09-25 16:26:19 (UTC)
committer llornkcor <llornkcor>2002-09-25 16:26:19 (UTC)
commitd44c455b86d6cccbc497e3e8d8aa399096eff7db (patch) (side-by-side diff)
tree8dd582c828f21ff11a99800159df2b982dbfcc48
parenta546a6ea143da9244a06f1e40829254e8bf4dc8f (diff)
downloadopie-d44c455b86d6cccbc497e3e8d8aa399096eff7db.zip
opie-d44c455b86d6cccbc497e3e8d8aa399096eff7db.tar.gz
opie-d44c455b86d6cccbc497e3e8d8aa399096eff7db.tar.bz2
fix qpeDir() to return users dir, not qpeDir.. duh
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/qpeapplication.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index c107a08..bdf67b9 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -759,100 +759,101 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
}
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 );
}
#endif
/*!
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>$OPIEDIR/</tt>.
*/
QString QPEApplication::qpeDir()
{
const char * base = getenv( "OPIEDIR" );
if ( base )
return QString( base ) + "/";
return QString( "../" );
}
/*!
Returns the user's current Document directory. There is a trailing "/".
+ .. well, it does now,, and there's no trailing '/'
*/
QString QPEApplication::documentDir()
{
- return QString( qpeDir() + "Documents");
+ return QString( QDir::homeDirPath() + "/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 );
Config config("qpe");
config.setGroup( "Rotation" );
config.writeEntry( "Screen", getenv("QWS_DISPLAY") );
} else {
#ifndef QT_NO_COP
{ QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" ); e << r; }
#endif
}
}
/*!
\internal
*/