* ./modules/gui/kde/kde.cpp: the interface rc file defaults to the one in

    DATA_PATH.
  * ./modules/gui/wxwindows/*.cpp: fixed minor warnings.

diff --git a/modules/gui/kde/interface.cpp b/modules/gui/kde/interface.cpp
index a3abe508d917e7a7c48cc3c38f34d56ebc3acbd1..f7a9737fe43c1f15d024998b722eebe9e79ba59b 100644 (file)
--- a/modules/gui/kde/interface.cpp
+++ b/modules/gui/kde/interface.cpp
@@ -387,7 +387,7 @@ void KInterface::slotUpdateLanguages()
     p_audio_es = NULL;
     p_spu_es = NULL;
 
-    for( int i = 0 ;
+    for( unsigned int i = 0 ;
          i < p_intf->p_sys->p_input->stream.i_selected_es_number ;
          i++
         )
@@ -440,7 +440,9 @@ void KInterface::languageMenus(KActionMenu *root, es_descriptor_t *p_es,
     
 #define ES p_intf->p_sys->p_input->stream.pp_es[i]
     /* create a set of language buttons and append them to the container */
-    for( int i = 0 ; i < p_intf->p_sys->p_input->stream.i_es_number ; i++ )
+    for( unsigned int i = 0 ;
+         i < p_intf->p_sys->p_input->stream.i_es_number ;
+         i++ )
     {
         if( ( ES->i_cat == i_cat ) &&
             ( !ES->p_pgrm ||

diff --git a/modules/gui/kde/kde.cpp b/modules/gui/kde/kde.cpp
index 8fa61a1ae4b359efacea3753b044f3625811d37d..a5642e2abe0c1a2beb166f9dd1810ea7bf9d1e53 100644 (file)
--- a/modules/gui/kde/kde.cpp
+++ b/modules/gui/kde/kde.cpp
@@ -2,7 +2,7 @@
  * kde.cpp : KDE plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: kde.cpp,v 1.5 2003/01/15 13:16:39 sam Exp $
+ * $Id: kde.cpp,v 1.6 2003/01/28 21:08:29 sam Exp $
  *
  * Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
  *
@@ -50,17 +50,12 @@ static void run(intf_thread_t *p_intf);
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-#ifdef WIN32
-    int i = 90;
-#else
     int i = getenv( "DISPLAY" ) == NULL ? 8 : 85;
-#endif
     add_category_hint( "kde", NULL );
-    add_file( "kdeuirc", "", NULL, N_( "Path to ui.rc file" ), NULL );
+    add_file( "kdeuirc", DATA_PATH "/ui.rc", NULL, N_( "path to ui.rc file" ), NULL );
     set_description( _("KDE interface module") );
     set_capability( "interface", i );
     set_program( "kvlc" );
-    //set_callbacks( E_(Open), E_(Close) );
     set_callbacks( open, close );
 vlc_module_end();
 

diff --git a/modules/gui/kde/menu.cpp b/modules/gui/kde/menu.cpp
index fbdbe4bf6c1135659fcc1e7af61f7c411abde988..e1ca639c9941d45796d8ca383e2b4942ce911f04 100644 (file)
--- a/modules/gui/kde/menu.cpp
+++ b/modules/gui/kde/menu.cpp
@@ -32,7 +32,9 @@ void KTitleMenu::regenerateSlot()
     int i_item = 0;
     vlc_mutex_lock( &fInterfaceThread->p_sys->p_input->stream.stream_lock );
 
-    for( int i = 0 ; i < fInterfaceThread->p_sys->p_input->stream.i_es_number ; i++ )
+    for( unsigned int i = 0 ;
+         i < fInterfaceThread->p_sys->p_input->stream.i_es_number ;
+         i++ )
     {
         if( fInterfaceThread->p_sys->p_input->stream.pp_es[i]->i_cat /* == i_cat */ )
         {

diff --git a/modules/gui/wxwindows/fileinfo.cpp b/modules/gui/wxwindows/fileinfo.cpp
index 1d31ea76dacbd8feec0220663cbadae946898809..10231d1fb1a680608aae643948319063d44901e7 100644 (file)
--- a/modules/gui/wxwindows/fileinfo.cpp
+++ b/modules/gui/wxwindows/fileinfo.cpp
@@ -2,7 +2,7 @@
  * fileinfo.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: fileinfo.cpp,v 1.1 2002/12/21 11:20:30 sigmunau Exp $
+ * $Id: fileinfo.cpp,v 1.2 2003/01/28 21:08:29 sam Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
@@ -76,7 +76,6 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
     /* Initializations */
     intf_thread_t *p_intf = _p_intf;
     input_thread_t *p_input;
-    Interface *p_main_interface = _p_main_interface;
 
     wxTreeCtrl *tree = new wxTreeCtrl( this, -1 );
     p_input = p_intf->p_sys->p_input;

diff --git a/modules/gui/wxwindows/timer.cpp b/modules/gui/wxwindows/timer.cpp
index 969a55c5ab0caca872bd632b2254db14b85cdb1b..294d2c1a5a7bca27756265e28746e63ff05c01bf 100644 (file)
--- a/modules/gui/wxwindows/timer.cpp
+++ b/modules/gui/wxwindows/timer.cpp
@@ -2,7 +2,7 @@
  * timer.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: timer.cpp,v 1.9 2003/01/26 10:36:10 gbazin Exp $
+ * $Id: timer.cpp,v 1.10 2003/01/28 21:08:29 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -97,8 +97,6 @@ static int wxSetupMenus( intf_thread_t * p_intf )
  *****************************************************************************/
 void Timer::Notify()
 {
-    int i_stop;
-
     vlc_mutex_lock( &p_intf->change_lock );
 
     /* If the "display popup" flag has changed */