Qt: media library disambiguation.

If we need to axe something more...

modules/gui/qt4/components/playlist/ml_item.cpp

 /*****************************************************************************
- * ml_item.cpp: the media library's result item
+ * ml_item.cpp: the SQL media library's result item
  *****************************************************************************
  * Copyright (C) 2008-2011 the VideoLAN Team and AUTHORS
  * $Id$
@@ -29,7 +29,7 @@
 # include <config.h>
 #endif
 
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
 
 #include <QDateTime>
 #include <QUrl>

modules/gui/qt4/components/playlist/ml_item.hpp

 /*****************************************************************************
- * ml_item.hpp: the media library's result item
+ * ml_item.hpp: the SQL media library's result item
  *****************************************************************************
  * Copyright (C) 2008-2011 the VideoLAN Team and AUTHORS
  * $Id$
@@ -32,7 +32,7 @@
 # include <config.h>
 #endif
 
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
 
 #include <vlc_common.h>
 #include <vlc_interface.h>

modules/gui/qt4/components/playlist/ml_model.cpp

 /*****************************************************************************
- * ml_model.cpp: the media library's model
+ * ml_model.cpp: the SQL media library's model
  *****************************************************************************
  * Copyright (C) 2008-2011 the VideoLAN Team and AUTHORS
  * $Id$
@@ -29,7 +29,7 @@
 # include <config.h>
 #endif
 
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
 
 #include <QUrl>
 #include <QMenu>

modules/gui/qt4/components/playlist/ml_model.hpp

 /*****************************************************************************
- * ml_model.hpp ML model
+ * ml_model.hpp SQL ML model
  *****************************************************************************
  * Copyright (C) 2008-2011 the VideoLAN Team and AUTHORS
  * $Id$
@@ -32,7 +32,7 @@
 # include <config.h>
 #endif
 
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
 #include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_media_library.h>

modules/gui/qt4/components/playlist/playlist.cpp

@@ -100,7 +100,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
     model->setModel( VLCProxyModel::PL_MODEL, plmodel );
     model->switchToModel( VLCProxyModel::PL_MODEL );
 
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
     MLModel *mlmodel = new MLModel( p_intf, model );
     model->setModel( VLCProxyModel::SQLML_MODEL, mlmodel );
 #endif

modules/gui/qt4/components/playlist/selector.cpp

@@ -240,7 +240,7 @@ void PLSelector::createItems()
     ml->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_ML ) );
     ml->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/library" ) );
 
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
     /* SQL ML */
     ml = addItem( SQL_ML_TYPE, "SQL Media Library" )->treeItem();
     ml->treeItem()->setData( 0, Qt::DecorationRole, QIcon( ":/sidebar/library" ) );
@@ -377,7 +377,7 @@ void PLSelector::setSource( QTreeWidgetItem *item )
                 item->setData( 0, CAP_SEARCH_ROLE, true );
         }
     }
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
     else if( i_type == SQL_ML_TYPE )
     {
         emit categoryActivated( NULL, true );

modules/gui/qt4/components/playlist/standardpanel.cpp

@@ -454,7 +454,7 @@ void StandardPLPanel::searchDelayed( const QString& searchText )
 /* This activated by the selector selection */
 void StandardPLPanel::setRootItem( playlist_item_t *p_item, bool b )
 {
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
     if( b )
     {
         msg_Dbg( p_intf, "Setting the SQL ML" );

modules/gui/qt4/components/simple_preferences.cpp

@@ -568,7 +568,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 #else
             ui.osGroupBox->hide();
 #endif
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
             BUTTONACT( ui.sqlMLbtn, configML() );
 #else
             ui.sqlMLbtn->hide();
@@ -986,7 +986,7 @@ void SPrefsPanel::changeStyle( QString s_style )
 
 void SPrefsPanel::configML()
 {
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
     MLConfDialog *mld = new MLConfDialog( this, p_intf );
     mld->exec();
     delete mld;

modules/gui/qt4/dialogs/ml_configuration.cpp

 /*****************************************************************************
- * ml_configuration.cpp: ML's configuration dialog (folder view)
+ * ml_configuration.cpp: SQL ML's configuration dialog (folder view)
  *****************************************************************************
  * Copyright (C) 2008-2010 the VideoLAN Team and AUTHORS
  * $Id$
@@ -28,7 +28,7 @@
 # include <config.h>
 #endif
 
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
 
 #include "ml_configuration.hpp"
 

modules/gui/qt4/dialogs/ml_configuration.hpp

 /*****************************************************************************
- * ml_configuration.hpp: ML's configuration dialog (folder view)
+ * ml_configuration.hpp: SQL ML's configuration dialog (folder view)
  *****************************************************************************
  * Copyright (C) 2008-2010 the VideoLAN Team and AUTHORS
  * $Id$
@@ -32,7 +32,7 @@
 # include <config.h>
 #endif
 
-#ifdef MEDIA_LIBRARY
+#ifdef SQL_MEDIA_LIBRARY
 
 #include <vlc_common.h>
 #include <vlc_media_library.h>