diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/core/kvi_pointerhashtable.h | 2 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app_fs.cpp | 22 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 10 | ||||
| -rw-r--r-- | src/modules/snd/libkvisnd.cpp | 2 |
4 files changed, 26 insertions, 10 deletions
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h index d7e8475..5617c45 100644 --- a/src/kvilib/core/kvi_pointerhashtable.h +++ b/src/kvilib/core/kvi_pointerhashtable.h @@ -96,7 +96,7 @@ inline void kvi_hash_key_copy(const char * const &szFrom,const char * &szTo,bool inline void kvi_hash_key_destroy(const char * &szKey,bool bDeepCopy) { if(bDeepCopy) - kvi_free(szKey); + kvi_free((void*)szKey); } inline const char * & kvi_hash_key_default(const char **) diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index cd80567..bfee534 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -38,7 +38,9 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <tqdatetime.h> +#ifdef COMPILE_TDE_SUPPORT #include <tdestandarddirs.h> +#endif #include "config.h" @@ -77,11 +79,11 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt } } break; - case HelpEN : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break; + case HelpEN : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break; case HelpNoIntl : szData.append("help"); break; - case Log : tqDebug("WARNING Global log directory requested!"); break; - case Incoming : tqDebug("WARNING Global incoming directory requested!"); break; - case Trash : tqDebug("WARNING Global trash directory requested!"); break; + case Log : tqDebug("WARNING Global log directory requested!"); break; + case Incoming : tqDebug("WARNING Global incoming directory requested!"); break; + case Trash : tqDebug("WARNING Global trash directory requested!"); break; case Config : szData.append("config"); break; case Audio : szData.append("audio"); break; case Scripts : szData.append("scripts"); break; @@ -91,11 +93,17 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt case DefScript : szData.append("defscript"); break; case License : szData.append("license"); break; case Filters : szData.append("filters"); break; - case Locale : szData=locate("locale",""); break; - case Tmp : tqDebug("WARNING Global tmp directory requested!"); break; + case Locale : +#ifdef COMPILE_TDE_SUPPORT + szData=locate("locale",""); +#else + szData.append("locale"); +#endif + break; + case Tmp : tqDebug("WARNING Global tmp directory requested!"); break; case Themes : szData.append("themes"); break; case Classes : szData.append("classes"); break; - case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; + case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break; } if(!appendFile.isEmpty()) diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index 8a94def..b1ce89b 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -705,7 +705,15 @@ void KviApp::loadDirectories() // First find the global (readable) one... findGlobalKvircDirectory(); // Init locale - TQString szLocalePath = locate("locale",""); + TQString szLocalePath = TQString::null; +#ifdef COMPILE_TDE_SUPPORT + szLocalePath = locate("locale",""); +#else + szLocalePath = m_szGlobalKvircDir; + szLocalePath.append(KVI_PATH_SEPARATOR); + szLocalePath.append("locale"); + szLocalePath.append(KVI_PATH_SEPARATOR); +#endif KviLocale::init(this,szLocalePath); //__debug_1arg("Global Kvirc directory is %s",m_szGlobalKvircDir.ptr()); diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 7f0db3f..4f9f929 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -67,7 +67,7 @@ #endif //COMPILE_OSS_SUPPORT #ifdef COMPILE_ARTS_SUPPORT - #include <arts/soundserver.h> + #include <soundserver.h> static Arts::Dispatcher * g_pArtsDispatcher = 0; |