daily pastebin goal
44%
SHARE
TWEET

Untitled

a guest Jul 17th, 2017 48 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git CMakeLists.txt CMakeLists.txt
  2. index e161584..f178657 100644
  3. --- CMakeLists.txt
  4. +++ CMakeLists.txt
  5. @@ -2,6 +2,12 @@ project( Predicate )
  6.  
  7.  cmake_minimum_required(VERSION 2.6)
  8.  
  9. +find_package(KDE4 4.3.0 REQUIRED)
  10. +include(KDE4Defaults)
  11. +include(MacroLibrary)
  12. +include (MacroAdditionalCleanFiles)
  13. +include (MacroAddFileDependencies)
  14. +
  15.  if(COMMAND cmake_policy)
  16.    cmake_policy(SET CMP0003 NEW)
  17.    cmake_policy(SET CMP0005 NEW)
  18. diff --git Predicate/EscapedString.h Predicate/EscapedString.h
  19. index dca9066..60d417b 100644
  20. --- Predicate/EscapedString.h
  21. +++ Predicate/EscapedString.h
  22. @@ -118,22 +118,22 @@ public:
  23.      inline const char operator[](int i) const { QByteArray::operator[](i); }
  24.      inline const char operator[](uint i) const { QByteArray::operator[](i); }
  25.  #else
  26. -    inline char at(int i) const { QByteArray::at(i); }
  27. -    inline char operator[](int i) const { QByteArray::operator[](i); }
  28. -    inline char operator[](uint i) const { QByteArray::operator[](i); }
  29. +    inline char at(int i) const { return QByteArray::at(i); }
  30. +    inline char operator[](int i) const { return QByteArray::operator[](i); }
  31. +    inline char operator[](uint i) const { return QByteArray::operator[](i); }
  32.  #endif
  33. -    inline QByteRef operator[](int i) { QByteArray::operator[](i); }
  34. -    inline QByteRef operator[](uint i) { QByteArray::operator[](i); }
  35. +    inline QByteRef operator[](int i) { return QByteArray::operator[](i); }
  36. +    inline QByteRef operator[](uint i) { return QByteArray::operator[](i); }
  37.  
  38. -    inline int indexOf(char c, int from = 0) const { QByteArray::indexOf(c, from); }
  39. -    inline int indexOf(const char *c, int from = 0) const { QByteArray::indexOf(c, from); }
  40. -    inline int indexOf(const QByteArray &a, int from = 0) const { QByteArray::indexOf(a, from); }
  41. +    inline int indexOf(char c, int from = 0) const { return QByteArray::indexOf(c, from); }
  42. +    inline int indexOf(const char *c, int from = 0) const { return QByteArray::indexOf(c, from); }
  43. +    inline int indexOf(const QByteArray &a, int from = 0) const { return QByteArray::indexOf(a, from); }
  44.      inline int indexOf(const EscapedString &s, int from = 0) const {
  45.          return s.isValid() ? QByteArray::indexOf(s, from) : -1;
  46.      }
  47. -    inline int lastIndexOf(char c, int from = -1) const { QByteArray::lastIndexOf(c, from); }
  48. -    inline int lastIndexOf(const char *c, int from = -1) const { QByteArray::lastIndexOf(c, from); }
  49. -    inline int lastIndexOf(const QByteArray &a, int from = -1) const { QByteArray::lastIndexOf(a, from); }
  50. +    inline int lastIndexOf(char c, int from = -1) const { return QByteArray::lastIndexOf(c, from); }
  51. +    inline int lastIndexOf(const char *c, int from = -1) const { return QByteArray::lastIndexOf(c, from); }
  52. +    inline int lastIndexOf(const QByteArray &a, int from = -1) const { return QByteArray::lastIndexOf(a, from); }
  53.      inline int lastIndexOf(const EscapedString &s, int from = 0) const {
  54.          return s.isValid() ? QByteArray::lastIndexOf(s, from) : -1;
  55.      }
  56. diff --git Predicate/VersionInfo.cpp Predicate/VersionInfo.cpp
  57. index fe51f45..111fded 100644
  58. --- Predicate/VersionInfo.cpp
  59. +++ Predicate/VersionInfo.cpp
  60. @@ -38,6 +38,7 @@ bool ServerVersionInfo::isNull() const
  61.  {
  62.  //! @todo add this to SDC:        bool operator==(const Data& other) const { return false; }
  63.      *d.data() == Data();
  64. +    return false; //!@todo need to return the right thing here
  65.  };
  66.  
  67.  //------------------------
  68. @@ -55,4 +56,5 @@ PREDICATE_EXPORT DatabaseVersionInfo Predicate::version()
  69.  bool DatabaseVersionInfo::isNull() const
  70.  {
  71.      *this == DatabaseVersionInfo();
  72. +    return false; //! @todo need to return the right thing here
  73.  }
  74. diff --git tests/CMakeLists.txt tests/CMakeLists.txt
  75. index 19adc7c..8f929b7 100644
  76. --- tests/CMakeLists.txt
  77. +++ tests/CMakeLists.txt
  78. @@ -1 +1,3 @@
  79.  add_subdirectory( features )
  80. +add_subdirectory( unittests )
  81. +
RAW Paste Data
Top