diff options
Diffstat (limited to 'bibletime/frontend/displaywindow')
23 files changed, 214 insertions, 214 deletions
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp index 0e80a35..0bbd85b 100644 --- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp +++ b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp @@ -30,8 +30,8 @@ #include <math.h> //Qt includes -#include <qwidgetlist.h> -#include <qtimer.h> +#include <tqwidgetlist.h> +#include <tqtimer.h> //KDE includes #include <kaccel.h> @@ -133,37 +133,37 @@ void CBibleReadWindow::initActions() { new KAction( i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel, - this, SLOT(nextBook()), + this, TQT_SLOT(nextBook()), actionCollection(), "nextBook" ); new KAction( i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel, - this, SLOT(previousBook()), + this, TQT_SLOT(previousBook()), actionCollection(), "previousBook" ); new KAction( i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel, - this, SLOT(nextChapter()), + this, TQT_SLOT(nextChapter()), actionCollection(), "nextChapter" ); new KAction( i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel, - this, SLOT(previousChapter()), + this, TQT_SLOT(previousChapter()), actionCollection(), "previousChapter" ); new KAction( i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel, - this, SLOT(nextVerse()), + this, TQT_SLOT(nextVerse()), actionCollection(), "nextVerse" ); new KAction( i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel, - this, SLOT(previousVerse()), + this, TQT_SLOT(previousVerse()), actionCollection(), "previousVerse" ); @@ -177,31 +177,31 @@ void CBibleReadWindow::initActions() { i18n("Strong's Search"), CResMgr::displaywindows::general::findStrongs::icon, CResMgr::displaywindows::general::findStrongs::accel, - this, SLOT(openSearchStrongsDialog()), + this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), CResMgr::displaywindows::general::findStrongs::actionName); - m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); + m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); - m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference"); + m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference"); - m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText"); + m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText"); - m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, SLOT(copyDisplayedText()), actionCollection(), "copyChapter"); + m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter"); m_actions.copy.selectedText = actionCollection()->action("copySelectedText"); Q_ASSERT(m_actions.copy.selectedText); - m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText"); + m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText"); - m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), this, SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText"); + m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), this, TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText"); - m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), this, SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML"); + m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), this, TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML"); - m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText"); + m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText"); - m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, SLOT(printAll()), actionCollection(), "printChapter"); + m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printChapter"); CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection()); } @@ -210,7 +210,7 @@ void CBibleReadWindow::initConnections() { CLexiconReadWindow::initConnections(); /* if (m_transliterationButton) { // Transliteration is not always available - connect(m_transliterationButton, SIGNAL(sigChanged()), SLOT(lookup())); + connect(m_transliterationButton, TQT_SIGNAL(sigChanged()), TQT_SLOT(lookup())); }*/ } @@ -273,7 +273,7 @@ void CBibleReadWindow::updatePopupMenu() { // } // // m_actions.findStrongs->setEnabled( hasStrongs ); - m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null ); + m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString::null ); m_actions.copy.referenceOnly->setEnabled( displayWidget()->hasActiveAnchor() ); @@ -409,12 +409,12 @@ void CBibleReadWindow::reload() { } /** No descriptions */ -bool CBibleReadWindow::eventFilter( QObject* o, QEvent* e) { +bool CBibleReadWindow::eventFilter( TQObject* o, TQEvent* e) { const bool ret = CLexiconReadWindow::eventFilter(o,e); // Q_ASSERT(o->inherits("CDisplayWindow")); // qWarning("class: %s", o->className()); - if (e && (e->type() == QEvent::FocusIn)) { //sync other windows to this active + if (e && (e->type() == TQEvent::FocusIn)) { //sync other windows to this active /* This is a hack to work around a KHTML problem (similair to the Drag&Drop problem we had): * If new HTML content is loaded from inside a kHTML event handler @@ -424,7 +424,7 @@ bool CBibleReadWindow::eventFilter( QObject* o, QEvent* e) { * This is not really in a KHTML event handler but works anyway. * Sometime KDE/Qt is hard to use ... */ - QTimer::singleShot(0, this, SLOT(syncWindows())); + TQTimer::singleShot(0, this, TQT_SLOT(syncWindows())); } return ret; @@ -438,7 +438,7 @@ void CBibleReadWindow::lookup( CSwordKey* newKey ) { void CBibleReadWindow::syncWindows() { // qWarning("syncing windows"); - QWidgetList windows = mdi()->windowList(); + TQWidgetList windows = mdi()->windowList(); // Q_ASSERT(windows.count()); if (!windows.count()) { return; diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h index 2326700..6e36db3 100644 --- a/bibletime/frontend/displaywindow/cbiblereadwindow.h +++ b/bibletime/frontend/displaywindow/cbiblereadwindow.h @@ -19,7 +19,7 @@ #include "backend/cswordversekey.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> //KDE includes #include <kaction.h> @@ -65,7 +65,7 @@ protected: /** Event filter. * Reimplementation of the event filter to filter out events like focus in. */ - virtual bool eventFilter( QObject* o, QEvent* e); + virtual bool eventFilter( TQObject* o, TQEvent* e); struct { KAction* selectAll; diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp index c4a4627..ec87501 100644 --- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp +++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp @@ -24,7 +24,7 @@ #include "util/cresmgr.h" //Qt includes -#include <qsplitter.h> +#include <tqsplitter.h> //KDE includes #include <kaction.h> @@ -65,7 +65,7 @@ void CBookReadWindow::initActions() { i18n("Toggle tree view"), CResMgr::displaywindows::bookWindow::toggleTree::icon, CResMgr::displaywindows::bookWindow::toggleTree::accel, - this, SLOT(treeToggled()), + this, TQT_SLOT(treeToggled()), actionCollection(), "toggleTree"); CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection()); @@ -92,17 +92,17 @@ void CBookReadWindow::insertKeyboardActions( KActionCollection* const a ) { void CBookReadWindow::initConnections() { CLexiconReadWindow::initConnections(); - connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)), - keyChooser(), SLOT(updateKey(CSwordKey*))); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - m_treeChooser, SLOT(updateKey(CSwordKey*))); + connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)), + this, TQT_SLOT(lookup(CSwordKey*))); + connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)), + keyChooser(), TQT_SLOT(updateKey(CSwordKey*))); + connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), + m_treeChooser, TQT_SLOT(updateKey(CSwordKey*))); } /** Init the view */ void CBookReadWindow::initView() { - QSplitter* splitter = new QSplitter(this); + TQSplitter* splitter = new TQSplitter(this); setMainToolBar( new KToolBar(this) ); addDockWindow(mainToolBar()); @@ -122,7 +122,7 @@ void CBookReadWindow::initView() { m_treeChooser->hide(); - splitter->setResizeMode(m_treeChooser, QSplitter::Stretch); + splitter->setResizeMode(m_treeChooser, TQSplitter::Stretch); setCentralWidget( splitter ); setIcon(CToolClass::getIconForModule(modules().first())); } diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp index ddcfadf..78797af 100644 --- a/bibletime/frontend/displaywindow/cbuttons.cpp +++ b/bibletime/frontend/displaywindow/cbuttons.cpp @@ -17,15 +17,15 @@ #include "util/cpointers.h" //Qt includes -#include <qstring.h> -#include <qtooltip.h> +#include <tqstring.h> +#include <tqtooltip.h> //KDE includes #include <kpopupmenu.h> #include <klocale.h> -// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, QWidget *parent, const char *name ) +// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name ) // : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) { // m_filterOptions = filterOptions; // m_filterOptions->transliteration = 0; @@ -34,7 +34,7 @@ // setPopup(m_popup); // setPopupDelay(0001); // -// connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionSelected(int))); +// connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(optionSelected(int))); // populateMenu(); // } // @@ -65,7 +65,7 @@ // sword::StringList::iterator it; // // for (it = options.begin(); it != options.end(); ++it) { -// int id = m_popup->insertItem(QString::fromLatin1((*it).c_str())); +// int id = m_popup->insertItem(TQString::fromLatin1((*it).c_str())); // if (m_filterOptions->transliteration == m_popup->indexOf(id)-1 ) { //workaround // m_popup->setItemChecked(id, true); // } @@ -86,7 +86,7 @@ *********** CDisplaySettingsButton ************* ************************************************/ -CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,QWidget *parent, const char *name ) +CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,TQWidget *parent, const char *name ) : KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) { // qWarning("CDisplaySettingsButton::CDisplaySettingsButton"); m_displaySettings = displaySettings; @@ -97,7 +97,7 @@ CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *di setPopup(m_popup); setPopupDelay(0001); //Fix, O only opens menu on mouse release or move - connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionToggled(int))); + connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(optionToggled(int))); populateMenu(); } @@ -107,12 +107,12 @@ void CDisplaySettingsButton::reset(const ListCSwordModuleInfo& useModules) { //disable the settings button if no options are available if (!populateMenu()) { setEnabled(false); - QToolTip::add + TQToolTip::add (this, i18n("Display settings: No options available")); } else { setEnabled(true); - QToolTip::add + TQToolTip::add (this, i18n("Display settings")); } } @@ -169,7 +169,7 @@ int CDisplaySettingsButton::populateMenu() { } /** No descriptions */ -int CDisplaySettingsButton::addMenuEntry( const QString name, const int* option, const bool available) { +int CDisplaySettingsButton::addMenuEntry( const TQString name, const int* option, const bool available) { int ret = 0; if (available) { @@ -201,7 +201,7 @@ const int CDisplaySettingsButton::menuItemCount() { void CDisplaySettingsButton::setItemStatus( const int index, const bool checked ) { const int ID = m_popup->idAt(index); m_popup->setItemChecked(ID, checked); - const QString text = m_popup->text(ID).remove('&'); + const TQString text = m_popup->text(ID).remove('&'); if (m_dict[text]) { *(m_dict[text]) = checked; } diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h index ac72f49..aa8c29e 100644 --- a/bibletime/frontend/displaywindow/cbuttons.h +++ b/bibletime/frontend/displaywindow/cbuttons.h @@ -17,7 +17,7 @@ #include "backend/cswordmoduleinfo.h" //QT includes -#include <qdict.h> +#include <tqdict.h> //KDE includes #include <ktoolbarbutton.h> @@ -30,7 +30,7 @@ class KPopupMenu; // class CTransliterationButton : public KToolBarButton { // Q_OBJECT // public: -// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, QWidget *parent, const char *name=0); +// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, TQWidget *parent, const char *name=0); // ~CTransliterationButton(); // /** // * Setup the menu entries. @@ -58,7 +58,7 @@ class KPopupMenu; class CDisplaySettingsButton : public KToolBarButton { Q_OBJECT public: - CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, QWidget *parent=0, const char *name=0); + CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, TQWidget *parent=0, const char *name=0); void reset(const ListCSwordModuleInfo& useModules); /** * Sets the item at position pos to the satet given as 2nd paramter. @@ -89,13 +89,13 @@ protected: CSwordBackend::FilterOptions m_available; ListCSwordModuleInfo m_modules; - QDict<int> m_dict; + TQDict<int> m_dict; KPopupMenu* m_popup; int populateMenu(); bool isOptionAvailable( const CSwordModuleInfo::FilterTypes option); - int addMenuEntry( const QString name, const int* option, const bool available); + int addMenuEntry( const TQString name, const int* option, const bool available); }; #endif diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp index 9355831..b73d506 100644 --- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp +++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp @@ -110,37 +110,37 @@ void CCommentaryReadWindow::initActions() { new KAction( i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel, - this, SLOT(nextBook()), + this, TQT_SLOT(nextBook()), actionCollection(), "nextBook" ); new KAction( i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel, - this, SLOT(previousBook()), + this, TQT_SLOT(previousBook()), actionCollection(), "previousBook" ); new KAction( i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel, - this, SLOT(nextChapter()), + this, TQT_SLOT(nextChapter()), actionCollection(), "nextChapter" ); new KAction( i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel, - this, SLOT(previousChapter()), + this, TQT_SLOT(previousChapter()), actionCollection(), "previousChapter" ); new KAction( i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel, - this, SLOT(nextVerse()), + this, TQT_SLOT(nextVerse()), actionCollection(), "nextVerse" ); new KAction( i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel, - this, SLOT(previousVerse()), + this, TQT_SLOT(previousVerse()), actionCollection(), "previousVerse" ); diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h index 8b13d72..8d0816b 100644 --- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h +++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h @@ -16,7 +16,7 @@ #include "cbiblereadwindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> /** *@author The BibleTime team diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp index 1eebba7..1020307 100644 --- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp +++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp @@ -106,19 +106,19 @@ CMDIArea* const CDisplayWindow::mdi() const { } /** Returns the right window caption. */ -const QString CDisplayWindow::windowCaption() { +const TQString CDisplayWindow::windowCaption() { if (!m_modules.count()) { - return QString::null; + return TQString::null; } - return QString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")"); + return TQString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")"); } -/** Returns the used modules as a QPtrList */ +/** Returns the used modules as a TQPtrList */ ListCSwordModuleInfo CDisplayWindow::modules() { ListCSwordModuleInfo mods; - for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { + for (TQStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { Q_ASSERT(backend()->findModuleByName(*it)); if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { mods.append(m); @@ -129,8 +129,8 @@ ListCSwordModuleInfo CDisplayWindow::modules() { } /** Set the window caption. */ -void CDisplayWindow::setCaption( const QString& ) { - QWidget::setCaption( windowCaption() ); +void CDisplayWindow::setCaption( const TQString& ) { + TQWidget::setCaption( windowCaption() ); m_mdi->emitWindowCaptionChanged(); } @@ -161,47 +161,47 @@ void CDisplayWindow::initActions() { new KAction(i18n("Search"), CResMgr::displaywindows::general::search::icon, CResMgr::displaywindows::general::search::accel, - this, SLOT(slotSearchInModules()), + this, TQT_SLOT(slotSearchInModules()), actionCollection(), CResMgr::displaywindows::general::search::actionName ); KStdAction::zoomIn( - displayWidget()->connectionsProxy(), SLOT(zoomIn()), + displayWidget()->connectionsProxy(), TQT_SLOT(zoomIn()), actionCollection(), "zoomIn" ); KStdAction::zoomOut( - displayWidget()->connectionsProxy(), SLOT(zoomOut()), + displayWidget()->connectionsProxy(), TQT_SLOT(zoomOut()), actionCollection(), "zoomOut" ); KStdAction::close( - this, SLOT(close()), + this, TQT_SLOT(close()), actionCollection(), "closeWindow" ); KStdAction::selectAll( - displayWidget()->connectionsProxy(), SLOT(selectAll()), + displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection(), "selectAll" ); KStdAction::copy( - displayWidget()->connectionsProxy(), SLOT(copySelection()), + displayWidget()->connectionsProxy(), TQT_SLOT(copySelection()), actionCollection(), "copySelectedText" ); KStdAction::find( - displayWidget()->connectionsProxy(), SLOT(openFindTextDialog()), + displayWidget()->connectionsProxy(), TQT_SLOT(openFindTextDialog()), actionCollection(), "findText" ); new KToolBarPopupAction( i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel, - keyChooser(), SLOT( backInHistory() ), + 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(), SLOT( forwardInHistory() ), + keyChooser(), TQT_SLOT( forwardInHistory() ), actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName ); @@ -218,7 +218,7 @@ void CDisplayWindow::windowActivated( const bool hasFocus ) { /** Refresh the settings of this window. */ void CDisplayWindow::reload() { //first make sure all used Sword modules are still present - for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { + for (TQStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { if (!backend()->findModuleByName(*it)) { it = m_modules.remove(it); if (it == m_modules.end()) { @@ -323,13 +323,13 @@ CModuleChooserBar* const CDisplayWindow::moduleChooserBar() const { /** Sets the module chooser bar. */ void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ) { if (m_moduleChooserBar) { - disconnect(m_moduleChooserBar, SIGNAL(sigChanged()), this, SLOT(modulesChanged())); + disconnect(m_moduleChooserBar, TQT_SIGNAL(sigChanged()), this, TQT_SLOT(modulesChanged())); } //if a new bar should be set! if (bar) { m_moduleChooserBar = bar; - connect(bar, SIGNAL(sigChanged()), SLOT(modulesChanged())); + connect(bar, TQT_SIGNAL(sigChanged()), TQT_SLOT(modulesChanged())); } } @@ -351,8 +351,8 @@ const bool CDisplayWindow::init() { setCaption(windowCaption()); //setup focus stuff. - setFocusPolicy(QWidget::ClickFocus); - parentWidget()->setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); + parentWidget()->setFocusPolicy(TQWidget::ClickFocus); initActions(); initToolbars(); @@ -397,10 +397,10 @@ CDisplaySettingsButton* const CDisplayWindow::displaySettingsButton() const { /** Sets the display settings button. */ void CDisplayWindow::setDisplaySettingsButton( CDisplaySettingsButton* button ) { if (m_displaySettingsButton) - disconnect(m_displaySettingsButton, SIGNAL( sigChanged() ),this, SLOT(lookup() )); + disconnect(m_displaySettingsButton, TQT_SIGNAL( sigChanged() ),this, TQT_SLOT(lookup() )); m_displaySettingsButton = button; - connect(m_displaySettingsButton, SIGNAL(sigChanged()),this, SLOT(lookup())); + connect(m_displaySettingsButton, TQT_SIGNAL(sigChanged()),this, TQT_SLOT(lookup())); } /** Lookup the current key. Used to refresh the display. */ @@ -408,7 +408,7 @@ void CDisplayWindow::lookup() { lookup( key() ); } -void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName ) { +void CDisplayWindow::lookup( const TQString& moduleName, const TQString& keyName ) { Q_ASSERT(isReady()); if (!isReady()) { return; @@ -435,7 +435,7 @@ void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName ) } } -void CDisplayWindow::lookup( const QString& keyName ) { +void CDisplayWindow::lookup( const TQString& keyName ) { /* This function is called for example after a bookmark was dropped on this window */ Q_ASSERT(modules().first()); @@ -453,7 +453,7 @@ KPopupMenu* const CDisplayWindow::popup() { // qWarning("CReadWindow::popup()"); if (!m_popupMenu) { m_popupMenu = new KPopupMenu(this); - connect(m_popupMenu, SIGNAL(aboutToShow()), this, SLOT(updatePopupMenu())); + connect(m_popupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updatePopupMenu())); if (displayWidget()) { displayWidget()->installPopup(m_popupMenu); } @@ -475,7 +475,7 @@ void CDisplayWindow::setDisplayWidget( CDisplay* newDisplay ) { m_displayWidget = newDisplay; } -void CDisplayWindow::closeEvent(QCloseEvent* e) { +void CDisplayWindow::closeEvent(TQCloseEvent* e) { if (!queryClose()) { e->ignore(); } diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h index c166687..3c25acf 100644 --- a/bibletime/frontend/displaywindow/cdisplaywindow.h +++ b/bibletime/frontend/displaywindow/cdisplaywindow.h @@ -25,7 +25,7 @@ #include "frontend/cprofilewindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> //KDE includes #include <kmainwindow.h> @@ -69,7 +69,7 @@ public: /** * Returns the right window caption. */ - const QString windowCaption(); + const TQString windowCaption(); /** * Returns the used modules as a QPtrList */ @@ -85,7 +85,7 @@ public: /** * Set the window caption. */ - virtual void setCaption( const QString& ); + virtual void setCaption( const TQString& ); /** * Sets the new filter options of this window. */ @@ -180,11 +180,11 @@ public slots: * Lookup the specified key in the given module. If the module is not chosen withing * this display window create a new displaywindow with the right module in it. */ - virtual void lookup( const QString& module, const QString& key ); + virtual void lookup( const TQString& module, const TQString& key ); /** * Lookup the key in the chosen modules. */ - virtual void lookup( const QString& key ); + virtual void lookup( const TQString& key ); /** * Refresh the settings of this window. */ @@ -236,7 +236,7 @@ protected: * Returns the installed popup menu. */ KPopupMenu* const popup(); - virtual void closeEvent(QCloseEvent* e); + virtual void closeEvent(TQCloseEvent* e); protected slots: virtual void modulesChanged(); @@ -256,7 +256,7 @@ private: CMDIArea* m_mdi; //we may only cache the module names bacause after a backend relaod the pointers are invalid! - QStringList m_modules; + TQStringList m_modules; CSwordBackend::FilterOptions m_filterOptions; CSwordBackend::DisplayOptions m_displayOptions; diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp index e2e91e4..1dc7c2e 100644 --- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp +++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp @@ -48,10 +48,10 @@ void CHTMLWriteWindow::initView() { void CHTMLWriteWindow::initConnections() { CWriteWindow::initConnections(); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()), - this, SLOT(textChanged()) ); + connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), + this, TQT_SLOT(lookup(CSwordKey*))); + connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()), + this, TQT_SLOT(textChanged()) ); }; void CHTMLWriteWindow::initToolbars() { @@ -68,7 +68,7 @@ void CHTMLWriteWindow::initToolbars() { m_actions.saveText = new KAction( i18n("Save text"), CResMgr::displaywindows::writeWindow::saveText::icon, CResMgr::displaywindows::writeWindow::saveText::accel, - this, SLOT( saveCurrentText() ), + this, TQT_SLOT( saveCurrentText() ), actionCollection(), CResMgr::displaywindows::writeWindow::saveText::actionName ); @@ -78,7 +78,7 @@ void CHTMLWriteWindow::initToolbars() { m_actions.deleteEntry = new KAction(i18n("Delete current entry"), CResMgr::displaywindows::writeWindow::deleteEntry::icon, CResMgr::displaywindows::writeWindow::deleteEntry::accel, - this, SLOT(deleteEntry()), + this, TQT_SLOT(deleteEntry()), actionCollection(), CResMgr::displaywindows::writeWindow::deleteEntry::actionName ); @@ -88,7 +88,7 @@ void CHTMLWriteWindow::initToolbars() { m_actions.restoreText = new KAction(i18n("Restore original text"), CResMgr::displaywindows::writeWindow::restoreText::icon, CResMgr::displaywindows::writeWindow::restoreText::accel, - this, SLOT(restoreText()), actionCollection(), + this, TQT_SLOT(restoreText()), actionCollection(), CResMgr::displaywindows::writeWindow::restoreText::actionName ); m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip ); diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.h b/bibletime/frontend/displaywindow/chtmlwritewindow.h index 04b70f6..fd51ee0 100644 --- a/bibletime/frontend/displaywindow/chtmlwritewindow.h +++ b/bibletime/frontend/displaywindow/chtmlwritewindow.h @@ -16,7 +16,7 @@ #include "cplainwritewindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> class KAction; diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp index b36118d..4d29f28 100644 --- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp +++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp @@ -81,12 +81,12 @@ void CLexiconReadWindow::initActions() { new KAction( i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel, - this, SLOT( nextEntry() ), + this, TQT_SLOT( nextEntry() ), actionCollection(), "nextEntry" ); new KAction( i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel, - this, SLOT( previousEntry() ), + this, TQT_SLOT( previousEntry() ), actionCollection(), "previousEntry" ); @@ -96,29 +96,29 @@ void CLexiconReadWindow::initActions() { m_actions.findText = actionCollection()->action("findText"); Q_ASSERT(m_actions.findText); - //m_actions.findStrongs = new KAction(i18n("Strong's Search"), KShortcut(0),this, SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs"); + //m_actions.findStrongs = new KAction(i18n("Strong's Search"), KShortcut(0),this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs"); m_actions.findStrongs = new KAction( i18n("Strong's Search"), CResMgr::displaywindows::general::findStrongs::icon, CResMgr::displaywindows::general::findStrongs::accel, - this, SLOT(openSearchStrongsDialog()), + this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), CResMgr::displaywindows::general::findStrongs::actionName); - m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); + m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); - m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAll()), actionCollection(), "copyEntryWithText"); + m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAll()), actionCollection(), "copyEntryWithText"); m_actions.copy.selectedText = actionCollection()->action("copySelectedText"); Q_ASSERT(m_actions.copy.selectedText); - m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain"); + m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain"); - m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML"); + m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML"); - m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly"); + m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly"); - m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), this, SLOT(printAll()), actionCollection(), "printEntryWithText"); + m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printEntryWithText"); // init with the user defined settings CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection()); @@ -128,27 +128,27 @@ void CLexiconReadWindow::initActions() { void CLexiconReadWindow::initConnections() { Q_ASSERT(keyChooser()); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(keyChooser(), SIGNAL(historyChanged()), - this, SLOT(slotUpdateHistoryButtons())); + connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), + this, TQT_SLOT(lookup(CSwordKey*))); + connect(keyChooser(), TQT_SIGNAL(historyChanged()), + this, TQT_SLOT(slotUpdateHistoryButtons())); //connect the history actions to the right slots connect( - m_actions.backInHistory->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFillBackHistory()) + m_actions.backInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotFillBackHistory()) ); connect( - m_actions.backInHistory->popupMenu(), SIGNAL(activated(int)), - keyChooser(), SLOT(backInHistory(int)) + m_actions.backInHistory->popupMenu(), TQT_SIGNAL(activated(int)), + keyChooser(), TQT_SLOT(backInHistory(int)) ); connect( - m_actions.forwardInHistory->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFillForwardHistory()) + m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotFillForwardHistory()) ); connect( - m_actions.forwardInHistory->popupMenu(), SIGNAL(activated(int)), - keyChooser(), SLOT(forwardInHistory(int)) + m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(activated(int)), + keyChooser(), TQT_SLOT(forwardInHistory(int)) ); @@ -199,7 +199,7 @@ void CLexiconReadWindow::initToolbars() { void CLexiconReadWindow::setupPopupMenu() { popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window")); - // m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection()); + // m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection()); m_actions.findText->plug(popup()); m_actions.findStrongs->plug(popup()); @@ -242,7 +242,7 @@ void CLexiconReadWindow::updatePopupMenu() { } } m_actions.findStrongs->setEnabled( hasStrongs );*/ - m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null ); + m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString::null ); m_actions.copy.reference->setEnabled( displayWidget()->hasActiveAnchor() ); //m_actions.copy.entry->setEnabled( displayWidget()->hasActiveAnchor() ); @@ -280,11 +280,11 @@ void CLexiconReadWindow::saveAsPlain() { void CLexiconReadWindow::slotFillBackHistory() { // qWarning("fill back history"); - QStringList keyList = keyChooser()->getPreviousKeys(); - QPopupMenu* menu = m_actions.backInHistory->popupMenu(); + TQStringList keyList = keyChooser()->getPreviousKeys(); + TQPopupMenu* menu = m_actions.backInHistory->popupMenu(); menu->clear(); - QStringList::iterator it; + TQStringList::iterator it; int index = 1; for (it = keyList.begin(); it != keyList.end(); ++it) { menu->insertItem(*it,index, index); @@ -294,11 +294,11 @@ void CLexiconReadWindow::slotFillBackHistory() { void CLexiconReadWindow::slotFillForwardHistory() { // qWarning("fill forward history"); - QStringList keyList = keyChooser()->getNextKeys(); - QPopupMenu* menu = m_actions.forwardInHistory->popupMenu(); + TQStringList keyList = keyChooser()->getNextKeys(); + TQPopupMenu* menu = m_actions.forwardInHistory->popupMenu(); menu->clear(); - QStringList::iterator it; + TQStringList::iterator it; int index = 1; for (it = keyList.begin(); it != keyList.end(); ++it) { menu->insertItem(*it,index, index); diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h index a29e4d0..1710963 100644 --- a/bibletime/frontend/displaywindow/clexiconreadwindow.h +++ b/bibletime/frontend/displaywindow/clexiconreadwindow.h @@ -16,7 +16,7 @@ #include "creadwindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> //KDE includes #include <kaction.h> diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp index 11492b6..7f0f1fc 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp +++ b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp @@ -12,9 +12,9 @@ #include "cmodulechooserbar.h" #include "cmodulechooserbutton.h" -#include <qtimer.h> +#include <tqtimer.h> -CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, QWidget *parent, const char *name ) +CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent, const char *name ) : KToolBar(parent,name), m_moduleType(type), m_idCounter(0), @@ -44,12 +44,12 @@ CModuleChooserButton* const CModuleChooserBar::addButton( CSwordModuleInfo* cons insertWidget( m_idCounter, b->size().width(), b ); m_buttonList.append(b); - connect( b, SIGNAL(sigAddButton()), this, SLOT(addButton()) ); + connect( b, TQT_SIGNAL(sigAddButton()), this, TQT_SLOT(addButton()) ); - connect( b, SIGNAL(sigRemoveButton(const int)), this, SLOT(removeButton(const int)) ); + connect( b, TQT_SIGNAL(sigRemoveButton(const int)), this, TQT_SLOT(removeButton(const int)) ); - connect( b, SIGNAL(sigChanged()), SIGNAL(sigChanged()) ); - connect( b, SIGNAL(sigChanged()), SLOT(updateMenuItems()) ); + connect( b, TQT_SIGNAL(sigChanged()), TQT_SIGNAL(sigChanged()) ); + connect( b, TQT_SIGNAL(sigChanged()), TQT_SLOT(updateMenuItems()) ); b->show(); @@ -144,7 +144,7 @@ void CModuleChooserBar::setModules( ListCSwordModuleInfo useModules ) { \fn CModuleChooserBar::updateMenuItems() */ void CModuleChooserBar::updateMenuItems() { - QPtrList<CModuleChooserButton> buttons = m_buttonList ; + TQPtrList<CModuleChooserButton> buttons = m_buttonList ; for (buttons.first(); buttons.current(); buttons.next()) { buttons.current()->updateMenuItems(); diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h index 0ab2009..5d4cf06 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbar.h +++ b/bibletime/frontend/displaywindow/cmodulechooserbar.h @@ -20,8 +20,8 @@ #include "util/cpointers.h" //Qt includes -#include <qwidget.h> -#include <qhbox.h> +#include <tqwidget.h> +#include <tqhbox.h> //KDE includes #include <ktoolbar.h> @@ -35,7 +35,7 @@ public: /** * Default constructor */ - CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, QWidget *parent=0, const char *name=0); + CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent=0, const char *name=0); /** * Returns a list of selected modules. */ @@ -70,7 +70,7 @@ private: CSwordModuleInfo::ModuleType m_moduleType; int m_idCounter; int m_buttonLimit; - QPtrList<CModuleChooserButton> m_buttonList; + TQPtrList<CModuleChooserButton> m_buttonList; signals: // Signals void sigChanged(); diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp index 7f5eaa4..3d8105f 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp +++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp @@ -17,10 +17,10 @@ #include "util/cresmgr.h" //Qt includes -#include <qstring.h> -#include <qtooltip.h> -#include <qdict.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqtooltip.h> +#include <tqdict.h> +#include <tqvaluelist.h> //KDE includes #include <klocale.h> @@ -53,7 +53,7 @@ CModuleChooserButton::~CModuleChooserButton() { } /** Returns the icon used for the current status. */ -const QString CModuleChooserButton::iconName() { +const TQString CModuleChooserButton::iconName() { switch (m_moduleType) { case CSwordModuleInfo::Bible: if (m_hasModule) @@ -84,7 +84,7 @@ CSwordModuleInfo* CModuleChooserButton::module() { for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) { for (unsigned int i = 0; i < popup->count(); i++) { if ( m_popup->isItemChecked(popup->idAt(i)) ) { - QString mod = popup->text(popup->idAt(i)).remove('&'); + TQString mod = popup->text(popup->idAt(i)).remove('&'); return backend()->findModuleByName( mod.left(mod.find(" ")) ); } } @@ -128,10 +128,10 @@ void CModuleChooserButton::moduleChosen( int ID ) { setText( i18n("Select a work") ); m_popup->changeTitle(m_titleId, i18n("Select a work")); - QToolTip::remove + TQToolTip::remove (this); if (module()) { - QToolTip::add + TQToolTip::add (this, module()->name()); } } @@ -162,11 +162,11 @@ void CModuleChooserButton::populateMenu() { } m_popup->insertSeparator(); - connect(m_popup, SIGNAL(activated(int)), this, SLOT(moduleChosen(int))); + connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int))); setPopup(m_popup, true); - QStringList languages; - QDict<KPopupMenu> langdict; + TQStringList languages; + TQDict<KPopupMenu> langdict; //the modules list contains only the modules we can use, i.e. same type and same features ListCSwordModuleInfo modules; @@ -187,10 +187,10 @@ void CModuleChooserButton::populateMenu() { /*ListCSwordModuleInfo::iterator*/ end_it = modules.end(); for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - QString lang = (*it)->language()->translatedName(); + TQString lang = (*it)->language()->translatedName(); if (lang.isEmpty()) { - //lang = QString::fromLatin1("xx"); //unknown language -- do not use English as default!! + //lang = TQString::fromLatin1("xx"); //unknown language -- do not use English as default!! lang = (*it)->language()->abbrev(); if (lang.isEmpty()) { lang = "xx"; @@ -203,7 +203,7 @@ void CModuleChooserButton::populateMenu() { KPopupMenu* menu = new KPopupMenu; langdict.insert(lang, menu ); m_submenus.append(menu); - connect(menu, SIGNAL(activated(int)), this, SLOT(moduleChosen(int))); + connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int))); } } @@ -212,7 +212,7 @@ void CModuleChooserButton::populateMenu() { // for (modules.first(); modules.current(); modules.next()) { /*ListCSwordModuleInfo::iterator*/ end_it = modules.end(); for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - QString lang = (*it)->language()->translatedName(); + TQString lang = (*it)->language()->translatedName(); if (lang.isEmpty()) { lang = (*it)->language()->abbrev(); @@ -221,8 +221,8 @@ void CModuleChooserButton::populateMenu() { } } - QString name((*it)->name()); - name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : QString::null); + TQString name((*it)->name()); + name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : TQString::null); const int id = langdict[lang]->insertItem( name ); if ( m_module && (*it)->name() == m_module->name()) { @@ -231,16 +231,16 @@ void CModuleChooserButton::populateMenu() { } languages.sort(); - for ( QStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) { + for ( TQStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) { m_popup->insertItem( *it, langdict[*it]); } if (module()) { - QToolTip::add + TQToolTip::add (this, module()->name()); } else { - QToolTip::add + TQToolTip::add (this, i18n("No work selected")); } } @@ -250,7 +250,7 @@ void CModuleChooserButton::populateMenu() { \fn CModuleChooserButton::updateMenuItems() */ void CModuleChooserButton::updateMenuItems() { - QString moduleName; + TQString moduleName; CSwordModuleInfo* module = 0; ListCSwordModuleInfo chosenModules = m_moduleChooserBar->getModuleList(); diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h index 2bd9fa7..d1a99b2 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h +++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.h @@ -17,8 +17,8 @@ #include "util/cpointers.h" //Qt includes -#include <qdict.h> -#include <qtoolbutton.h> +#include <tqdict.h> +#include <tqtoolbutton.h> //KDE includes #include <ktoolbarbutton.h> @@ -51,7 +51,7 @@ private: /** * Returns the icon used for the current status. */ - const QString iconName(); + const TQString iconName(); bool m_hasModule; int m_id; @@ -61,7 +61,7 @@ private: CSwordModuleInfo* m_module; KPopupMenu* m_popup; - QPtrList<KPopupMenu> m_submenus; + TQPtrList<KPopupMenu> m_submenus; CModuleChooserBar* m_moduleChooserBar; diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp index ba95bec..b855ee8 100644 --- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp +++ b/bibletime/frontend/displaywindow/cplainwritewindow.cpp @@ -18,7 +18,7 @@ #include "util/cresmgr.h" //Qt includes -#include <qregexp.h> +#include <tqregexp.h> //KDE includes #include <kaction.h> @@ -65,7 +65,7 @@ void CPlainWriteWindow::initToolbars() { m_actions.saveText = new KAction(i18n("Save text"), CResMgr::displaywindows::writeWindow::saveText::icon, CResMgr::displaywindows::writeWindow::saveText::accel, - this, SLOT(saveCurrentText()), + this, TQT_SLOT(saveCurrentText()), actionCollection(), CResMgr::displaywindows::writeWindow::saveText::actionName ); @@ -76,7 +76,7 @@ void CPlainWriteWindow::initToolbars() { m_actions.deleteEntry = new KAction(i18n("Delete current entry"), CResMgr::displaywindows::writeWindow::deleteEntry::icon, CResMgr::displaywindows::writeWindow::deleteEntry::accel, - this, SLOT(deleteEntry()), + this, TQT_SLOT(deleteEntry()), actionCollection(), CResMgr::displaywindows::writeWindow::deleteEntry::actionName ); @@ -87,7 +87,7 @@ void CPlainWriteWindow::initToolbars() { m_actions.restoreText = new KAction(i18n("Restore original text"), CResMgr::displaywindows::writeWindow::restoreText::icon, CResMgr::displaywindows::writeWindow::restoreText::accel, - this, SLOT(restoreText()), + this, TQT_SLOT(restoreText()), actionCollection(), CResMgr::displaywindows::writeWindow::restoreText::actionName ); @@ -97,11 +97,11 @@ void CPlainWriteWindow::initToolbars() { void CPlainWriteWindow::initConnections() { CWriteWindow::initConnections(); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); + connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), + this, TQT_SLOT(lookup(CSwordKey*))); - connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()), - this, SLOT(textChanged()) ); + connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()), + this, TQT_SLOT(textChanged()) ); } void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) { @@ -117,15 +117,15 @@ void CPlainWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) { }; /** Saves the text for the current key. Directly writes the changed text into the module. */ -void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) { - QString t = displayWidget()->plainText(); +void CPlainWriteWindow::saveCurrentText( const TQString& /*key*/ ) { + TQString t = displayWidget()->plainText(); //since t is a complete HTML page at the moment, strip away headers and footers of a HTML page - QRegExp re("(?:<html.*>.+<body.*>)", false); //remove headers, case insensitive + TQRegExp re("(?:<html.*>.+<body.*>)", false); //remove headers, case insensitive re.setMinimal(true); t.replace(re, ""); - t.replace(QRegExp("</body></html>", false), "");//remove footer + t.replace(TQRegExp("</body></html>", false), "");//remove footer - const QString& oldKey = this->key()->key(); + const TQString& oldKey = this->key()->key(); if( modules().first()->isWritable() ) { modules().first()->write(this->key(), t ); this->key()->key( oldKey ); @@ -134,7 +134,7 @@ void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) { textChanged(); } else { KMessageBox::error( this, - QString::fromLatin1("<qt><B>%1</B><BR>%2</qt>") + TQString::fromLatin1("<qt><B>%1</B><BR>%2</qt>") .arg( i18n("Module is not writable.") ) .arg( i18n("Either the module may not be edited, or " "you do not have write permission.") ), diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.h b/bibletime/frontend/displaywindow/cplainwritewindow.h index 94f9b70..6a498c7 100644 --- a/bibletime/frontend/displaywindow/cplainwritewindow.h +++ b/bibletime/frontend/displaywindow/cplainwritewindow.h @@ -16,7 +16,7 @@ #include "cwritewindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> class KAction; @@ -79,7 +79,7 @@ protected slots: // Protected slots /** * Saves the text for the current key. Directly writes the changed text into the module. */ - virtual void saveCurrentText( const QString& ); + virtual void saveCurrentText( const TQString& ); /** * Is called when the current text was changed. */ diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp index d1bcd11..ccd78e3 100644 --- a/bibletime/frontend/displaywindow/creadwindow.cpp +++ b/bibletime/frontend/displaywindow/creadwindow.cpp @@ -55,24 +55,24 @@ CReadDisplay* const CReadWindow::displayWidget() { void CReadWindow::setDisplayWidget( CReadDisplay* newDisplay ) { CDisplayWindow::setDisplayWidget(newDisplay); if (m_displayWidget) { - disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)), this, SLOT(lookup(const QString&, const QString&))); + disconnect(m_displayWidget->connectionsProxy(), TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), this, TQT_SLOT(lookup(const TQString&, const TQString&))); - disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)), this, SLOT(lookup(const QString&))); + disconnect(m_displayWidget->connectionsProxy(), TQT_SIGNAL(referenceDropped(const TQString&)), this, TQT_SLOT(lookup(const TQString&))); } m_displayWidget = newDisplay; connect( m_displayWidget->connectionsProxy(), - SIGNAL(referenceClicked(const QString&, const QString&)), + TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), this, - SLOT(lookup(const QString&, const QString&)) + TQT_SLOT(lookup(const TQString&, const TQString&)) ); connect( m_displayWidget->connectionsProxy(), - SIGNAL(referenceDropped(const QString&)), + TQT_SIGNAL(referenceDropped(const TQString&)), this, - SLOT(lookup(const QString&)) + TQT_SLOT(lookup(const TQString&)) ); } @@ -113,7 +113,7 @@ void CReadWindow::lookup( CSwordKey* newKey ) { /** Store the settings of this window in the given CProfileWindow object. */ void CReadWindow::storeProfileSettings(CProfileWindow * const settings) { - QRect rect; + TQRect rect; rect.setX(parentWidget()->x()); rect.setY(parentWidget()->y()); rect.setWidth(width()); @@ -127,9 +127,9 @@ void CReadWindow::storeProfileSettings(CProfileWindow * const settings) { if (key()) { sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key()); - QString oldLang; + TQString oldLang; if (vk) { - oldLang = QString(vk->getLocale()); + oldLang = TQString(vk->getLocale()); vk->setLocale("en"); //save english locale names as default! } settings->setKey( key()->key() ); @@ -138,7 +138,7 @@ void CReadWindow::storeProfileSettings(CProfileWindow * const settings) { } } - QStringList mods; + TQStringList mods; ListCSwordModuleInfo allMods = modules(); ListCSwordModuleInfo::iterator end_it = allMods.end(); @@ -157,7 +157,7 @@ void CReadWindow::applyProfileSettings(CProfileWindow * const settings) { parentWidget()->showMaximized(); } else { - const QRect rect = settings->geometry(); + const TQRect rect = settings->geometry(); resize(rect.width(), rect.height()); parentWidget()->move(rect.x(), rect.y()); } @@ -169,15 +169,15 @@ void CReadWindow::insertKeyboardActions( KActionCollection* const ) {} /** No descriptions */ void CReadWindow::copyDisplayedText() { - CExportManager mgr(QString::null); + CExportManager mgr(TQString::null); mgr.copyKey(key(), CExportManager::Text, true); } /*! - \fn CReadWindow::resizeEvent(QResizeEvent* e) + \fn CReadWindow::resizeEvent(TQResizeEvent* e) */ -void CReadWindow::resizeEvent(QResizeEvent* /*e*/) { +void CReadWindow::resizeEvent(TQResizeEvent* /*e*/) { displayWidget()->moveToAnchor( Rendering::CDisplayRendering::keyToHTMLAnchor(key()->key()) ); @@ -185,9 +185,9 @@ void CReadWindow::resizeEvent(QResizeEvent* /*e*/) { void CReadWindow::openSearchStrongsDialog() { // qWarning("looking for lemma %s", displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma].latin1() ); - QString searchText = QString::null; + TQString searchText = TQString::null; - if (displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null) { + if (displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString::null) { searchText.append("strong:").append(displayWidget()->getCurrentNodeInfo() [CDisplay::Lemma]); } diff --git a/bibletime/frontend/displaywindow/creadwindow.h b/bibletime/frontend/displaywindow/creadwindow.h index 9dd36b0..35cdc42 100644 --- a/bibletime/frontend/displaywindow/creadwindow.h +++ b/bibletime/frontend/displaywindow/creadwindow.h @@ -19,8 +19,8 @@ #include "frontend/display/creaddisplay.h" //Qt includes -#include <qwidget.h> -#include <qpopupmenu.h> +#include <tqwidget.h> +#include <tqpopupmenu.h> class KPopupMenu; @@ -54,7 +54,7 @@ protected: // Protected methods * Returns the display widget of this window. */ virtual CReadDisplay* const displayWidget(); - virtual void resizeEvent(QResizeEvent* e); + virtual void resizeEvent(TQResizeEvent* e); protected slots: virtual void lookup( CSwordKey* ); diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp index 34be15c..760a767 100644 --- a/bibletime/frontend/displaywindow/cwritewindow.cpp +++ b/bibletime/frontend/displaywindow/cwritewindow.cpp @@ -42,8 +42,8 @@ void CWriteWindow::initConnections() { // qWarning("CWriteWindow::initConnections()"); Q_ASSERT(keyChooser()); - connect(keyChooser(), SIGNAL(beforeKeyChange(const QString&)), - this, SLOT(beforeKeyChange(const QString&)) + connect(keyChooser(), TQT_SIGNAL(beforeKeyChange(const TQString&)), + this, TQT_SLOT(beforeKeyChange(const TQString&)) ); }; @@ -54,7 +54,7 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) { settings->setWriteWindowType( writeWindowType() ); - QRect rect; + TQRect rect; rect.setX(parentWidget()->x()); rect.setY(parentWidget()->y()); rect.setWidth(width()); @@ -67,9 +67,9 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) { if (key()) { sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key()); - QString oldLang; + TQString oldLang; if (vk) { - oldLang = QString::fromLatin1(vk->getLocale()); + oldLang = TQString::fromLatin1(vk->getLocale()); vk->setLocale("en"); //save english locale names as default! } settings->setKey( key()->key() ); @@ -78,7 +78,7 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) { } } - QStringList mods; + TQStringList mods; ListCSwordModuleInfo allMods = modules(); // for (CSwordModuleInfo* m = modules().first(); m; m = modules().next()) { ListCSwordModuleInfo::iterator end_it = allMods.end(); @@ -95,7 +95,7 @@ void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) { parentWidget()->showMaximized(); } else { - const QRect rect = settings->geometry(); + const TQRect rect = settings->geometry(); resize(rect.width(), rect.height()); parentWidget()->move(rect.x(), rect.y()); //setGeometry( settings->geometry() ); @@ -153,7 +153,7 @@ bool CWriteWindow::queryClose() { return true; } -void CWriteWindow::beforeKeyChange(const QString& key) { +void CWriteWindow::beforeKeyChange(const TQString& key) { Q_ASSERT(displayWidget()); Q_ASSERT(keyChooser()); if (!isReady()) { diff --git a/bibletime/frontend/displaywindow/cwritewindow.h b/bibletime/frontend/displaywindow/cwritewindow.h index dfa4c1a..986fa7d 100644 --- a/bibletime/frontend/displaywindow/cwritewindow.h +++ b/bibletime/frontend/displaywindow/cwritewindow.h @@ -17,7 +17,7 @@ #include "cdisplaywindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> /**The base class for all write-only display windows. *@author The BibleTime team @@ -60,7 +60,7 @@ protected: // Protected methods void setDisplayWidget( CWriteDisplay* display ); virtual const CDisplayWindow::WriteWindowType writeWindowType() = 0; virtual bool queryClose(); - virtual void saveCurrentText( const QString& key ) = 0; + virtual void saveCurrentText( const TQString& key ) = 0; protected slots: /** Save text to the module @@ -70,7 +70,7 @@ protected slots: saveCurrentText(key()->key()); }; }; - virtual void beforeKeyChange(const QString&); + virtual void beforeKeyChange(const TQString&); private: CWriteDisplay* m_writeDisplay; |