diff --git a/aboutdata.h b/aboutdata.h index d5648d4dd..abf882613 100644 --- a/aboutdata.h +++ b/aboutdata.h @@ -12,9 +12,9 @@ #include -inline KAboutData* okularAboutData( const char* name, const char* iname ) +inline KAboutData okularAboutData( const char* name, const char* iname ) { - KAboutData *about = new KAboutData( + KAboutData about( name, //"okular", 0, // catalog name also "okular" ki18n(iname), //I18N_NOOP("okular"), @@ -28,11 +28,11 @@ inline KAboutData* okularAboutData( const char* name, const char* iname ) "http://okular.kde.org" ); - about->addAuthor(ki18n("Pino Toscano"), ki18n("Current maintainer"), "pino@kde.org"); - about->addAuthor(ki18n("Tobias Koenig"), ki18n("Lots of framework work, ODT and FictionBook backends"), "tokoe@kde.org"); - about->addAuthor(ki18n("Albert Astals Cid"), ki18n("Former maintainer"), "aacid@kde.org"); - about->addAuthor(ki18n("Piotr Szymanski"), ki18n("Created okular from KPDF codebase"), "djurban@pld-dc.org"); - about->addAuthor(ki18n("Enrico Ros"), ki18n("KPDF developer"), "eros.kde@email.it"); + about.addAuthor(ki18n("Pino Toscano"), ki18n("Current maintainer"), "pino@kde.org"); + about.addAuthor(ki18n("Tobias Koenig"), ki18n("Lots of framework work, ODT and FictionBook backends"), "tokoe@kde.org"); + about.addAuthor(ki18n("Albert Astals Cid"), ki18n("Former maintainer"), "aacid@kde.org"); + about.addAuthor(ki18n("Piotr Szymanski"), ki18n("Created okular from KPDF codebase"), "djurban@pld-dc.org"); + about.addAuthor(ki18n("Enrico Ros"), ki18n("KPDF developer"), "eros.kde@email.it"); return about; } diff --git a/part.cpp b/part.cpp index e6023a5a4..4567cdbd4 100644 --- a/part.cpp +++ b/part.cpp @@ -671,18 +671,6 @@ QString Part::currentDocument() } -//this don't go anywhere but is required by genericfactory.h -KAboutData* Part::createAboutData() -{ - // the non-i18n name here must be the same as the directory in - // which the part's rc file is installed ('partrcdir' in the - // Makefile) - KAboutData* aboutData = okularAboutData( "okularpart", I18N_NOOP( "okularpart" ) ); - aboutData->addAuthor(ki18n("Wilco Greven"), KLocalizedString(), "greven@kde.org"); - return aboutData; -} - - bool Part::slotImportPSFile() { QString app = KStandardDirs::findExe( "ps2pdf" ); diff --git a/part.h b/part.h index c1fb0bcb9..a16cc2f84 100644 --- a/part.h +++ b/part.h @@ -87,8 +87,6 @@ class Part : public KParts::ReadOnlyPart, public Okular::DocumentObserver, publi void notifyViewportChanged( bool smoothMove ); void notifyPageChanged( int page, int flags ); - static KAboutData* createAboutData(); - bool openDocument(const KUrl& url, uint page); void startPresentation(); QStringList supportedMimeTypes() const; diff --git a/shell/main.cpp b/shell/main.cpp index 0985f85f0..389da2ed7 100644 --- a/shell/main.cpp +++ b/shell/main.cpp @@ -20,9 +20,9 @@ int main(int argc, char** argv) { - KAboutData * about = okularAboutData( "okular", I18N_NOOP( "okular" ) ); + KAboutData about = okularAboutData( "okular", I18N_NOOP( "okular" ) ); - KCmdLineArgs::init(argc, argv, about); + KCmdLineArgs::init(argc, argv, &about); KCmdLineOptions options; options.add("p"); @@ -55,9 +55,7 @@ int main(int argc, char** argv) } } - int ret = app.exec(); - delete about; - return ret; + return app.exec(); } // vim:ts=2:sw=2:tw=78:et