Changeset 561 for trunk/tools/qvfb/qvfbshmem.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qvfb/qvfbshmem.cpp (modified) (8 diffs)

trunk/tools/qvfb/qvfbshmem.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -44 +44 @@
 #include "qvfbshmem.h"
 #include "qvfbhdr.h"
-
-#define QTE_PIPE "QtEmbedded-%1"
 
 #include <QFile>
@@ -72 +70 @@
 static QString qws_dataDir(int qws_display_id)
 {
-    QByteArray dataDir = QString("/tmp/qtembedded-%1").arg(qws_display_id).toLocal8Bit();
+    QByteArray dataDir = QT_VFB_DATADIR(qws_display_id).toLocal8Bit();
     if (mkdir(dataDir, 0700)) {
         if (errno != EEXIST) {
@@ -131 +129 @@
         username = logname;
 
-    QString oldPipe = "/tmp/qtembedded-" + username + "/" + QString(QTE_PIPE).arg(displayid);
+    qws_dataDir(displayid);
+
+    QString oldPipe = "/tmp/qtembedded-" + username + "/" + QString("QtEmbedded-%1").arg(displayid);
     int oldPipeSemkey = ftok(oldPipe.toLatin1().constData(), 'd');
     if (oldPipeSemkey != -1) {
@@ -152 +152 @@
     }
 
+    displayPipe = QTE_PIPE_QVFB(displayid);
+
     kh = new QVFbKeyPipeProtocol(displayid);
     /* should really depend on receiving qt version, but how can
@@ -210 +212 @@
     hdr->windowId = 0;
 
-    displayPipe = qws_dataDir(displayid) + QString(QTE_PIPE).arg(displayid);
-
     displayPiped = displayPipe + 'd';