feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Unify help content loading and error message.

Browse Source 
Task-number: QTCREATORBUG-12352
Change-Id: If74453e75cc8eaf27c114d0976099388be778fa6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Eike Ziller
2014-06-17 15:37:40 +02:00
parent 46cdd91024
commit be68fe7f4a
5 changed files with 115 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/help/localhelpmanager.h
View File

@@ -32,20 +32,26 @@
#include <QMutex>
#include <QObject>
#include <QUrl>
QT_FORWARD_DECLARE_CLASS(QHelpEngine)
QT_FORWARD_DECLARE_CLASS(QUrl)
class BookmarkManager;
namespace Help {
namespace Internal {
namespace Internal {
class LocalHelpManager : public QObject
{
Q_OBJECT
public:
struct HelpData {
QUrl resolvedUrl;
QByteArray data;
QString mimeType;
};
LocalHelpManager(QObject *parent = 0);
~LocalHelpManager();
@@ -60,7 +66,8 @@ public:
static QVariant engineFontSettings();
static bool isValidUrl(const QString &link);
Q_INVOKABLE QByteArray helpData(const QUrl &url);
static QByteArray loadErrorMessage(const QUrl &url, const QString &errorString);
Q_INVOKABLE static Help::Internal::LocalHelpManager::HelpData helpData(const QUrl &url);
private:
bool m_guiNeedsSetup;
@@ -72,7 +79,10 @@ private:
static QMutex m_bkmarkMutex;
static BookmarkManager *m_bookmarkManager;
};
} // Internal
} // Internal
} // Help
Q_DECLARE_METATYPE(Help::Internal::LocalHelpManager::HelpData)
#endif // LOCALHELPMANAGER_H