From 8bdc213167b853627e4bf63fac329f8932a3d942 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 29 Oct 2011 12:24:12 +0200 Subject: [PATCH] Search Manager now supports also MozSearch Used for example on http://www.qtcentre.org/content/, it is working now. Also updated copyright on files where it was missing. --- .../default/profiles/default/browsedata.db | Bin 20480 -> 20480 bytes src/bookmarksimport/bookmarksimportdialog.cpp | 17 +++++++ src/bookmarksimport/bookmarksimportdialog.h | 17 +++++++ src/bookmarksimport/chromeimporter.cpp | 19 +++++++- src/bookmarksimport/chromeimporter.h | 17 +++++++ src/bookmarksimport/firefoximporter.cpp | 20 +++++++-- src/bookmarksimport/firefoximporter.h | 18 ++++++++ src/bookmarksimport/operaimporter.cpp | 19 +++++++- src/bookmarksimport/operaimporter.h | 17 +++++++ src/opensearch/editsearchengine.cpp | 17 +++++++ src/opensearch/editsearchengine.h | 17 +++++++ src/opensearch/opensearchreader.cpp | 42 ++++++++++++------ src/opensearch/opensearchreader.h | 19 +++++++- src/opensearch/searchenginesdialog.cpp | 17 +++++++ src/opensearch/searchenginesdialog.h | 17 +++++++ src/tools/iconfetcher.cpp | 19 +++++++- src/tools/iconfetcher.h | 17 +++++++ src/webview/webinspectordockwidget.cpp | 17 +++++++ src/webview/webinspectordockwidget.h | 17 +++++++ 19 files changed, 320 insertions(+), 23 deletions(-) diff --git a/bin/data/default/profiles/default/browsedata.db b/bin/data/default/profiles/default/browsedata.db index 6548dcc16f0aa4dc6329b4bce5a239cce84b7479..6b95ee7ce85c120b8586b6c262e7e5b0da82de1d 100644 GIT binary patch delta 43 scmZozz}T>Wae}lUGXn#I2oOU7Q~5+4V@BqU3G=-f88-R+XJ%vo0I^yKfB*mh delta 43 scmZozz}T>Wae}lUBLf422oOU7Q`tlvV@Ae}3G=-f|8Mg7&&>EA0J!1`c>n+a diff --git a/src/bookmarksimport/bookmarksimportdialog.cpp b/src/bookmarksimport/bookmarksimportdialog.cpp index c7a55b8e9..ae72dd438 100644 --- a/src/bookmarksimport/bookmarksimportdialog.cpp +++ b/src/bookmarksimport/bookmarksimportdialog.cpp @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "bookmarksimportdialog.h" #include "ui_bookmarksimportdialog.h" #include "firefoximporter.h" diff --git a/src/bookmarksimport/bookmarksimportdialog.h b/src/bookmarksimport/bookmarksimportdialog.h index 547e41479..586d83b60 100644 --- a/src/bookmarksimport/bookmarksimportdialog.h +++ b/src/bookmarksimport/bookmarksimportdialog.h @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef BOOKMARKSIMPORTDIALOG_H #define BOOKMARKSIMPORTDIALOG_H diff --git a/src/bookmarksimport/chromeimporter.cpp b/src/bookmarksimport/chromeimporter.cpp index 6b18d03bc..0449e6470 100644 --- a/src/bookmarksimport/chromeimporter.cpp +++ b/src/bookmarksimport/chromeimporter.cpp @@ -1,8 +1,23 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "chromeimporter.h" #include "globalfunctions.h" -#include - ChromeImporter::ChromeImporter(QObject* parent) : QObject(parent) , m_error(false) diff --git a/src/bookmarksimport/chromeimporter.h b/src/bookmarksimport/chromeimporter.h index 0e54257ab..c025279eb 100644 --- a/src/bookmarksimport/chromeimporter.h +++ b/src/bookmarksimport/chromeimporter.h @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef CHROMEIMPORTER_H #define CHROMEIMPORTER_H diff --git a/src/bookmarksimport/firefoximporter.cpp b/src/bookmarksimport/firefoximporter.cpp index 00ab381a3..f544a7175 100644 --- a/src/bookmarksimport/firefoximporter.cpp +++ b/src/bookmarksimport/firefoximporter.cpp @@ -1,8 +1,22 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "firefoximporter.h" -#include -#include - FirefoxImporter::FirefoxImporter(QObject *parent) : QObject(parent) , m_error(false) diff --git a/src/bookmarksimport/firefoximporter.h b/src/bookmarksimport/firefoximporter.h index b222be380..46c4f7e79 100644 --- a/src/bookmarksimport/firefoximporter.h +++ b/src/bookmarksimport/firefoximporter.h @@ -1,9 +1,27 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef FIREFOXIMPORTER_H #define FIREFOXIMPORTER_H #include #include #include +#include #include #include "bookmarksmodel.h" diff --git a/src/bookmarksimport/operaimporter.cpp b/src/bookmarksimport/operaimporter.cpp index 70c053efe..4b87a0ed4 100644 --- a/src/bookmarksimport/operaimporter.cpp +++ b/src/bookmarksimport/operaimporter.cpp @@ -1,7 +1,22 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "operaimporter.h" -#include - OperaImporter::OperaImporter(QObject* parent) : QObject(parent) , m_error(false) diff --git a/src/bookmarksimport/operaimporter.h b/src/bookmarksimport/operaimporter.h index be3c0dd44..70af9759f 100644 --- a/src/bookmarksimport/operaimporter.h +++ b/src/bookmarksimport/operaimporter.h @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef OPERAIMPORTER_H #define OPERAIMPORTER_H diff --git a/src/opensearch/editsearchengine.cpp b/src/opensearch/editsearchengine.cpp index cf9265c7a..9b84f8a67 100644 --- a/src/opensearch/editsearchengine.cpp +++ b/src/opensearch/editsearchengine.cpp @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "editsearchengine.h" #include "ui_editsearchengine.h" diff --git a/src/opensearch/editsearchengine.h b/src/opensearch/editsearchengine.h index b95707e52..29112144a 100644 --- a/src/opensearch/editsearchengine.h +++ b/src/opensearch/editsearchengine.h @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef EDITSEARCHENGINES_H #define EDITSEARCHENGINES_H diff --git a/src/opensearch/opensearchreader.cpp b/src/opensearch/opensearchreader.cpp index 7b88578a4..a5ac73a9e 100644 --- a/src/opensearch/opensearchreader.cpp +++ b/src/opensearch/opensearchreader.cpp @@ -16,7 +16,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ - +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "opensearchreader.h" #include "opensearchengine.h" @@ -80,15 +96,15 @@ OpenSearchEngine *OpenSearchReader::read(QIODevice *device) OpenSearchEngine *OpenSearchReader::read() { OpenSearchEngine *engine = new OpenSearchEngine(); + m_searchXml = device()->peek(1024*5); while (!isStartElement() && !atEnd()) readNext(); - if (name() != QLatin1String("OpenSearchDescription") - || namespaceUri() != QLatin1String("http://a9.com/-/spec/opensearch/1.1/")) { - raiseError(QObject::tr("The file is not an OpenSearch 1.1 file.")); - return engine; - } + if (!m_searchXml.contains(QLatin1String("http://a9.com/-/spec/opensearch/1.1/"))) { + raiseError(QObject::tr("The file is not an OpenSearch 1.1 file.")); + return engine; + } while (!atEnd()) { readNext(); @@ -96,12 +112,11 @@ OpenSearchEngine *OpenSearchReader::read() if (!isStartElement()) continue; - if (name() == QLatin1String("ShortName")) { + if (name() == QLatin1String("ShortName") || name() == QLatin1String("os:ShortName")) { engine->setName(readElementText()); - } else if (name() == QLatin1String("Description")) { + } else if (name() == QLatin1String("Description") || name() == QLatin1String("os:Description")) { engine->setDescription(readElementText()); - } else if (name() == QLatin1String("Url")) { - + } else if (name() == QLatin1String("Url") || name() == QLatin1String("os:Url")) { QString type = attributes().value(QLatin1String("type")).toString(); QString url = attributes().value(QLatin1String("template")).toString(); QString method = attributes().value(QLatin1String("method")).toString(); @@ -123,8 +138,9 @@ OpenSearchEngine *OpenSearchReader::read() readNext(); - while (!(isEndElement() && name() == QLatin1String("Url"))) { - if (!isStartElement() || (name() != QLatin1String("Param") && name() != QLatin1String("Parameter"))) { + while (!isEndElement() || (name() != QLatin1String("Url") && name() != QLatin1String("os:Url"))) { + if (!isStartElement() || (name() != QLatin1String("Param") && name() != QLatin1String("Parameter") + && name() != QLatin1String("os:Param") && name() != QLatin1String("os:Parameter") )) { readNext(); continue; } @@ -149,7 +165,7 @@ OpenSearchEngine *OpenSearchReader::read() engine->setSearchMethod(method); } - } else if (name() == QLatin1String("Image")) { + } else if (name() == QLatin1String("Image") || name() == QLatin1String("os:Image")) { engine->setImageUrl(readElementText()); } diff --git a/src/opensearch/opensearchreader.h b/src/opensearch/opensearchreader.h index a4f11bc95..d391bed53 100644 --- a/src/opensearch/opensearchreader.h +++ b/src/opensearch/opensearchreader.h @@ -16,7 +16,23 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ - +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef OPENSEARCHREADER_H #define OPENSEARCHREADER_H @@ -33,6 +49,7 @@ public: private: OpenSearchEngine *read(); + QString m_searchXml; }; diff --git a/src/opensearch/searchenginesdialog.cpp b/src/opensearch/searchenginesdialog.cpp index 32ca94631..7909f75d1 100644 --- a/src/opensearch/searchenginesdialog.cpp +++ b/src/opensearch/searchenginesdialog.cpp @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "searchenginesdialog.h" #include "ui_searchenginesdialog.h" #include "editsearchengine.h" diff --git a/src/opensearch/searchenginesdialog.h b/src/opensearch/searchenginesdialog.h index 64112cd39..aee2f2c28 100644 --- a/src/opensearch/searchenginesdialog.h +++ b/src/opensearch/searchenginesdialog.h @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef SEARCHENGINESDIALOG_H #define SEARCHENGINESDIALOG_H diff --git a/src/tools/iconfetcher.cpp b/src/tools/iconfetcher.cpp index 8a35d1024..639af6bbf 100644 --- a/src/tools/iconfetcher.cpp +++ b/src/tools/iconfetcher.cpp @@ -1,7 +1,22 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "iconfetcher.h" -#include - FollowRedirectReply::FollowRedirectReply(const QUrl &url, QNetworkAccessManager* manager) : QObject() , m_manager(manager) diff --git a/src/tools/iconfetcher.h b/src/tools/iconfetcher.h index 3105966ca..51c9abf99 100644 --- a/src/tools/iconfetcher.h +++ b/src/tools/iconfetcher.h @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef ICONFETCHER_H #define ICONFETCHER_H diff --git a/src/webview/webinspectordockwidget.cpp b/src/webview/webinspectordockwidget.cpp index de8992b40..05acf5a91 100644 --- a/src/webview/webinspectordockwidget.cpp +++ b/src/webview/webinspectordockwidget.cpp @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #include "webinspectordockwidget.h" #include "docktitlebarwidget.h" #include "webpage.h" diff --git a/src/webview/webinspectordockwidget.h b/src/webview/webinspectordockwidget.h index 4ca955efc..5f52309cc 100644 --- a/src/webview/webinspectordockwidget.h +++ b/src/webview/webinspectordockwidget.h @@ -1,3 +1,20 @@ +/* ============================================================ +* QupZilla - WebKit based browser +* Copyright (C) 2010-2011 David Rosca +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* ============================================================ */ #ifndef WEBINSPECTORDOCKWIDGET_H #define WEBINSPECTORDOCKWIDGET_H