Phonon hacks not needed for Qt 4.5

2 files changed, 1 insertions, 87 deletions

diff --git a/sigmodr/corewidgets/sigmodr.widgets b/sigmodr/corewidgets/sigmodr.widgets
index 5ef4b42b..47c7da09 100644
--- a/sigmodr/corewidgets/sigmodr.widgets
+++ b/sigmodr/corewidgets/sigmodr.widgets
@@ -1,6 +1,6 @@
 [Global]
 PluginName=SigmodrCoreWidgetsPlugin
-Includes=sigmodr/corewidgets/FractionWidget.h,sigmodr/corewidgets/ScriptWidget.h,phonon/volumeslider.h,phonon/seekslider.h
+Includes=sigmodr/corewidgets/FractionWidget.h,sigmodr/corewidgets/ScriptWidget.h
 
 [Sigmodr::CoreWidgets::FractionWidget]
 ToolTip=Fraction editor
@@ -11,13 +11,3 @@ Group=Sigmodr
 ToolTip=Script editor
 WhatsThis=Widget for editing a script for Sigmodr
 Group=Sigmodr
-
-[Phonon::SeekSlider]
-ToolTip=Seek widget for media streams
-WhatsThis=Widget for seeking in a media stream
-Group=Phonon
-
-[Phonon::VolumeSlider]
-ToolTip=Volume slider for Phonon
-WhatsThis=Widget for changing the volume
-Group=Phonon
diff --git a/sigmodr/corewidgets/sigmodrwidgets.cpp b/sigmodr/corewidgets/sigmodrwidgets.cpp
index fc685847..dc404e01 100644
--- a/sigmodr/corewidgets/sigmodrwidgets.cpp
+++ b/sigmodr/corewidgets/sigmodrwidgets.cpp
@@ -12,8 +12,6 @@
 
 #include <sigmodr/corewidgets/FractionWidget.h>
 #include <sigmodr/corewidgets/ScriptWidget.h>
-#include <phonon/seekslider.h>
-#include <phonon/volumeslider.h>
 
 
 class SigmodrCoreWidgetsFractionWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
@@ -88,78 +86,6 @@ private:
 };
 
 
-class PhononSeekSliderPlugin : public QObject, public QDesignerCustomWidgetInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(QDesignerCustomWidgetInterface)
-public:
-    PhononSeekSliderPlugin(QObject *parent = 0) :
-        QObject(parent), mInitialized(false) {}
-    virtual ~PhononSeekSliderPlugin() {}
-    
-    bool isContainer() const { return false; }
-    bool isInitialized() const { return mInitialized; }
-    QIcon icon() const { return QIcon(":/pics/phononseekslider.png"); }
-    QString codeTemplate() const { return QLatin1String("");}
-//  QString domXml() const { return QLatin1String(""); }
-    QString group() const { return QLatin1String("Phonon"); }
-    QString includeFile() const { return QLatin1String("phonon/seekslider.h"); }
-    QString name() const { return QLatin1String("Phonon::SeekSlider"); }
-    QString toolTip() const { return QLatin1String("Seek widget for media streams"); }
-    QString whatsThis() const { return QLatin1String("Widget for seeking in a media stream"); }
-
-    QWidget* createWidget( QWidget* parent ) 
-    {
-        return new Phonon::SeekSlider( parent );
-    }
-    void initialize(QDesignerFormEditorInterface *core) 
-    {
-        Q_UNUSED(core);
-        if (mInitialized) return;
-        mInitialized=true;
-    }
-
-private:
-    bool mInitialized;
-};
-
-
-class PhononVolumeSliderPlugin : public QObject, public QDesignerCustomWidgetInterface
-{
-    Q_OBJECT
-    Q_INTERFACES(QDesignerCustomWidgetInterface)
-public:
-    PhononVolumeSliderPlugin(QObject *parent = 0) :
-        QObject(parent), mInitialized(false) {}
-    virtual ~PhononVolumeSliderPlugin() {}
-    
-    bool isContainer() const { return false; }
-    bool isInitialized() const { return mInitialized; }
-    QIcon icon() const { return QIcon(":/pics/phononvolumeslider.png"); }
-    QString codeTemplate() const { return QLatin1String("");}
-//  QString domXml() const { return QLatin1String(""); }
-    QString group() const { return QLatin1String("Phonon"); }
-    QString includeFile() const { return QLatin1String("phonon/volumeslider.h"); }
-    QString name() const { return QLatin1String("Phonon::VolumeSlider"); }
-    QString toolTip() const { return QLatin1String("Volume slider for Phonon"); }
-    QString whatsThis() const { return QLatin1String("Widget for changing the volume"); }
-
-    QWidget* createWidget( QWidget* parent ) 
-    {
-        return new Phonon::VolumeSlider( parent );
-    }
-    void initialize(QDesignerFormEditorInterface *core) 
-    {
-        Q_UNUSED(core);
-        if (mInitialized) return;
-        mInitialized=true;
-    }
-
-private:
-    bool mInitialized;
-};
-
-
 class SigmodrCoreWidgetsPlugin : public QObject, public QDesignerCustomWidgetCollectionInterface
 {
 	Q_OBJECT
@@ -180,8 +106,6 @@ SigmodrCoreWidgetsPlugin::SigmodrCoreWidgetsPlugin(QObject *parent)
 	(void) new KComponentData("makekdewidgets");
 		m_plugins.append( new SigmodrCoreWidgetsFractionWidgetPlugin(this) );
 		m_plugins.append( new SigmodrCoreWidgetsScriptWidgetPlugin(this) );
-        m_plugins.append( new PhononSeekSliderPlugin(this) );
-        m_plugins.append( new PhononVolumeSliderPlugin(this) );
 }
 
 #include <sigmodrwidgets.moc>