X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmain.cpp;h=d850a45b7ad096f288db92669430dc02e7e3245a;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=cf4b964d8b672501cc7c503d546f1533a42aec11;hpb=89b470612186d1b6fd6531d64786aef8857cbdaf;p=kdenlive diff --git a/src/main.cpp b/src/main.cpp index cf4b964d..d850a45b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "kdenlive-config.h" +#include "config-kdenlive.h" #include "mainwindow.h" #include @@ -34,8 +34,9 @@ int main(int argc, char *argv[]) ki18n("Kdenlive"), VERSION, ki18n("An open source video editor."), KAboutData::License_GPL, - ki18n("Copyright © 2007–2011 Kdenlive authors")); + ki18n("Copyright © 2007–2013 Kdenlive authors")); aboutData.addAuthor(ki18n("Jean-Baptiste Mardelle"), ki18n("MLT and KDE SC 4 porting, main developer and maintainer"), "jb@kdenlive.org"); + aboutData.addAuthor(ki18n("Laurent Montel"), ki18n("Bugs fixing, clean up code, optimization etc."), "montel@kde.org"); aboutData.addAuthor(ki18n("Marco Gittler"), ki18n("MLT transitions and effects, timeline, audio thumbs"), "g.marco@freenet.de"); aboutData.addAuthor(ki18n("Dan Dennedy"), ki18n("Bug fixing, etc."), "dan@dennedy.org"); aboutData.addAuthor(ki18n("Simon A. Eugster"), ki18n("Color scopes, bug fixing, etc."), "simon.eu@gmail.com"); @@ -75,7 +76,7 @@ int main(int argc, char *argv[]) } } else { KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); //new - QString clipsToLoad = args->getOption("i"); + QString clipsToLoad = args->getOption("i"); QString mltPath = args->getOption("mlt-path"); KUrl url; if (args->count()) { @@ -86,10 +87,6 @@ int main(int argc, char *argv[]) args->clear(); } - int result = app.exec(); -#ifdef Q_WS_MAC - delete window; -#endif return result; }