diff options
Diffstat (limited to 'src/frontend/displaywindow/chtmlwritewindow.cpp')
-rw-r--r-- | src/frontend/displaywindow/chtmlwritewindow.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/frontend/displaywindow/chtmlwritewindow.cpp b/src/frontend/displaywindow/chtmlwritewindow.cpp index df36080..705daf0 100644 --- a/src/frontend/displaywindow/chtmlwritewindow.cpp +++ b/src/frontend/displaywindow/chtmlwritewindow.cpp @@ -29,8 +29,6 @@ using namespace Profile; CHTMLWriteWindow::CHTMLWriteWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent) : CPlainWriteWindow(modules, parent) {} -CHTMLWriteWindow::~CHTMLWriteWindow() {} - void CHTMLWriteWindow::initView() { CWriteDisplay* writeDisplay = CDisplay::createWriteInstance(this, CDisplay::HTMLDisplay); Q_ASSERT(writeDisplay); @@ -77,13 +75,15 @@ void CHTMLWriteWindow::initToolbars() { void CHTMLWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) { CWriteWindow::storeProfileSettings(profileWindow); QAction* action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName); - profileWindow->setWindowSettings( action->isChecked() ); + Q_ASSERT(action != 0); + profileWindow->windowSettings = action->isChecked(); } void CHTMLWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) { CWriteWindow::applyProfileSettings(profileWindow); - if (profileWindow->windowSettings()) { + if (profileWindow->windowSettings) { QAction* action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName); + Q_ASSERT(action != 0); action->setChecked(true); } } @@ -91,8 +91,10 @@ void CHTMLWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) { /** Is called when the current text was changed. */ void CHTMLWriteWindow::textChanged() { QAction* action = actionCollection()->action(CResMgr::displaywindows::writeWindow::saveText::actionName); + Q_ASSERT(action != 0); action->setEnabled( ((CWriteDisplay*)displayWidget())->isModified() ); action = actionCollection()->action(CResMgr::displaywindows::writeWindow::restoreText::actionName); + Q_ASSERT(action != 0); action->setEnabled( ((CWriteDisplay*)displayWidget())->isModified() ); } @@ -105,6 +107,7 @@ void CHTMLWriteWindow::restoreText() { bool CHTMLWriteWindow::syncAllowed() const { QAction* action = actionCollection()->action(CResMgr::displaywindows::commentaryWindow::syncWindow::actionName); + Q_ASSERT(action != 0); return action->isChecked(); } |