Skip to content

V
vlc-2-2
Commit 2cb2200b authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./modules/gui/kde/preferences.cpp: fixed a compilation issue and a crash.

parent cb07a716
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 18 deletions
modules/gui/kde/preferences.cpp
View file @ 2cb2200b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* preferences.cpp: preferences window for the kde gui * preferences.cpp: preferences window for the kde gui
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: preferences.cpp,v 1.9 2002/12/13 01:56:29 gbazin Exp $ * $Id: preferences.cpp,v 1.10 2002/12/17 09:54:32 sam Exp $
* *
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> Mon Aug 12 2002 * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> Mon Aug 12 2002
* *
...@@ -52,7 +52,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -52,7 +52,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
KDialogBase ( Tabbed, caption, Ok| Apply|Cancel|User1, Ok, parent, KDialogBase ( Tabbed, caption, Ok| Apply|Cancel|User1, Ok, parent,
"vlc preferences", true, false, "Save") "vlc preferences", true, false, "Save")
{ {
module_t *p_parser; module_t *p_parser = NULL;
vlc_list_t list; vlc_list_t list;
module_config_t *p_item; module_config_t *p_item;
int i_index; int i_index;
...@@ -78,7 +78,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -78,7 +78,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
if( !p_parser || i_index == list.i_count ) if( !p_parser || i_index == list.i_count )
{ {
vlc_list_release( list ); vlc_list_release( &list );
return; return;
} }
...@@ -114,7 +114,6 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -114,7 +114,6 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
case CONFIG_ITEM_MODULE: case CONFIG_ITEM_MODULE:
{ {
vlc_mutex_lock( p_item->p_lock ); vlc_mutex_lock( p_item->p_lock );
KPluginsBox *item_frame = KPluginsBox *item_frame =
new KPluginsBox( p_intf, p_item->psz_text, new KPluginsBox( p_intf, p_item->psz_text,
...@@ -168,7 +167,6 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -168,7 +167,6 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
kl->setMaxLength(40); kl->setMaxLength(40);
vlc_mutex_unlock( p_item->p_lock ); vlc_mutex_unlock( p_item->p_lock );
} }
break; break;
...@@ -194,7 +192,6 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -194,7 +192,6 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
ci, SLOT(setValue( const QString &))); ci, SLOT(setValue( const QString &)));
QToolTip::add(kfile, p_item->psz_longtext); QToolTip::add(kfile, p_item->psz_longtext);
vlc_mutex_unlock( p_item->p_lock ); vlc_mutex_unlock( p_item->p_lock );
} }
break; break;
...@@ -228,11 +225,9 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -228,11 +225,9 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
connect(kdi, SIGNAL(valueChanged(double)), connect(kdi, SIGNAL(valueChanged(double)),
ci, SLOT(setValue(double))); ci, SLOT(setValue(double)));
QToolTip::add(kdi, p_item->psz_longtext); QToolTip::add(kdi, p_item->psz_longtext);
} }
break; break;
case CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
/* add check button */ /* add check button */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment