diff options
Diffstat (limited to 'bibletime/frontend/displaywindow/cdisplaywindow.cpp')
| -rw-r--r-- | bibletime/frontend/displaywindow/cdisplaywindow.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp index 1020307..8695558 100644 --- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp +++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp @@ -39,7 +39,7 @@ #include "util/cresmgr.h" -//Qt includes +//TQt includes //KDE includes #include <kdeversion.h> @@ -48,16 +48,16 @@ using namespace Profile; -CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name) { +CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char* name) { switch (modules.first()->type()) { case CSwordModuleInfo::Bible: - return new CBibleReadWindow(modules, parent, name); + return new CBibleReadWindow(modules, tqparent, name); case CSwordModuleInfo::Commentary: - return new CCommentaryReadWindow(modules, parent, name); + return new CCommentaryReadWindow(modules, tqparent, name); case CSwordModuleInfo::Lexicon: - return new CLexiconReadWindow(modules, parent, name); + return new CLexiconReadWindow(modules, tqparent, name); case CSwordModuleInfo::GenericBook: - return new CBookReadWindow(modules, parent, name); + return new CBookReadWindow(modules, tqparent, name); default: qWarning("unknown module type"); break; @@ -66,23 +66,23 @@ CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CM } -CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const CDisplayWindow::WriteWindowType type, const char* name) { +CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const CDisplayWindow::WriteWindowType type, const char* name) { if (type == HTMLWindow) { - return new CHTMLWriteWindow(modules, parent, name); + return new CHTMLWriteWindow(modules, tqparent, name); } else { - return new CPlainWriteWindow(modules, parent, name); + return new CPlainWriteWindow(modules, tqparent, name); } return 0; } -CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name ) +CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *tqparent, const char *name ) #if KDE_VERSION >= 0x030200 -: KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose), +: KMainWindow(KMainWindow::NoDCOPObject, tqparent, name, WDestructiveClose), #else -: KMainWindow(parent, name, WDestructiveClose), +: KMainWindow(tqparent, name, WDestructiveClose), #endif -m_mdi(parent), +m_mdi(tqparent), m_filterOptions(), m_displayOptions(), m_displaySettingsButton(0), @@ -108,7 +108,7 @@ CMDIArea* const CDisplayWindow::mdi() const { /** Returns the right window caption. */ const TQString CDisplayWindow::windowCaption() { if (!m_modules.count()) { - return TQString::null; + return TQString(); } return TQString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")"); @@ -161,7 +161,7 @@ void CDisplayWindow::initActions() { new KAction(i18n("Search"), CResMgr::displaywindows::general::search::icon, CResMgr::displaywindows::general::search::accel, - this, TQT_SLOT(slotSearchInModules()), + TQT_TQOBJECT(this), TQT_SLOT(slotSearchInModules()), actionCollection(), CResMgr::displaywindows::general::search::actionName ); @@ -174,7 +174,7 @@ void CDisplayWindow::initActions() { actionCollection(), "zoomOut" ); KStdAction::close( - this, TQT_SLOT(close()), + TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "closeWindow" ); @@ -195,13 +195,13 @@ void CDisplayWindow::initActions() { new KToolBarPopupAction( i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel, - keyChooser(), TQT_SLOT( backInHistory() ), + TQT_TQOBJECT(keyChooser()), TQT_SLOT( backInHistory() ), actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName ); new KToolBarPopupAction( i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel, - keyChooser(), TQT_SLOT( forwardInHistory() ), + TQT_TQOBJECT(keyChooser()), TQT_SLOT( forwardInHistory() ), actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName ); @@ -351,8 +351,8 @@ const bool CDisplayWindow::init() { setCaption(windowCaption()); //setup focus stuff. - setFocusPolicy(TQWidget::ClickFocus); - parentWidget()->setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); + tqparentWidget()->setFocusPolicy(TQ_ClickFocus); initActions(); initToolbars(); @@ -421,7 +421,7 @@ void CDisplayWindow::lookup( const TQString& moduleName, const TQString& keyName } //ToDo: check for containsRef compat - if (m && modules().contains(m)) { + if (m && modules().tqcontains(m)) { key()->key(keyName); keyChooser()->setKey(key()); //the key chooser does send an update signal } |