From 4d15525dca978724769b16ee76196047c9a8c2b3 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Wed, 25 Jul 2012 16:29:49 +0000 Subject: [PATCH] + remove a few function attribute references --- src/common/kiwix/cluceneIndexer.cpp | 2 +- src/common/kiwix/cluceneIndexer.h | 2 +- src/common/kiwix/indexer.cpp | 4 ++-- src/common/kiwix/indexer.h | 4 ++-- src/common/kiwix/reader.cpp | 4 ++-- src/common/kiwix/reader.h | 2 +- src/common/kiwix/xapianIndexer.cpp | 2 +- src/common/kiwix/xapianIndexer.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/common/kiwix/cluceneIndexer.cpp b/src/common/kiwix/cluceneIndexer.cpp index 5b391cbd8..0e939a7ec 100644 --- a/src/common/kiwix/cluceneIndexer.cpp +++ b/src/common/kiwix/cluceneIndexer.cpp @@ -26,7 +26,7 @@ namespace kiwix { CluceneIndexer::CluceneIndexer() { } - void CluceneIndexer::indexingPrelude(const string &indexPath) { + void CluceneIndexer::indexingPrelude(const string indexPath) { this->dir = FSDirectory::getDirectory(indexPath.c_str(), true); this->writer = new IndexWriter(this->dir, &analyzer, true); this->writer->setUseCompoundFile(false); diff --git a/src/common/kiwix/cluceneIndexer.h b/src/common/kiwix/cluceneIndexer.h index f170b3a55..a397a2bb7 100644 --- a/src/common/kiwix/cluceneIndexer.h +++ b/src/common/kiwix/cluceneIndexer.h @@ -43,7 +43,7 @@ namespace kiwix { CluceneIndexer(); protected: - void indexingPrelude(const string &indexPath); + void indexingPrelude(const string indexPath); void index(const string &url, const string &title, const string &unaccentedTitle, diff --git a/src/common/kiwix/indexer.cpp b/src/common/kiwix/indexer.cpp index 55d5f35e2..3910db2b1 100644 --- a/src/common/kiwix/indexer.cpp +++ b/src/common/kiwix/indexer.cpp @@ -342,7 +342,7 @@ namespace kiwix { /* ZIM & Index methods */ void Indexer::setZimPath(const string path) { - pthread_mutex_lock(&zimPathMutex); + pthread_mutex_lock(&zimPathMutex); this->zimPath = path; pthread_mutex_unlock(&zimPathMutex); } @@ -394,7 +394,7 @@ namespace kiwix { } /* Manage */ - bool Indexer::start(const string &zimPath, const string &indexPath) { + bool Indexer::start(const string zimPath, const string indexPath) { this->setProgression(0); this->setZimPath(zimPath); this->setIndexPath(indexPath); diff --git a/src/common/kiwix/indexer.h b/src/common/kiwix/indexer.h index a80fa84a9..0968f3eb7 100644 --- a/src/common/kiwix/indexer.h +++ b/src/common/kiwix/indexer.h @@ -61,7 +61,7 @@ namespace kiwix { public: Indexer(); - bool start(const string &zimPath, const string &indexPath); + bool start(const string zimPath, const string indexPath); bool stop(); bool isRunning(); unsigned int getProgression(); @@ -132,7 +132,7 @@ namespace kiwix { string getIndexPath(); protected: - virtual void indexingPrelude(const string &indexPath) = 0; + virtual void indexingPrelude(const string indexPath) = 0; virtual void index(const string &url, const string &title, const string &unaccentedTitle, diff --git a/src/common/kiwix/reader.cpp b/src/common/kiwix/reader.cpp index 649bc1281..15f3d9506 100644 --- a/src/common/kiwix/reader.cpp +++ b/src/common/kiwix/reader.cpp @@ -39,9 +39,9 @@ void unescapeUrl(string &url) { namespace kiwix { /* Constructor */ - Reader::Reader(const string &zimFilePath) + Reader::Reader(const string zimFilePath) : zimFileHandler(NULL) { - + this->zimFileHandler = new zim::File(zimFilePath); if (this->zimFileHandler != NULL) { diff --git a/src/common/kiwix/reader.h b/src/common/kiwix/reader.h index 9d1f1f8fc..e2d8a7834 100644 --- a/src/common/kiwix/reader.h +++ b/src/common/kiwix/reader.h @@ -38,7 +38,7 @@ namespace kiwix { class Reader { public: - Reader(const string &zimFilePath); + Reader(const string zimFilePath); ~Reader(); void reset(); diff --git a/src/common/kiwix/xapianIndexer.cpp b/src/common/kiwix/xapianIndexer.cpp index 34ce58a24..908015193 100644 --- a/src/common/kiwix/xapianIndexer.cpp +++ b/src/common/kiwix/xapianIndexer.cpp @@ -41,7 +41,7 @@ namespace kiwix { */ } - void XapianIndexer::indexingPrelude(const string &indexPath) { + void XapianIndexer::indexingPrelude(const string indexPath) { this->writableDatabase = Xapian::WritableDatabase(indexPath, Xapian::DB_CREATE_OR_OVERWRITE); this->writableDatabase.begin_transaction(true); } diff --git a/src/common/kiwix/xapianIndexer.h b/src/common/kiwix/xapianIndexer.h index 06fadbe7a..da5f19e12 100644 --- a/src/common/kiwix/xapianIndexer.h +++ b/src/common/kiwix/xapianIndexer.h @@ -33,7 +33,7 @@ namespace kiwix { XapianIndexer(); protected: - void indexingPrelude(const string &indexPath); + void indexingPrelude(const string indexPath); void index(const string &url, const string &title, const string &unaccentedTitle,