diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-16 14:35:51 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-16 14:35:51 +0000 |
| commit | 7af884d886e2428d5b28e9cf7d81c97d7e378123 (patch) | |
| tree | 64fe5f9f02f7d338baa54c3a380e43a66ae45f8f /quanta/parts | |
| parent | af2166652dfcfacffa91a7e1466e3abed19862ce (diff) | |
| download | tdewebdev-7af884d886e2428d5b28e9cf7d81c97d7e378123.tar.gz tdewebdev-7af884d886e2428d5b28e9cf7d81c97d7e378123.zip | |
[kdewebdev/quanta] fix deprecation warnings; make compatible with QT_NO_ASCII_CAST flag
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1214823 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta/parts')
| -rw-r--r-- | quanta/parts/kafka/htmldocumentpropertiesui.ui | 2 | ||||
| -rw-r--r-- | quanta/parts/kafka/kafkacommon.cpp | 4 | ||||
| -rw-r--r-- | quanta/parts/preview/whtmlpart.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui index 0834a6bd..6314ca62 100644 --- a/quanta/parts/kafka/htmldocumentpropertiesui.ui +++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui @@ -408,7 +408,7 @@ <customwidgets> <customwidget> <class>DualEditableTree</class> - <header location="local">../../treeviews/tagattributetree.h</header> + <header location="local">tagattributetree.h</header> <sizehint> <width>250</width> <height>100</height> diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp index 0220646d..5d4c5714 100644 --- a/quanta/parts/kafka/kafkacommon.cpp +++ b/quanta/parts/kafka/kafkacommon.cpp @@ -2340,8 +2340,8 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh closingNamespaceName = next->tag->nameSpace; closingNodeName = next->tag->name; closingCaseSensitive = next->tag->dtd()->caseSensitive; - if(QuantaCommon::closesTag(namespaceName, nodeName, caseSensitive, - closingNamespaceName, closingNodeName, closingCaseSensitive)) + if(QuantaCommon::closesTag(namespaceName, nodeName, !caseSensitive.isEmpty(), + closingNamespaceName, closingNodeName, !closingCaseSensitive.isEmpty())) extractNode(next, modifs, false, false); } } diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 1b34e123..47c1ca70 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -129,7 +129,7 @@ void WHTMLPart::addToHistory(const TQString &url) if ( !history.isEmpty() ) hpos++; - history.append(url); + history.append(url.ascii()); hpos = history.count()-1; |