aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt25
-rw-r--r--cmake/kvi_sysconfig.h.cmake5
-rw-r--r--src/kvilib/core/kvi_qstring.cpp2
-rw-r--r--src/kvilib/core/kvi_string.cpp2
-rw-r--r--src/kvilib/core/kvi_string.h2
-rw-r--r--src/kvirc/kernel/kvi_app.h2
-rw-r--r--src/kvirc/kernel/kvi_app_setup.cpp14
-rw-r--r--src/modules/addon/managementdialog.cpp2
8 files changed, 33 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f31c407db..0e6692e64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -465,21 +465,36 @@ ENDIF()
############################################################################
# DCC voice support
############################################################################
+CHECK_INCLUDE_FILE(linux/soundcard.h CMAKE_HAVE_LINUX_SOUNDCARD_H)
+CHECK_INCLUDE_FILE(sys/soundcard.h CMAKE_HAVE_SYS_SOUNDCARD_H)
+CHECK_INCLUDE_FILE(soundcard.h CMAKE_HAVE_SOUNDCARD_H)
+
OPTION(WANT_DCC_VOICE "Compile DCC Voice Support" ON)
IF(WITHOUT_DCC_VOICE)
SET(WANT_DCC_VOICE OFF)
ENDIF()
IF(WANT_DCC_VOICE)
- SET(COMPILE_DISABLE_DCC_VOICE 1)
- SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "yes")
+ IF(CMAKE_HAVE_LINUX_SOUNDCARD_H)
+ SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "yes, linux/soundcard.h found")
+ SET(HAVE_LINUX_SOUNDCARD_H 1)
+ ELSEIF(CMAKE_HAVE_SYS_SOUNDCARD_H)
+ SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "yes, sys/soundcard.h found")
+ SET(HAVE_SYS_SOUNDCARD_H 1)
+ ELSEIF(CMAKE_HAVE_SOUNDCARD_H)
+ SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "yes, soundcard.h found")
+ SET(HAVE_SOUNDCARD_H 1)
+ ELSE()
+ SET(COMPILE_DISABLE_DCC_VOICE 1)
+ LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS WITHOUT_DCC_VOICE)
+ SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "no, soundcard.h not found")
+
+ ENDIF()
ELSE()
+ SET(COMPILE_DISABLE_DCC_VOICE 1)
LIST(APPEND CMAKE_KVIRC_BUILD_FLAGS WITHOUT_DCC_VOICE)
SET(CMAKE_STATUS_DCC_VOICE_SUPPORT "user disabled")
ENDIF()
-
-
-
############################################################################
# ix86 asm support
############################################################################
diff --git a/cmake/kvi_sysconfig.h.cmake b/cmake/kvi_sysconfig.h.cmake
index 3a486b222..06006f2bf 100644
--- a/cmake/kvi_sysconfig.h.cmake
+++ b/cmake/kvi_sysconfig.h.cmake
@@ -29,6 +29,11 @@
#cmakedefine COMPILE_PHONON_SUPPORT 1
#cmakedefine COMPILE_DBUS_SUPPORT 1
+#cmakedefine COMPILE_DISABLE_DCC_VOICE 1
+#cmakedefine HAVE_LINUX_SOUNDCARD_H 1
+#cmakedefine HAVE_SYS_SOUNDCARD_H 1
+#cmakedefine HAVE_SOUNDCARD_H 1
+
#define COMPILE_USE_STANDALONE_MOC_SOURCES 1
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index 580661763..bfa5cb63f 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -533,7 +533,7 @@ namespace KviQString
case 's': // char * string
{
argString = kvi_va_arg(list,char *);
- if(!argString)argString = "[!NULL!]";
+ if(!argString)argString = (char*) "[!NULL!]";
QString str(argString);
if(str.isEmpty())continue;
int len = str.length();
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 61f5bed81..4c54c66f7 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -2120,7 +2120,7 @@ KviStr & KviStr::replaceAll(const char c,const char *str)
return (*this);
}
-KviStr & KviStr::replaceAll(char *toFind,const char *str,bool bCaseS)
+KviStr & KviStr::replaceAll(const char *toFind,const char *str,bool bCaseS)
{
int len = (int)strlen(toFind);
int idx = findFirstIdx(toFind,bCaseS);
diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h
index 290a4e767..b4b878507 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/kvi_string.h
@@ -315,7 +315,7 @@ public:
//Replaces all occurences of char c with the string str
KviStr & replaceAll(const char c,const char *str);
//same as above but with a string
- KviStr & replaceAll(char *toFind,const char *str,bool bCaseS = true);
+ KviStr & replaceAll(const char *toFind,const char *str,bool bCaseS = true);
KviStr & transliterate(const char * szToFind,const char * szReplacement);
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 86346795d..01acd75a9 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -309,7 +309,7 @@ private:
void setupFileAssociations();
bool checkUriAssociations(const char * proto);
- void setupUriAssociations(char * proto);
+ void setupUriAssociations(const char * proto);
void saveKvircDirectory();
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index c57ad37e2..8418367e8 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -348,7 +348,7 @@ bool KviApp::checkUriAssociations(const char * proto)
}
-void KviApp::setupUriAssociations(char * proto)
+void KviApp::setupUriAssociations(const char * proto)
{
#ifdef COMPILE_ON_WINDOWS
HKEY hKey;
@@ -579,9 +579,7 @@ void KviApp::findGlobalKvircDirectory()
for(int i=0;usualKvircGlobalDir[i] != 0;i++){
m_szGlobalKvircDir = usualKvircGlobalPrePath[j];
m_szGlobalKvircDir+= usualKvircGlobalDir[i];
- #warning you must change back hardcoded 4.0 to VERSION_BRANCH
- //m_szGlobalKvircDir+= VERSION_BRANCH;
- m_szGlobalKvircDir+= "4.0/";
+ m_szGlobalKvircDir+= KVIRC_VERSION_BRANCH;
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
}
}
@@ -590,9 +588,7 @@ void KviApp::findGlobalKvircDirectory()
for(int k=0;usualKvircGlobalDir[k] != 0;k++){
m_szGlobalKvircDir = QDir::homeDirPath();
m_szGlobalKvircDir+= usualKvircGlobalDir[k];
- #warning you must change back hardcoded 4.0 to VERSION_BRANCH
- //m_szGlobalKvircDir+= VERSION_BRANCH;
- m_szGlobalKvircDir+= "4.0/";
+ m_szGlobalKvircDir+= KVIRC_VERSION_BRANCH;
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
}
@@ -601,9 +597,7 @@ void KviApp::findGlobalKvircDirectory()
m_szGlobalKvircDir = QDir::homeDirPath();
m_szGlobalKvircDir+= "/.kde";
m_szGlobalKvircDir+= usualKvircGlobalDir[k];
- #warning you must change back hardcoded 4.0 to VERSION_BRANCH
- //m_szGlobalKvircDir+= VERSION_BRANCH;
- m_szGlobalKvircDir+= "4.0/";
+ m_szGlobalKvircDir+= KVIRC_VERSION_BRANCH;
if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
}
#endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index aa5020d78..c5b41b4aa 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -286,8 +286,6 @@ void KviScriptManagementDialog::installScript()
szFileName.replace("\\","\\\\");
- QString szError;
-
// Switch between script and addon
if(szFileName.endsWith(".kvs"))
{
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 10:40:16 +0000