Replace QPEApplication::qpeDir() + "/ with

	QPEApplication::qpeDir() + "

as it is guranteed that qpeDir() will have '/' as the last
charachter

4 files changed, 9 insertions, 9 deletions

diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index 586628b..24669ac 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -124,252 +124,252 @@ InputMethods::InputMethods( QWidget *parent ) :
 
 
     imButton = new QWidgetStack( this ); // later a widget stack
     imButton->setFocusPolicy(NoFocus);
     if (parent->sizeHint().height() > 0)
         imButton->setFixedHeight( parent->sizeHint().height() );
     hbox->addWidget(imButton);
 
     imChoice = new QToolButton( this );
     imChoice->setFocusPolicy(NoFocus);
     imChoice->setPixmap( QPixmap( (const char **)tri_xpm ) );
     if (parent->sizeHint().height() > 0)
         imChoice->setFixedHeight( parent->sizeHint().height() );
     imChoice->setFixedWidth( 13 );
     imChoice->setAutoRaise( TRUE );
     hbox->addWidget( imChoice );
     connect( imChoice, SIGNAL(clicked()), this, SLOT(chooseIm()) );
 
     loadInputMethods();
 
     QCopChannel *channel = new QCopChannel( "QPE/IME", this );
     connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
              this, SLOT(qcopReceive(const QCString&,const QByteArray&)) );
 }
 
 InputMethods::~InputMethods()
 {
     Config cfg("qpe");
     cfg.setGroup("InputMethod");
     if (imethod)
         cfg.writeEntry("im", imethod->name() );
     if (mkeyboard)
         cfg.writeEntry("current", mkeyboard->name() );
 
     unloadInputMethods();
 }
 
 void InputMethods::hideInputMethod()
 {
     kbdButton->setOn( FALSE );
 }
 
 void InputMethods::showInputMethod()
 {
     kbdButton->setOn( TRUE );
 }
 
 void InputMethods::showInputMethod(const QString& name)
 {
     int i = 0;
     QValueList<InputMethod>::Iterator it;
     InputMethod *im = 0;
     for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
         QString lname = (*it).libName.mid((*it).libName.findRev('/') + 1);
         if ( (*it).name() == name || lname == name ) {
             im = &(*it);
             break;
         }
     }
     if ( im )
         chooseKeyboard(im);
 }
 
 void InputMethods::resetStates()
 {
     if ( mkeyboard && !mkeyboard->newIM )
         mkeyboard->interface->resetState();
 }
 
 QRect InputMethods::inputRect() const
 {
     if ( !mkeyboard || !mkeyboard->widget || !mkeyboard->widget->isVisible() )
         return QRect();
     else
         return mkeyboard->widget->geometry();
 }
 
 void InputMethods::unloadInputMethods()
 {
     unloadMethod( inputMethodList );
     unloadMethod( inputModifierList );
     inputMethodList.clear();
     inputModifierList.clear();
 
 }
 
 void InputMethods::unloadMethod( QValueList<InputMethod>& list ) {
     QValueList<InputMethod>::Iterator it;
 
     for (it = list.begin(); it != list.end(); ++it )
         (*it).releaseInterface();
 
 }
 
 
 QStringList InputMethods::plugins()const {
-   QString path = QPEApplication::qpeDir() + "/plugins/inputmethods";
+   QString path = QPEApplication::qpeDir() + "plugins/inputmethods";
 #ifdef Q_OS_MACX
    QDir dir( path, "lib*.dylib" );
 #else
    QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
    return dir.entryList();
 }
 
 void InputMethods::installTranslator( const QString& type ) {
     QStringList langs = Global::languageList();
     QStringList::ConstIterator lit;
     for ( lit= langs.begin(); lit!=langs.end(); ++lit) {
         QString lang = *lit;
         QTranslator * trans = new QTranslator(qApp);
 
-        QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+        QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+type+".qm";
 
         if ( trans->load( tfn ))
             qApp->installTranslator( trans );
         else
             delete trans;
     }
 }
 
 void InputMethods::setPreferedHandlers() {
     Config cfg("qpe");
     cfg.setGroup("InputMethod");
     QString current = cfg.readEntry("current");
     QString im = cfg.readEntry("im");
 
     QValueList<InputMethod>::Iterator it;
     if (!inputModifierList.isEmpty() && !im.isEmpty() ) {
         for (it = inputModifierList.begin(); it != inputModifierList.end(); ++it )
             if ( (*it).name() == im ) {
                 imethod = &(*it); break;
             }
 
     }
     if (!inputMethodList.isEmpty() && !current.isEmpty() ) {
         for (it = inputMethodList.begin(); it != inputMethodList.end(); ++it )
             if ( (*it).name() == current ) {
                 owarn << "preferred keyboard is " << current << "" << oendl;
                 mkeyboard = &(*it);
                 kbdButton->setPixmap( *mkeyboard->icon() );
                 break;
             }
     }
 
 }
 
 void InputMethods::loadInputMethods()
 {
 #ifndef QT_NO_COMPONENT
     hideInputMethod();
     mkeyboard = 0;
 
     unloadInputMethods();
 
-    QString path = QPEApplication::qpeDir() + "/plugins/inputmethods";
+    QString path = QPEApplication::qpeDir() + "plugins/inputmethods";
     QStringList list = plugins();
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         InputMethodInterface *iface = 0;
         ExtInputMethodInterface *eface = 0;
         QLibrary *lib = new QLibrary( path + "/" + *it );
 
         if ( lib->queryInterface( IID_InputMethod, (QUnknownInterface**)&iface ) == QS_OK ) {
             InputMethod input;
             input.newIM = FALSE;
             input.library = lib;
             input.libName = *it;
             input.interface = iface;
             input.widget = input.interface->inputMethod( 0, inputWidgetStyle );
             input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) );
             inputMethodList.append( input );
         } else if ( lib->queryInterface( IID_ExtInputMethod, (QUnknownInterface**)&eface ) == QS_OK ) {
             InputMethod input;
             input.newIM = TRUE;
             input.library = lib;
             input.libName = *it;
             input.extInterface = eface;
             input.widget = input.extInterface->keyboardWidget( 0, inputWidgetStyle );
             // may be either a simple, or advanced.
             if (input.widget) {
         //odebug << "its a keyboard" << oendl;
                 inputMethodList.append( input );
             } else {
         //odebug << "its a real im" << oendl;
                 input.widget = input.extInterface->statusWidget( 0, 0 );
                 if (input.widget) {
             //odebug << "blah" << oendl;
                     inputModifierList.append( input );
                     imButton->addWidget(input.widget, inputModifierList.count());
                 }
             }
         }else{
             delete lib;
             lib = 0l;
         }
         installTranslator(  (*it).left( (*it).find(".") ) );
     }
     qHeapSort( inputMethodList );
 #endif /* killed BUILT in cause they would not compile */
 
     QWSServer::setCurrentInputMethod( 0 );
 
     /* set the prefered IM + handler */
     setPreferedHandlers();
     if ( !inputModifierList.isEmpty() ) {
         if (!imethod)
             imethod = &inputModifierList[0];
         imButton->raiseWidget(imethod->widget);
         QWSServer::setCurrentInputMethod( imethod->extInterface->inputMethod() );
     } else {
         imethod = 0;
     }
 
     // we need to update keyboards afterwards, as some of them may not be compatible with
     // the current input method
     updateKeyboards(imethod);
 
     if ( !inputModifierList.isEmpty() )
         imButton->show();
     else
         imButton->hide();
 
     if ( inputModifierList.count() > 1 )
         imChoice->show();
     else
         imChoice->hide();
 }
 
 void InputMethods::chooseKbd()
 {
     QPopupMenu pop( this );
     pop.setFocusPolicy( NoFocus ); //don't reset IM
 
     QString imname;
     if (imethod)
         imname = imethod->libName.mid(imethod->libName.findRev('/') + 1);
 
     int i = 0;
     int firstDepKbd = 0;
 
     QValueList<InputMethod>::Iterator it;
     for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
         // add empty new items, all old items.
         if (!(*it).newIM || (*it).extInterface->compatible().count() == 0 ) {
             pop.insertItem( (*it).name(), i, firstDepKbd);
             if ( mkeyboard == &(*it) )
                 pop.setItemChecked( i, TRUE );
 
             firstDepKbd++;
         } else if ( (*it).extInterface->compatible().contains(imname)) {
             // check if we need to insert a sep.
diff --git a/core/launcher/irserver.cpp b/core/launcher/irserver.cpp
index 092eb0c..19cf904 100644
--- a/core/launcher/irserver.cpp
+++ b/core/launcher/irserver.cpp
@@ -1,76 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "irserver.h"
 #include "obexinterface.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qtopia/qlibrary.h>
 #include <qtopia/qpeapplication.h>
 
 /* QT */
 #include <qdir.h>
 
 IrServer::IrServer( QObject *parent, const char *name )
   : QObject( parent, name ), obexIface(0)
 {
     lib = 0;
     obexIface = 0;
-    QString path = QPEApplication::qpeDir() + "/plugins/obex/";
+    QString path = QPEApplication::qpeDir() + "plugins/obex/";
 #ifdef Q_OS_MACX
     QDir dir( path, "lib*.dylib" );
 #else
     QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         QLibrary *trylib = new QLibrary( path + *it );
     //odebug << "trying lib " << (path + (*it)) << "" << oendl;
         if ( trylib->queryInterface( IID_ObexInterface, (QUnknownInterface**)&obexIface ) == QS_OK ) {
             lib = trylib;
         //odebug << "found obex lib" << oendl;
             QString lang = getenv( "LANG" );
             QTranslator * trans = new QTranslator(qApp);
             QString type = (*it).left( (*it).find(".") );
-            QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+            QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+type+".qm";
         //odebug << "tr fpr obex: " << tfn << "" << oendl;
             if ( trans->load( tfn ))
                 qApp->installTranslator( trans );
             else
                 delete trans;
 
             break;
         } else {
             delete lib;
         }
     }
     if ( !lib )
     odebug << "could not load IR plugin" << oendl;
 }
 
 IrServer::~IrServer()
 {
     if ( obexIface )
         obexIface->release();
     delete lib;
 }
 
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index f3a7651..66f665f 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -222,169 +222,169 @@ void StartMenu::createMenuEntries( QPopupMenu *menu, QDir dir, bool ltabs, bool
         dirs.sort();

 

         for ( QStringList::Iterator it = dirs.begin(); it != dirs.end(); it++ ) {

             createDirEntry( menu, dir, *it, lot );

             }

     }

 }

 

 bool StartMenu::loadMenu( QPopupMenu *menu )

 {

     Config cfg("StartMenu");

     cfg.setGroup("Menu");

 

     bool ltabs = cfg.readBoolEntry("LauncherTabs", TRUE);

     bool lot = cfg.readBoolEntry("LauncherOther", TRUE);

     useWidePopupMenu = cfg.readBoolEntry(  "LauncherSubPopup",  TRUE );

     bool sepfirst = !ltabs && !lot;

 

     currentItem = 0;

         launchMenu->clear();

 

     appLnks.setAutoDelete( true );

     tabNames.setAutoDelete( true );

     appLnks.clear();

     tabNames.clear();

     appLnks.setAutoDelete( false );

     tabNames.setAutoDelete( false );

 

     QDir dir( MimeType::appsFolderName(), QString::null, QDir::Name );

     createMenuEntries( menu, dir, ltabs, lot );

 

            if ( !menu->count() ) sepfirst = TRUE;

 

     launchMenu->setName( sepfirst ? "accessories" : "accessories_need_sep" ); // No tr

 

     return currentItem;

 }

 

 

 void StartMenu::launch()

 {

     int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height();

 

     if ( launchMenu->isVisible() )

         launchMenu->hide();

     else

         launchMenu->popup( QPoint( 1, y ) );

 }

 

 

 

 

 static int compareAppletPositions(const void *b, const void *a)

 {

     const MenuApplet* aa = *(const MenuApplet**)a;

     const MenuApplet* ab = *(const MenuApplet**)b;

     int d = aa->iface->position() - ab->iface->position();

     if ( d ) return d;

     return QString::compare(aa->library->library(),ab->library->library());

 }

 

 void StartMenu::clearApplets()

 {

     if ( launchMenu )

         launchMenu-> hide();

 

     for ( QIntDictIterator<MenuApplet> it( menuApplets ); it.current(); ++it ) {

             MenuApplet *applet = it.current();

             if ( launchMenu ) {

                 launchMenu->removeItem( applet-> id );

                 delete applet->popup;

             }

 

         applet->iface->release();

         applet->library->unload();

         delete applet-> library;

     }

     menuApplets.clear();

 }

 

 

 

 

 void StartMenu::loadApplets()

 {

     Config cfg( "StartMenu" );

     cfg.setGroup( "Applets" );

 

     // SafeMode causes too much problems, so we disable it for now --

     // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02

     // removed in the remerge PluginManager could handle it

     // we don't currently use it -zecke

 

     QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );

 

     QString lang = getenv( "LANG" );

-    QString path = QPEApplication::qpeDir() + "/plugins/applets";

+    QString path = QPEApplication::qpeDir() + "plugins/applets";

     QDir dir( path, "lib*.so" );

     QStringList list = dir.entryList();

     QStringList::Iterator it;

     int napplets = 0;

     MenuApplet* *xapplets = new MenuApplet*[list.count()];

     for ( it = list.begin(); it != list.end(); ++it ) {

         if ( exclude.find( *it ) != exclude.end() )

             continue;

         MenuAppletInterface *iface = 0;

         QLibrary *lib = new QLibrary( path + "/" + *it );

         if (( lib->queryInterface( IID_MenuApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {

             MenuApplet *applet = new MenuApplet;

             xapplets[napplets++] = applet;

             applet->library = lib;

             applet->iface = iface;

 

             QTranslator *trans = new QTranslator(qApp);

             QString type = (*it).left( (*it).find(".") );

-            QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";

+            QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+type+".qm";

             if ( trans->load( tfn ))

                 qApp->installTranslator( trans );

             else

                 delete trans;

         } else {

             exclude += *it;

             delete lib;

         }

     }

     cfg.writeEntry( "ExcludeApplets", exclude, ',' );

     qsort(xapplets, napplets, sizeof(menuApplets[0]), compareAppletPositions);

 

 

     while ( napplets-- ) {

         MenuApplet *applet = xapplets[napplets];

         applet->popup = applet->iface->popup( this );

 

         // menuApplets got an id < -1

         menuApplets.insert( -( currentItem + 2 ), new MenuApplet( *applet ) );

         currentItem++;

     }

     delete [] xapplets;

 

     addApplets( launchMenu );

 }

 

 

 /*

  * Launcher calls loadMenu too often fix that

  */

 void StartMenu::addApplets(QPopupMenu* pop) {

     QIntDict<MenuApplet> dict;

     if( pop-> count ( ))

         pop-> insertSeparator ( );

 

     for ( QIntDictIterator<MenuApplet> it( menuApplets ); it.current(); ++it ) {

             MenuApplet *applet = it.current();

         if ( applet->popup )

             applet->id = pop->insertItem( applet->iface->icon(),

                                           applet->iface->text(), applet->popup );

         else

             applet->id = pop->insertItem( applet->iface->icon(),

                                           applet->iface->text() );

 

 

         dict.insert( applet->id, new MenuApplet( *applet ) );

     }

     /* need to update the key */

     menuApplets.setAutoDelete( true );

     menuApplets.clear();

     menuApplets.setAutoDelete( false );

     menuApplets = dict;

 }

diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 3c72d25..d0f1808 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -4,147 +4,147 @@
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "systray.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qtopia/qpeapplication.h>
 #include <qtopia/qlibrary.h>
 #include <qtopia/config.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qlayout.h>
 #include <qdir.h>
 
 /* STD */
 #include <stdlib.h>
 
 SysTray::SysTray( QWidget *parent ) : QFrame( parent ), layout(0)
 {
     //setFrameStyle( QFrame::Panel | QFrame::Sunken );
     loadApplets();
 }
 
 SysTray::~SysTray()
 {
     clearApplets();
 }
 
 static int compareAppletPositions(const void *a, const void *b)
 {
     const TaskbarApplet* aa = *(const TaskbarApplet**)a;
     const TaskbarApplet* ab = *(const TaskbarApplet**)b;
     int d = ab->iface->position() - aa->iface->position();
     if ( d ) return d;
     return QString::compare(ab->name,aa->name);
 }
 
 void SysTray::loadApplets()
 {
     hide();
     clearApplets();
     addApplets();
 }
 
 void SysTray::clearApplets()
 {
 #ifndef QT_NO_COMPONENTS
 
     /*
      * Note on clearing. SOme applets delete their
      * applets themselves some don't do it
      * and on restart this can crash. If we delete it
      * here we might end up in a double deletion. We could
      * use QGuardedPtr but that would be one QOBject
      * for every applet more but only useful for restart
      */
     QValueList<TaskbarApplet>::Iterator mit;
     for ( mit = appletList.begin(); mit != appletList.end(); ++mit ) {
         (*mit).iface->release();
         (*mit).library->unload();
         delete (*mit).library;
     }
 
 #endif
     appletList.clear();
     if ( layout )
         delete layout;
     layout = new QHBoxLayout( this, 0, 1 );
     layout->setAutoAdd(TRUE);
 }
 
 void SysTray::addApplets()
 {
     hide();
 #ifndef QT_NO_COMPONENTS
     Config cfg( "Taskbar" );
     cfg.setGroup( "Applets" );
     QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
 
     QString lang = getenv( "LANG" );
-    QString path = QPEApplication::qpeDir() + "/plugins/applets";
+    QString path = QPEApplication::qpeDir() + "plugins/applets";
 #ifdef Q_OS_MACX
     QDir dir( path, "lib*.dylib" );
 #else
     QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     int napplets=0;
     TaskbarApplet* *applets = new TaskbarApplet*[list.count()];
     for ( it = list.begin(); it != list.end(); ++it ) {
         if ( exclude.find( *it ) != exclude.end() )
             continue;
     owarn << "Found Applet: " << (*it) << "" << oendl;
         TaskbarAppletInterface *iface = 0;
         QLibrary *lib = new QLibrary( path + "/" + *it );
         if (( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
             TaskbarApplet *applet = new TaskbarApplet;
             applets[napplets++] = applet;
             applet->library = lib;
             applet->iface = iface;
 
             QTranslator *trans = new QTranslator(qApp);
             QString type = (*it).left( (*it).find(".") );
-            QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+            QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+type+".qm";
             if ( trans->load( tfn ))
                 qApp->installTranslator( trans );
             else
                 delete trans;
         } else {
             exclude += *it;
             delete lib;
         }
     }
     cfg.writeEntry( "ExcludeApplets", exclude, ',' );
     qsort(applets,napplets,sizeof(applets[0]),compareAppletPositions);
     while (napplets--) {
         TaskbarApplet *applet = applets[napplets];
         applet->applet = applet->iface->applet( this );
         appletList.append(*applet);
     }
     delete [] applets;
 #else /* ## FIXME single app */
     TaskbarApplet * const applet = new TaskbarApplet();
     applet->iface = new ClockAppletImpl();
     applet->applet = applet->iface->applet( this );
     appletList.append( applet );
 #endif
     show();
 }