← Back to branch summary

~ubuntu-branches/ubuntu/wily/kdebase/wily

« back to all changes in this revision

Viewing changes to apps/lib/konq/konq_sound.cc

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-11-25 16:00:47 UTC
  • mfrom: (1.1.53 upstream)
  • Revision ID: james.westby@ubuntu.com-20101125160047-bsycodsp50o8su5s
Tags: 4:4.5.80-0ubuntu1
* New upstream beta release
* Drop kubuntu_06_simple_aboutpage.diff, didn't apply and no point
  keeping a distro patch to an app we don't ship by default
* Drop kubuntu_23_konqueror_spinner_in_toolbar.diff now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/lib/konq/konq_sound.cc
23
23
 
24
24
#include "konq_sound.h"
25
25
#include <kurl.h>
 
26
#include <kpluginfactory.h>
26
27
 
27
28
using namespace std;
28
29
 
89
90
        return false;
90
91
}
91
92
 
92
 
class KonqSoundFactory : public KLibFactory
 
93
class KonqSoundFactory : public KPluginFactory
93
94
{
94
95
public:
95
96
        KonqSoundFactory(QObject *parent = 0)
96
 
                : KLibFactory(parent) {}
 
97
                : KPluginFactory(0, 0, parent) {}
97
98
        virtual ~KonqSoundFactory() {}
98
99
 
99
100
protected:
100
 
        virtual QObject *createObject(QObject * = 0,
101
 
                const char *className = "QObject", const QStringList &args = QStringList());
 
101
        virtual QObject *create(const char *iface,
 
102
                                                        QWidget *parentWidget,
 
103
                                                        QObject *parent,
 
104
                                                        const QVariantList &args,
 
105
                                                        const QString &keyword);
102
106
};
103
107
 
104
 
QObject *KonqSoundFactory::createObject(QObject *,
105
 
        const char *className, const QStringList &)
 
108
QObject *KonqSoundFactory::create(const char *iface, QWidget *, QObject *, const QVariantList &, const QString &)
106
109
{
107
 
        if (qstrcmp(className, "KonqSoundPlayer") == 0)
 
110
        if (qstrcmp(iface, "KonqSoundPlayer") == 0)
108
111
                return new KonqSoundPlayerImpl();
109
112
        return 0;
110
113
}
111
114
 
112
 
extern "C"
113
 
{
114
 
        KDE_EXPORT KLibFactory *init_konq_sound()
115
 
        {
116
 
                return new KonqSoundFactory();
117
 
        }
118
 
}
 
115
K_EXPORT_PLUGIN(KonqSoundFactory)
119
116
 
120
117
// vim: ts=4 sw=4 noet