Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Mar 23rd, 2010  |  syntax: None  |  size: 8.54 KB  |  hits: 121  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. Index: akonadi/libs/tests/notificationmessagetest.cpp
  2. ===================================================================
  3. --- akonadi/libs/tests/notificationmessagetest.cpp      (revision 1106878)
  4. +++ akonadi/libs/tests/notificationmessagetest.cpp      (working copy)
  5. @@ -22,7 +22,7 @@
  6.  
  7.  #include <notificationmessage_p.h>
  8.  
  9. -#include <QtTest>
  10. +#include <QtTest/QTest>
  11.  
  12.  QTEST_APPLESS_MAIN( NotificationMessageTest )
  13.  
  14. Index: akonadi/server/control/controlmanager.cpp
  15. ===================================================================
  16. --- akonadi/server/control/controlmanager.cpp   (revision 1106878)
  17. +++ akonadi/server/control/controlmanager.cpp   (working copy)
  18. @@ -17,13 +17,13 @@
  19.   *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  20.   ***************************************************************************/
  21.  
  22. +#include "controlmanager.h"
  23. +
  24.  #include <QtCore/QCoreApplication>
  25.  #include <QtCore/QTimer>
  26.  
  27.  #include "controlmanageradaptor.h"
  28.  
  29. -#include "controlmanager.h"
  30. -
  31.  ControlManager::ControlManager( QObject *parent )
  32.    : QObject( parent )
  33.  {
  34. Index: akonadi/server/tests/unittest/imapstreamparsertest.h
  35. ===================================================================
  36. --- akonadi/server/tests/unittest/imapstreamparsertest.h        (revision 1106878)
  37. +++ akonadi/server/tests/unittest/imapstreamparsertest.h        (working copy)
  38. @@ -18,8 +18,8 @@
  39.      02110-1301, USA.
  40.  */
  41.  
  42. -#ifndef IMAPPARSER_TEST_H
  43. -#define IMAPPARSER_TEST_H
  44. +#ifndef IMAPSTREAMPARSERTEST_H
  45. +#define IMAPSTREAMPARSERTEST_H
  46.  
  47.  #include <QtCore/QObject>
  48.  #include <QtTest/QtTest>
  49. Index: akonadi/server/tests/unittest/scopetest.cpp
  50. ===================================================================
  51. --- akonadi/server/tests/unittest/scopetest.cpp (revision 1106878)
  52. +++ akonadi/server/tests/unittest/scopetest.cpp (working copy)
  53. @@ -18,7 +18,8 @@
  54.  */
  55.  
  56.  #include <QObject>
  57. -#include <QtTest>
  58. +#include <QtTest/QTest>
  59. +#include <QtCore/QBuffer>
  60.  
  61.  #include "handler/scope.cpp"
  62.  #include "imapstreamparser.h"
  63. Index: akonadi/server/tests/unittest/handlerhelpertest.cpp
  64. ===================================================================
  65. --- akonadi/server/tests/unittest/handlerhelpertest.cpp (revision 1106878)
  66. +++ akonadi/server/tests/unittest/handlerhelpertest.cpp (working copy)
  67. @@ -18,7 +18,7 @@
  68.  */
  69.  
  70.  #include <QObject>
  71. -#include <QtTest>
  72. +#include <QtTest/QTest>
  73.  
  74.  #include "handlerhelper.cpp"
  75.  
  76. Index: akonadi/server/shared/akapplication.cpp
  77. ===================================================================
  78. --- akonadi/server/shared/akapplication.cpp     (revision 1106878)
  79. +++ akonadi/server/shared/akapplication.cpp     (working copy)
  80. @@ -19,7 +19,7 @@
  81.  
  82.  #include "akapplication.h"
  83.  #include "akdebug.h"
  84. -#include "config-akonadi.h"
  85. +#include <config-akonadi.h>
  86.  
  87.  #include <QDBusConnection>
  88.  #include <QTimer>
  89. Index: akonadi/server/src/preprocessorinstance.h
  90. ===================================================================
  91. --- akonadi/server/src/preprocessorinstance.h   (revision 1106878)
  92. +++ akonadi/server/src/preprocessorinstance.h   (working copy)
  93. @@ -22,8 +22,8 @@
  94.   *
  95.   *****************************************************************************/
  96.  
  97. -#ifndef _PREPROCESSORINSTANCE_H_
  98. -#define _PREPROCESSORINSTANCE_H_
  99. +#ifndef AKONADI_PREPROCESSORINSTANCE_H
  100. +#define AKONADI_PREPROCESSORINSTANCE_H
  101.  
  102.  #include <QtCore/QObject>
  103.  #include <QtCore/QList>
  104. Index: akonadi/server/src/storage/itemretrievalthread.h
  105. ===================================================================
  106. --- akonadi/server/src/storage/itemretrievalthread.h    (revision 1106878)
  107. +++ akonadi/server/src/storage/itemretrievalthread.h    (working copy)
  108. @@ -17,8 +17,8 @@
  109.      02110-1301, USA.
  110.  */
  111.  
  112. -#ifndef AKONADI_ITEMRETRIEVERTHREAD_H
  113. -#define AKONADI_ITEMRETRIEVERTHREAD_H
  114. +#ifndef AKONADI_ITEMRETRIEVALTHREAD_H
  115. +#define AKONADI_ITEMRETRIEVALTHREAD_H
  116.  
  117.  #include "itemretriever.h"
  118.  
  119. Index: akonadi/server/src/storage/itemretrievalmanager.h
  120. ===================================================================
  121. --- akonadi/server/src/storage/itemretrievalmanager.h   (revision 1106878)
  122. +++ akonadi/server/src/storage/itemretrievalmanager.h   (working copy)
  123. @@ -17,8 +17,8 @@
  124.      02110-1301, USA.
  125.  */
  126.  
  127. -#ifndef AKONADI_ITEMRETRIEVERMANAGER_H
  128. -#define AKONADI_ITEMRETRIEVERMANAGER_H
  129. +#ifndef AKONADI_ITEMRETRIEVALMANAGER_H
  130. +#define AKONADI_ITEMRETRIEVALMANAGER_H
  131.  
  132.  #include "itemretriever.h"
  133.  
  134. Index: akonadi/server/src/search/dbusoperators.h
  135. ===================================================================
  136. --- akonadi/server/src/search/dbusoperators.h   (revision 1106878)
  137. +++ akonadi/server/src/search/dbusoperators.h   (working copy)
  138. @@ -16,8 +16,8 @@
  139.     Boston, MA 02110-1301, USA.
  140.  */
  141.  
  142. -#ifndef _NEPOMUK_SEARCH_DBUS_OPERATORS_H_
  143. -#define _NEPOMUK_SEARCH_DBUS_OPERATORS_H_
  144. +#ifndef AKONADI_DBUSOPERATORS_H
  145. +#define AKONADI_DBUSOPERATORS_H
  146.  
  147.  #include <QtDBus/QDBusArgument>
  148.  
  149. Index: akonadi/server/src/search/querymetatype.h
  150. ===================================================================
  151. --- akonadi/server/src/search/querymetatype.h   (revision 1106878)
  152. +++ akonadi/server/src/search/querymetatype.h   (working copy)
  153. @@ -21,8 +21,8 @@
  154.   * into the service interface when generated via qdbusxml2cpp.
  155.   */
  156.  
  157. -#ifndef _NEPOMUK_QUERY_META_TYPE_H_
  158. -#define _NEPOMUK_QUERY_META_TYPE_H_
  159. +#ifndef AKONADI_QUERYMETATYPE_H
  160. +#define AKONADI_QUERYMETATYPE_H
  161.  
  162.  typedef QHash<QString, QString> RequestPropertyMapDBus;
  163.  Q_DECLARE_METATYPE( RequestPropertyMapDBus )
  164. Index: akonadi/server/src/search/result.h
  165. ===================================================================
  166. --- akonadi/server/src/search/result.h  (revision 1106878)
  167. +++ akonadi/server/src/search/result.h  (working copy)
  168. @@ -17,8 +17,8 @@
  169.     Boston, MA 02110-1301, USA.
  170.   */
  171.  
  172. -#ifndef _NEPOMUK_SEARCH_RESULT_H_
  173. -#define _NEPOMUK_SEARCH_RESULT_H_
  174. +#ifndef AKONADI_RESULT_H
  175. +#define AKONADI_RESULT_H
  176.  
  177.  #include <QtCore/QSharedDataPointer>
  178.  #include <QtCore/QUrl>
  179. Index: akonadi/server/src/search/queryserviceclient.h
  180. ===================================================================
  181. --- akonadi/server/src/search/queryserviceclient.h      (revision 1106878)
  182. +++ akonadi/server/src/search/queryserviceclient.h      (working copy)
  183. @@ -16,8 +16,8 @@
  184.     Boston, MA 02110-1301, USA.
  185.  */
  186.  
  187. -#ifndef _NEPOMUK_QUERY_SERVICE_CLIENT_H_
  188. -#define _NEPOMUK_QUERY_SERVICE_CLIENT_H_
  189. +#ifndef AKONADI_QUERYSERVICECLIENT_H
  190. +#define AKONADI_QUERYSERVICECLIENT_H
  191.  
  192.  #include <QtCore/QObject>
  193.  
  194. Index: akonadi/server/src/preprocessormanager.h
  195. ===================================================================
  196. --- akonadi/server/src/preprocessormanager.h    (revision 1106878)
  197. +++ akonadi/server/src/preprocessormanager.h    (working copy)
  198. @@ -22,8 +22,8 @@
  199.   *
  200.   *****************************************************************************/
  201.  
  202. -#ifndef _PREPROCESSORMANAGER_H_
  203. -#define _PREPROCESSORMANAGER_H_
  204. +#ifndef AKONADI_PREPROCESSORMANAGER_H
  205. +#define AKONADI_PREPROCESSORMANAGER_H
  206.  
  207.  #include <QtCore/QObject>
  208.  #include <QtCore/QList>
  209. Index: akonadi/server/src/handler/akappend.cpp
  210. ===================================================================
  211. --- akonadi/server/src/handler/akappend.cpp     (revision 1106878)
  212. +++ akonadi/server/src/handler/akappend.cpp     (working copy)
  213. @@ -17,11 +17,12 @@
  214.   *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  215.   ***************************************************************************/
  216.  
  217. +#include "akappend.h"
  218. +
  219.  #include "libs/imapparser_p.h"
  220.  #include "imapstreamparser.h"
  221.  
  222.  #include "append.h"
  223. -#include "akappend.h"
  224.  #include "response.h"
  225.  #include "handlerhelper.h"
  226.  
  227. Index: akonadi/server/src/nepomuksearch.cpp
  228. ===================================================================
  229. --- akonadi/server/src/nepomuksearch.cpp        (revision 1106878)
  230. +++ akonadi/server/src/nepomuksearch.cpp        (working copy)
  231. @@ -17,12 +17,12 @@
  232.      02110-1301, USA.
  233.  */
  234.  
  235. +#include "nepomuksearch.h"
  236. +
  237.  #include <QtCore/QDebug>
  238.  #include <QtCore/QStringList>
  239.  #include <QtCore/QUrl>
  240.  
  241. -#include "nepomuksearch.h"
  242. -
  243.  #include "search/result.h"
  244.  
  245.  using namespace Akonadi;
  246. Index: akonadi/server/src/nepomukmanager.cpp
  247. ===================================================================
  248. --- akonadi/server/src/nepomukmanager.cpp       (revision 1106878)
  249. +++ akonadi/server/src/nepomukmanager.cpp       (working copy)
  250. @@ -17,12 +17,12 @@
  251.      02110-1301, USA.
  252.  */
  253.  
  254. +#include "nepomukmanager.h"
  255. +
  256.  #include <QtCore/QDebug>
  257.  #include <QtCore/QUrl>
  258.  #include <QMetaObject>
  259.  
  260. -#include "nepomukmanager.h"
  261. -
  262.  #include "search/result.h"
  263.  
  264.  #include "entities.h"
create a new version of this paste RAW Paste Data