Browse Source

Rename class: Fb2WebView => Fb2TextEdit

Kandrashin Denis 13 years ago
parent
commit
a03fedf832

+ 4 - 4
source/fb2dlgs.cpp

@@ -47,7 +47,7 @@ void Fb2CodeFindDlg::find()
 //  Fb2TextFindDlg
 //---------------------------------------------------------------------------
 
-Fb2TextFindDlg::Fb2TextFindDlg(Fb2WebView &edit)
+Fb2TextFindDlg::Fb2TextFindDlg(Fb2TextEdit &edit)
     : QDialog(&edit)
     , ui(new Ui::Fb2Find)
     , m_edit(edit)
@@ -78,7 +78,7 @@ void Fb2TextFindDlg::find()
 //  Fb2NoteDlg
 //---------------------------------------------------------------------------
 
-Fb2NoteDlg::Fb2NoteDlg(Fb2WebView &view)
+Fb2NoteDlg::Fb2NoteDlg(Fb2TextEdit &view)
     : QDialog(&view)
 {
     setWindowTitle(tr("Insert footnote"));
@@ -132,7 +132,7 @@ Fb2NoteDlg::Fb2NoteDlg(Fb2WebView &view)
     m_key->setCurrentIndex(0);
     m_title->setFocus();
 
-    Fb2WebPage *page = new Fb2WebPage(this);
+    Fb2TextPage *page = new Fb2TextPage(this);
     connect(m_text, SIGNAL(loadFinished(bool)), SLOT(loadFinished()));
     page->setNetworkAccessManager(view.page()->networkAccessManager());
     page->setContentEditable(true);
@@ -144,6 +144,6 @@ Fb2NoteDlg::Fb2NoteDlg(Fb2WebView &view)
 
 void Fb2NoteDlg::loadFinished()
 {
-    Fb2WebElement body = m_text->page()->mainFrame()->documentElement().findFirst("body");
+    Fb2TextElement body = m_text->page()->mainFrame()->documentElement().findFirst("body");
     body.select();
 }

+ 4 - 4
source/fb2dlgs.hpp

@@ -4,7 +4,7 @@
 #include <QDialog>
 
 class Fb2CodeEdit;
-class Fb2WebView;
+class Fb2TextEdit;
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
@@ -38,7 +38,7 @@ class Fb2TextFindDlg : public QDialog
     Q_OBJECT
 
 public:
-    explicit Fb2TextFindDlg(Fb2WebView &edit);
+    explicit Fb2TextFindDlg(Fb2TextEdit &edit);
     virtual ~Fb2TextFindDlg();
 
 private slots:
@@ -46,7 +46,7 @@ private slots:
 
 private:
     Ui::Fb2Find * ui;
-    Fb2WebView & m_edit;
+    Fb2TextEdit & m_edit;
 };
 
 class Fb2NoteDlg : public QDialog
@@ -54,7 +54,7 @@ class Fb2NoteDlg : public QDialog
     Q_OBJECT
     
 public:
-    explicit Fb2NoteDlg(Fb2WebView &view);
+    explicit Fb2NoteDlg(Fb2TextEdit &view);
 
 private slots:
     void loadFinished();

+ 1 - 1
source/fb2head.cpp

@@ -455,7 +455,7 @@ Qt::ItemFlags Fb2HeadModel::flags(const QModelIndex &index) const
 //  Fb2TreeView
 //---------------------------------------------------------------------------
 
-Fb2HeadView::Fb2HeadView(Fb2WebView &view, QWidget *parent)
+Fb2HeadView::Fb2HeadView(Fb2TextEdit &view, QWidget *parent)
     : QTreeView(parent)
     , m_view(view)
 {

+ 3 - 3
source/fb2head.hpp

@@ -19,7 +19,7 @@ QT_END_NAMESPACE
 
 #include "fb2xml.h"
 
-class Fb2WebView;
+class Fb2TextEdit;
 
 class Fb2Scheme : public QDomElement
 {
@@ -154,7 +154,7 @@ class Fb2HeadView : public QTreeView
     Q_OBJECT
 
 public:
-    explicit Fb2HeadView(Fb2WebView &view, QWidget *parent = 0);
+    explicit Fb2HeadView(Fb2TextEdit &view, QWidget *parent = 0);
     void initToolbar(QToolBar &toolbar);
 
 signals:
@@ -177,7 +177,7 @@ private:
     void showStatus(const QModelIndex &current);
 
 private:
-    Fb2WebView & m_view;
+    Fb2TextEdit & m_view;
     QAction * actionInsert;
     QAction * actionModify;
     QAction * actionDelete;

+ 4 - 4
source/fb2html.cpp

@@ -2,21 +2,21 @@
 #include "fb2utils.h"
 
 //---------------------------------------------------------------------------
-//  Fb2WebElement
+//  Fb2TextElement
 //---------------------------------------------------------------------------
 
-void Fb2WebElement::select()
+void Fb2TextElement::select()
 {
     static const QString javascript = FB2::read(":/js/set_cursor.js");
     evaluateJavaScript(javascript);
 }
 
-bool Fb2WebElement::isSection() const
+bool Fb2TextElement::isSection() const
 {
     return tagName() == "DIV" && attribute("class").toLower() == "section";
 }
 
-bool Fb2WebElement::isTitle() const
+bool Fb2TextElement::isTitle() const
 {
     return tagName() == "DIV" && attribute("class").toLower() == "title";
 }

+ 4 - 4
source/fb2html.h

@@ -3,12 +3,12 @@
 
 #include <QWebElement>
 
-class Fb2WebElement : public QWebElement
+class Fb2TextElement : public QWebElement
 {
 public:
-    Fb2WebElement() {}
-    Fb2WebElement(const QWebElement &x) : QWebElement(x) {}
-    Fb2WebElement &operator=(const QWebElement &x) { QWebElement::operator=(x); return *this; }
+    Fb2TextElement() {}
+    Fb2TextElement(const QWebElement &x) : QWebElement(x) {}
+    Fb2TextElement &operator=(const QWebElement &x) { QWebElement::operator=(x); return *this; }
     bool isSection() const;
     bool isTitle() const;
 

+ 1 - 1
source/fb2main.hpp

@@ -18,7 +18,7 @@ class Fb2CodeEdit;
 class Fb2TreeView;
 class Fb2HeadView;
 class Fb2TextFrame;
-class Fb2WebView;
+class Fb2TextEdit;
 
 class Fb2MainWindow : public QMainWindow
 {

+ 3 - 3
source/fb2save.cpp

@@ -133,19 +133,19 @@ void Fb2HtmlHandler::onEnd(const QString &name)
 //  Fb2SaveWriter
 //---------------------------------------------------------------------------
 
-Fb2SaveWriter::Fb2SaveWriter(Fb2WebView &view, QByteArray *array)
+Fb2SaveWriter::Fb2SaveWriter(Fb2TextEdit &view, QByteArray *array)
     : QXmlStreamWriter(array)
     , m_view(view)
 {
 }
 
-Fb2SaveWriter::Fb2SaveWriter(Fb2WebView &view, QIODevice *device)
+Fb2SaveWriter::Fb2SaveWriter(Fb2TextEdit &view, QIODevice *device)
     : QXmlStreamWriter(device)
     , m_view(view)
 {
 }
 
-Fb2SaveWriter::Fb2SaveWriter(Fb2WebView &view, QString *string)
+Fb2SaveWriter::Fb2SaveWriter(Fb2TextEdit &view, QString *string)
     : QXmlStreamWriter(string)
     , m_view(view)
 {

+ 6 - 6
source/fb2save.hpp

@@ -16,7 +16,7 @@ QT_END_NAMESPACE
 
 #include "fb2temp.hpp"
 
-class Fb2WebView;
+class Fb2TextEdit;
 
 class Fb2SaveDialog : public QFileDialog
 {
@@ -66,10 +66,10 @@ private:
 class Fb2SaveWriter : public QXmlStreamWriter
 {
 public:
-    explicit Fb2SaveWriter(Fb2WebView &view, QByteArray *array);
-    explicit Fb2SaveWriter(Fb2WebView &view, QIODevice *device);
-    explicit Fb2SaveWriter(Fb2WebView &view, QString *string);
-    Fb2WebView & view() { return m_view; }
+    explicit Fb2SaveWriter(Fb2TextEdit &view, QByteArray *array);
+    explicit Fb2SaveWriter(Fb2TextEdit &view, QIODevice *device);
+    explicit Fb2SaveWriter(Fb2TextEdit &view, QString *string);
+    Fb2TextEdit & view() { return m_view; }
     QString getFileName(const QString &src);
     void writeStartElement(const QString &name, int level);
     void writeEndElement(int level);
@@ -80,7 +80,7 @@ private:
     QByteArray downloadFile(const QUrl &url);
     void writeContentType(const QString &name, QByteArray &data);
 private:
-    Fb2WebView &m_view;
+    Fb2TextEdit &m_view;
     QStringList m_names;
 };
 

+ 1 - 1
source/fb2temp.cpp

@@ -187,7 +187,7 @@ qint64 Fb2ImageReply::readData(char *data, qint64 maxSize)
 //    http://doc.trolltech.com/qq/32/qq32-webkit-protocols.html
 //---------------------------------------------------------------------------
 
-Fb2NetworkAccessManager::Fb2NetworkAccessManager(Fb2WebView &view)
+Fb2NetworkAccessManager::Fb2NetworkAccessManager(Fb2TextEdit &view)
     : QNetworkAccessManager(&view)
     , m_view(view)
 {

+ 3 - 3
source/fb2temp.hpp

@@ -8,7 +8,7 @@
 #include <QTemporaryFile>
 #include <QNetworkAccessManager>
 
-class Fb2WebView;
+class Fb2TextEdit;
 
 class Fb2TemporaryFile : public QTemporaryFile
 {
@@ -78,7 +78,7 @@ class Fb2NetworkAccessManager : public QNetworkAccessManager
 {
     Q_OBJECT
 public:
-    explicit Fb2NetworkAccessManager(Fb2WebView &view);
+    explicit Fb2NetworkAccessManager(Fb2TextEdit &view);
 
 protected:
     virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0);
@@ -87,7 +87,7 @@ private:
     QNetworkReply *imageRequest(Operation op, const QNetworkRequest &request);
 
 private:
-    Fb2WebView & m_view;
+    Fb2TextEdit & m_view;
     QString m_path;
 };
 

+ 3 - 3
source/fb2tree.cpp

@@ -143,7 +143,7 @@ Fb2TreeItem * Fb2TreeItem::content(const Fb2TreeModel &model, int number, QModel
 //  Fb2TreeModel
 //---------------------------------------------------------------------------
 
-Fb2TreeModel::Fb2TreeModel(Fb2WebView &view, QObject *parent)
+Fb2TreeModel::Fb2TreeModel(Fb2TextEdit &view, QObject *parent)
     : QAbstractItemModel(parent)
     , m_view(view)
     , m_root(NULL)
@@ -327,7 +327,7 @@ bool Fb2TreeModel::removeRows(int row, int count, const QModelIndex &parent)
 //  Fb2TreeView
 //---------------------------------------------------------------------------
 
-Fb2TreeView::Fb2TreeView(Fb2WebView &view, QWidget *parent)
+Fb2TreeView::Fb2TreeView(Fb2TextEdit &view, QWidget *parent)
     : QTreeView(parent)
     , m_view(view)
 {
@@ -572,7 +572,7 @@ void Fb2TreeView::moveRight()
 //  Fb2TreeWidget
 //---------------------------------------------------------------------------
 
-Fb2TreeWidget::Fb2TreeWidget(Fb2WebView &view, QWidget* parent)
+Fb2TreeWidget::Fb2TreeWidget(Fb2TextEdit &view, QWidget* parent)
     : QWidget(parent)
 {
     QVBoxLayout * layout = new QVBoxLayout(this);

+ 8 - 8
source/fb2tree.hpp

@@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE
 class QAction;
 QT_END_NAMESPACE
 
-class Fb2WebView;
+class Fb2TextEdit;
 
 class Fb2TreeModel;
 
@@ -47,7 +47,7 @@ public:
         return m_list.size();
     }
 
-    Fb2WebElement element() const {
+    Fb2TextElement element() const {
         return m_element;
     }
 
@@ -88,10 +88,10 @@ class Fb2TreeModel: public QAbstractItemModel
     Q_OBJECT
 
 public:
-    explicit Fb2TreeModel(Fb2WebView &view, QObject *parent = 0);
+    explicit Fb2TreeModel(Fb2TextEdit &view, QObject *parent = 0);
     virtual ~Fb2TreeModel();
     QModelIndex index(const QString &location) const;
-    Fb2WebView & view() { return m_view; }
+    Fb2TextEdit & view() { return m_view; }
     void selectText(const QModelIndex &index);
     QModelIndex move(const QModelIndex &index, int dx, int dy);
     QModelIndex append(const QModelIndex &parent);
@@ -106,7 +106,7 @@ public:
     virtual bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
 
 private:
-    Fb2WebView & m_view;
+    Fb2TextEdit & m_view;
     Fb2TreeItem * m_root;
 };
 
@@ -115,7 +115,7 @@ class Fb2TreeView : public QTreeView
     Q_OBJECT
 
 public:
-    explicit Fb2TreeView(Fb2WebView &view, QWidget *parent = 0);
+    explicit Fb2TreeView(Fb2TextEdit &view, QWidget *parent = 0);
     void initActions(QToolBar *toolbar);
 
 public slots:
@@ -144,7 +144,7 @@ private:
     Fb2TreeModel * model();
 
 private:
-    Fb2WebView & m_view;
+    Fb2TextEdit & m_view;
     QTimer m_timerSelect;
     QTimer m_timerUpdate;
     QMenu m_menu;
@@ -159,7 +159,7 @@ class Fb2TreeWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit Fb2TreeWidget(Fb2WebView &view, QWidget* parent = 0);
+    explicit Fb2TreeWidget(Fb2TextEdit &view, QWidget* parent = 0);
 
 protected:
     QToolBar * m_tool;

+ 56 - 56
source/fb2view.cpp

@@ -66,10 +66,10 @@ void Fb2NoteView::hint(const QWebElement element, const QRect &rect)
 }
 
 //---------------------------------------------------------------------------
-//  Fb2WebPage
+//  Fb2TextPage
 //---------------------------------------------------------------------------
 
-Fb2WebPage::Fb2WebPage(QObject *parent)
+Fb2TextPage::Fb2TextPage(QObject *parent)
     : QWebPage(parent)
 {
     QWebSettings *s = settings();
@@ -83,7 +83,7 @@ Fb2WebPage::Fb2WebPage(QObject *parent)
     s->setUserStyleSheetUrl(QUrl::fromLocalFile(":style.css"));
 }
 
-bool Fb2WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
+bool Fb2TextPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
 {
     Q_UNUSED(frame);
     if (type == NavigationTypeLinkClicked) {
@@ -94,12 +94,12 @@ bool Fb2WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest
     return QWebPage::acceptNavigationRequest(frame, request, type);
 }
 
-QWebElement Fb2WebPage::body()
+QWebElement Fb2TextPage::body()
 {
     return doc().findFirst("body");
 }
 
-QWebElement Fb2WebPage::doc()
+QWebElement Fb2TextPage::doc()
 {
     return mainFrame()->documentElement();
 }
@@ -107,26 +107,26 @@ QWebElement Fb2WebPage::doc()
 class Fb2InsertBodyCommand : public QUndoCommand
 {
 public:
-    explicit Fb2InsertBodyCommand(Fb2WebPage &page, QUndoCommand *parent = 0) : QUndoCommand(parent), m_page(page) {}
+    explicit Fb2InsertBodyCommand(Fb2TextPage &page, QUndoCommand *parent = 0) : QUndoCommand(parent), m_page(page) {}
     virtual void undo();
     virtual void redo();
 private:
-    Fb2WebPage & m_page;
+    Fb2TextPage & m_page;
 };
 
 void Fb2InsertBodyCommand::undo()
 {
     m_page.body().lastChild().removeFromDocument();
-    Fb2WebElement(m_page.body().lastChild()).select();
+    Fb2TextElement(m_page.body().lastChild()).select();
 }
 
 void Fb2InsertBodyCommand::redo()
 {
     m_page.body().appendInside("<div class=body><div class=section><p>text</p></div></div>");
-    Fb2WebElement(m_page.body().lastChild()).select();
+    Fb2TextElement(m_page.body().lastChild()).select();
 }
 
-void Fb2WebPage::insertBody()
+void Fb2TextPage::insertBody()
 {
     undoStack()->beginMacro("Insert title");
     undoStack()->push(new Fb2InsertBodyCommand(*this));
@@ -135,15 +135,15 @@ void Fb2WebPage::insertBody()
 }
 
 //---------------------------------------------------------------------------
-//  Fb2WebView
+//  Fb2TextEdit
 //---------------------------------------------------------------------------
 
-Fb2WebView::Fb2WebView(QWidget *parent)
-    : Fb2BaseWebView(parent)
+Fb2TextEdit::Fb2TextEdit(QWidget *parent)
+    : Fb2TextBase(parent)
     , m_noteView(0)
     , m_thread(0)
 {
-    setPage(new Fb2WebPage(this));
+    setPage(new Fb2TextPage(this));
     page()->setNetworkAccessManager(new Fb2NetworkAccessManager(*this));
     page()->setContentEditable(true);
     connect(page(), SIGNAL(contentsChanged()), this, SLOT(fixContents()));
@@ -151,46 +151,46 @@ Fb2WebView::Fb2WebView(QWidget *parent)
     connect(this, SIGNAL(loadFinished(bool)), SLOT(loadFinished()));
 }
 
-Fb2WebView::~Fb2WebView()
+Fb2TextEdit::~Fb2TextEdit()
 {
     FB2DELETE(m_noteView);
 }
 
-Fb2NoteView & Fb2WebView::noteView()
+Fb2NoteView & Fb2TextEdit::noteView()
 {
     if (m_noteView) return *m_noteView;
     m_noteView = new Fb2NoteView(qobject_cast<QWidget*>(parent()), url());
-    m_noteView->setPage(new Fb2WebPage(this));
+    m_noteView->setPage(new Fb2TextPage(this));
     m_noteView->page()->setNetworkAccessManager(page()->networkAccessManager());
     m_noteView->page()->setContentEditable(false);
     m_noteView->setGeometry(QRect(100, 100, 400, 200));
     return *m_noteView;
 }
 
-QWebElement Fb2WebView::body()
+QWebElement Fb2TextEdit::body()
 {
     return doc().findFirst("body");
 }
 
-QWebElement Fb2WebView::doc()
+QWebElement Fb2TextEdit::doc()
 {
     return page()->mainFrame()->documentElement();
 }
 
-void Fb2WebView::fixContents()
+void Fb2TextEdit::fixContents()
 {
     foreach (QWebElement span, doc().findAll("span.apple-style-span[style]")) {
         span.removeAttribute("style");
     }
 }
 
-void Fb2WebView::mouseMoveEvent(QMouseEvent *event)
+void Fb2TextEdit::mouseMoveEvent(QMouseEvent *event)
 {
     m_point = event->pos();
     QWebView::mouseMoveEvent(event);
 }
 
-void Fb2WebView::linkHovered(const QString &link, const QString &title, const QString &textContent)
+void Fb2TextEdit::linkHovered(const QString &link, const QString &title, const QString &textContent)
 {
     Q_UNUSED(title);
     Q_UNUSED(textContent);
@@ -220,14 +220,14 @@ void Fb2WebView::linkHovered(const QString &link, const QString &title, const QS
     noteView().hint(element, QRect(point, size));
 }
 
-void Fb2WebView::load(const QString &filename, const QString &xml)
+void Fb2TextEdit::load(const QString &filename, const QString &xml)
 {
     if (m_thread) return;
     m_thread = new Fb2ReadThread(this, filename, xml);
     m_thread->start();
 }
 
-bool Fb2WebView::save(QIODevice *device, const QString &codec)
+bool Fb2TextEdit::save(QIODevice *device, const QString &codec)
 {
     Fb2SaveWriter writer(*this, device);
     if (!codec.isEmpty()) writer.setCodec(codec.toLatin1());
@@ -236,13 +236,13 @@ bool Fb2WebView::save(QIODevice *device, const QString &codec)
     return ok;
 }
 
-bool Fb2WebView::save(QByteArray *array)
+bool Fb2TextEdit::save(QByteArray *array)
 {
     Fb2SaveWriter writer(*this, array);
     return Fb2SaveHandler(writer).save();
 }
 
-bool Fb2WebView::save(QString *string)
+bool Fb2TextEdit::save(QString *string)
 {
     // Use class QByteArray instead QString
     // to store information about encoding.
@@ -252,12 +252,12 @@ bool Fb2WebView::save(QString *string)
     return ok;
 }
 
-void Fb2WebView::data(QString name, QByteArray data)
+void Fb2TextEdit::data(QString name, QByteArray data)
 {
     m_files.set(name, data);
 }
 
-void Fb2WebView::html(QString name, QString html)
+void Fb2TextEdit::html(QString name, QString html)
 {
     static int number = 0;
     setHtml(html, QUrl(QString("fb2:/%1/").arg(number++)));
@@ -265,75 +265,75 @@ void Fb2WebView::html(QString name, QString html)
     m_thread = 0;
 }
 
-void Fb2WebView::zoomIn()
+void Fb2TextEdit::zoomIn()
 {
     qreal zoom = zoomFactor();
     setZoomFactor(zoom * 1.1);
 }
 
-void Fb2WebView::zoomOut()
+void Fb2TextEdit::zoomOut()
 {
     qreal zoom = zoomFactor();
     setZoomFactor(zoom * 0.9);
 }
 
-void Fb2WebView::zoomReset()
+void Fb2TextEdit::zoomReset()
 {
     setZoomFactor(1);
 }
 
-bool Fb2WebView::UndoEnabled()
+bool Fb2TextEdit::UndoEnabled()
 {
     return pageAction(QWebPage::Undo)->isEnabled();
 }
 
-bool Fb2WebView::RedoEnabled()
+bool Fb2TextEdit::RedoEnabled()
 {
     return pageAction(QWebPage::Redo)->isEnabled();
 }
 
-bool Fb2WebView::CutEnabled()
+bool Fb2TextEdit::CutEnabled()
 {
     return pageAction(QWebPage::Cut)->isEnabled();
 }
 
-bool Fb2WebView::CopyEnabled()
+bool Fb2TextEdit::CopyEnabled()
 {
     return pageAction(QWebPage::Copy)->isEnabled();
 }
 
-bool Fb2WebView::BoldChecked()
+bool Fb2TextEdit::BoldChecked()
 {
     return pageAction(QWebPage::ToggleBold)->isChecked();
 }
 
-bool Fb2WebView::ItalicChecked()
+bool Fb2TextEdit::ItalicChecked()
 {
     return pageAction(QWebPage::ToggleItalic)->isChecked();
 }
 
-bool Fb2WebView::StrikeChecked()
+bool Fb2TextEdit::StrikeChecked()
 {
     return pageAction(QWebPage::ToggleStrikethrough)->isChecked();
 }
 
-bool Fb2WebView::SubChecked()
+bool Fb2TextEdit::SubChecked()
 {
     return pageAction(QWebPage::ToggleSubscript)->isChecked();
 }
 
-bool Fb2WebView::SupChecked()
+bool Fb2TextEdit::SupChecked()
 {
     return pageAction(QWebPage::ToggleSuperscript)->isChecked();
 }
 
-void Fb2WebView::find()
+void Fb2TextEdit::find()
 {
     Fb2TextFindDlg dlg(*this);
     dlg.exec();
 }
 
-void Fb2WebView::insertImage()
+void Fb2TextEdit::insertImage()
 {
     QString filters;
     filters += tr("Common Graphics (*.png *.jpg *.jpeg *.gif);;");
@@ -353,24 +353,24 @@ void Fb2WebView::insertImage()
     execCommand("insertImage", name.prepend("#"));
 }
 
-void Fb2WebView::insertNote()
+void Fb2TextEdit::insertNote()
 {
     Fb2NoteDlg dlg(*this);
     dlg.exec();
 }
 
 
-void Fb2WebView::insertLink()
+void Fb2TextEdit::insertLink()
 {
 }
 
-void Fb2WebView::execCommand(const QString &cmd, const QString &arg)
+void Fb2TextEdit::execCommand(const QString &cmd, const QString &arg)
 {
     QString javascript = QString("document.execCommand(\"%1\",false,\"%2\")").arg(cmd).arg(arg);
     page()->mainFrame()->evaluateJavaScript(javascript);
 }
 
-QWebElement Fb2WebView::current()
+QWebElement Fb2TextEdit::current()
 {
     QStringList list = location().split(",");
     QStringListIterator iterator(list);
@@ -388,26 +388,26 @@ QWebElement Fb2WebView::current()
     return result;
 }
 
-QString Fb2WebView::location()
+QString Fb2TextEdit::location()
 {
     static const QString javascript = FB2::read(":/js/get_location.js");
     return page()->mainFrame()->evaluateJavaScript(javascript).toString();
 }
 
-QString Fb2WebView::status()
+QString Fb2TextEdit::status()
 {
     static const QString javascript = FB2::read(":/js/get_status.js");
     return page()->mainFrame()->evaluateJavaScript(javascript).toString();
 }
 
-void Fb2WebView::loadFinished()
+void Fb2TextEdit::loadFinished()
 {
-    Fb2WebElement element = body().findFirst("div.body");
+    Fb2TextElement element = body().findFirst("div.body");
     if (element.isNull()) element = body();
     element.select();
 }
 
-void Fb2WebView::insertTitle()
+void Fb2TextEdit::insertTitle()
 {
     page()->undoStack()->beginMacro("Insert title");
     static const QString javascript = FB2::read(":/js/insert_title.js");
@@ -415,17 +415,17 @@ void Fb2WebView::insertTitle()
     page()->undoStack()->endMacro();
 }
 
-void Fb2WebView::insertSubtitle()
+void Fb2TextEdit::insertSubtitle()
 {
-    Fb2WebElement element = current();
+    Fb2TextElement element = current();
     while (!element.isNull()) {
-        Fb2WebElement parent = element.parent();
+        Fb2TextElement parent = element.parent();
         if (parent.isSection()) {
-            Fb2WebElement previous = element.previousSibling();
+            Fb2TextElement previous = element.previousSibling();
             if (!previous.isNull()) element = previous;
             QString html = "<div class=subtitle><p><br/></p></div>";
             element.appendOutside(html);
-            Fb2WebElement subtitle = element.nextSibling();
+            Fb2TextElement subtitle = element.nextSibling();
             subtitle.select();
             break;
         }

+ 8 - 8
source/fb2view.hpp

@@ -17,12 +17,12 @@ QT_END_NAMESPACE
 
 class Fb2NoteView;
 
-class Fb2BaseWebView : public QWebView
+class Fb2TextBase : public QWebView
 {
     Q_OBJECT
 
 public:
-    Fb2BaseWebView(QWidget* parent = 0)
+    Fb2TextBase(QWidget* parent = 0)
         : QWebView(parent)
     {
           m_timer.setInterval(100);
@@ -48,12 +48,12 @@ private:
     QSize m_size;
 };
 
-class Fb2WebPage : public QWebPage
+class Fb2TextPage : public QWebPage
 {
     Q_OBJECT
 
 public:
-    explicit Fb2WebPage(QObject *parent = 0);
+    explicit Fb2TextPage(QObject *parent = 0);
     QWebElement body();
     QWebElement doc();
 
@@ -64,13 +64,13 @@ protected:
     virtual bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
 };
 
-class Fb2WebView : public Fb2BaseWebView
+class Fb2TextEdit : public Fb2TextBase
 {
     Q_OBJECT
 
 public:
-    explicit Fb2WebView(QWidget *parent = 0);
-    virtual ~Fb2WebView();
+    explicit Fb2TextEdit(QWidget *parent = 0);
+    virtual ~Fb2TextEdit();
 
     Fb2TemporaryList & files() { return m_files; }
     void load(const QString &filename, const QString &xml = QString());
@@ -134,7 +134,7 @@ public:
     explicit Fb2TextFrame(QWidget* parent = 0);
     ~Fb2TextFrame();
     void hideInspector();
-    Fb2WebView view;
+    Fb2TextEdit view;
 
 public slots:
     void showInspector();