ground/gcs/src/shared/qtsingleapplication/namespace.patch

   1
   2 --- qtlocalpeer.cpp  1970-01-01 01:00:00.000000000
   3 +++ qtlocalpeer.cpp  2008/05/16 10:36:53.000000000
   4 @@ -13,6 +13,8 @@
   5  #include <time.h>
   6  #endif
   7
   8 +namespace SharedTools {
   9 +
  10  const char* QtLocalPeer::ack = "ack";
  11
  12  QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
  13 @@ -139,3 +141,5 @@
  14      delete socket;
  15      emit messageReceived(message); // ##(might take a long time to return)
  16  }
  17 +
  18 +}
  19
  20 --- qtlocalpeer.h  1970-01-01 01:00:00.000000000
  21 +++ qtlocalpeer.h  2008/05/16 10:36:53.000000000
  22 @@ -1,9 +1,11 @@
  23
  24 +
  25  #include <QtNetwork/QLocalServer>
  26  #include <QtNetwork/QLocalSocket>
  27  #include <QtCore/QDir>
  28  #include <qtlockedfile.h>
  29
  30 +namespace SharedTools {
  31
  32  class QtLocalPeer : public QObject
  33  {
  34 @@ -31,3 +33,5 @@
  35  private:
  36      static const char* ack;
  37  };
  38 +
  39 +} // SharedTools
  40
  41 --- qtsingleapplication.cpp  1970-01-01 01:00:00.000000000
  42 +++ qtsingleapplication.cpp  2008/05/16 10:36:53.000000000
  43 @@ -3,6 +3,8 @@
  44  #include "qtlocalpeer.h"
  45  #include <QtGui/QWidget>
  46
  47 +namespace SharedTools {
  48 +
  49  void QtSingleApplication::sysInit(const QString &appId)
  50  {
  51      actWin = 0;
  52 @@ -95,3 +97,5 @@
  53          actWin->activateWindow();
  54      }
  55  }
  56 +
  57 +}
  58
  59 --- qtsingleapplication.h  1970-01-01 01:00:00.000000000
  60 +++ qtsingleapplication.h  2008/05/16 10:36:53.000000000
  61 @@ -1,6 +1,8 @@
  62
  63  #include <QtGui/QApplication>
  64
  65 +namespace SharedTools {
  66 +
  67  class QtLocalPeer;
  68
  69  class QtSingleApplication : public QApplication
  70 @@ -47,3 +49,5 @@
  71      QtLocalPeer *peer;
  72      QWidget *actWin;
  73  };
  74 +
  75 +}
  76
  77 --- qtsingleapplication.pri  1970-01-01 01:00:00.000000000
  78 +++ qtsingleapplication.pri  2008/05/16 10:36:53.000000000
  79 @@ -6,7 +6,7 @@
  80  QT *= network
  81
  82  gotqtlockedfile = $$find(HEADERS, .*qtlockedfile.h)
  83 -isEmpty(gotqtlockedfile):include(../../qtlockedfile/src/qtlockedfile.pri)
  84 +isEmpty(gotqtlockedfile):include(../qtlockedfile/qtlockedfile.pri)
  85
  86
  87  win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
  88
  89 --- qtsinglecoreapplication.cpp  1970-01-01 01:00:00.000000000
  90 +++ qtsinglecoreapplication.cpp  2008/05/16 10:36:53.000000000
  91 @@ -2,6 +2,7 @@
  92  #include "qtsinglecoreapplication.h"
  93  #include "qtlocalpeer.h"
  94
  95 +namespace SharedTools {
  96
  97  QtSingleCoreApplication::QtSingleCoreApplication(int &argc, char **argv)
  98      : QCoreApplication(argc, argv)
  99 @@ -36,3 +37,4 @@
 100      return peer->applicationId();
 101  }
 102
 103 +}
 104
 105 --- qtsinglecoreapplication.h  1970-01-01 01:00:00.000000000
 106 +++ qtsinglecoreapplication.h  2008/05/16 10:36:53.000000000
 107 @@ -1,6 +1,8 @@
 108
 109  #include <QtCore/QCoreApplication>
 110
 111 +namespace SharedTools {
 112 +
 113  class QtLocalPeer;
 114
 115  class QtSingleCoreApplication : public QCoreApplication
 116 @@ -25,3 +27,5 @@
 117  private:
 118      QtLocalPeer* peer;
 119  };
 120 +
 121 +}
 122
 123 --- qtsinglecoreapplication.pri  1970-01-01 01:00:00.000000000
 124 +++ qtsinglecoreapplication.pri  2008/05/16 10:36:53.000000000
 125 @@ -6,7 +6,7 @@
 126  QT *= network
 127
 128  gotqtlockedfile = $$find(HEADERS, .*qtlockedfile.h)
 129 -isEmpty(gotqtlockedfile):include(../../qtlockedfile/src/qtlockedfile.pri)
 130 +isEmpty(gotqtlockedfile):include(../qtlockedfile/qtlockedfile.pri)
 131
 132
 133  win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {