1 files changed, 32 insertions, 50 deletions

diff --git a/src/toolbarsearch.cpp b/src/toolbarsearch.cpp
index 16022fe0..26661386 100644
--- a/src/toolbarsearch.cpp
+++ b/src/toolbarsearch.cpp
@@ -1,51 +1,33 @@
-/****************************************************************************
-**
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information
-** to ensure GNU General Public Licensing requirements will be met:
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.  In addition, as a special
-** exception, Nokia gives you certain additional rights. These rights
-** are described in the Nokia Qt GPL Exception version 1.3, included in
-** the file GPL_EXCEPTION.txt in this package.
-**
-** Qt for Windows(R) Licensees
-** As a special exception, Nokia, as the sole copyright holder for Qt
-** Designer, grants users of the Qt/Eclipse Integration plug-in the
-** right for the Qt/Eclipse Integration to link to functionality
-** provided by Qt Designer and its related libraries.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-**
-****************************************************************************/
-
+/* ============================================================
+ *
+ * This file is a part of the reKonq project
+ *
+ * Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
+ *
+ *
+ * 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 2, 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.
+ *
+ * ============================================================ */
+
+// Local Includes
 #include "toolbarsearch.h"
 #include "autosaver.h"
 
-#include <QtCore/QSettings>
-#include <QtCore/QUrl>
-
-#include <QtGui/QCompleter>
-#include <QtGui/QMenu>
-#include <QtGui/QStringListModel>
-
-#include <QtWebKit/QWebSettings>
+// Qt Includes
+#include <QSettings>
+#include <QUrl>
+#include <QCompleter>
+#include <QMenu>
+#include <QStringListModel>
+#include <QWebSettings>
 
 /*
     ToolbarSearch is a very basic search widget that also contains a small history.
@@ -66,7 +48,7 @@ ToolbarSearch::ToolbarSearch(QWidget *parent)
     lineEdit()->setCompleter(completer);
 
     connect(lineEdit(), SIGNAL(returnPressed()), SLOT(searchNow()));
-    setInactiveText(tr("Google"));
+    setInactiveText("Google");
     load();
 }
 
@@ -114,7 +96,7 @@ void ToolbarSearch::searchNow()
     url.addQueryItem(QLatin1String("q"), searchText);
     url.addQueryItem(QLatin1String("ie"), QLatin1String("UTF-8"));
     url.addQueryItem(QLatin1String("oe"), QLatin1String("UTF-8"));
-    url.addQueryItem(QLatin1String("client"), QLatin1String("qtdemobrowser"));
+    url.addQueryItem(QLatin1String("client"), QLatin1String("reKonq"));
     emit search(url);
 }
 
@@ -125,18 +107,18 @@ void ToolbarSearch::aboutToShowMenu()
     m->clear();
     QStringList list = m_stringListModel->stringList();
     if (list.isEmpty()) {
-        m->addAction(tr("No Recent Searches"));
+        m->addAction( tr("No Recent Searches") );
         return;
     }
 
-    QAction *recent = m->addAction(tr("Recent Searches"));
+    QAction *recent = m->addAction( tr("Recent Searches") );
     recent->setEnabled(false);
     for (int i = 0; i < list.count(); ++i) {
         QString text = list.at(i);
         m->addAction(text)->setData(text);
     }
     m->addSeparator();
-    m->addAction(tr("Clear Recent Searches"), this, SLOT(clear()));
+    m->addAction( tr("Clear Recent Searches"), this, SLOT(clear()));
 }
 
 void ToolbarSearch::triggeredMenuAction(QAction *action)