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