From 201318461b0e72491c5cc3e3bd75a0ef3f1fdaff Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 25 Jan 2008 08:42:24 +0000 Subject: [PATCH] Qt4 - Remove QFontDialog Dependency... We don't have some CONFIG_ITEM_FONT yet... Do we have complete fontconfig support btw ? --- modules/gui/qt4/components/preferences_widgets.cpp | 7 ++++++- modules/gui/qt4/components/preferences_widgets.hpp | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp index b7a2080538..139292e157 100644 --- a/modules/gui/qt4/components/preferences_widgets.cpp +++ b/modules/gui/qt4/components/preferences_widgets.cpp @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include @@ -135,10 +134,12 @@ ConfigControl *ConfigControl::createControl( vlc_object_t *p_this, p_control = new DirectoryConfigControl( p_this, p_item, parent, l, line, false ); break; +#if 0 case CONFIG_ITEM_FONT: p_control = new FontConfigControl( p_this, p_item, parent, l, line, false ); break; +#endif case CONFIG_ITEM_KEY: p_control = new KeySelectorControl( p_this, p_item, parent, l, line ); break; @@ -337,6 +338,9 @@ void DirectoryConfigControl::updateField() text->setText( dir ); } +#if 0 +#include + /********* String / Font **********/ FontConfigControl::FontConfigControl( vlc_object_t *_p_this, module_config_t *_p_item, QWidget *_p_widget, @@ -357,6 +361,7 @@ void FontConfigControl::updateField() if( !ok ) return; text->setText( font.family() ); } +#endif /********* String / choice list **********/ StringListConfigControl::StringListConfigControl( vlc_object_t *_p_this, diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp index 156b2c1c40..8eee6819c1 100644 --- a/modules/gui/qt4/components/preferences_widgets.hpp +++ b/modules/gui/qt4/components/preferences_widgets.hpp @@ -312,6 +312,7 @@ public slots: virtual void updateField(); }; +#if 0 class FontConfigControl : public FileConfigControl { Q_OBJECT; @@ -324,6 +325,7 @@ public: public slots: virtual void updateField(); }; +#endif class ModuleConfigControl : public VStringConfigControl { -- 2.39.2