From 3ebcf66f612df712542ad3ab0aeaf780dcdf0289 Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Tue, 30 Oct 2012 20:48:28 +0000 Subject: [PATCH] KDE and windows compile fixes --- application.cpp | 4 ++-- application.h | 1 + po/ko.po | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application.cpp b/application.cpp index 31c25caf3..e2cc5273c 100644 --- a/application.cpp +++ b/application.cpp @@ -91,7 +91,7 @@ int Application::newInstance() { KCmdLineArgs *args(KCmdLineArgs::parsedArgs()); QStringList urls; for (int i = 0; i < args->count(); ++i) { - urls.append(args->url(i)); + urls.append(args->arg(i)); } if (!urls.isEmpty()) { w->load(urls); @@ -108,7 +108,7 @@ void Application::mwDestroyed(QObject *obj) } } -#elif Q_OS_WIN +#elif defined Q_OS_WIN Application::Application(int &argc, char **argv) : QtSingleApplication(argc, argv) { diff --git a/application.h b/application.h index b837b6e2c..f836ed6b4 100644 --- a/application.h +++ b/application.h @@ -25,6 +25,7 @@ #define APPLICATION_H #include "config.h" +#include #ifdef ENABLE_KDE_SUPPORT #include class MainWindow; diff --git a/po/ko.po b/po/ko.po index 2dcfaa01f..dc7e2ecba 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,7 +3,6 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Cantata 0.9.0\n" @@ -16,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: application.cpp:77 msgid ""