<div dir="ltr">I've branched from this commit in my git clone to create a v1.7-bugfix branch and will continue merging from master into that branch so long as commits are only fixes. The branch can be found in the repo at <a href="https://github.com/greg-hellings/sword">https://github.com/greg-hellings/sword</a><div>
<br></div><div>--Greg</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jul 30, 2013 at 9:06 PM, <span dir="ltr"><<a href="mailto:scribe@crosswire.org" target="_blank">scribe@crosswire.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: scribe<br>
Date: 2013-07-30 19:06:33 -0700 (Tue, 30 Jul 2013)<br>
New Revision: 2926<br>
<br>
Removed:<br>
trunk/examples/qt/<br>
trunk/src/utilfuns/qt/<br>
Modified:<br>
trunk/CMakeLists.txt<br>
trunk/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
trunk/include/config.h<br>
trunk/include/swbuf.h<br>
trunk/include/swkey.h<br>
trunk/include/swmgr.h<br>
trunk/src/utilfuns/Makefile.am<br>
trunk/usrinst.sh<br>
Log:<br>
reverted Qt enhancement option<br>
set revision for 1.7.0RC1 (1.6.901)<br>
<br>
<br>
Modified: trunk/CMakeLists.txt<br>
===================================================================<br>
--- trunk/CMakeLists.txt 2013-07-31 01:39:30 UTC (rev 2925)<br>
+++ trunk/CMakeLists.txt 2013-07-31 02:06:33 UTC (rev 2926)<br>
@@ -15,7 +15,7 @@<br>
# A CMake port of the SWORD build system... we hope<br>
PROJECT(libsword CXX C)<br>
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)<br>
-SET(SWORD_VERSION 1.6.2)<br>
+SET(SWORD_VERSION 1.6.901)<br>
<br>
# Make sure it's an out-of-stream build<br>
IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})<br>
<br>
Modified: trunk/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
===================================================================<br>
--- trunk/<a href="http://configure.ac" target="_blank">configure.ac</a> 2013-07-31 01:39:30 UTC (rev 2925)<br>
+++ trunk/<a href="http://configure.ac" target="_blank">configure.ac</a> 2013-07-31 02:06:33 UTC (rev 2926)<br>
@@ -5,7 +5,7 @@<br>
# Version change: Change line 8 only !<br>
# Change it immediately after a release<br>
<br>
-AC_INIT(sword, 1.6.2, <a href="mailto:sword-bugs@crosswire.org">sword-bugs@crosswire.org</a>, sword, <a href="http://crosswire.org/sword" target="_blank">http://crosswire.org/sword</a>)<br>
+AC_INIT(sword, 1.6.901, <a href="mailto:sword-bugs@crosswire.org">sword-bugs@crosswire.org</a>, sword, <a href="http://crosswire.org/sword" target="_blank">http://crosswire.org/sword</a>)<br>
AC_CONFIG_SRCDIR(sword.bmp)<br>
AC_PREREQ(2.52)<br>
AC_REVISION($Revision: 1.45 $)<br>
@@ -47,8 +47,6 @@<br>
# ---------------------------------------------------------------------<br>
# With options<br>
# ---------------------------------------------------------------------<br>
-AC_ARG_WITH(qt,<br>
- AC_HELP_STRING([--with-qt],[allow easier integration with Qt (default=yes)]),,with_qt=yes)<br>
AC_ARG_WITH(zlib,<br>
AC_HELP_STRING([--with-zlib],[allow zlib compressed modules (default=yes)]),,with_zlib=yes)<br>
AC_ARG_WITH(icu,<br>
@@ -125,7 +123,6 @@<br>
AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEZLIB"<br>
fi<br>
<br>
-<br>
AS_IF([test "x$with_internalregex" = "xyes"],<br>
[have_systemregex="no"],<br>
[AC_SEARCH_LIBS(regexec, regex, [have_systemregex="yes"], [have_systemregex="no"])])<br>
@@ -288,23 +285,6 @@<br>
<br>
AC_CHECK_FUNCS(vsnprintf, [have_vsnprintf="yes"])<br>
<br>
-<br>
-if test x$with_qt = xyes; then<br>
-PKG_CHECK_MODULES([QT4], [QtCore QtGui >= 4.4.0], [<br>
- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)<br>
- AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)<br>
- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)<br>
-], with_qt="no")<br>
-else<br>
- with_qt="no"<br>
-fi<br>
-<br>
-if test x$with_qt = xyes; then<br>
- AM_CXXFLAGS="$AM_CXXFLAGS $QT4_CFLAGS"<br>
- LIBS="$LIBS $QT4_LIBS"<br>
-fi<br>
-<br>
-<br>
# ---------------------------------------------------------------------<br>
# Alter global conf directory only if not /etc<br>
# ---------------------------------------------------------------------<br>
@@ -350,7 +330,6 @@<br>
# ---------------------------------------------------------------------<br>
<br>
# don't #ifdef in .cpp files HAVE_ stuff because non-ac compiles won't be able to switch them since we include config.h<br>
-AM_CONDITIONAL(HAVE_QT, test x$with_qt = xyes)<br>
AM_CONDITIONAL(HAVE_LIBZ, test x$with_zlib = xyes)<br>
AM_CONDITIONAL(HAVE_ICU, test x$with_icu = xyes)<br>
AM_CONDITIONAL(HAVE_ICUSWORD, test x$with_icusword = xyes)<br>
@@ -392,7 +371,6 @@<br>
echo " INTERNAL FTPLIB: $with_internalftplib"<br>
echo " INTERNAL REGEX: $with_internalregex"<br>
echo " CLUCENE: $with_clucene"<br>
-echo " QT SUPPORT: $with_qt"<br>
echo<br>
echo<br>
<br>
<br>
Modified: trunk/include/config.h<br>
===================================================================<br>
--- trunk/include/config.h 2013-07-31 01:39:30 UTC (rev 2925)<br>
+++ trunk/include/config.h 2013-07-31 02:06:33 UTC (rev 2926)<br>
@@ -54,7 +54,7 @@<br>
#define PACKAGE_NAME "sword"<br>
<br>
/* Define to the full name and version of this package. */<br>
-#define PACKAGE_STRING "sword 1.6.2"<br>
+#define PACKAGE_STRING "sword 1.7.0RC1"<br>
<br>
/* Define to the one symbol short name of this package. */<br>
#define PACKAGE_TARNAME "sword"<br>
@@ -63,13 +63,13 @@<br>
#define PACKAGE_URL "<a href="http://crosswire.org/sword" target="_blank">http://crosswire.org/sword</a>"<br>
<br>
/* Define to the version of this package. */<br>
-#define PACKAGE_VERSION "1.6.2"<br>
+#define PACKAGE_VERSION "1.7.0RC1"<br>
<br>
/* Define to 1 if you have the ANSI C header files. */<br>
#define STDC_HEADERS 1<br>
<br>
/* Version number of package */<br>
-#define VERSION "1.6.2"<br>
+#define VERSION "1.7.0RC1"<br>
<br>
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most<br>
significant byte first (like Motorola and SPARC, unlike Intel). */<br>
<br>
Modified: trunk/include/swbuf.h<br>
===================================================================<br>
--- trunk/include/swbuf.h 2013-07-31 01:39:30 UTC (rev 2925)<br>
+++ trunk/include/swbuf.h 2013-07-31 02:06:33 UTC (rev 2926)<br>
@@ -29,10 +29,7 @@<br>
#ifdef __BORLANDC__<br>
#include <mem.h><br>
#endif<br>
-#include <string><br>
<br>
-class QString;<br>
-<br>
SWORD_NAMESPACE_START<br>
<br>
<br>
@@ -99,8 +96,6 @@<br>
*<br>
*/<br>
SWBuf(const char *initVal, unsigned long initSize = 0);<br>
- SWBuf(const std::string &initVal);<br>
- SWBuf(const QString &initVal);<br>
// SWBuf(unsigned long initSize);<br>
<br>
/**<br>
@@ -330,8 +325,6 @@<br>
inline char *getRawData() { return buf; }<br>
<br>
inline operator const char *() const { return c_str(); }<br>
- inline operator std::string() const { return c_str(); }<br>
- operator QString () const;<br>
inline char &operator[](unsigned long pos) { return charAt(pos); }<br>
inline char &operator[](long pos) { return charAt((unsigned long)pos); }<br>
inline char &operator[](unsigned int pos) { return charAt((unsigned long)pos); }<br>
<br>
Modified: trunk/include/swkey.h<br>
===================================================================<br>
--- trunk/include/swkey.h 2013-07-31 01:39:30 UTC (rev 2925)<br>
+++ trunk/include/swkey.h 2013-07-31 02:06:33 UTC (rev 2926)<br>
@@ -30,10 +30,7 @@<br>
#include <defs.h><br>
#include <sysdata.h><br>
#include <utilstr.h><br>
-#include <string><br>
<br>
-class QString;<br>
-<br>
SWORD_NAMESPACE_START<br>
<br>
#define KEYERR_OUTOFBOUNDS 1<br>
@@ -43,7 +40,6 @@<br>
SWKey &operator =(const SWKey &ikey) { positionFrom(ikey); return *this; } \<br>
SWKey &operator =(SW_POSITION pos) { setPosition(pos); return *this; } \<br>
operator const char *() const { return getText(); } \<br>
- operator const std::string() const { return getText(); } \<br>
bool operator ==(const SWKey &ikey) { return equals(ikey); } \<br>
bool operator !=(const SWKey &ikey) { return !equals(ikey); } \<br>
virtual bool operator >(const SWKey &ikey) { return (compare(ikey) > 0); } \<br>
@@ -126,13 +122,11 @@<br>
* @param ikey string to use for initializing this new key<br>
*/<br>
SWKey(const char *ikey = 0);<br>
- SWKey(const std::string &);<br>
<br>
/** Copy Constructor<br>
* @param k The SWKey object to copy.<br>
*/<br>
SWKey(const SWKey &k);<br>
- SWKey(const QString &k);<br>
<br>
/** Destructor, cleans up this instance of SWKey<br>
*/<br>
<br>
Modified: trunk/include/swmgr.h<br>
===================================================================<br>
--- trunk/include/swmgr.h 2013-07-31 01:39:30 UTC (rev 2925)<br>
+++ trunk/include/swmgr.h 2013-07-31 02:06:33 UTC (rev 2926)<br>
@@ -214,7 +214,6 @@<br>
* @return the module, if found, otherwise 0<br>
*/<br>
SWModule *getModule(const char *modName) { ModMap::iterator it = Modules.find(modName); return ((it != Modules.end()) ? it->second : 0); }<br>
- SWModule *getModule(const SWBuf &modName) { return getModule(modName.c_str()); }<br>
const SWModule *getModule(const char *modName) const { ModMap::const_iterator it = Modules.find(modName); return ((it != Modules.end()) ? it->second : 0); }<br>
<br>
<br>
<br>
Modified: trunk/src/utilfuns/Makefile.am<br>
===================================================================<br>
--- trunk/src/utilfuns/Makefile.am 2013-07-31 01:39:30 UTC (rev 2925)<br>
+++ trunk/src/utilfuns/Makefile.am 2013-07-31 02:06:33 UTC (rev 2926)<br>
@@ -26,14 +26,8 @@<br>
UNTGZ =<br>
endif<br>
<br>
-if HAVE_QT<br>
-QTSUPPORT=$(utilfunsdir)/qt/qtsupport.cpp<br>
-AM_CPPFLAGS += $(QT4_CFLAGS)<br>
-endif<br>
-<br>
libsword_la_SOURCES += $(UNTGZ)<br>
libsword_la_SOURCES += $(ftpsrc)<br>
-libsword_la_SOURCES += $(QTSUPPORT)<br>
<br>
if USE_INTERNAL_REGEX<br>
SWREGEX = $(utilfunsdir)/regex.c<br>
<br>
Modified: trunk/usrinst.sh<br>
===================================================================<br>
--- trunk/usrinst.sh 2013-07-31 01:39:30 UTC (rev 2925)<br>
+++ trunk/usrinst.sh 2013-07-31 02:06:33 UTC (rev 2926)<br>
@@ -38,7 +38,6 @@<br>
#OPTIONS="--with-icusword $OPTIONS"<br>
#OPTIONS="--without-clucene $OPTIONS"<br>
#OPTIONS="--without-curl $OPTIONS"<br>
-OPTIONS="--without-qt $OPTIONS"<br>
<br>
#OPTIONS="--disable-tests $OPTIONS"<br>
#OPTIONS="--disable-utilities $OPTIONS"<br>
<br>
<br>
_______________________________________________<br>
sword-cvs mailing list<br>
<a href="mailto:sword-cvs@crosswire.org">sword-cvs@crosswire.org</a><br>
<a href="http://www.crosswire.org/mailman/listinfo/sword-cvs" target="_blank">http://www.crosswire.org/mailman/listinfo/sword-cvs</a><br>
</blockquote></div><br></div>