Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git CMakeLists.txt CMakeLists.txt
- index e161584..f178657 100644
- --- CMakeLists.txt
- +++ CMakeLists.txt
- @@ -2,6 +2,12 @@ project( Predicate )
- cmake_minimum_required(VERSION 2.6)
- +find_package(KDE4 4.3.0 REQUIRED)
- +include(KDE4Defaults)
- +include(MacroLibrary)
- +include (MacroAdditionalCleanFiles)
- +include (MacroAddFileDependencies)
- +
- if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
- cmake_policy(SET CMP0005 NEW)
- diff --git Predicate/EscapedString.h Predicate/EscapedString.h
- index dca9066..60d417b 100644
- --- Predicate/EscapedString.h
- +++ Predicate/EscapedString.h
- @@ -118,22 +118,22 @@ public:
- inline const char operator[](int i) const { QByteArray::operator[](i); }
- inline const char operator[](uint i) const { QByteArray::operator[](i); }
- #else
- - inline char at(int i) const { QByteArray::at(i); }
- - inline char operator[](int i) const { QByteArray::operator[](i); }
- - inline char operator[](uint i) const { QByteArray::operator[](i); }
- + inline char at(int i) const { return QByteArray::at(i); }
- + inline char operator[](int i) const { return QByteArray::operator[](i); }
- + inline char operator[](uint i) const { return QByteArray::operator[](i); }
- #endif
- - inline QByteRef operator[](int i) { QByteArray::operator[](i); }
- - inline QByteRef operator[](uint i) { QByteArray::operator[](i); }
- + inline QByteRef operator[](int i) { return QByteArray::operator[](i); }
- + inline QByteRef operator[](uint i) { return QByteArray::operator[](i); }
- - inline int indexOf(char c, int from = 0) const { QByteArray::indexOf(c, from); }
- - inline int indexOf(const char *c, int from = 0) const { QByteArray::indexOf(c, from); }
- - inline int indexOf(const QByteArray &a, int from = 0) const { QByteArray::indexOf(a, from); }
- + inline int indexOf(char c, int from = 0) const { return QByteArray::indexOf(c, from); }
- + inline int indexOf(const char *c, int from = 0) const { return QByteArray::indexOf(c, from); }
- + inline int indexOf(const QByteArray &a, int from = 0) const { return QByteArray::indexOf(a, from); }
- inline int indexOf(const EscapedString &s, int from = 0) const {
- return s.isValid() ? QByteArray::indexOf(s, from) : -1;
- }
- - inline int lastIndexOf(char c, int from = -1) const { QByteArray::lastIndexOf(c, from); }
- - inline int lastIndexOf(const char *c, int from = -1) const { QByteArray::lastIndexOf(c, from); }
- - inline int lastIndexOf(const QByteArray &a, int from = -1) const { QByteArray::lastIndexOf(a, from); }
- + inline int lastIndexOf(char c, int from = -1) const { return QByteArray::lastIndexOf(c, from); }
- + inline int lastIndexOf(const char *c, int from = -1) const { return QByteArray::lastIndexOf(c, from); }
- + inline int lastIndexOf(const QByteArray &a, int from = -1) const { return QByteArray::lastIndexOf(a, from); }
- inline int lastIndexOf(const EscapedString &s, int from = 0) const {
- return s.isValid() ? QByteArray::lastIndexOf(s, from) : -1;
- }
- diff --git Predicate/VersionInfo.cpp Predicate/VersionInfo.cpp
- index fe51f45..111fded 100644
- --- Predicate/VersionInfo.cpp
- +++ Predicate/VersionInfo.cpp
- @@ -38,6 +38,7 @@ bool ServerVersionInfo::isNull() const
- {
- //! @todo add this to SDC: bool operator==(const Data& other) const { return false; }
- *d.data() == Data();
- + return false; //!@todo need to return the right thing here
- };
- //------------------------
- @@ -55,4 +56,5 @@ PREDICATE_EXPORT DatabaseVersionInfo Predicate::version()
- bool DatabaseVersionInfo::isNull() const
- {
- *this == DatabaseVersionInfo();
- + return false; //! @todo need to return the right thing here
- }
- diff --git tests/CMakeLists.txt tests/CMakeLists.txt
- index 19adc7c..8f929b7 100644
- --- tests/CMakeLists.txt
- +++ tests/CMakeLists.txt
- @@ -1 +1,3 @@
- add_subdirectory( features )
- +add_subdirectory( unittests )
- +
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
