From 075bdcd93cf7882bad4cb027adf159f93674d6e5 Mon Sep 17 00:00:00 2001 From: Szymon Tomasz Stefanek Date: Mon, 27 Dec 2010 05:02:48 +0000 Subject: More renaming and cleanup git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5237 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/help/libkvihelp.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/modules/help/libkvihelp.cpp') diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp index 67a9cc1cc..f89b835e8 100644 --- a/src/modules/help/libkvihelp.cpp +++ b/src/modules/help/libkvihelp.cpp @@ -26,11 +26,11 @@ #include "helpwindow.h" #include "index.h" #include "KviLocale.h" -#include "kvi_module.h" +#include "KviModule.h" #include "KviFileUtils.h" #include "kvi_sourcesdate.h" -#include "kvi_app.h" -#include "kvi_frame.h" +#include "KviApplication.h" +#include "KviMainWindow.h" #include #include @@ -109,7 +109,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) if(!f.exists() || !f.isAbsolute()) { // try relative path (to local help) - g_pApp->getLocalKvircDirectory(szHelpDir,KviApp::Help); + g_pApp->getLocalKvircDirectory(szHelpDir,KviApplication::Help); dirHelp = QDir(szHelpDir); szDoc = dirHelp.absoluteFilePath(szParam); qDebug("No abs path, trying local relative path: %s",szDoc.toUtf8().data()); @@ -118,7 +118,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) if(!f.exists()) { //try relative path (to global help) - g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help); + g_pApp->getGlobalKvircDirectory(szHelpDir,KviApplication::Help); dirHelp = QDir(szHelpDir); szDoc = dirHelp.absoluteFilePath(szParam); @@ -136,8 +136,8 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) if (!g_pDocIndex->documentList().count()) { QString szDoclist,szDict; - g_pApp->getLocalKvircDirectory(szDoclist,KviApp::Help,"help.doclist." KVI_SOURCES_DATE); - g_pApp->getLocalKvircDirectory(szDict,KviApp::Help,"help.dict." KVI_SOURCES_DATE); + g_pApp->getLocalKvircDirectory(szDoclist,KviApplication::Help,"help.doclist." KVI_SOURCES_DATE); + g_pApp->getLocalKvircDirectory(szDict,KviApplication::Help,"help.dict." KVI_SOURCES_DATE); if ( KviFileUtils::fileExists(szDoclist) && KviFileUtils::fileExists( szDict )) { g_pDocIndex->readDict(); @@ -204,13 +204,13 @@ static bool help_module_init(KviModule * m) { QString szHelpDir,szDocList; - g_pApp->getLocalKvircDirectory(szDocList,KviApp::Help,"help.doclist." KVI_SOURCES_DATE); - g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help); + 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->setDocListFile(szDocList); - g_pApp->getLocalKvircDirectory(szHelpDir,KviApp::Help,"help.dict." KVI_SOURCES_DATE); + g_pApp->getLocalKvircDirectory(szHelpDir,KviApplication::Help,"help.dict." KVI_SOURCES_DATE); g_pDocIndex->setDictionaryFile(szHelpDir); g_pHelpWidgetList = new KviPointerList; -- cgit v1.3.1-10-gc9f91