Replace QPEApplication::qpeDir() + "/ with

	QPEApplication::qpeDir() + "

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

3 files changed, 4 insertions, 4 deletions

diff --git a/libopie2/opiecore/opluginloader.cpp b/libopie2/opiecore/opluginloader.cpp
index 2a6e369..d33eac6 100644
--- a/libopie2/opiecore/opluginloader.cpp
+++ b/libopie2/opiecore/opluginloader.cpp
@@ -470,13 +470,13 @@ void OGenericPluginLoader::setSafeMode(const QString& str, bool b) {
     conf.writeEntry( "CrashedPlugin", str );
 }
 
 /**
  * @internal
  *
- * Set the List of Plugin Dirs to lst. Currently only QPEApplication::qpeDir()+"/plugins/"+mytype
+ * Set the List of Plugin Dirs to lst. Currently only QPEApplication::qpeDir()+"plugins/"+mytype
  * is used as plugin dir
  */
 void OGenericPluginLoader::setPluginDirs( const QStringList& lst ) {
     m_plugDirs = lst;
 }
 
@@ -635,13 +635,13 @@ void OGenericPluginLoader::installTranslators(const QString& type) {
     /*
      * for each language and maybe later for each language dir...
      * try to load a Translator
      */
     for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
         QTranslator* trans = new QTranslator(  qApp );
-        QString tfn = QPEApplication::qpeDir()+"/i18n/" + *it + "/lib" + type + ".qm" ;
+        QString tfn = QPEApplication::qpeDir()+"i18n/" + *it + "/lib" + type + ".qm" ;
 
         /*
          * If loaded then install else clean up and don't leak
          */
         if ( trans->load( tfn ) ) 
                     qApp->installTranslator( trans );
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index 32bae0a..7e185a2 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -67,13 +67,13 @@ OManufacturerDB::OManufacturerDB()
     Global::statusMessage( "Reading Manufacturers..." );
     #endif
     QString filename( "/etc/manufacturers" );
     odebug << "OManufacturerDB: trying to read " << filename << oendl;
     if ( !QFile::exists( filename ) )
     {
-        filename = QPEApplication::qpeDir()+"/etc/manufacturers";
+        filename = QPEApplication::qpeDir()+"etc/manufacturers";
         odebug << "OManufacturerDB: trying to read " << filename << oendl;
         if ( !QFile::exists( filename ) )
         {
             filename = "/usr/share/wellenreiter/manufacturers";
             odebug << "OManufacturerDB: trying to read " << filename << oendl;
         }
diff --git a/libopie2/opiesecurity/multiauthcommon.cpp b/libopie2/opiesecurity/multiauthcommon.cpp
index 9de62d2..e563193 100644
--- a/libopie2/opiesecurity/multiauthcommon.cpp
+++ b/libopie2/opiesecurity/multiauthcommon.cpp
@@ -86,13 +86,13 @@ int runPlugins() {
     int nbSuccessMin = config.readNumEntry("nbSuccessMin", 1);
     int nbSuccess = 0;
 
     /* tries to launch successively each plugin in $OPIEDIR/plugins/security
      * directory which file name is in Security.conf / [Misc] / IncludePlugins
      */
-    QString path = QPEApplication::qpeDir() + "/plugins/security";
+    QString path = QPEApplication::qpeDir() + "plugins/security";
     QStringList::Iterator libIt;
 
     for ( libIt = plugins.begin(); libIt != plugins.end(); ++libIt ) {
         QInterfacePtr<MultiauthPluginInterface> iface;
         QLibrary *lib = new QLibrary( path + "/" + *libIt );