From 4d60687b6698f9f119d221bd262135642425af7d Mon Sep 17 00:00:00 2001
From: Patrick Star <qtc-committer@nokia.com>
Date: Thu, 4 Dec 2008 15:03:57 +0100
Subject: [PATCH] Fixes: - use indexwindow from shared
---
shared/help/help.pri | 5 ++-
src/plugins/help/help.pro | 5 ++-
src/plugins/help/indexwindow.h | 82 ----------------------------------
3 files changed, 6 insertions(+), 86 deletions(-)
delete mode 100644 src/plugins/help/indexwindow.h
diff --git a/shared/help/help.pri b/shared/help/help.pri
index 9503d085938..dff0ae7699b 100644
--- a/shared/help/help.pri
+++ b/shared/help/help.pri
@@ -9,7 +9,8 @@ HEADERS += \
$$PWD/helpviewer.h \
$$PWD/contentwindow.h \
$$PWD/bookmarkmanager.h \
- $$PWD/../namespace_global.h
+ $$PWD/../namespace_global.h \
+ $$PWD/indexwindow.h
SOURCES += \
$$PWD/filternamedialog.cpp \
@@ -19,7 +20,7 @@ SOURCES += \
$$PWD/contentwindow.cpp \
$$PWD/bookmarkmanager.cpp
-FORMS += \
+FORMS += \
$$PWD/filternamedialog.ui \
$$PWD/topicchooser.ui \
$$PWD/bookmarkdialog.ui
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index 1148606cab7..b2e9a1dbd61 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -16,8 +16,8 @@ HEADERS += helpplugin.h \
searchwidget.h \
helpfindsupport.h \
help_global.h \
- helpindexfilter.h \
- indexwindow.h
+ helpindexfilter.h
+
SOURCES += helpplugin.cpp \
docsettingspage.cpp \
filtersettingspage.cpp \
@@ -26,6 +26,7 @@ SOURCES += helpplugin.cpp \
searchwidget.cpp \
helpfindsupport.cpp \
helpindexfilter.cpp
+
FORMS += docsettingspage.ui \
filtersettingspage.ui
RESOURCES += help.qrc
diff --git a/src/plugins/help/indexwindow.h b/src/plugins/help/indexwindow.h
deleted file mode 100644
index 51ebb06653d..00000000000
--- a/src/plugins/help/indexwindow.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-**
-** Non-Open Source Usage
-**
-** Licensees may use this file in accordance with the Qt Beta Version
-** License Agreement, Agreement version 2.2 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.2, included in the file GPL_EXCEPTION.txt in this package.
-**
-***************************************************************************/
-
-#ifndef INDEXWINDOW_H
-#define INDEXWINDOW_H
-
-#include <QtCore/QUrl>
-#include <QtGui/QWidget>
-#include <QtGui/QLineEdit>
-
-QT_BEGIN_NAMESPACE
-
-class QHelpIndexWidget;
-class QHelpEngine;
-
-class IndexWindow : public QWidget
-{
- Q_OBJECT
-
-public:
- IndexWindow(QHelpEngine *helpEngine, QWidget *parent = 0);
- ~IndexWindow();
-
- void setSearchLineEditText(const QString &text);
- QString searchLineEditText() const
- {
- return m_searchLineEdit->text();
- }
-
-signals:
- void linkActivated(const QUrl &link);
- void linksActivated(const QMap<QString, QUrl> &links,
- const QString &keyword);
- void escapePressed();
-
-private slots:
- void filterIndices(const QString &filter);
- void enableSearchLineEdit();
- void disableSearchLineEdit();
-
-private:
- bool eventFilter(QObject *obj, QEvent *e);
- void focusInEvent(QFocusEvent *e);
-
- QLineEdit *m_searchLineEdit;
- QHelpIndexWidget *m_indexWidget;
- QHelpEngine *m_helpEngine;
-};
-
-QT_END_NAMESPACE
-
-#endif // INDEXWINDOW_H
--
GitLab