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

   1
   2 --- qtlockedfile.cpp  1970-01-01 01:00:00.000000000
   3 +++ qtlockedfile.cpp  2008/05/16 10:51:19.000000000
   4 @@ -1,5 +1,7 @@
   5  #include "qtlockedfile.h"
   6
   7 +namespace SharedTools {
   8 +
   9  /*!
  10      \class QtLockedFile
  11
  12 @@ -123,3 +125,5 @@
  13
  14      Destroys the \e QtLockedFile object. If any locks were held, they are released.
  15  */
  16 +
  17 +}
  18
  19 --- qtlockedfile.h  1970-01-01 01:00:00.000000000
  20 +++ qtlockedfile.h  2008/05/16 10:51:19.000000000
  21 @@ -19,6 +19,8 @@
  22  #  define QT_QTLOCKEDFILE_EXPORT
  23  #endif
  24
  25 +namespace SharedTools {
  26 +
  27  class QT_QTLOCKEDFILE_EXPORT QtLockedFile : public QFile
  28  {
  29  public:
  30 @@ -41,4 +43,6 @@
  31      LockMode m_lock_mode;
  32  };
  33
  34 +}
  35 +
  36  #endif
  37
  38 --- qtlockedfile_unix.cpp  1970-01-01 01:00:00.000000000
  39 +++ qtlockedfile_unix.cpp  2008/05/16 10:51:19.000000000
  40 @@ -5,6 +5,8 @@
  41
  42  #include "qtlockedfile.h"
  43
  44 +namespace SharedTools {
  45 +
  46  bool QtLockedFile::lock(LockMode mode, bool block)
  47  {
  48      if (!isOpen()) {
  49 @@ -73,3 +75,4 @@
  50          unlock();
  51  }
  52
  53 +}
  54
  55 --- qtlockedfile_win.cpp  1970-01-01 01:00:00.000000000
  56 +++ qtlockedfile_win.cpp  2008/05/16 10:51:19.000000000
  57 @@ -2,6 +2,8 @@
  58  #include <qt_windows.h>
  59  #include <QtCore/QFileInfo>
  60
  61 +namespace SharedTools {
  62 +
  63  #define SEMAPHORE_PREFIX "QtLockedFile semaphore "
  64  #define MUTEX_PREFIX "QtLockedFile mutex "
  65  #define SEMAPHORE_MAX 100
  66 @@ -168,3 +170,4 @@
  67      }
  68  }
  69
  70 +}