From f284deea53e9ce30e27c62167803dad0759c2763 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Nov 2009 13:30:07 +1000 Subject: Revert "Doc: Added an example to demonstrate the QWebElement class." This reverts commit 19d63f4d932ae16d0e1c69892681ecd1fabeb44c. Conflicts: doc/src/qt4-intro.qdoc --- doc/src/diagrams/webkit-simpleselector.png | Bin 82564 -> 0 bytes doc/src/images/webkit-simpleselector.png | Bin 130292 -> 0 bytes doc/src/qt4-intro.qdoc | 6 +- examples/webkit/simpleselector/main.cpp | 54 --------------- examples/webkit/simpleselector/simpleselector.pro | 11 --- examples/webkit/simpleselector/window.cpp | 81 ---------------------- examples/webkit/simpleselector/window.h | 64 ----------------- examples/webkit/simpleselector/window.ui | 72 ------------------- examples/webkit/webkit.pro | 3 +- src/gui/kernel/qwidget.cpp | 11 --- src/gui/kernel/qwidget.h | 4 -- 11 files changed, 6 insertions(+), 300 deletions(-) delete mode 100644 doc/src/diagrams/webkit-simpleselector.png delete mode 100644 doc/src/images/webkit-simpleselector.png delete mode 100644 examples/webkit/simpleselector/main.cpp delete mode 100644 examples/webkit/simpleselector/simpleselector.pro delete mode 100644 examples/webkit/simpleselector/window.cpp delete mode 100644 examples/webkit/simpleselector/window.h delete mode 100644 examples/webkit/simpleselector/window.ui diff --git a/doc/src/diagrams/webkit-simpleselector.png b/doc/src/diagrams/webkit-simpleselector.png deleted file mode 100644 index e442f97..0000000 Binary files a/doc/src/diagrams/webkit-simpleselector.png and /dev/null differ diff --git a/doc/src/images/webkit-simpleselector.png b/doc/src/images/webkit-simpleselector.png deleted file mode 100644 index 2c888ca..0000000 Binary files a/doc/src/images/webkit-simpleselector.png and /dev/null differ diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index a77c3e1..48dea4a 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -583,7 +583,11 @@ DOM, helps reuse CSS selector knowledge, and gives little maintenance or footprint overhead. - \snippet webkitsnippets/webelement/main.cpp FindAll + \code + QWebElement document = frame->documentElement(); + QList allSpans = document.findAll("span"); + QList introSpans = document.findAll("p.intro span"); + \endcode See the QWebElement class documentation for more information. diff --git a/examples/webkit/simpleselector/main.cpp b/examples/webkit/simpleselector/main.cpp deleted file mode 100644 index 74c5469..0000000 --- a/examples/webkit/simpleselector/main.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [main program] -#include -#include "window.h" - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - Window window; - window.setUrl(QUrl("http://www.webkit.org")); - window.show(); - return app.exec(); -} -//! [main program] diff --git a/examples/webkit/simpleselector/simpleselector.pro b/examples/webkit/simpleselector/simpleselector.pro deleted file mode 100644 index 3f3037f..0000000 --- a/examples/webkit/simpleselector/simpleselector.pro +++ /dev/null @@ -1,11 +0,0 @@ -QT += webkit -FORMS = window.ui -HEADERS = window.h -SOURCES = main.cpp \ - window.cpp - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/webkit/simpleselector -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/simpleselector -INSTALLS += target sources diff --git a/examples/webkit/simpleselector/window.cpp b/examples/webkit/simpleselector/window.cpp deleted file mode 100644 index 295ab7f..0000000 --- a/examples/webkit/simpleselector/window.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include "window.h" - -//! [Window class constructor] -Window::Window(QWidget *parent) - : QWidget(parent) -{ - setupUi(this); -} -//! [Window class constructor] - -//! [return pressed] -void Window::on_elementLineEdit_returnPressed() -{ - QWebFrame *frame = webView->page()->mainFrame(); - -//! [select elements] - QWebElement document = frame->documentElement(); - QList elements = document.findAll(elementLineEdit->text()); -//! [select elements] - - foreach (QWebElement element, elements) - element.setAttribute("style", "background-color: #f0f090"); -} -//! [return pressed] - -//! [button clicked] -void Window::on_highlightButton_clicked() -{ - on_elementLineEdit_returnPressed(); -} -//! [button clicked] - -//! [set URL] -void Window::setUrl(const QUrl &url) -{ - webView->setUrl(url); -} -//! [set URL] diff --git a/examples/webkit/simpleselector/window.h b/examples/webkit/simpleselector/window.h deleted file mode 100644 index 437d360..0000000 --- a/examples/webkit/simpleselector/window.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef WINDOW_H -#define WINDOW_H - -#include -#include -#include "ui_window.h" - -//! [Window class definition] -class Window : public QWidget, private Ui::Window -{ - Q_OBJECT - -public: - Window(QWidget *parent = 0); - void setUrl(const QUrl &url); - -public slots: - void on_elementLineEdit_returnPressed(); - void on_highlightButton_clicked(); -}; -//! [Window class definition] - -#endif diff --git a/examples/webkit/simpleselector/window.ui b/examples/webkit/simpleselector/window.ui deleted file mode 100644 index aa824df..0000000 --- a/examples/webkit/simpleselector/window.ui +++ /dev/null @@ -1,72 +0,0 @@ - - - Window - - - - 0 - 0 - 640 - 480 - - - - Web Element Selector - - - - - - - http://webkit.org/ - - - - - - - - - - QFormLayout::ExpandingFieldsGrow - - - - - &Element: - - - elementLineEdit - - - - - - - li a - - - - - - - - - &Highlight - - - - - - - - - - QWebView - QWidget -
QtWebKit/QWebView
- - - - - diff --git a/examples/webkit/webkit.pro b/examples/webkit/webkit.pro index 47c1443..0a1d6bd 100644 --- a/examples/webkit/webkit.pro +++ b/examples/webkit/webkit.pro @@ -1,8 +1,7 @@ TEMPLATE = subdirs SUBDIRS += formextractor \ previewer \ - fancybrowser \ - simpleselector + fancybrowser contains(QT_CONFIG, openssl):SUBDIRS += googlechat diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 315f8e7..31067e1 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -11465,17 +11465,6 @@ void QWidget::languageChange() { } // compat \sa QWidget::setMaximumSize() */ -/*! - \fn QWidget::setupUi(QWidget *widget) - - Sets up the user interface for the specified \a widget. - - \note This function is available with widgets that derive from user - interface descriptions created using \l{uic}. - - \sa {Using a Designer UI File in Your Application} -*/ - QRect QWidgetPrivate::frameStrut() const { Q_Q(const QWidget); diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h index c13cdf1..e0aa722 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -288,10 +288,6 @@ public: void setMaximumWidth(int maxw); void setMaximumHeight(int maxh); -#ifdef Q_QDOC - void setupUi(QWidget *widget); -#endif - QSize sizeIncrement() const; void setSizeIncrement(const QSize &); void setSizeIncrement(int w, int h); -- cgit v0.12