namespace.patch 3.0 KB

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