diff options
| -rw-r--r-- | src/kvirc/kernel/kvi_app_fs.cpp | 6 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/module/kvi_modulemanager.cpp | 27 | ||||
| -rw-r--r-- | src/modules/editor/scripteditor.cpp | 6 |
4 files changed, 12 insertions, 29 deletions
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index 96ba56a34..e62d32fba 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -52,6 +52,12 @@ void KviApp::getGlobalKvircDirectory(QString &szData,KvircSubdir dir,const QStri case None : break; case Pics : szData.append("pics"); break; case Modules : + #ifdef KVIRC_MODULES_DIR + szData = KVIRC_MODULES_DIR; + #else + szData.append("modules"); + #endif + break; case Plugins : szData.append("modules"); break; case EasyPlugins : szData.append("easyplugins"); break; case ConfigPlugins : KviQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break; diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index f50155260..2e7751af7 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -70,7 +70,7 @@ bool KviApp::checkGlobalKvircDirectory(const QString dir) { //First check if the help subdir exists QString szDir2 = dir; - szDir2+=KVI_PATH_SEPARATOR"modules"; + szDir2+=KVI_PATH_SEPARATOR"help"; if(!KviFileUtils::directoryExists(szDir2))return false; //Then check if the pics subdir exists QString szDir = dir; diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp index 8cd0bb94f..41141ff39 100644 --- a/src/kvirc/module/kvi_modulemanager.cpp +++ b/src/kvirc/module/kvi_modulemanager.cpp @@ -125,9 +125,9 @@ void KviModuleManager::completeModuleNames(const QString &word,KviPointerList<QS { QString szDir; // FIXME: Should check for duplicate names here! - g_pApp->getLocalKvircDirectory(szDir,KviApp::Plugins); + g_pApp->getLocalKvircDirectory(szDir,KviApp::Modules); completeModuleNames(szDir,word,matches); - g_pApp->getGlobalKvircDirectory(szDir,KviApp::Plugins); + g_pApp->getGlobalKvircDirectory(szDir,KviApp::Modules); completeModuleNames(szDir,word,matches); } @@ -150,19 +150,6 @@ KviModule * KviModuleManager::getModule(const QString &modName) return m; } -/* -static bool default_module_cmd_load(KviModule *,KviCommand *) -{ - return true; -} - -static bool default_module_cmd_unload(KviModule *m,KviCommand *) -{ - g_pModuleManager->unloadModule(m->name()); - return true; -} -*/ - bool KviModuleManager::loadModule(const QString &modName) { if(findModule(modName)) @@ -181,16 +168,10 @@ bool KviModuleManager::loadModule(const QString &modName) #endif szName=szName.toLower(); -#ifdef KVIRC_MODULES_DIR - tmp = KVIRC_MODULES_DIR; - KviQString::ensureLastCharIs(tmp, KVI_PATH_SEPARATOR_CHAR); - tmp.append(szName); -#else - g_pApp->getLocalKvircDirectory(tmp,KviApp::Plugins,szName); -#endif + g_pApp->getLocalKvircDirectory(tmp,KviApp::Modules,szName); if(!KviFileUtils::fileExists(tmp)) { - g_pApp->getGlobalKvircDirectory(tmp,KviApp::Plugins,szName); + g_pApp->getGlobalKvircDirectory(tmp,KviApp::Modules,szName); } QLibrary* pLibrary = new QLibrary(tmp); diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 2e46c648b..19b5aa50d 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -141,11 +141,7 @@ void KviScriptEditorWidget::asyncCompleterCreation() m_pListCompletition = new QStringList(); QString szPath; -#ifdef KVIRC_MODULES_DIR - szPath = KVIRC_MODULES_DIR; -#else - g_pApp->getGlobalKvircDirectory(szPath,KviApp::Plugins); -#endif + g_pApp->getGlobalKvircDirectory(szPath,KviApp::Modules); QDir d(szPath); |