diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-12 20:17:26 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-12 20:17:26 +0000 |
| commit | 69aa74860a18517762167b5bbd832321299dfc76 (patch) | |
| tree | 7d712c7b65c2721e375de315d07affbd05a977ad /quanta | |
| parent | 042dc76a36d755237893cc95628cf137b4f76543 (diff) | |
| download | tdewebdev-69aa74860a18517762167b5bbd832321299dfc76.tar.gz tdewebdev-69aa74860a18517762167b5bbd832321299dfc76.zip | |
Fix kdewebdev FTBFS under oneiricv3.5.13
Quanta lvalue gcc error patch provided by "/dev/ammo42"
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1258664 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta')
| -rw-r--r-- | quanta/parsers/tag.h | 3 | ||||
| -rw-r--r-- | quanta/parts/kafka/kafkacommon.cpp | 15 | ||||
| -rw-r--r-- | quanta/src/Makefile.am | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/quanta/parsers/tag.h b/quanta/parsers/tag.h index de7e0123..073e9568 100644 --- a/quanta/parsers/tag.h +++ b/quanta/parsers/tag.h @@ -88,6 +88,9 @@ public: void addAttribute(TagAttr attr) {attrs.append(attr);} /** Get the attribute number index */ TagAttr getAttribute(uint index) const {return attrs[index];} + /* /!\ KLUDGE WARNING /!\ */ + /** Get the attribute number index: returns a pointer */ + TagAttr* getAttribute_gcc46(uint index) {return (TagAttr*) &attrs[index];} /** Remove the attribute number index */ void deleteAttribute(uint index) {attrs.remove(attrs.at(index));} /** Insert a new Attribute, even if it already exists. Prefer using editAttribute. diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp index 9d0c7cdf..94569fe2 100644 --- a/quanta/parts/kafka/kafkacommon.cpp +++ b/quanta/parts/kafka/kafkacommon.cpp @@ -740,17 +740,18 @@ void kafkaCommon::fitsNodesPosition(Node* startNode, int colMovement, int lineMo beginCol, lastLine + lineMovement, lastCol); for(j = 0; j < node->tag->attrCount(); ++j) { - if(node->tag->getAttribute(j).nameLine == SNbeginLine) + TagAttr* ta = node->tag->getAttribute_gcc46(j); + if(ta->nameLine == SNbeginLine) { - node->tag->getAttribute(j).nameLine += lineMovement; - node->tag->getAttribute(j).nameCol += colMovement; - node->tag->getAttribute(j).valueLine += lineMovement; - node->tag->getAttribute(j).valueCol += colMovement; + ta->nameLine += lineMovement; + ta->nameCol += colMovement; + ta->valueLine += lineMovement; + ta->valueCol += colMovement; } else { - node->tag->getAttribute(j).nameLine += lineMovement; - node->tag->getAttribute(j).valueLine += lineMovement; + ta->nameLine += lineMovement; + ta->valueLine += lineMovement; } } node = getNextNode(node, b); diff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am index 667bb89f..64e6c2c9 100644 --- a/quanta/src/Makefile.am +++ b/quanta/src/Makefile.am @@ -30,7 +30,7 @@ quanta_LDADD = $(top_builddir)/quanta/project/libproject.la \ $(top_builddir)/quanta/utility/libutility.la \ $(top_builddir)/lib/libquantamodule.la \ -lkatepartinterfaces $(LIB_KNEWSTUFF) $(LIB_KAFKA) $(LIB_CVSSERVICE) \ - $(LIB_KMDI) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_KABC) $(LIB_KSPELL) $(LIB_KHTML) + $(LIB_KMDI) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_KABC) $(LIB_KSPELL) $(LIB_KHTML) -lX11 -lkdefx # $(top_builddir)/lib/compatibility/libcompat.la AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \ @@ -64,7 +64,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \ quanta_METASOURCES = AUTO # the library search path. -quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lX11 # this is where the kdelnk file will go xdg_apps_DATA = quanta.desktop |