← Back to branch summary

~ubuntu-branches/ubuntu/raring/gwenview/raring-proposed

« back to all changes in this revision

Viewing changes to app/kipiinterface.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac, Philip Muškovac, Scott Kitterman
  • Date: 2011-12-24 18:54:55 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20111224185455-zxffs6i6m5cwwuze
Tags: 4:4.7.95-0ubuntu1
[ Philip Muškovac ]
* New upstream release candiate

[ Scott Kitterman ]
* Fix Ubuntu Vcs- header in debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/kipiinterface.cpp
27
27
#include <QRegExp>
28
28
 
29
29
// KDE
30
 
#include <kaction.h>
31
 
#include <kactioncollection.h>
32
 
#include <kdebug.h>
33
 
#include <kurl.h>
34
 
#include <kxmlguifactory.h>
35
 
#include <kdirlister.h>
 
30
#include <KAction>
 
31
#include <KActionCollection>
 
32
#include <KDebug>
 
33
#include <KUrl>
 
34
#include <KXMLGUIFactory>
 
35
#include <KDirLister>
36
36
 
37
37
// KIPI
38
38
#include <libkipi/imagecollectionshared.h>
66
66
{
67
67
    static const QRegExp sExtensionRE;
68
68
public:
69
 
    KIPIImageInfo(KIPI::Interface* interface, const KUrl& url) : KIPI::ImageInfoShared(interface, url) {}
 
69
    KIPIImageInfo(KIPI::Interface* interface, const KUrl& url)
 
70
    : KIPI::ImageInfoShared(interface, url)
 
71
    {}
70
72
 
71
73
    QString title()
72
74
    {
157
159
 
158
160
const QRegExp KIPIImageInfo::sExtensionRE("\\.[a-z0-9]+$", Qt::CaseInsensitive);
159
161
 
160
 
struct MenuInfo {
 
162
struct MenuInfo
 
163
{
161
164
    QString mName;
162
165
    QList<QAction*> mActions;
163
 
    MenuInfo() {}
164
 
    MenuInfo(const QString& name) : mName(name) {}
 
166
 
 
167
    MenuInfo()
 
168
    {}
 
169
 
 
170
    MenuInfo(const QString& name)
 
171
    : mName(name)
 
172
    {}
165
173
};
166
174
typedef QMap<KIPI::Category, MenuInfo> MenuInfoMap;
167
175
 
168
 
struct KIPIInterfacePrivate {
 
176
struct KIPIInterfacePrivate
 
177
{
169
178
    KIPIInterface* q;
170
179
    MainWindow* mMainWindow;
171
180
    QMenu* mPluginMenu;