ImageViewer: Register the actions with the action manager

Merge-request: 2165
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
This commit is contained in:
Denis Mingulov
2010-06-18 11:02:50 +02:00
committed by Thorbjørn Lindeijer
parent 1f33357bb6
commit 89280929dc
10 changed files with 318 additions and 12 deletions

View File

@@ -42,9 +42,16 @@
namespace ImageViewer {
namespace Internal {
///////////////////////////////// ImageViewerPluginPrivate //////////////////////////////////
struct ImageViewerPluginPrivate
{
QPointer<ImageViewerFactory> factory;
};
///////////////////////////////// ImageViewerPlugin //////////////////////////////////
ImageViewerPlugin::ImageViewerPlugin()
: d_ptr(new ImageViewerPluginPrivate)
{
}
@@ -60,16 +67,17 @@ bool ImageViewerPlugin::initialize(const QStringList &arguments, QString *errorM
if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/imageviewer/ImageViewer.mimetypes.xml"), errorMessage))
return false;
ImageViewerFactory *factory = new ImageViewerFactory(this);
d_ptr->factory = new ImageViewerFactory(this);
Aggregation::Aggregate *aggregate = new Aggregation::Aggregate;
aggregate->add(factory);
aggregate->add(d_ptr->factory);
addAutoReleasedObject(factory);
addAutoReleasedObject(d_ptr->factory);
return true;
}
void ImageViewerPlugin::extensionsInitialized()
{
d_ptr->factory->extensionsInitialized();
}
} // namespace Internal