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/helpwidget.cpp | 14 +++++++------- src/modules/help/helpwidget.h | 4 ++-- src/modules/help/helpwindow.cpp | 14 +++++++------- src/modules/help/helpwindow.h | 4 ++-- src/modules/help/libkvihelp.cpp | 20 ++++++++++---------- 5 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/modules/help') diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index 02b73f6ed..218644498 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -25,12 +25,12 @@ #include "helpwidget.h" #include "helpwindow.h" -#include "kvi_frame.h" -#include "kvi_iconmanager.h" +#include "KviMainWindow.h" +#include "KviIconManager.h" #include "KviLocale.h" -#include "kvi_app.h" -#include "kvi_msgbox.h" -#include "kvi_module.h" +#include "KviApplication.h" +#include "KviMessageBox.h" +#include "KviModule.h" #include "KviFileUtils.h" #include @@ -44,7 +44,7 @@ extern Index * g_pDocIndex; extern KviPointerList * g_pHelpWindowList; extern KviPointerList * g_pHelpWidgetList; -KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame *,bool bIsStandalone) +KviHelpWidget::KviHelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone) : QWidget(par) { setObjectName("help_widget"); @@ -96,7 +96,7 @@ void KviHelpWidget::showIndex() QString szHelpDir; QDir dirHelp; - g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help); + g_pApp->getGlobalKvircDirectory(szHelpDir,KviApplication::Help); dirHelp = QDir(szHelpDir); m_pTextBrowser->setSource(QUrl::fromLocalFile(dirHelp.absoluteFilePath("index.html"))); diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h index 567d25348..bec03d087 100644 --- a/src/modules/help/helpwidget.h +++ b/src/modules/help/helpwidget.h @@ -33,14 +33,14 @@ class QToolButton; class QLineEdit; -class KviFrame; +class KviMainWindow; //class QProcess; class KviHelpWidget : public QWidget { Q_OBJECT public: - KviHelpWidget(QWidget *par,KviFrame * lpFrm,bool bIsStandalone = false); + KviHelpWidget(QWidget *par,KviMainWindow * lpFrm,bool bIsStandalone = false); ~KviHelpWidget(); private: QToolButton * m_pBtnIndex; diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 03cb7fc64..fddd70d33 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -25,11 +25,11 @@ #include "helpwindow.h" #include "helpwidget.h" -#include "kvi_app.h" -#include "kvi_iconmanager.h" -#include "kvi_options.h" +#include "KviApplication.h" +#include "KviIconManager.h" +#include "KviOptions.h" #include "KviLocale.h" -#include "kvi_module.h" +#include "KviModule.h" #include "KviConfigurationFile.h" #include "kvi_sourcesdate.h" @@ -47,7 +47,7 @@ extern KviPointerList * g_pHelpWindowList; extern KviPointerList * g_pHelpWidgetList; bool g_bIndexingDone = FALSE; -KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) +KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name) : KviWindow(KVI_WINDOW_TYPE_HELP,lpFrm,name) { g_pHelpWindowList->append(this); @@ -122,8 +122,8 @@ void KviHelpWindow::initialSetup() g_bIndexingDone=TRUE; 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 ( QFileInfo( szDoclist ).exists() && QFileInfo( szDict ).exists() ) { g_pDocIndex->readDict(); diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h index 31b526531..b278b38fc 100644 --- a/src/modules/help/helpwindow.h +++ b/src/modules/help/helpwindow.h @@ -24,7 +24,7 @@ // //============================================================================= -#include "kvi_window.h" +#include "KviWindow.h" #include "KviCString.h" #include "KviTalVBox.h" #include "KviTalListWidget.h" @@ -41,7 +41,7 @@ class KviHelpWindow : public KviWindow { Q_OBJECT public: - KviHelpWindow(KviFrame * lpFrm,const char * name); + KviHelpWindow(KviMainWindow * lpFrm,const char * name); ~KviHelpWindow(); protected: KviHelpWidget * m_pHelpWidget; 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