Make sure that qpeDir() has a QDir::seperator() as last character. This code

comes from Qtopia1.7
Conversion to it is done by myself

1 files changed, 20 insertions, 7 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 3efba20..0b6d56d 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -328,158 +328,158 @@ public:
     // get the non-maximized version, so we have to do it the hard way )
     int offsetX = w->x() - w->geometry().left();
     int offsetY = w->y() - w->geometry().top();
 
     QRect r;
     if ( w->isMaximized() )
         r = ( (HackWidget *) w)->normalGeometry();
     else
         r = w->geometry();
 
     // Stores the window placement as pos(), size()  (due to the offset mapping)
     Config cfg( "qpe" );
     cfg.setGroup("ApplicationPositions");
     QString s;
     s.sprintf("%d,%d,%d,%d,%d", r.left() + offsetX, r.top() + offsetY, r.width(), r.height(), w->isMaximized() );
     cfg.writeEntry( app, s );
     }
 
     static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
     {
         /*
         // This works but disable it for now until it is safe to apply
         // What is does is scan the .desktop files of all the apps for
         // the applnk that has the corresponding argv[0] as this program
         // then it uses the name stored in the .desktop file as the caption
         // for the main widget. This saves duplicating translations for
         // the app name in the program and in the .desktop files.
 
         AppLnkSet apps( appsPath );
 
         QList<AppLnk> appsList = apps.children();
         for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
           if ( (*it)->exec() == appName ) {
         mw->setCaption( (*it)->name() );
         return TRUE;
           }
         }
         */
         return FALSE;
     }
 
 
     void show(QWidget* mw, bool nomax)
     {
         setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" );
         nomaximize = nomax;
         qpe_main_widget = mw;
                 qcopQok = TRUE;
 #ifndef QT_NO_COP
 
         sendQCopQ();
 #endif
 
         if ( preloaded ) {
             if (forceshow)
                 show_mx(mw, nomax, appName);
         }
         else if ( keep_running ) {
             show_mx(mw, nomax, appName);
         }
     }
 
     void loadTextCodecs()
     {
-        QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
+        QString path = QPEApplication::qpeDir() + "plugins/textcodecs";
 #ifdef Q_OS_MACX
         QDir dir( path, "lib*.dylib" );
 #else
         QDir dir( path, "lib*.so" );
 #endif
         QStringList list;
         if ( dir. exists ( ))
             list = dir.entryList();
         QStringList::Iterator it;
         for ( it = list.begin(); it != list.end(); ++it ) {
             TextCodecInterface *iface = 0;
             QLibrary *lib = new QLibrary( path + "/" + *it );
             if ( lib->queryInterface( IID_QtopiaTextCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
                 QValueList<int> mibs = iface->mibEnums();
                 for (QValueList<int>::ConstIterator i = mibs.begin(); i != mibs.end(); ++i) {
                     (void)iface->createForMib(*i);
                     // ### it exists now; need to remember if we can delete it
                 }
             }
             else {
                 lib->unload();
                 delete lib;
             }
         }
     }
 
     void loadImageCodecs()
     {
-        QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
+        QString path = QPEApplication::qpeDir() + "plugins/imagecodecs";
 #ifdef Q_OS_MACX
         QDir dir( path, "lib*.dylib" );
 #else
         QDir dir( path, "lib*.so" );
 #endif
         QStringList list;
         if ( dir. exists ( ))
             list = dir.entryList();
         QStringList::Iterator it;
         for ( it = list.begin(); it != list.end(); ++it ) {
             ImageCodecInterface *iface = 0;
             QLibrary *lib = new QLibrary( path + "/" + *it );
             if ( lib->queryInterface( IID_QtopiaImageCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
                 QStringList formats = iface->keys();
                 for (QStringList::ConstIterator i = formats.begin(); i != formats.end(); ++i) {
                     (void)iface->installIOHandler(*i);
                     // ### it exists now; need to remember if we can delete it
                 }
             }
             else {
                 lib->unload();
                 delete lib;
             }
         }
     }
 
 };
 
 class ResourceMimeFactory : public QMimeSourceFactory
 {
 public:
         ResourceMimeFactory() : resImage( 0 )
     {
         setFilePath( Global::helpPath() );
         setExtensionType( "html", "text/html;charset=UTF-8" );
     }
         ~ResourceMimeFactory() {
             delete resImage;
         }
 
     const QMimeSource* data( const QString& abs_name ) const
     {
         const QMimeSource * r = QMimeSourceFactory::data( abs_name );
         if ( !r ) {
             int sl = abs_name.length();
             do {
                 sl = abs_name.findRev( '/', sl - 1 );
                 QString name = sl >= 0 ? abs_name.mid( sl + 1 ) : abs_name;
                 int dot = name.findRev( '.' );
                 if ( dot >= 0 )
                     name = name.left( dot );
                 QImage img = Resource::loadImage( name );
                 if ( !img.isNull() ) {
                                     delete resImage;
                                     resImage = new QImageDrag( img );
                                     r = resImage;
                                 }
             }
             while ( !r && sl > 0 );
         }
         return r;
     }
 private:
     mutable QImageDrag *resImage;
@@ -1126,133 +1126,146 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
                 }
                 else { // we didn't grab the keyboard, so send the event to the launcher
                     QCopEnvelope e ( "QPE/Launcher", "deviceButton(int,int,int)" );
                     e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
                 }
             }
             return true;
         }
     }
     if ( e->type == QWSEvent::Focus ) {
         QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
         if ( !fe->simpleData.get_focus ) {
             QWidget * active = activeWindow();
             while ( active && active->isPopup() ) {
                 active->close();
                 active = activeWindow();
             }
         }
         else {
             // make sure our modal widget is ALWAYS on top
             QWidget *topm = activeModalWidget();
             if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) {
                 topm->raise();
             }
         }
         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
 
 #ifdef OPIE_WITHROHFEEDBACK
     if( d->RoH )
       delete d->RoH;
 #endif
     delete d;
 }
 
 /*!
   Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
-    const char * base = getenv( "OPIEDIR" );
-    if ( base )
-        return QString( base ) + "/";
+    QString base, dir;
+
+    if (getenv( "OPIEDIR" ))
+        base = QString(getenv("OPIEDIR")).stripWhiteSpace();
+    if ( !base.isNull() && (base.length() > 0 )){
+#ifdef Q_OS_WIN32
+        QString temp(base);
+        if (temp[(int)temp.length()-1] != QDir::separator())
+            temp.append(QDir::separator());
+        dir = temp;
+#else
+        dir = QString( base ) + "/";
+#endif
+    }else{
+        dir = QString( ".." ) + QDir::separator();
+    }
 
-    return QString( "../" );
+    return dir;
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
   .. well, it does now,, and there's no 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 );
         Config config("qpe");
         config.setGroup( "Rotation" );
         config.writeEntry( "Rot", r );
     }
     else {
 #ifndef QT_NO_COP
         { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
             e << r;
         }
 #endif
 
     }
 }
 
 #include <qgfx_qws.h>
 #include <qwindowsystem_qws.h>
@@ -1774,129 +1787,129 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 
   \sa keepRunning()
 */
 void QPEApplication::setKeepRunning()
 {
     if ( qApp && qApp->inherits( "QPEApplication" ) ) {
         QPEApplication * qpeApp = ( QPEApplication* ) qApp;
         qpeApp->d->keep_running = TRUE;
     }
 }
 
 /*!
   Returns TRUE if the application will quit after processing the
   current list of qcop messages; otherwise returns FALSE.
 
   \sa setKeepRunning()
 */
 bool QPEApplication::keepRunning() const
 {
     return d->keep_running;
 }
 
 /*!
   \internal
 */
 void QPEApplication::internalSetStyle( const QString &style )
 {
 #if QT_VERSION >= 300
     if ( style == "QPE" ) {
         setStyle( new QPEStyle );
     }
     else {
         QStyle *s = QStyleFactory::create( style );
         if ( s )
             setStyle( s );
     }
 #else
     if ( style == "Windows" ) {
         setStyle( new QWindowsStyle );
     }
     else if ( style == "QPE" ) {
         setStyle( new QPEStyle );
     }
     else if ( style == "Light" ) {
         setStyle( new LightStyle );
     }
 #ifndef QT_NO_STYLE_PLATINUM
     else if ( style == "Platinum" ) {
         setStyle( new QPlatinumStyle );
     }
 #endif
 #ifndef QT_NO_STYLE_MOTIF
     else if ( style == "Motif" ) {
         setStyle( new QMotifStyle );
     }
 #endif
 #ifndef QT_NO_STYLE_MOTIFPLUS
     else if ( style == "MotifPlus" ) {
         setStyle( new QMotifPlusStyle );
     }
 #endif
 
     else {
         QStyle *sty = 0;
-        QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/";
+        QString path = QPEApplication::qpeDir ( ) + "plugins/styles/";
 
 #ifdef Q_OS_MACX
         if ( style. find ( ".dylib" ) > 0 )
             path += style;
         else
             path = path + "lib" + style. lower ( ) + ".dylib"; // compatibility
 #else
         if ( style. find ( ".so" ) > 0 )
             path += style;
         else
             path = path + "lib" + style. lower ( ) + ".so"; // compatibility
 #endif
         static QLibrary *lastlib = 0;
         static StyleInterface *lastiface = 0;
 
         QLibrary *lib = new QLibrary ( path );
         StyleInterface *iface = 0;
 
         if (( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK ) && iface )
             sty = iface-> style ( );
 
         if ( sty ) {
             setStyle ( sty );
 
             if ( lastiface )
                 lastiface-> release ( );
             lastiface = iface;
 
             if ( lastlib ) {
                 lastlib-> unload ( );
                 delete lastlib;
             }
             lastlib = lib;
         }
         else {
             if ( iface )
                 iface-> release ( );
             delete lib;
 
             setStyle ( new LightStyle ( ));
         }
     }
 #endif
 }
 
 /*!
   \internal
 */
 void QPEApplication::prepareForTermination( bool willrestart )
 {
     if ( willrestart ) {
         QLabel *lblWait = new QLabel( tr( "Please wait..." ), 0, "wait hack", QWidget::WStyle_Customize |
                                       QWidget::WStyle_NoBorder | QWidget::WStyle_Tool );
         lblWait->setAlignment( QWidget::AlignCenter );
         lblWait->show();
         lblWait->showMaximized();
     }
     { QCopEnvelope envelope( "QPE/System", "forceQuit()" );
     }
     processEvents(); // ensure the message goes out.
 }
 
 /*!
   \internal