[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdecore
From:       David Faure <faure () kde ! org>
Date:       2005-07-03 0:54:14
Message-ID: 1120352054.686226.2418.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 431022 by dfaure:

Fix compilation (due to no_cast_to_ascii)


 M  +4 -3      kapplication.cpp  


--- branches/work/kde4/kdelibs/kdecore/kapplication.cpp #431021:431022
@@ -1147,14 +1147,15 @@
 {
 #ifdef Q_WS_X11
     QByteArray fName = QFile::encodeName(locateLocal("socket", "KSMserver"));
-    QString display = ::getenv(DISPLAY);
+    QString display = QString::fromLocal8Bit( ::getenv(DISPLAY) );
     // strip the screen number from the display
-    display.replace(QRegExp("\\.[0-9]+$"), "");
+    display.remove(QRegExp("\\.[0-9]+$"));
     int i;
     while( (i = display.indexOf(':')) >= 0)
        display[i] = '_';
 
-    fName += "_"+display;
+    fName += '_';
+    fName += display.toLocal8Bit();
     QByteArray smEnv = ::getenv("SESSION_MANAGER");
     bool check = smEnv.isEmpty();
     if ( !check && smModificationTime ) {
[prev in list] [next in list] [prev in thread] [next in thread]