The big rename for modules. Still some details remaining.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5284 17fca916-40b9-46aa-a4ea-0a15b648b75c

8 files changed, 98 insertions, 98 deletions

diff --git a/src/modules/help/CMakeLists.txt b/src/modules/help/CMakeLists.txt
index ac9d04d02..567f94e88 100644
--- a/src/modules/help/CMakeLists.txt
+++ b/src/modules/help/CMakeLists.txt
@@ -1,16 +1,16 @@
 # CMakeLists for src/modules/help
 
 SET(kvihelp_MOC_HDRS
-	helpwidget.h
-	helpwindow.h
-	index.h
+	HelpWidget.h
+	HelpWindow.h
+	HelpIndex.h
 )
 
 SET(kvihelp_SRCS
 	libkvihelp.cpp
-	helpwidget.cpp
-	helpwindow.cpp
-	index.cpp
+	HelpWidget.cpp
+	HelpWindow.cpp
+	HelpIndex.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/help/index.cpp b/src/modules/help/HelpIndex.cpp
index 0bd2a0033..5d9ddc062 100644
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/HelpIndex.cpp
@@ -35,7 +35,7 @@
 **
 ****************************************************************************/
 
-#include "index.h"
+#include "HelpIndex.h"
 
 #include <QFile>
 #include <QDir>
@@ -75,7 +75,7 @@ QDataStream &operator<<( QDataStream &s, const Document &l )
     return s;
 }
 
-Index::Index( const QString &dp, const QString &hp )
+HelpIndex::HelpIndex( const QString &dp, const QString &hp )
     : QObject( 0 ), docPath( dp )
 {
     Q_UNUSED(hp);
@@ -91,7 +91,7 @@ Index::Index( const QString &dp, const QString &hp )
 	connect(m_pTimer, SIGNAL(timeout()), this, SLOT(filterNext()));
 }
 
-Index::Index( const QStringList &dl, const QString &hp )
+HelpIndex::HelpIndex( const QStringList &dl, const QString &hp )
     : QObject( 0 )
 {
     Q_UNUSED(hp);
@@ -102,27 +102,27 @@ Index::Index( const QStringList &dl, const QString &hp )
              this, SLOT(setLastWinClosed()) );
 }
 
-void Index::setLastWinClosed()
+void HelpIndex::setLastWinClosed()
 {
     lastWindowClosed = true;
 }
 
-void Index::setDictionaryFile( const QString &f )
+void HelpIndex::setDictionaryFile( const QString &f )
 {
     dictFile = f;
 }
 
-void Index::setDocListFile( const QString &f )
+void HelpIndex::setDocListFile( const QString &f )
 {
     docListFile = f;
 }
 
-void Index::setDocList( const QStringList &lst )
+void HelpIndex::setDocList( const QStringList &lst )
 {
     docList = lst;
 }
 
-void Index::makeIndex()
+void HelpIndex::makeIndex()
 {
 	if ( !alreadyHaveDocList )
 		setupDocumentList();
@@ -134,7 +134,7 @@ void Index::makeIndex()
 	m_pTimer->start(); //singleshot
 }
 
-void Index::filterNext()
+void HelpIndex::filterNext()
 {
 	if(m_iCurItem < docList.count() && !lastWindowClosed)
 	{
@@ -148,7 +148,7 @@ void Index::filterNext()
 	}
 }
 
-void Index::setupDocumentList()
+void HelpIndex::setupDocumentList()
 {
     docList.clear();
     titleList.clear();
@@ -165,7 +165,7 @@ void Index::setupDocumentList()
     }
 }
 
-void Index::insertInDict( const QString &str, int docNum )
+void HelpIndex::insertInDict( const QString &str, int docNum )
 {
     if ( str == QLatin1String("amp") || str == QLatin1String("nbsp"))
         return;
@@ -183,7 +183,7 @@ void Index::insertInDict( const QString &str, int docNum )
     }
 }
 
-QString Index::getCharsetForDocument(QFile *file)
+QString HelpIndex::getCharsetForDocument(QFile *file)
 {
     QTextStream s(file);
     QString contents = s.readAll();
@@ -206,7 +206,7 @@ QString Index::getCharsetForDocument(QFile *file)
     return encoding;
 }
 
-void Index::parseDocument( const QString &filename, int docNum )
+void HelpIndex::parseDocument( const QString &filename, int docNum )
 {
     QFile file( filename );
     if ( !file.open(QFile::ReadOnly) ) {
@@ -261,7 +261,7 @@ void Index::parseDocument( const QString &filename, int docNum )
     file.close();
 }
 
-void Index::writeDict()
+void HelpIndex::writeDict()
 {
     QFile f( dictFile );
     if ( !f.open(QFile::WriteOnly ) )
@@ -276,7 +276,7 @@ void Index::writeDict()
     writeDocumentList();
 }
 
-void Index::writeDocumentList()
+void HelpIndex::writeDocumentList()
 {
     QFile f( docListFile );
     if ( !f.open(QFile::WriteOnly ) )
@@ -292,7 +292,7 @@ void Index::writeDocumentList()
     
 }
 
-void Index::readDict()
+void HelpIndex::readDict()
 {
     QFile f( dictFile );
     if ( !f.open(QFile::ReadOnly ) )
@@ -314,7 +314,7 @@ void Index::readDict()
     readDocumentList();
 }
 
-void Index::readDocumentList()
+void HelpIndex::readDocumentList()
 {
     QFile f( docListFile );
     if ( !f.open(QFile::ReadOnly ) )
@@ -328,7 +328,7 @@ void Index::readDocumentList()
     s1 >> titleList;
 }
 
-QStringList Index::query( const QStringList &terms, const QStringList &termSeq, const QStringList &seqWords )
+QStringList HelpIndex::query( const QStringList &terms, const QStringList &termSeq, const QStringList &seqWords )
 {
     QList<Term> termList;
     for (QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it ) {
@@ -384,7 +384,7 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq,
     return results;
 }
 
-QString Index::getDocumentTitle( const QString &fullFileName )
+QString HelpIndex::getDocumentTitle( const QString &fullFileName )
 {
     QUrl url(fullFileName);
     QString fileName = url.toLocalFile();
@@ -416,7 +416,7 @@ QString Index::getDocumentTitle( const QString &fullFileName )
     return title;
 }
 
-QStringList Index::getWildcardTerms( const QString &term )
+QStringList HelpIndex::getWildcardTerms( const QString &term )
 {
     QStringList lst;
     QStringList terms = split( term );
@@ -459,7 +459,7 @@ QStringList Index::getWildcardTerms( const QString &term )
     return lst;
 }
 
-QStringList Index::split( const QString &str )
+QStringList HelpIndex::split( const QString &str )
 {
     QStringList lst;
     int j = 0;
@@ -484,7 +484,7 @@ QStringList Index::split( const QString &str )
     return lst;
 }
 
-QVector<Document> Index::setupDummyTerm( const QStringList &terms )
+QVector<Document> HelpIndex::setupDummyTerm( const QStringList &terms )
 {
     QList<Term> termList;
     for (QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) {
@@ -511,14 +511,14 @@ QVector<Document> Index::setupDummyTerm( const QStringList &terms )
     return maxList;
 }
 
-void Index::buildMiniDict( const QString &str )
+void HelpIndex::buildMiniDict( const QString &str )
 {
     if ( miniDict[ str ] )
         miniDict[ str ]->positions.append( wordNum );
     ++wordNum;
 }
 
-bool Index::searchForPattern( const QStringList &patterns, const QStringList &words, const QString &fileName )
+bool HelpIndex::searchForPattern( const QStringList &patterns, const QStringList &words, const QString &fileName )
 {
     QUrl url(fileName);
     QString fName = url.toLocalFile();
diff --git a/src/modules/help/index.h b/src/modules/help/HelpIndex.h
index 3d5970645..6eb1cdf6c 100644
--- a/src/modules/help/index.h
+++ b/src/modules/help/HelpIndex.h
@@ -72,7 +72,7 @@ struct Document {
 QDataStream &operator>>( QDataStream &s, Document &l );
 QDataStream &operator<<( QDataStream &s, const Document &l );
 
-class Index : public QObject
+class HelpIndex : public QObject
 {
     Q_OBJECT
 public:
@@ -86,8 +86,8 @@ public:
 	    QList<uint> positions;
     };
 
-    Index( const QString &dp, const QString &hp );
-    Index( const QStringList &dl, const QString &hp );
+    HelpIndex( const QString &dp, const QString &hp );
+    HelpIndex( const QStringList &dl, const QString &hp );
     void writeDict();
     void readDict();
     void makeIndex();
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/HelpWidget.cpp
index 66de43932..e7f5d53f3 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : helpwidget.cpp
+//   File : HelpWidget.cpp
 //   Creation date : Thu Aug 10 2000 17:42:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "helpwidget.h"
-#include "helpwindow.h"
+#include "HelpWidget.h"
+#include "HelpWindow.h"
 
 #include "KviMainWindow.h"
 #include "KviIconManager.h"
@@ -40,11 +40,11 @@
 #include <QClipboard>
 #include <QDir>
 
-extern Index        * g_pDocIndex;
-extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
-extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList;
+extern HelpIndex        * g_pDocIndex;
+extern KviPointerList<HelpWindow> * g_pHelpWindowList;
+extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
-KviHelpWidget::KviHelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
+HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 : QWidget(par)
 {
 	setObjectName("help_widget");
@@ -86,12 +86,12 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 	connect(m_pTextBrowser,SIGNAL(forwardAvailable(bool)),m_pBtnForward,SLOT(setEnabled(bool)));
 }
 
-KviHelpWidget::~KviHelpWidget()
+HelpWidget::~HelpWidget()
 {
 	if(m_bIsStandalone)g_pHelpWidgetList->removeRef(this);
 }
 
-void KviHelpWidget::showIndex()
+void HelpWidget::showIndex()
 {
 	QString szHelpDir;
         QDir dirHelp;
@@ -102,7 +102,7 @@ void KviHelpWidget::showIndex()
 	m_pTextBrowser->setSource(QUrl::fromLocalFile(dirHelp.absoluteFilePath("index.html")));
 }
 
-void KviHelpWidget::resizeEvent(QResizeEvent *)
+void HelpWidget::resizeEvent(QResizeEvent *)
 {
 	int hght = m_pToolBar->sizeHint().height();
 	if(hght < 40)hght = 40;
@@ -110,7 +110,7 @@ void KviHelpWidget::resizeEvent(QResizeEvent *)
 	m_pTextBrowser->setGeometry(0,hght,width(),height() - hght);
 }
 
-void KviHelpWidget::doClose()
+void HelpWidget::doClose()
 {
 	// hack needed to workaround "QToolBar::emulateButtonClicked()"
 	// that refers to the "this" pointer after this slot has been
@@ -118,13 +118,13 @@ void KviHelpWidget::doClose()
 	QTimer::singleShot(0,this,SLOT(suicide()));
 }
 
-void KviHelpWidget::suicide()
+void HelpWidget::suicide()
 {
 	// goodbye cruel wolrd
 	delete this;
 }
 
-QSize KviHelpWidget::sizeHint() const
+QSize HelpWidget::sizeHint() const
 {
 	int wdth = m_pTextBrowser->sizeHint().width();
 	if(m_pToolBar->sizeHint().width() > wdth)wdth = m_pToolBar->sizeHint().width();
@@ -133,5 +133,5 @@ QSize KviHelpWidget::sizeHint() const
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "helpwidget.moc"
+#include "HelpWidget.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/helpwidget.h b/src/modules/help/HelpWidget.h
index 8b6509ef9..e94225f17 100644
--- a/src/modules/help/helpwidget.h
+++ b/src/modules/help/HelpWidget.h
@@ -2,7 +2,7 @@
 #define _HELPWIDGET_H_
 //=============================================================================
 //
-//   File : helpwidget.h
+//   File : HelpWidget.h
 //   Creation date : Thu Aug 10 2000 17:26:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "index.h"
+#include "HelpIndex.h"
 
 #include "KviTalHBox.h"
 
@@ -36,12 +36,12 @@ class QLineEdit;
 class KviMainWindow;
 //class QProcess;
 
-class KviHelpWidget : public QWidget
+class HelpWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviHelpWidget(QWidget *par,KviMainWindow * lpFrm,bool bIsStandalone = false);
-	~KviHelpWidget();
+	HelpWidget(QWidget *par,KviMainWindow * lpFrm,bool bIsStandalone = false);
+	~HelpWidget();
 private:
 	QToolButton  * m_pBtnIndex;
 	QToolButton  * m_pBtnBackward;
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/HelpWindow.cpp
index 052d2c6eb..5f58d85ed 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : helpwindow.cpp
+//   File : HelpWindow.cpp
 //   Creation date : Tue Aug 11 2000 18:08:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "helpwindow.h"
-#include "helpwidget.h"
+#include "HelpWindow.h"
+#include "HelpWidget.h"
 
 #include "KviApplication.h"
 #include "KviIconManager.h"
@@ -42,12 +42,12 @@
 #include <QToolTip>
 #include <QTimer>
 
-extern Index        * g_pDocIndex;
-extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
-extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList;
+extern HelpIndex        * g_pDocIndex;
+extern KviPointerList<HelpWindow> * g_pHelpWindowList;
+extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
 bool g_bIndexingDone = FALSE;
-KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
+HelpWindow::HelpWindow(KviMainWindow * lpFrm,const char * name)
 : KviWindow(KVI_WINDOW_TYPE_HELP,lpFrm,name)
 {
 	g_pHelpWindowList->append(this);
@@ -55,7 +55,7 @@ KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
 	m_pSplitter->setObjectName("main_splitter");
 	m_pSplitter->setChildrenCollapsible(false);
 
-	m_pHelpWidget = new KviHelpWidget(m_pSplitter,lpFrm);
+	m_pHelpWidget = new HelpWidget(m_pSplitter,lpFrm);
 
 	m_pToolBar=new KviTalVBox(m_pSplitter);	
 	m_pTabWidget = new QTabWidget(m_pToolBar);
@@ -68,7 +68,7 @@ KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
 	m_pBottomLayout->setVisible(false);
 
 	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
-	m_pTabWidget->addTab(m_pIndexTab,__tr2qs("Index"));
+	m_pTabWidget->addTab(m_pIndexTab,__tr2qs("HelpIndex"));
 
 	KviTalHBox* pSearchBox = new KviTalHBox(m_pIndexTab);
 	m_pIndexSearch = new QLineEdit(pSearchBox);
@@ -108,12 +108,12 @@ KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
 	QTimer::singleShot(0,this,SLOT(initialSetup()));
 }
 
-KviHelpWindow::~KviHelpWindow()
+HelpWindow::~HelpWindow()
 {
 	g_pHelpWindowList->removeRef(this);
 }
 
-void KviHelpWindow::initialSetup()
+void HelpWindow::initialSetup()
 {
 	m_pIndexSearch->setFocus();
 
@@ -138,19 +138,19 @@ void KviHelpWindow::initialSetup()
 	}
 }
 
-void KviHelpWindow::indexingStart( int iNum )
+void HelpWindow::indexingStart( int iNum )
 {
 	m_pBtnRefreshIndex->setEnabled(false);
 	m_pBottomLayout->setVisible(true);
 	m_pProgressBar->setRange(0, iNum);
 	m_pProgressBar->setValue(0);
 }
-void KviHelpWindow::indexingProgress( int iNum )
+void HelpWindow::indexingProgress( int iNum )
 {
 	m_pProgressBar->setValue(iNum);
 }
 
-void KviHelpWindow::indexingEnd()
+void HelpWindow::indexingEnd()
 {
 	m_pProgressBar->setValue(0);
 	m_pBottomLayout->setVisible(false);
@@ -162,13 +162,13 @@ void KviHelpWindow::indexingEnd()
 	m_pBtnRefreshIndex->setEnabled(true);
 }
 
-void KviHelpWindow::saveProperties(KviConfigurationFile *cfg)
+void HelpWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("Splitter",m_pSplitter->sizes());
 }
 
-void KviHelpWindow::loadProperties(KviConfigurationFile *cfg)
+void HelpWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	QList<int> def;
 	int w = width();
@@ -178,12 +178,12 @@ void KviHelpWindow::loadProperties(KviConfigurationFile *cfg)
 	KviWindow::loadProperties(cfg);
 }
 
-void KviHelpWindow::refreshIndex()
+void HelpWindow::refreshIndex()
 {
 	g_pDocIndex->makeIndex();
 }
 
-void KviHelpWindow::startSearch()
+void HelpWindow::startSearch()
 {
 	QString str = m_pTermsEdit->text();
 	str = str.replace( "\'", "\"" );
@@ -258,19 +258,19 @@ void KviHelpWindow::startSearch()
 	setCursor( Qt::ArrowCursor );
 }
 
-QTextBrowser * KviHelpWindow::textBrowser()
+QTextBrowser * HelpWindow::textBrowser()
 {
 	return m_pHelpWidget->textBrowser();
 }
 
-void KviHelpWindow::showIndexTopic()
+void HelpWindow::showIndexTopic()
 {
 	if (m_pIndexSearch->text().isEmpty()|| !m_pIndexListWidget->selectedItems().count()) return;
 	int i=g_pDocIndex->titlesList().indexOf(m_pIndexListWidget->selectedItems().at(0)->text());
 	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
-void KviHelpWindow::searchInIndex( const QString &s )
+void HelpWindow::searchInIndex( const QString &s )
 {
 	QListWidgetItem *item ;
 	QString sl = s.toLower();
@@ -287,36 +287,36 @@ void KviHelpWindow::searchInIndex( const QString &s )
 	}
 }
 
-void KviHelpWindow::indexSelected ( QListWidgetItem *item )
+void HelpWindow::indexSelected ( QListWidgetItem *item )
 {
 	if (!item) return;
 	int i=g_pDocIndex->titlesList().indexOf(item->text());
 	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
-void KviHelpWindow::searchSelected ( QListWidgetItem *item )
+void HelpWindow::searchSelected ( QListWidgetItem *item )
 {
 	if (!item) return;
 	int i=g_pDocIndex->titlesList().indexOf(item->text());
 	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
-QPixmap * KviHelpWindow::myIconPtr()
+QPixmap * HelpWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP);
 }
 
-void KviHelpWindow::resizeEvent(QResizeEvent *)
+void HelpWindow::resizeEvent(QResizeEvent *)
 {
 	m_pSplitter->setGeometry(0,0,width(),height());
 }
 
-void KviHelpWindow::fillCaptionBuffers()
+void HelpWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs("Help Browser");
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "helpwindow.moc"
+#include "HelpWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/helpwindow.h b/src/modules/help/HelpWindow.h
index 8b262273c..94eacc347 100644
--- a/src/modules/help/helpwindow.h
+++ b/src/modules/help/HelpWindow.h
@@ -2,7 +2,7 @@
 #define _HELPWINDOW_H_
 //=============================================================================
 //
-//   File : helpwindow.h
+//   File : HelpWindow.h
 //   Creation date : Fri Aug 11 2000 18:05:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,16 +35,16 @@
 class QProgressBar;
 class QPushButton;
 class QTextBrowser;
-class KviHelpWidget;
+class HelpWidget;
 
-class KviHelpWindow : public KviWindow
+class HelpWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviHelpWindow(KviMainWindow * lpFrm,const char * name);
-	~KviHelpWindow();
+	HelpWindow(KviMainWindow * lpFrm,const char * name);
+	~HelpWindow();
 protected:
-	KviHelpWidget * m_pHelpWidget;
+	HelpWidget * m_pHelpWidget;
 	KviTalVBox    * m_pToolBar;
 	QTabWidget    * m_pTabWidget;
 	KviTalVBox    * m_pIndexTab;
@@ -61,7 +61,7 @@ protected:
 	QLineEdit     * m_pTermsEdit;
 	QPushButton   * m_pBtnRefreshIndex;
 public:
-	KviHelpWidget * helpWidget(){ return m_pHelpWidget; };
+	HelpWidget * helpWidget(){ return m_pHelpWidget; };
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index 8cf269cbd..039d4fbef 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "helpwidget.h"
-#include "helpwindow.h"
-#include "index.h"
+#include "HelpWidget.h"
+#include "HelpWindow.h"
+#include "HelpIndex.h"
 #include "KviLocale.h"
 #include "KviModule.h"
 #include "KviFileUtils.h"
@@ -36,9 +36,9 @@
 #include <QFileInfo>
 #include <QSplitter>
 
-Index        * g_pDocIndex = 0;
-KviPointerList<KviHelpWidget> * g_pHelpWidgetList = 0;
-KviPointerList<KviHelpWindow> * g_pHelpWindowList = 0;
+HelpIndex        * g_pDocIndex = 0;
+KviPointerList<HelpWidget> * g_pHelpWidgetList = 0;
+KviPointerList<HelpWindow> * g_pHelpWindowList = 0;
 
 /*
 	@doc: help.open
@@ -177,7 +177,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!c->switches()->find('n',"new"))
 	{
-		KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->findChild<KviHelpWidget *>("help_widget");
+		HelpWidget * w = (HelpWidget *)c->window()->frame()->findChild<HelpWidget *>("help_widget");
 
 		if(w)
 		{
@@ -187,11 +187,11 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	}
 	if(c->switches()->find('m',"mdi"))
 	{
-		KviHelpWindow *w = new KviHelpWindow(c->window()->frame(),"Help browser");
+		HelpWindow *w = new HelpWindow(c->window()->frame(),"Help browser");
 		w->textBrowser()->setSource(QUrl::fromLocalFile(f.absoluteFilePath()));
 		c->window()->frame()->addWindow(w);
 	} else {
-		KviHelpWidget *w = new KviHelpWidget(c->window()->frame()->splitter(),
+		HelpWidget *w = new HelpWidget(c->window()->frame()->splitter(),
 			c->window()->frame(),true);
 		w->textBrowser()->setSource(QUrl::fromLocalFile(f.absoluteFilePath()));
 		w->show();
@@ -207,15 +207,15 @@ static bool help_module_init(KviModule * m)
 	g_pApp->getLocalKvircDirectory(szDocList,KviApplication::Help,"help.doclist." KVI_SOURCES_DATE);
 	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApplication::Help);
 
-	g_pDocIndex = new Index(szHelpDir,szDocList);
+	g_pDocIndex = new HelpIndex(szHelpDir,szDocList);
 	g_pDocIndex->setDocListFile(szDocList);
 
 	g_pApp->getLocalKvircDirectory(szHelpDir,KviApplication::Help,"help.dict." KVI_SOURCES_DATE);
 	g_pDocIndex->setDictionaryFile(szHelpDir);
 
-	g_pHelpWidgetList = new KviPointerList<KviHelpWidget>;
+	g_pHelpWidgetList = new KviPointerList<HelpWidget>;
 	g_pHelpWidgetList->setAutoDelete(false);
-	g_pHelpWindowList = new KviPointerList<KviHelpWindow>;
+	g_pHelpWindowList = new KviPointerList<HelpWindow>;
 	g_pHelpWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",help_kvs_cmd_open);