diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-25 18:20:45 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-25 18:20:45 (GMT) |
| commit | e58b7f0cc139c5fda3d472c38161be8fb718db7d (patch) | |
| tree | 3c20cccfe050d125a5f4736ba11b6383e8734be4 /examples/xml/dombookmarks/xbeltree.cpp | |
| parent | c2a4a1b1e06f8b0d02e7b56c9eb0c19fd2fae80a (diff) | |
| parent | 4c3539dfbc65d5decdd842d4181f9aa3d38d213c (diff) | |
| download | Qt-e58b7f0cc139c5fda3d472c38161be8fb718db7d.zip Qt-e58b7f0cc139c5fda3d472c38161be8fb718db7d.tar.gz Qt-e58b7f0cc139c5fda3d472c38161be8fb718db7d.tar.bz2 | |
Merge branch '4.6'
Conflicts:
doc/src/modules.qdoc
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/webkit/fancybrowser/mainwindow.cpp
src/gui/widgets/qtabbar.cpp
src/gui/widgets/qtabbar_p.h
tests/auto/qpixmap/tst_qpixmap.cpp
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/tabbedbrowser.cpp
translations/translations.pri
Diffstat (limited to 'examples/xml/dombookmarks/xbeltree.cpp')
| -rw-r--r-- | examples/xml/dombookmarks/xbeltree.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/xml/dombookmarks/xbeltree.cpp b/examples/xml/dombookmarks/xbeltree.cpp index 996decc..7e2cc08 100644 --- a/examples/xml/dombookmarks/xbeltree.cpp +++ b/examples/xml/dombookmarks/xbeltree.cpp @@ -90,8 +90,8 @@ bool XbelTree::read(QIODevice *device) clear(); - disconnect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int)), - this, SLOT(updateDomElement(QTreeWidgetItem *, int))); + disconnect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), + this, SLOT(updateDomElement(QTreeWidgetItem*,int))); QDomElement child = root.firstChildElement("folder"); while (!child.isNull()) { @@ -99,8 +99,8 @@ bool XbelTree::read(QIODevice *device) child = child.nextSiblingElement("folder"); } - connect(this, SIGNAL(itemChanged(QTreeWidgetItem *, int)), - this, SLOT(updateDomElement(QTreeWidgetItem *, int))); + connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), + this, SLOT(updateDomElement(QTreeWidgetItem*,int))); return true; } |