Replace QPEApplication::qpeDir() + "/ with

	QPEApplication::qpeDir() + "

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

4 files changed, 7 insertions, 7 deletions

diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 020a116..3c096ed 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -5,101 +5,101 @@
 //      copyright            : (C) 2000 - 2004 by llornkcor
 //      email                : ljp@llornkcor.com
 //                            ***************************************************/
 //  /***************************************************************************
 //   *   This program is free software; you can redistribute it and/or modify  *
 //   *   it under the terms of the GNU General Public License as published by  *
 //   *   the Free Software Foundation; either version 2 of the License, or     *
 //   *   (at your option) any later version.                                   *
 //   ***************************************************************************/
 //ftp://ibiblio.org/pub/docs/books/gutenberg/GUTINDEX.ALL
 
 #include "LibraryDialog.h"
 #include "output.h"
 
 /* OPIE */
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
 #include <opie2/odebug.h>
 
 /* QT */
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 //#include <qlayout.h>
 
 /* STD */
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 /*
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog. */
 LibraryDialog::LibraryDialog( QWidget* parent,  const char* name , bool /*modal*/, WFlags fl )
                 : QDialog( parent, name, true/* modal*/, fl )
 {
         if ( !name )
                 setName( "LibraryDialog" );
         indexLoaded=false;
         initDialog();
 
       //      this->setMaximumWidth(240);
 
         index = "GUTINDEX.ALL";
         local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
         local_index = local_library + index;
 
         QString iniFile ;
-        iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc";
+        iniFile = QPEApplication::qpeDir()+"etc/gutenbrowser/gutenbrowserrc";
 
-        new_index =QPEApplication::qpeDir()+"/etc/gutenbrowser/PGWHOLE.TXT";
+        new_index =QPEApplication::qpeDir()+"etc/gutenbrowser/PGWHOLE.TXT";
 
-        old_index = QPEApplication::qpeDir()+"/etc/gutenbrowser/GUTINDEX.ALL";
+        old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
             //    old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
 
             //     iniFile = local_library+"gutenbrowserrc";
             //     new_index = local_library + "PGWHOLE.TXT";
             //     old_index = local_library + "GUTINDEX.ALL";
 
         Config config("Gutenbrowser");
 
         config.setGroup( "HttpServer" );
         proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
 
         config.setGroup( "FTPsite" );
         ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org");
         odebug << "Library Dialog: ftp_host is "+ftp_host << oendl;
             //      ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) );
             //      ftp_host=ftp_host.stripWhiteSpace();
         ftp_base_dir= config.readEntry("base",  "/pub/gutenberg");
 
         i_binary = 0;
 
         config.setGroup("SortAuth");
         if( config.readEntry("authSort", "FALSE") == "TRUE")
                 authBox->setChecked(TRUE);
 
         config.setGroup("General");
         downDir =config.readEntry( "DownloadDirectory",local_library);
         odebug << "downDir is "+downDir << oendl;
         newindexLib.setName( old_index);
         indexLib.setName( old_index);
 
         new QPEDialogListener(this);
 				QTimer::singleShot( 1000, this, SLOT( FindLibrary()) );
 
 }
 
 LibraryDialog::~LibraryDialog()
 {
 //      delete QList_Item2;
 //      delete QList_Item1;
 //      delete QList_Item3;
 //      delete QList_Item4;
 //      delete QList_Item5;
 
     //  saveConfig();
 }
 
   /*This groks using PGWHOLE.TXT */
 void  LibraryDialog::Newlibrary()
diff --git a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
index a9c7346..de9c72b 100644
--- a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
+++ b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
@@ -1,89 +1,89 @@
 /***************************************************************************
                           ftpsitedlg.cpp  -  description
                              -------------------
     begin                : Tue Jul 25 2000
     copyright            : (C) 2000 -2004 by llornkcor
     email                : ljp@llornkcor.com
  ***************************************************************************/
 /***************************************************************************
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
 #include "optionsDialog.h"
 #include "gutenbrowser.h"
 //#include "NetworkDialog.h"
 #include "output.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 
 /* QT */
 #include <qprogressbar.h>
 #include <qurloperator.h>
 #include <qlistbox.h>
 
 /* STD */
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 
 // :)~
 void optionsDialog::ftpSiteDlg( )
 {
 //printf( "ftpSiteDlg: ListFile is "+ ListFile +"\n" );
 //  initDialog();
     local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
 //    ListFile = local_library + "ftpList";
-    ListFile = QPEApplication::qpeDir() + "/etc/gutenbrowser";
+    ListFile = QPEApplication::qpeDir() + "etc/gutenbrowser";
     QDir dir(ListFile);
     if( !dir.exists())
         dir.mkdir(ListFile,true);
     ListFile+="/ftpList";
     odebug << "opening "+ListFile << oendl;
     if ( QFile(ListFile).exists() ) {
         openSiteList();
     } else {
            switch( QMessageBox::warning( this, "Gutenbrowser",
                                           "Do you want to  download \nan ftp site list?",
                                           QMessageBox::Yes,   QMessageBox::No)) {
                     case   QMessageBox::Yes: // yes
                         getSite();
                     break;
                     case   QMessageBox::No: // No
                       // exit
                     break;
             }
 
     }
 }
 
 
 /*
 // get ftp list from web- parse it. */
 void optionsDialog::getSite()
 {
     QString file_name;
     QString ftp_listFileURL;
     QString outputFile;
 //    outputFile = local_library+ "list.html";
     outputFile = ListFile + "list.html";
     QString networkUrl= "http://www.gutenberg.org/www/mirror.sites.html";
 //http://www.gutenberg.org/index.html";
 //       QString networkUrl= "http://llornkcor.com/index.shtml";
 //    //  "http://www.gutenberg.org/index.html"
 //
 //Qhttp stops working at times.... :(
 //    NetworkDialog *NetworkDlg;
 //    NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog",TRUE,0,networkUrl,outputFile);
 //    if( NetworkDlg->exec() != 0 )
 //    { // use new, improved, *INSTANT* network-dialog-file-getterer
 //        odebug << "gitcha!" << oendl;
 //    }
 //    delete NetworkDlg;
 //#ifdef Q_WS_QWS
 
 // TODO qprocess here
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 644fae8..fac21da 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -97,102 +97,102 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 		buttons2 = new QHBoxLayout(-1,"buttons2");
 		edits = new QHBoxLayout(-1,"edits");
 
 		useSplitter=TRUE;
 
 		initConfig();
 		initMenuBar();
 		initButtonBar();
 		initStatusBar();
 		initView();
 		initSlots();
 		qDebug("init finished");
 		QPEApplication::setStylusOperation( mainList->viewport(),QPEApplication::RightOnHold);
 
 		connect( mainList, SIGNAL( mouseButtonPressed( int, QListBoxItem *, const QPoint &)),
 						 this, SLOT( mainListPressed(int, QListBoxItem *, const QPoint &)) );
 		if( useIcons)
 				toggleButtonIcons( TRUE);
 		else
 				toggleButtonIcons( FALSE);
 
 		enableButtons(false);
 
 		Config config("Gutenbrowser"); // populate menubuttonlist
 		config.setGroup("General");
 
 		config.setGroup( "Files" );
 		QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
 		int  i_numofFiles = s_numofFiles.toInt();
 
 		QString tempFileName;
 
 		for (int i = 0; i <= i_numofFiles; i++) {
 					//       tempFileName.setNum(i);
 				config.setGroup( "Files" );
 				QString ramble = config.readEntry( QString::number(i), "" );
 
 				config.setGroup( "Titles" );
 				QString tempTitle = config.readEntry( ramble, "");
 				config.setGroup( tempTitle);
 				int index = config.readNumEntry( "LineNumber", -1 );
 				if( index != -1) {
 						odebug << tempTitle << oendl;
 						if(!tempTitle.isEmpty()) bookmarksMenu->insertItem( tempTitle);
 				}
 		}
 
 			//    QString gutenIndex= local_library + "GUTINDEX.ALL";
-		QString gutenIndex = QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL";
+		QString gutenIndex = QPEApplication::qpeDir()+ "etc/gutenbrowser/GUTINDEX.ALL";
 		qDebug("gutenindex "+gutenIndex );
 		if( QFile( gutenIndex).exists() ) {
 				indexLib.setName( gutenIndex);
 		} else {
-				QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT";
+				QString localLibIndexFile = QPEApplication::qpeDir()+ "etc/gutenbrowser/PGWHOLE.TXT";
 					//        QString localLibIndexFile= local_library + "PGWHOLE.TXT";
 				newindexLib.setName( localLibIndexFile);
 		}
 		qDebug("attempting new library");
 		LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */);
 		loadCheck = false;
 		chdir(local_library);
 		if(!showMainList) {
 				Lview->setFocus();
 					//          if(firstTime)
 					//              Bookmark();
 				for (int i=1;i< qApp->argc();i++) {
 						qDebug("Suppose we open somethin");
 						if(!load(qApp->argv()[i])) return;
 				}
 		} else {
 				fillWithTitles();
 				mainList->setFocus();
 					//        mainList->setCurrentItem(0);
 
 		}
 		writeConfig();
 	 QTimer::singleShot( 250, this, SLOT(hideView()) );
 } //end init
 
 Gutenbrowser::~Gutenbrowser() {
 			//  QPEApplication::grabKeyboard();
 			//  QPEApplication::ungrabKeyboard();
 		odebug << "Exit" << oendl;
 }
 
   /*
 		Google.com search */
 void Gutenbrowser::InfoBarClick() {
 		QString text;
 		if( Lview->hasSelectedText()) {
 				Lview->copy();
 				QClipboard *cb = QApplication::clipboard();
 				text = cb->text();
 		} else {
 					//    text=title;
 				text=this->caption();
 		}
 		searchGoogle(text);
 }
 
   /*
 		download http with wget or preferred browser */
diff --git a/noncore/apps/opie-gutenbrowser/helpme.cpp b/noncore/apps/opie-gutenbrowser/helpme.cpp
index 53e0236..0e23114 100644
--- a/noncore/apps/opie-gutenbrowser/helpme.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpme.cpp
@@ -13,97 +13,97 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "helpme.h"
 #include "helpwindow.h"
 
 /* OPIE */
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/odebug.h>
 
 /* QT */
 #include <qprogressdialog.h>
 #include <qlayout.h>
 
 /* STD */
 #include <sys/stat.h>
 #include <unistd.h>
 
 HelpMe::HelpMe(QWidget *parent,  QString name ) : QDialog(parent,name)
 {
     local_library = ( QDir::homeDirPath ())+"/Applications/gutenbrowser/";
     setCaption(tr("Gutenbrowser About " VERSION));
 
   QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
 
     Edit = new QMultiLineEdit(this, "");
     Edit->setReadOnly(true);
     Edit->append(tr("Based on gutenbook.pl, available from http://www.gutenbook.org"));
     Edit->append(tr("Much appreciation to Lee Burgess,"));
     Edit->append(tr("for the original idea and concept of gutenbook.\n"));
     Edit->append(tr("A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html\n"));
     Edit->append(tr("For bug reports, comments or questions about Gutenbrowser, email"));
     Edit->append(tr("ljp@llornkcor.com\n"));
     Edit->append(tr("\nMade using Qt, Qt Embedded, and Qtopia, a cross platform development API\nhttp://www.trolltech.com\n\n"));
     Edit->append(tr("Arnold's Laws of Documentation:"));
     Edit->append(tr("(1) If it should exist, it doesn't."));
     Edit->append(tr("(2) If it does exist, it's out of date."));
     Edit->append(tr("(3) Only documentation for"));
     Edit->append(tr("useless programs transcends the"));
     Edit->append(tr("first two laws.\n"));
     Edit->append(tr("Everything is temporary, anyway....\n :o)"));
     Edit->setWordWrap(QMultiLineEdit::WidgetWidth);
   QString pixDir;
-  pixDir=QPEApplication::qpeDir()+"/pics/";
+  pixDir=QPEApplication::qpeDir()+"pics/";
     QPushButton *help;
     help = new QPushButton(this);
     help->setPixmap( QPixmap( pixDir+"gutenbrowser/help.png"));
     help->setText("Help");
     connect( help,SIGNAL(clicked()),this,SLOT( help() ));
 
 /*    QPushButton *ok;
     ok = new QPushButton(this);
     ok->setPixmap(  QPixmap( pixDir+"/gutenbrowser/exit.png"));
     ok->setText("ok");
     connect(ok,SIGNAL(clicked()),this,SLOT(accept() ));
 */
     help->setFixedHeight(25);
 //    ok->setFixedHeight(25);
 
 //  layout->addMultiCellWidget( ok, 0, 0, 4, 4 );
   layout->addMultiCellWidget( help, 0, 0, 4, 4 );
   layout->addMultiCellWidget( Edit, 1, 1, 0, 4 );
 }
 
 HelpMe::~HelpMe()
 {
 //delete Edit;
 
 }
 
 void HelpMe::goToURL()
 {
 
     url = "http://www.llornkcor.com/";
     goGetit( url);
 }
 
 void HelpMe::goToURL2()
 {
     url = "http://www.gutenberg.org";
     goGetit( url);
 }
 
 void HelpMe::goToURL3()
 {
     url = "http://www.gutenbook.org";
     goGetit( url);
 }
 
 void HelpMe::goGetit( QString url)
 {
      HelpWindow *help = new HelpWindow( url, ".", 0, "gutenbrowser");