From 7bd76ca360ea98e3f1e9155121366ca35aa00118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 23 Jul 2013 06:44:15 +0200 Subject: [PATCH] KAboutData -> K4AboutData for porting --- main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main.cpp b/main.cpp index 3a5e86c3d0..224f1d901f 100644 --- a/main.cpp +++ b/main.cpp @@ -28,7 +28,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include #include #include @@ -500,19 +500,19 @@ KDE_EXPORT int kdemain(int argc, char * argv[]) // number. If it had it, it was removed at the "pos" check envir.sprintf("DISPLAY=%s.%d", display_name.data(), KWin::screen_number); - if (putenv(strdup(envir.toAscii()))) { + if (putenv(strdup(envir.toAscii().constData()))) { fprintf(stderr, "%s: WARNING: unable to set DISPLAY environment variable\n", argv[0]); perror("putenv()"); } } - KAboutData aboutData( - KWIN_NAME, // The program name used internally - 0, // The message catalog name. If null, program name is used instead + K4AboutData aboutData( + QByteArray(KWIN_NAME), // The program name used internally + QByteArray(), // The message catalog name. If null, program name is used instead ki18n("KWin"), // A displayable program name string - version, // The program version string + QByteArray(version), // The program version string ki18n(description), // Short description of what the app does - KAboutData::License_GPL, // The license this code is released under + K4AboutData::License_GPL, // The license this code is released under ki18n("(c) 1999-2008, The KDE Developers")); // Copyright Statement aboutData.addAuthor(ki18n("Matthias Ettrich"), KLocalizedString(), "ettrich@kde.org"); aboutData.addAuthor(ki18n("Cristian Tibirna"), KLocalizedString(), "tibirna@kde.org");