diff options
| author |  Szymon Tomasz Stefanek | 2008-04-28 03:04:54 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2008-04-28 03:04:54 +0000 |
| commit | 875b9b3c697182686d552cae85e136d17f36896a (patch) | |
| tree | bda7a7456401b25f19a091189134c0de2233c177 /src/modules/mediaplayer | |
| parent | A huge progress in KDE4 port, kvirc and several modules now compile. Linking ... (diff) | |
| download | KVIrc-875b9b3c697182686d552cae85e136d17f36896a.tar.gz KVIrc-875b9b3c697182686d552cae85e136d17f36896a.tar.bz2 KVIrc-875b9b3c697182686d552cae85e136d17f36896a.zip | |
Yet more KDE4 port
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1609 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/mediaplayer')
| -rw-r--r-- | src/modules/mediaplayer/libkvimediaplayer.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_amarokinterface.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_amarokinterface.h | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_dcopinterface.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_dcopinterface.h | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_interface.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_jukinterface.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_jukinterface.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index 14931574d..a08cd1420 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -1615,7 +1615,7 @@ static bool mediaplayer_module_init( KviModule * m ) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface)); #endif -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmarokInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviJukInterface)); #endif diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp index 72c0f7924..2db7a4af4 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.cpp +++ b/src/modules/mediaplayer/mp_amarokinterface.cpp @@ -24,7 +24,7 @@ #include "mp_amarokinterface.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_app.h" #include "kvi_locale.h" diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h index 6b2148e82..fc4033c5f 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.h +++ b/src/modules/mediaplayer/mp_amarokinterface.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_dcophelper.h" #include "mp_interface.h" diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp index b68ec8c54..c2b612658 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.cpp +++ b/src/modules/mediaplayer/mp_dcopinterface.cpp @@ -24,7 +24,7 @@ #include "mp_dcopinterface.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "dcopclient.h" diff --git a/src/modules/mediaplayer/mp_dcopinterface.h b/src/modules/mediaplayer/mp_dcopinterface.h index 14a3212d2..2efd5b4ab 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.h +++ b/src/modules/mediaplayer/mp_dcopinterface.h @@ -26,7 +26,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "mp_interface.h" diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp index 3c9b81049..69b3d6a4a 100644 --- a/src/modules/mediaplayer/mp_interface.cpp +++ b/src/modules/mediaplayer/mp_interface.cpp @@ -32,7 +32,7 @@ static QTextCodec * mediaplayer_get_codec()
{
- QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding));
+ QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toUtf8().data()); if(!c)c = QTextCodec::codecForLocale();
return c;
diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp index 7c0fbccd6..45c54c218 100644 --- a/src/modules/mediaplayer/mp_jukinterface.cpp +++ b/src/modules/mediaplayer/mp_jukinterface.cpp @@ -24,7 +24,7 @@ #include "mp_jukinterface.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_app.h" #include "kvi_locale.h" diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h index 9b1400a56..b8abdcfca 100644 --- a/src/modules/mediaplayer/mp_jukinterface.h +++ b/src/modules/mediaplayer/mp_jukinterface.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" -#ifdef COMPILE_KDE_SUPPORT +#ifdef COMPILE_KDE3_SUPPORT #include "kvi_dcophelper.h" #include "mp_interface.h" |