Changeset 561 for trunk/demos/browser


Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
45 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/demos/browser/autosaver.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/autosaver.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/bookmarks.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    7373    , m_bookmarkModel(0)
    7474{
    75     connect(this, SIGNAL(entryAdded(BookmarkNode *)),
     75    connect(this, SIGNAL(entryAdded(BookmarkNode*)),
    7676            m_saveTimer, SLOT(changeOccurred()));
    77     connect(this, SIGNAL(entryRemoved(BookmarkNode *, int, BookmarkNode *)),
     77    connect(this, SIGNAL(entryRemoved(BookmarkNode*,int,BookmarkNode*)),
    7878            m_saveTimer, SLOT(changeOccurred()));
    79     connect(this, SIGNAL(entryChanged(BookmarkNode *)),
     79    connect(this, SIGNAL(entryChanged(BookmarkNode*)),
    8080            m_saveTimer, SLOT(changeOccurred()));
    8181}
    … …  
    363363    , m_bookmarksManager(bookmarkManager)
    364364{
    365     connect(bookmarkManager, SIGNAL(entryAdded(BookmarkNode *)),
    366             this, SLOT(entryAdded(BookmarkNode *)));
    367     connect(bookmarkManager, SIGNAL(entryRemoved(BookmarkNode *, int, BookmarkNode *)),
    368             this, SLOT(entryRemoved(BookmarkNode *, int, BookmarkNode *)));
    369     connect(bookmarkManager, SIGNAL(entryChanged(BookmarkNode *)),
    370             this, SLOT(entryChanged(BookmarkNode *)));
     365    connect(bookmarkManager, SIGNAL(entryAdded(BookmarkNode*)),
     366            this, SLOT(entryAdded(BookmarkNode*)));
     367    connect(bookmarkManager, SIGNAL(entryRemoved(BookmarkNode*,int,BookmarkNode*)),
     368            this, SLOT(entryRemoved(BookmarkNode*,int,BookmarkNode*)));
     369    connect(bookmarkManager, SIGNAL(entryChanged(BookmarkNode*)),
     370            this, SLOT(entryChanged(BookmarkNode*)));
    371371}
    372372
    … …  
    734734    , m_bookmarksManager(0)
    735735{
    736     connect(this, SIGNAL(activated(const QModelIndex &)),
    737             this, SLOT(activated(const QModelIndex &)));
     736    connect(this, SIGNAL(activated(QModelIndex)),
     737            this, SLOT(activated(QModelIndex)));
    738738    setMaxRows(-1);
    739739    setHoverRole(BookmarksModel::UrlStringRole);
    … …  
    793793    tree->header()->resizeSection(0, header);
    794794    tree->header()->setStretchLastSection(true);
    795     connect(tree, SIGNAL(activated(const QModelIndex&)),
     795    connect(tree, SIGNAL(activated(QModelIndex)),
    796796            this, SLOT(open()));
    797797    tree->setContextMenuPolicy(Qt::CustomContextMenu);
    798     connect(tree, SIGNAL(customContextMenuRequested(const QPoint &)),
    799             this, SLOT(customContextMenuRequested(const QPoint &)));
     798    connect(tree, SIGNAL(customContextMenuRequested(QPoint)),
     799            this, SLOT(customContextMenuRequested(QPoint)));
    800800    connect(addFolderButton, SIGNAL(clicked()),
    801801            this, SLOT(newFolder()));
    … …  
    885885    setRootIndex(model->index(0, 0));
    886886    connect(m_bookmarksModel, SIGNAL(modelReset()), this, SLOT(build()));
    887     connect(m_bookmarksModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(build()));
    888     connect(m_bookmarksModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SLOT(build()));
    889     connect(m_bookmarksModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), this, SLOT(build()));
     887    connect(m_bookmarksModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(build()));
     888    connect(m_bookmarksModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(build()));
     889    connect(m_bookmarksModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(build()));
    890890    setAcceptDrops(true);
    891891}
    … …  
    957957            button->setText(idx.data().toString());
    958958            ModelMenu *menu = new ModelMenu(this);
    959             connect(menu, SIGNAL(activated(const QModelIndex &)),
    960                     this, SLOT(activated(const QModelIndex &)));
     959            connect(menu, SIGNAL(activated(QModelIndex)),
     960                    this, SLOT(activated(QModelIndex)));
    961961            menu->setModel(m_bookmarksModel);
    962962            menu->setRootIndex(idx);

  • trunk/demos/browser/bookmarks.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/browser.pro

    r2 r561  
    44
    55CONFIG += qt warn_on
    6 contains(QT_BUILD_PARTS, tools): CONFIG += uitools
     6contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools
    77else: DEFINES += QT_NO_UITOOLS
     8
     9release:DEFINES+=QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT
    810
    911FORMS += \
    … …  
    7981    QMAKE_INFO_PLIST = Info_mac.plist
    8082    TARGET = Browser
     83
     84    # No 64-bit Flash on Mac, so build the browser 32-bit
     85    contains(QT_CONFIG, x86) {
     86        CONFIG -= x86_64
     87        CONFIG += x86
     88    }
     89    contains(QT_CONFIG, ppc) {
     90        CONFIG -= ppc64
     91        CONFIG += ppc
     92    }
    8193}
    8294
    … …  
    8799# install
    88100target.path = $$[QT_INSTALL_DEMOS]/browser
    89 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls
     101sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls data
    90102sources.path = $$[QT_INSTALL_DEMOS]/browser
    91103INSTALLS += target sources
     104
     105symbian {
     106    TARGET.UID3 = 0xA000CF70
     107    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     108}

  • trunk/demos/browser/browserapplication.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    8080    , m_localServer(0)
    8181{
    82     QCoreApplication::setOrganizationName(QLatin1String("Trolltech"));
     82    QCoreApplication::setOrganizationName(QLatin1String("Qt"));
    8383    QCoreApplication::setApplicationName(QLatin1String("demobrowser"));
    8484    QCoreApplication::setApplicationVersion(QLatin1String("0.1"));
    … …  
    206206        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
    207207    QWebSettings::setIconDatabasePath(directory);
     208    QWebSettings::setOfflineStoragePath(directory);
    208209
    209210    setWindowIcon(QIcon(QLatin1String(":browser.svg")));
    … …  
    247248    QUrl url = settings.value(QLatin1String("userStyleSheet")).toUrl();
    248249    defaultSettings->setUserStyleSheetUrl(url);
     250
     251    defaultSettings->setAttribute(QWebSettings::DnsPrefetchEnabled, true);
    249252
    250253    settings.endGroup();

  • trunk/demos/browser/browserapplication.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/browsermainwindow.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    8282    , m_reload(0)
    8383{
     84    setToolButtonStyle(Qt::ToolButtonFollowStyle);
    8485    setAttribute(Qt::WA_DeleteOnClose, true);
    8586    statusBar()->setSizeGripEnabled(true);
    … …  
    9091    BookmarksModel *boomarksModel = BrowserApplication::bookmarksManager()->bookmarksModel();
    9192    m_bookmarksToolbar = new BookmarksToolBar(boomarksModel, this);
    92     connect(m_bookmarksToolbar, SIGNAL(openUrl(const QUrl&)),
    93             m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
     93    connect(m_bookmarksToolbar, SIGNAL(openUrl(QUrl)),
     94            m_tabWidget, SLOT(loadUrlInCurrentTab(QUrl)));
    9495    connect(m_bookmarksToolbar->toggleViewAction(), SIGNAL(toggled(bool)),
    9596            this, SLOT(updateBookmarksToolbarActionText(bool)));
    … …  
    109110        setCentralWidget(centralWidget);
    110111
    111     connect(m_tabWidget, SIGNAL(loadPage(const QString &)),
    112         this, SLOT(loadPage(const QString &)));
    113     connect(m_tabWidget, SIGNAL(setCurrentTitle(const QString &)),
    114         this, SLOT(slotUpdateWindowTitle(const QString &)));
    115     connect(m_tabWidget, SIGNAL(showStatusBarMessage(const QString&)),
    116             statusBar(), SLOT(showMessage(const QString&)));
    117     connect(m_tabWidget, SIGNAL(linkHovered(const QString&)),
    118             statusBar(), SLOT(showMessage(const QString&)));
     112    connect(m_tabWidget, SIGNAL(loadPage(QString)),
     113        this, SLOT(loadPage(QString)));
     114    connect(m_tabWidget, SIGNAL(setCurrentTitle(QString)),
     115        this, SLOT(slotUpdateWindowTitle(QString)));
     116    connect(m_tabWidget, SIGNAL(showStatusBarMessage(QString)),
     117            statusBar(), SLOT(showMessage(QString)));
     118    connect(m_tabWidget, SIGNAL(linkHovered(QString)),
     119            statusBar(), SLOT(showMessage(QString)));
    119120    connect(m_tabWidget, SIGNAL(loadProgress(int)),
    120121            this, SLOT(slotLoadProgress(int)));
    121122    connect(m_tabWidget, SIGNAL(tabsChanged()),
    122123            m_autoSaver, SLOT(changeOccurred()));
    123     connect(m_tabWidget, SIGNAL(geometryChangeRequested(const QRect &)),
    124             this, SLOT(geometryChangeRequested(const QRect &)));
    125     connect(m_tabWidget, SIGNAL(printRequested(QWebFrame *)),
    126             this, SLOT(printRequested(QWebFrame *)));
     124    connect(m_tabWidget, SIGNAL(geometryChangeRequested(QRect)),
     125            this, SLOT(geometryChangeRequested(QRect)));
     126    connect(m_tabWidget, SIGNAL(printRequested(QWebFrame*)),
     127            this, SLOT(printRequested(QWebFrame*)));
    127128    connect(m_tabWidget, SIGNAL(menuBarVisibilityChangeRequested(bool)),
    128129            menuBar(), SLOT(setVisible(bool)));
    … …  
    369370    // History
    370371    HistoryMenu *historyMenu = new HistoryMenu(this);
    371     connect(historyMenu, SIGNAL(openUrl(const QUrl&)),
    372             m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
    373     connect(historyMenu, SIGNAL(hovered(const QString&)), this,
    374             SLOT(slotUpdateStatusbar(const QString&)));
     372    connect(historyMenu, SIGNAL(openUrl(QUrl)),
     373            m_tabWidget, SLOT(loadUrlInCurrentTab(QUrl)));
     374    connect(historyMenu, SIGNAL(hovered(QString)), this,
     375            SLOT(slotUpdateStatusbar(QString)));
    375376    historyMenu->setTitle(tr("Hi&story"));
    376377    menuBar()->addMenu(historyMenu);
    … …  
    404405    // Bookmarks
    405406    BookmarksMenu *bookmarksMenu = new BookmarksMenu(this);
    406     connect(bookmarksMenu, SIGNAL(openUrl(const QUrl&)),
    407             m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
    408     connect(bookmarksMenu, SIGNAL(hovered(const QString&)),
    409             this, SLOT(slotUpdateStatusbar(const QString&)));
     407    connect(bookmarksMenu, SIGNAL(openUrl(QUrl)),
     408            m_tabWidget, SLOT(loadUrlInCurrentTab(QUrl)));
     409    connect(bookmarksMenu, SIGNAL(hovered(QString)),
     410            this, SLOT(slotUpdateStatusbar(QString)));
    410411    bookmarksMenu->setTitle(tr("&Bookmarks"));
    411412    menuBar()->addMenu(bookmarksMenu);
    … …  
    455456    connect(m_historyBackMenu, SIGNAL(aboutToShow()),
    456457            this, SLOT(slotAboutToShowBackMenu()));
    457     connect(m_historyBackMenu, SIGNAL(triggered(QAction *)),
    458             this, SLOT(slotOpenActionUrl(QAction *)));
     458    connect(m_historyBackMenu, SIGNAL(triggered(QAction*)),
     459            this, SLOT(slotOpenActionUrl(QAction*)));
    459460    m_navigationBar->addAction(m_historyBack);
    460461
    … …  
    463464    connect(m_historyForwardMenu, SIGNAL(aboutToShow()),
    464465            this, SLOT(slotAboutToShowForwardMenu()));
    465     connect(m_historyForwardMenu, SIGNAL(triggered(QAction *)),
    466             this, SLOT(slotOpenActionUrl(QAction *)));
     466    connect(m_historyForwardMenu, SIGNAL(triggered(QAction*)),
     467            this, SLOT(slotOpenActionUrl(QAction*)));
    467468    m_historyForward->setMenu(m_historyForwardMenu);
    468469    m_navigationBar->addAction(m_historyForward);
    … …  
    478479    m_toolbarSearch = new ToolbarSearch(m_navigationBar);
    479480    m_navigationBar->addWidget(m_toolbarSearch);
    480     connect(m_toolbarSearch, SIGNAL(search(const QUrl&)), SLOT(loadUrl(const QUrl&)));
     481    connect(m_toolbarSearch, SIGNAL(search(QUrl)), SLOT(loadUrl(QUrl)));
    481482
    482483    m_chaseWidget = new ChaseWidget(this);
    … …  
    487488{
    488489    BookmarksDialog *dialog = new BookmarksDialog(this);
    489     connect(dialog, SIGNAL(openUrl(const QUrl&)),
    490             m_tabWidget, SLOT(loadUrlInCurrentTab(const QUrl&)));
     490    connect(dialog, SIGNAL(openUrl(QUrl)),
     491            m_tabWidget, SLOT(loadUrlInCurrentTab(QUrl)));
    491492    dialog->show();
    492493}
    … …  
    550551    }
    551552    m_autoSaver->changeOccurred();
    552 }
    553 
    554 QUrl BrowserMainWindow::guessUrlFromString(const QString &string)
    555 {
    556     QString urlStr = string.trimmed();
    557     QRegExp test(QLatin1String("^[a-zA-Z]+\\:.*"));
    558 
    559     // Check if it looks like a qualified URL. Try parsing it and see.
    560     bool hasSchema = test.exactMatch(urlStr);
    561     if (hasSchema) {
    562         QUrl url = QUrl::fromEncoded(urlStr.toUtf8(), QUrl::TolerantMode);
    563         if (url.isValid())
    564             return url;
    565     }
    566 
    567     // Might be a file.
    568     if (QFile::exists(urlStr)) {
    569         QFileInfo info(urlStr);
    570         return QUrl::fromLocalFile(info.absoluteFilePath());
    571     }
    572 
    573     // Might be a shorturl - try to detect the schema.
    574     if (!hasSchema) {
    575         int dotIndex = urlStr.indexOf(QLatin1Char('.'));
    576         if (dotIndex != -1) {
    577             QString prefix = urlStr.left(dotIndex).toLower();
    578             QByteArray schema = (prefix == QLatin1String("ftp")) ? prefix.toLatin1() : "http";
    579             QUrl url =
    580                 QUrl::fromEncoded(schema + "://" + urlStr.toUtf8(), QUrl::TolerantMode);
    581             if (url.isValid())
    582                 return url;
    583         }
    584     }
    585 
    586     // Fall back to QUrl's own tolerant parser.
    587     QUrl url = QUrl::fromEncoded(string.toUtf8(), QUrl::TolerantMode);
    588 
    589     // finally for cases where the user just types in a hostname add http
    590     if (url.scheme().isEmpty())
    591         url = QUrl::fromEncoded("http://" + string.toUtf8(), QUrl::TolerantMode);
    592     return url;
    593553}
    594554
    … …  
    677637        return;
    678638    QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
    679     connect(dialog, SIGNAL(paintRequested(QPrinter *)),
    680             currentTab(), SLOT(print(QPrinter *)));
     639    connect(dialog, SIGNAL(paintRequested(QPrinter*)),
     640            currentTab(), SLOT(print(QPrinter*)));
    681641    dialog->exec();
    682642#endif
    … …  
    740700        int ret = QMessageBox::warning(this, QString(),
    741701                           tr("Are you sure you want to close the window?"
    742                               "  There are %1 tab open").arg(m_tabWidget->count()),
     702                              "  There are %1 tabs open").arg(m_tabWidget->count()),
    743703                           QMessageBox::Yes | QMessageBox::No,
    744704                           QMessageBox::No);
    … …  
    839799    QSettings settings;
    840800    settings.beginGroup(QLatin1String("MainWindow"));
    841     QString home = settings.value(QLatin1String("home"), QLatin1String("http://qtsoftware.com/")).toString();
     801    QString home = settings.value(QLatin1String("home"), QLatin1String("http://qt.nokia.com/")).toString();
    842802    loadPage(home);
    843803}
    … …  
    873833void BrowserMainWindow::loadPage(const QString &page)
    874834{
    875     QUrl url = guessUrlFromString(page);
     835    QUrl url = QUrl::fromUserInput(page);
    876836    loadUrl(url);
    877837}

  • trunk/demos/browser/browsermainwindow.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    6969
    7070public:
    71     static QUrl guessUrlFromString(const QString &url);
    7271    TabWidget *tabWidget() const;
    7372    WebView *currentTab() const;

  • trunk/demos/browser/chasewidget.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/chasewidget.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/cookiejar.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    669669    domainLineEdit->setCompleter(new QCompleter(cookieModel, domainLineEdit));
    670670
    671     connect(domainLineEdit, SIGNAL(textChanged(const QString &)),
    672             this, SLOT(textChanged(const QString &)));
     671    connect(domainLineEdit, SIGNAL(textChanged(QString)),
     672            this, SLOT(textChanged(QString)));
    673673    connect(blockButton, SIGNAL(clicked()), this, SLOT(block()));
    674674    connect(allowButton, SIGNAL(clicked()), this, SLOT(allow()));

  • trunk/demos/browser/cookiejar.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/data/defaultbookmarks.xbel

    r2 r561  
    44    <folder folded="yes">
    55        <title>Bookmarks Bar</title>
    6         <bookmark href="http://qtsoftware.com/">
    7             <title>Qt Software</title>
     6        <bookmark href="http://qt.nokia.com/">
     7            <title>Qt Home Page</title>
    88        </bookmark>
    99        <bookmark href="http://webkit.org/">
    1010            <title>WebKit.org</title>
    1111        </bookmark>
    12         <bookmark href="http://doc.trolltech.com/">
     12        <bookmark href="http://qt.nokia.com/doc/">
    1313            <title>Qt Documentation</title>
    1414        </bookmark>
    15         <bookmark href="http://doc.trolltech.com/qq/">
     15        <bookmark href="http://qt.nokia.com/doc/qq/">
    1616            <title>Qt Quarterly</title>
    1717        </bookmark>
    18         <bookmark href="http://labs.trolltech.com/">
     18        <bookmark href="http://labs.qt.nokia.com/">
    1919            <title>Qt Labs</title>
    2020        </bookmark>
    … …  
    3131            <title>xkcd</title>
    3232        </bookmark>
     33       <bookmark href="http://twitter.com/qtbynokia">
     34            <title>Twitter</title>
     35        </bookmark>
    3336    </folder>
    3437    <folder folded="yes">

  • trunk/demos/browser/downloadmanager.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    9595    connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
    9696            this, SLOT(error(QNetworkReply::NetworkError)));
    97     connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)),
    98             this, SLOT(downloadProgress(qint64, qint64)));
     97    connect(m_reply, SIGNAL(downloadProgress(qint64,qint64)),
     98            this, SLOT(downloadProgress(qint64,qint64)));
    9999    connect(m_reply, SIGNAL(metaDataChanged()),
    100100            this, SLOT(metaDataChanged()));

  • trunk/demos/browser/downloadmanager.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/edittableview.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/edittableview.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/edittreeview.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/edittreeview.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/history.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    7878    connect(&m_expiredTimer, SIGNAL(timeout()),
    7979            this, SLOT(checkForExpired()));
    80     connect(this, SIGNAL(entryAdded(const HistoryItem &)),
     80    connect(this, SIGNAL(entryAdded(HistoryItem)),
    8181            m_saveTimer, SLOT(changeOccurred()));
    82     connect(this, SIGNAL(entryRemoved(const HistoryItem &)),
     82    connect(this, SIGNAL(entryRemoved(HistoryItem)),
    8383            m_saveTimer, SLOT(changeOccurred()));
    8484    load();
    … …  
    370370    connect(m_history, SIGNAL(historyReset()),
    371371            this, SLOT(historyReset()));
    372     connect(m_history, SIGNAL(entryRemoved(const HistoryItem &)),
     372    connect(m_history, SIGNAL(entryRemoved(HistoryItem)),
    373373            this, SLOT(historyReset()));
    374374
    375     connect(m_history, SIGNAL(entryAdded(const HistoryItem &)),
     375    connect(m_history, SIGNAL(entryAdded(HistoryItem)),
    376376            this, SLOT(entryAdded()));
    377377    connect(m_history, SIGNAL(entryUpdated(int)),
    … …  
    596596    , m_history(0)
    597597{
    598     connect(this, SIGNAL(activated(const QModelIndex &)),
    599             this, SLOT(activated(const QModelIndex &)));
     598    connect(this, SIGNAL(activated(QModelIndex)),
     599            this, SLOT(activated(QModelIndex)));
    600600    setHoverRole(HistoryModel::UrlStringRole);
    601601}
    … …  
    640640{
    641641    HistoryDialog *dialog = new HistoryDialog(this);
    642     connect(dialog, SIGNAL(openUrl(const QUrl&)),
    643             this, SIGNAL(openUrl(const QUrl&)));
     642    connect(dialog, SIGNAL(openUrl(QUrl)),
     643            this, SIGNAL(openUrl(QUrl)));
    644644    dialog->show();
    645645}
    … …  
    688688    tree->header()->resizeSection(0, header);
    689689    tree->header()->setStretchLastSection(true);
    690     connect(tree, SIGNAL(activated(const QModelIndex&)),
     690    connect(tree, SIGNAL(activated(QModelIndex)),
    691691            this, SLOT(open()));
    692692    tree->setContextMenuPolicy(Qt::CustomContextMenu);
    693     connect(tree, SIGNAL(customContextMenuRequested(const QPoint &)),
    694             this, SLOT(customContextMenuRequested(const QPoint &)));
     693    connect(tree, SIGNAL(customContextMenuRequested(QPoint)),
     694            this, SLOT(customContextMenuRequested(QPoint)));
    695695}
    696696
    … …  
    752752    if (sourceModel()) {
    753753        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    754         disconnect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
    755                    this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
    756         disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
    757                 this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
    758         disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    759                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     754        disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
     755                   this, SLOT(dataChanged(QModelIndex,QModelIndex)));
     756        disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
     757                this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     758        disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     759                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    760760    }
    761761
    … …  
    765765        m_loaded = false;
    766766        connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    767         connect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
    768                    this, SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
    769         connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
    770                 this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
    771         connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    772                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     767        connect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
     768                   this, SLOT(sourceDataChanged(QModelIndex,QModelIndex)));
     769        connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
     770                this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     771        connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     772                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    773773    }
    774774}
    … …  
    907907        return false;
    908908    int lastRow = row + count - 1;
    909     disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    910                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     909    disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     910                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    911911    beginRemoveRows(parent, row, lastRow);
    912912    int oldCount = rowCount();
    … …  
    915915    sourceModel()->removeRows(start, end - start + 1);
    916916    endRemoveRows();
    917     connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    918                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     917    connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     918                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    919919    m_loaded = false;
    920920    if (oldCount - count != rowCount())
    … …  
    989989    if (sourceModel()) {
    990990        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    991         disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
     991        disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
    992992                this, SLOT(sourceReset()));
    993         disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
     993        disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
    994994                this, SLOT(sourceReset()));
    995995    }
    … …  
    999999    if (newSourceModel) {
    10001000        connect(newSourceModel, SIGNAL(modelReset()), this, SLOT(sourceReset()));
    1001         connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
     1001        connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
    10021002                this, SLOT(sourceReset()));
    1003         connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
     1003        connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
    10041004                this, SLOT(sourceReset()));
    10051005    }
    … …  
    11781178        disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    11791179        disconnect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
    1180         disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
    1181                 this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
    1182         disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    1183                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     1180        disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
     1181                this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     1182        disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     1183                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    11841184    }
    11851185
    … …  
    11891189        connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
    11901190        connect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
    1191         connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
    1192                 this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
    1193         connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
    1194                 this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
     1191        connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
     1192                this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
     1193        connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
     1194                this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
    11951195    }
    11961196

  • trunk/demos/browser/history.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/htmls/notfound.html

    r2 r561  
    5050    <h2>When connecting to: %3.</h2>
    5151    <ul>
    52       <li>Check the address for errors such as <b>ww</b>.trolltech.com
    53       instead of <b>www</b>.trolltech.com</li>
     52      <li>Check the address for errors such as <b>ww</b>.example.com
     53      instead of <b>www</b>.example.com</li>
    5454      <li>If the address is correct, try checking the network
    5555      connection.</li>

  • trunk/demos/browser/main.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/modelmenu.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/modelmenu.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/networkaccessmanager.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5858#include <QtNetwork/QNetworkDiskCache>
    5959#include <QtNetwork/QNetworkProxy>
     60#include <QtNetwork/QNetworkRequest>
    6061#include <QtNetwork/QNetworkReply>
    6162#include <QtNetwork/QSslError>
    6263
    6364NetworkAccessManager::NetworkAccessManager(QObject *parent)
    64     : QNetworkAccessManager(parent)
    65 {
    66     connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
     65    : QNetworkAccessManager(parent),
     66    requestFinishedCount(0), requestFinishedFromCacheCount(0), requestFinishedPipelinedCount(0),
     67    requestFinishedSecureCount(0)
     68{
     69    connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
    6770            SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
    68     connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
    69             SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
     71    connect(this, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
     72            SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
     73    connect(this, SIGNAL(finished(QNetworkReply*)),
     74            SLOT(requestFinished(QNetworkReply*)));
    7075#ifndef QT_NO_OPENSSL
    71     connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
    72             SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
     76    connect(this, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)),
     77            SLOT(sslErrors(QNetworkReply*,QList<QSslError>)));
    7378#endif
    7479    loadSettings();
    … …  
    7883    diskCache->setCacheDirectory(location);
    7984    setCache(diskCache);
     85}
     86
     87QNetworkReply* NetworkAccessManager::createRequest(Operation op, const QNetworkRequest & req, QIODevice * outgoingData)
     88{
     89    QNetworkRequest request = req; // copy so we can modify
     90    // this is a temporary hack until we properly use the pipelining flags from QtWebkit
     91    // pipeline everything! :)
     92    request.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
     93    return QNetworkAccessManager::createRequest(op, request, outgoingData);
     94}
     95
     96void NetworkAccessManager::requestFinished(QNetworkReply *reply)
     97{
     98    requestFinishedCount++;
     99
     100    if (reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool() == true)
     101        requestFinishedFromCacheCount++;
     102
     103    if (reply->attribute(QNetworkRequest::HttpPipeliningWasUsedAttribute).toBool() == true)
     104        requestFinishedPipelinedCount++;
     105
     106    if (reply->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool() == true)
     107        requestFinishedSecureCount++;
     108
     109    if (requestFinishedCount % 10)
     110        return;
     111
     112    double pctCached = (double(requestFinishedFromCacheCount) * 100.0/ double(requestFinishedCount));
     113    double pctPipelined = (double(requestFinishedPipelinedCount) * 100.0/ double(requestFinishedCount));
     114    double pctSecure = (double(requestFinishedSecureCount) * 100.0/ double(requestFinishedCount));
     115    qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS]", requestFinishedCount, pctCached, pctPipelined, pctSecure);
     116
    80117}
    81118

  • trunk/demos/browser/networkaccessmanager.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4444
    4545#include <QtNetwork/QNetworkAccessManager>
     46#include <QtNetwork/QNetworkRequest>
    4647
    4748class NetworkAccessManager : public QNetworkAccessManager
    … …  
    5253    NetworkAccessManager(QObject *parent = 0);
    5354
     55    virtual QNetworkReply* createRequest ( Operation op, const QNetworkRequest & req, QIODevice * outgoingData = 0 );
     56
    5457private:
    5558    QList<QString> sslTrustedHostList;
     59    qint64 requestFinishedCount;
     60    qint64 requestFinishedFromCacheCount;
     61    qint64 requestFinishedPipelinedCount;
     62    qint64 requestFinishedSecureCount;
    5663
    5764public slots:
    5865    void loadSettings();
     66    void requestFinished(QNetworkReply *reply);
    5967
    6068private slots:

  • trunk/demos/browser/searchlineedit.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5151  : QAbstractButton(parent)
    5252{
     53#ifndef QT_NO_CURSOR
    5354    setCursor(Qt::ArrowCursor);
     55#endif // QT_NO_CURSOR
    5456    setToolTip(tr("Clear"));
    5557    setVisible(false);
    … …  
    104106{
    105107    setObjectName(QLatin1String("SearchButton"));
     108#ifndef QT_NO_CURSOR
    106109    setCursor(Qt::ArrowCursor);
     110#endif //QT_NO_CURSOR
    107111    setFocusPolicy(Qt::NoFocus);
    108112}
    … …  
    166170    m_searchButton(new SearchButton(this))
    167171{
    168     connect(lineEdit(), SIGNAL(textChanged(const QString &)),
    169             this, SIGNAL(textChanged(const QString &)));
     172    connect(lineEdit(), SIGNAL(textChanged(QString)),
     173            this, SIGNAL(textChanged(QString)));
    170174    setLeftWidget(m_searchButton);
    171175    m_inactiveText = tr("Search");

  • trunk/demos/browser/searchlineedit.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/settings.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    9090    QSettings settings;
    9191    settings.beginGroup(QLatin1String("MainWindow"));
    92     QString defaultHome = QLatin1String("http://qtsoftware.com");
     92    QString defaultHome = QLatin1String("http://qt.nokia.com");
    9393    homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
    9494    settings.endGroup();

  • trunk/demos/browser/settings.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/squeezelabel.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/squeezelabel.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/tabwidget.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    6565    setContextMenuPolicy(Qt::CustomContextMenu);
    6666    setAcceptDrops(true);
    67     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
    68             this, SLOT(contextMenuRequested(const QPoint &)));
     67    connect(this, SIGNAL(customContextMenuRequested(QPoint)),
     68            this, SLOT(contextMenuRequested(QPoint)));
    6969
    7070    QString alt = QLatin1String("Alt+%1");
    … …  
    222222    connect(m_tabBar, SIGNAL(reloadTab(int)), this, SLOT(reloadTab(int)));
    223223    connect(m_tabBar, SIGNAL(reloadAllTabs()), this, SLOT(reloadAllTabs()));
    224     connect(m_tabBar, SIGNAL(tabMoved(int, int)), this, SLOT(moveTab(int, int)));
     224    connect(m_tabBar, SIGNAL(tabMoved(int,int)), this, SLOT(moveTab(int,int)));
    225225    setTabBar(m_tabBar);
    226226    setDocumentMode(true);
    … …  
    258258    connect(m_recentlyClosedTabsMenu, SIGNAL(aboutToShow()),
    259259            this, SLOT(aboutToShowRecentTabsMenu()));
    260     connect(m_recentlyClosedTabsMenu, SIGNAL(triggered(QAction *)),
    261             this, SLOT(aboutToShowRecentTriggeredAction(QAction *)));
     260    connect(m_recentlyClosedTabsMenu, SIGNAL(triggered(QAction*)),
     261            this, SLOT(aboutToShowRecentTriggeredAction(QAction*)));
    262262    m_recentlyClosedTabsAction = new QAction(tr("Recently Closed Tabs"), this);
    263263    m_recentlyClosedTabsAction->setMenu(m_recentlyClosedTabsMenu);
    … …  
    305305    WebView *oldWebView = this->webView(m_lineEdits->currentIndex());
    306306    if (oldWebView) {
    307         disconnect(oldWebView, SIGNAL(statusBarMessage(const QString&)),
    308                 this, SIGNAL(showStatusBarMessage(const QString&)));
    309         disconnect(oldWebView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
    310                 this, SIGNAL(linkHovered(const QString&)));
     307        disconnect(oldWebView, SIGNAL(statusBarMessage(QString)),
     308                this, SIGNAL(showStatusBarMessage(QString)));
     309        disconnect(oldWebView->page(), SIGNAL(linkHovered(QString,QString,QString)),
     310                this, SIGNAL(linkHovered(QString)));
    311311        disconnect(oldWebView, SIGNAL(loadProgress(int)),
    312312                this, SIGNAL(loadProgress(int)));
    313313    }
    314314
    315     connect(webView, SIGNAL(statusBarMessage(const QString&)),
    316             this, SIGNAL(showStatusBarMessage(const QString&)));
    317     connect(webView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
    318             this, SIGNAL(linkHovered(const QString&)));
     315    connect(webView, SIGNAL(statusBarMessage(QString)),
     316            this, SIGNAL(showStatusBarMessage(QString)));
     317    connect(webView->page(), SIGNAL(linkHovered(QString,QString,QString)),
     318            this, SIGNAL(linkHovered(QString)));
    319319    connect(webView, SIGNAL(loadProgress(int)),
    320320            this, SIGNAL(loadProgress(int)));
    … …  
    451451    connect(webView, SIGNAL(iconChanged()),
    452452            this, SLOT(webViewIconChanged()));
    453     connect(webView, SIGNAL(titleChanged(const QString &)),
    454             this, SLOT(webViewTitleChanged(const QString &)));
    455     connect(webView, SIGNAL(urlChanged(const QUrl &)),
    456             this, SLOT(webViewUrlChanged(const QUrl &)));
     453    connect(webView, SIGNAL(titleChanged(QString)),
     454            this, SLOT(webViewTitleChanged(QString)));
     455    connect(webView, SIGNAL(urlChanged(QUrl)),
     456            this, SLOT(webViewUrlChanged(QUrl)));
    457457    connect(webView->page(), SIGNAL(windowCloseRequested()),
    458458            this, SLOT(windowCloseRequested()));
    459     connect(webView->page(), SIGNAL(geometryChangeRequested(const QRect &)),
    460             this, SIGNAL(geometryChangeRequested(const QRect &)));
    461     connect(webView->page(), SIGNAL(printRequested(QWebFrame *)),
    462             this, SIGNAL(printRequested(QWebFrame *)));
     459    connect(webView->page(), SIGNAL(geometryChangeRequested(QRect)),
     460            this, SIGNAL(geometryChangeRequested(QRect)));
     461    connect(webView->page(), SIGNAL(printRequested(QWebFrame*)),
     462            this, SIGNAL(printRequested(QWebFrame*)));
    463463    connect(webView->page(), SIGNAL(menuBarVisibilityChangeRequested(bool)),
    464464            this, SIGNAL(menuBarVisibilityChangeRequested(bool)));
    … …  
    561561        hasFocus = tab->hasFocus();
    562562
    563         m_recentlyClosedTabsAction->setEnabled(true);
    564         m_recentlyClosedTabs.prepend(tab->url());
    565         if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize)
    566             m_recentlyClosedTabs.removeLast();
     563        QWebSettings *globalSettings = QWebSettings::globalSettings();
     564        if (!globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) {
     565            m_recentlyClosedTabsAction->setEnabled(true);
     566            m_recentlyClosedTabs.prepend(tab->url());
     567            if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize)
     568                m_recentlyClosedTabs.removeLast();
     569        }
    567570    }
    568571    QWidget *lineEdit = m_lineEdits->widget(index);
    … …  
    762765        return;
    763766    connect(m_root, SIGNAL(triggered()), this, SLOT(rootTriggered()));
    764     connect(root, SIGNAL(destroyed(QObject *)), this, SLOT(rootDestroyed()));
     767    connect(root, SIGNAL(destroyed(QObject*)), this, SLOT(rootDestroyed()));
    765768    root->setEnabled(false);
    766769}
    … …  
    811814{
    812815    if (m_currentParent)
    813         disconnect(m_currentParent, SIGNAL(destroyed(QObject *)),
     816        disconnect(m_currentParent, SIGNAL(destroyed(QObject*)),
    814817                   this, SLOT(currentDestroyed()));
    815818
    … …  
    825828    m_root->setChecked(source->isChecked());
    826829    m_root->setEnabled(source->isEnabled());
    827     connect(m_currentParent, SIGNAL(destroyed(QObject *)),
     830    connect(m_currentParent, SIGNAL(destroyed(QObject*)),
    828831            this, SLOT(currentDestroyed()));
    829832}

  • trunk/demos/browser/tabwidget.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/toolbarsearch.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/toolbarsearch.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/urllineedit.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    8888    connect(m_clearButton, SIGNAL(clicked()),
    8989            m_lineEdit, SLOT(clear()));
    90     connect(m_lineEdit, SIGNAL(textChanged(const QString&)),
    91             m_clearButton, SLOT(textChanged(const QString&)));
     90    connect(m_lineEdit, SIGNAL(textChanged(QString)),
     91            m_clearButton, SLOT(textChanged(QString)));
    9292}
    9393
    … …  
    271271    m_webView = webView;
    272272    m_iconLabel->m_webView = webView;
    273     connect(webView, SIGNAL(urlChanged(const QUrl &)),
    274         this, SLOT(webViewUrlChanged(const QUrl &)));
     273    connect(webView, SIGNAL(urlChanged(QUrl)),
     274        this, SLOT(webViewUrlChanged(QUrl)));
    275275    connect(webView, SIGNAL(loadFinished(bool)),
    276276        this, SLOT(webViewIconChanged()));

  • trunk/demos/browser/urllineedit.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/webview.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    5555#include <QtWebKit/QWebHitTestResult>
    5656
     57#ifndef QT_NO_UITOOLS
    5758#include <QtUiTools/QUiLoader>
     59#endif  //QT_NO_UITOOLS
    5860
    5961#include <QtCore/QDebug>
    … …  
    6769{
    6870    setNetworkAccessManager(BrowserApplication::networkAccessManager());
    69     connect(this, SIGNAL(unsupportedContent(QNetworkReply *)),
    70             this, SLOT(handleUnsupportedContent(QNetworkReply *)));
     71    connect(this, SIGNAL(unsupportedContent(QNetworkReply*)),
     72            this, SLOT(handleUnsupportedContent(QNetworkReply*)));
    7173}
    7274
    … …  
    150152    bool isOpened = file.open(QIODevice::ReadOnly);
    151153    Q_ASSERT(isOpened);
     154    Q_UNUSED(isOpened)
     155
    152156    QString title = tr("Error loading page: %1").arg(reply->url().toString());
    153157    QString html = QString(QLatin1String(file.readAll()))
    … …  
    189193{
    190194    setPage(m_page);
    191     connect(page(), SIGNAL(statusBarMessage(const QString&)),
    192             SLOT(setStatusBarText(const QString&)));
     195    connect(page(), SIGNAL(statusBarMessage(QString)),
     196            SLOT(setStatusBarText(QString)));
    193197    connect(this, SIGNAL(loadProgress(int)),
    194198            this, SLOT(setProgress(int)));
    195199    connect(this, SIGNAL(loadFinished(bool)),
    196200            this, SLOT(loadFinished()));
    197     connect(page(), SIGNAL(loadingUrl(const QUrl&)),
    198             this, SIGNAL(urlChanged(const QUrl &)));
    199     connect(page(), SIGNAL(downloadRequested(const QNetworkRequest &)),
    200             this, SLOT(downloadRequested(const QNetworkRequest &)));
     201    connect(page(), SIGNAL(loadingUrl(QUrl)),
     202            this, SIGNAL(urlChanged(QUrl)));
     203    connect(page(), SIGNAL(downloadRequested(QNetworkRequest)),
     204            this, SLOT(downloadRequested(QNetworkRequest)));
    201205    page()->setForwardUnsupportedContent(true);
    202206

  • trunk/demos/browser/webview.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**

  • trunk/demos/browser/xbel.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    134134    BookmarkNode *root = new BookmarkNode(BookmarkNode::Root);
    135135    setDevice(device);
    136     while (!atEnd()) {
    137         readNext();
    138         if (isStartElement()) {
    139             QString version = attributes().value(QLatin1String("version")).toString();
    140             if (name() == QLatin1String("xbel")
    141                 && (version.isEmpty() || version == QLatin1String("1.0"))) {
    142                 readXBEL(root);
    143             } else {
    144                 raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
    145             }
     136    if (readNextStartElement()) {
     137        QString version = attributes().value(QLatin1String("version")).toString();
     138        if (name() == QLatin1String("xbel")
     139            && (version.isEmpty() || version == QLatin1String("1.0"))) {
     140            readXBEL(root);
     141        } else {
     142            raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
    146143        }
    147144    }
    … …  
    153150    Q_ASSERT(isStartElement() && name() == QLatin1String("xbel"));
    154151
    155     while (!atEnd()) {
    156         readNext();
    157         if (isEndElement())
    158             break;
    159 
    160         if (isStartElement()) {
    161             if (name() == QLatin1String("folder"))
    162                 readFolder(parent);
    163             else if (name() == QLatin1String("bookmark"))
    164                 readBookmarkNode(parent);
    165             else if (name() == QLatin1String("separator"))
    166                 readSeparator(parent);
    167             else
    168                 skipUnknownElement();
    169         }
     152    while (readNextStartElement()) {
     153        if (name() == QLatin1String("folder"))
     154            readFolder(parent);
     155        else if (name() == QLatin1String("bookmark"))
     156            readBookmarkNode(parent);
     157        else if (name() == QLatin1String("separator"))
     158            readSeparator(parent);
     159        else
     160            skipCurrentElement();
    170161    }
    171162}
    … …  
    178169    folder->expanded = (attributes().value(QLatin1String("folded")) == QLatin1String("no"));
    179170
    180     while (!atEnd()) {
    181         readNext();
    182 
    183         if (isEndElement())
    184             break;
    185 
    186         if (isStartElement()) {
    187             if (name() == QLatin1String("title"))
    188                 readTitle(folder);
    189             else if (name() == QLatin1String("desc"))
    190                 readDescription(folder);
    191             else if (name() == QLatin1String("folder"))
    192                 readFolder(folder);
    193             else if (name() == QLatin1String("bookmark"))
    194                 readBookmarkNode(folder);
    195             else if (name() == QLatin1String("separator"))
    196                 readSeparator(folder);
    197             else
    198                 skipUnknownElement();
    199         }
     171    while (readNextStartElement()) {
     172        if (name() == QLatin1String("title"))
     173            readTitle(folder);
     174        else if (name() == QLatin1String("desc"))
     175            readDescription(folder);
     176        else if (name() == QLatin1String("folder"))
     177            readFolder(folder);
     178        else if (name() == QLatin1String("bookmark"))
     179            readBookmarkNode(folder);
     180        else if (name() == QLatin1String("separator"))
     181            readSeparator(folder);
     182        else
     183            skipCurrentElement();
    200184    }
    201185}
    … …  
    225209    BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark, parent);
    226210    bookmark->url = attributes().value(QLatin1String("href")).toString();
    227     while (!atEnd()) {
    228         readNext();
    229         if (isEndElement())
    230             break;
    231 
    232         if (isStartElement()) {
    233             if (name() == QLatin1String("title"))
    234                 readTitle(bookmark);
    235             else if (name() == QLatin1String("desc"))
    236                 readDescription(bookmark);
    237             else
    238                 skipUnknownElement();
    239         }
     211    while (readNextStartElement()) {
     212        if (name() == QLatin1String("title"))
     213            readTitle(bookmark);
     214        else if (name() == QLatin1String("desc"))
     215            readDescription(bookmark);
     216        else
     217            skipCurrentElement();
    240218    }
    241219    if (bookmark->title.isEmpty())
    242220        bookmark->title = QObject::tr("Unknown title");
    243 }
    244 
    245 void XbelReader::skipUnknownElement()
    246 {
    247     Q_ASSERT(isStartElement());
    248 
    249     while (!atEnd()) {
    250         readNext();
    251 
    252         if (isEndElement())
    253             break;
    254 
    255         if (isStartElement())
    256             skipUnknownElement();
    257     }
    258221}
    259222

  • trunk/demos/browser/xbel.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the demonstration applications of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    8888
    8989private:
    90     void skipUnknownElement();
    9190    void readXBEL(BookmarkNode *parent);
    9291    void readTitle(BookmarkNode *parent);
Note: See TracChangeset for help on using the changeset viewer.