Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/19/head
Michele Calgaro 11 months ago
parent a9e61fd1e5
commit 3395b7a8e8
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -212,7 +212,7 @@ protected: // Protected methods
*/ */
void initMenubar(); void initMenubar();
/** /**
* Initializes the TQT_SIGNAL / TQT_SLOT connections * Initializes the signal / slot connections
*/ */
void initConnections(); void initConnections();
/** /**

@ -104,7 +104,7 @@ void BibleTime::initActions() {
TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("...")); TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
TDEAction* action = 0; TDEAction* action = 0;
action = KStdAction::quit(kapp, TQT_SLOT( quit() ), actionCollection()); action = KStdAction::quit(kapp, TQ_SLOT( quit() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::file::quit::tooltip ); action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
#if TDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
@ -115,7 +115,7 @@ void BibleTime::initActions() {
action = new TDEAction(i18n("Search in &open work(s)"), action = new TDEAction(i18n("Search in &open work(s)"),
CResMgr::mainMenu::mainIndex::search::icon, CResMgr::mainMenu::mainIndex::search::icon,
CResMgr::mainMenu::mainIndex::search::accel, CResMgr::mainMenu::mainIndex::search::accel,
this, TQT_SLOT(slotSearchModules()), actionCollection(), this, TQ_SLOT(slotSearchModules()), actionCollection(),
CResMgr::mainMenu::mainIndex::search::actionName CResMgr::mainMenu::mainIndex::search::actionName
); );
action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip ); action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip );
@ -128,7 +128,7 @@ void BibleTime::initActions() {
action = new TDEAction(i18n("Search in standard &Bible"), action = new TDEAction(i18n("Search in standard &Bible"),
CResMgr::mainMenu::mainIndex::searchdefaultbible::icon, CResMgr::mainMenu::mainIndex::searchdefaultbible::icon,
CResMgr::mainMenu::mainIndex::searchdefaultbible::accel, CResMgr::mainMenu::mainIndex::searchdefaultbible::accel,
this, TQT_SLOT(slotSearchDefaultBible()), actionCollection(), this, TQ_SLOT(slotSearchDefaultBible()), actionCollection(),
CResMgr::mainMenu::mainIndex::searchdefaultbible::actionName CResMgr::mainMenu::mainIndex::searchdefaultbible::actionName
); );
action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip ); action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip );
@ -138,7 +138,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
m_viewToolbar_action = KStdAction::showToolbar(this, TQT_SLOT( slotToggleToolbar() ), actionCollection()); m_viewToolbar_action = KStdAction::showToolbar(this, TQ_SLOT( slotToggleToolbar() ), actionCollection());
m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip ); m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip );
#if TDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
@ -150,7 +150,7 @@ void BibleTime::initActions() {
m_viewMainIndex_action = new TDEToggleAction(i18n("&Show bookshelf"), m_viewMainIndex_action = new TDEToggleAction(i18n("&Show bookshelf"),
CResMgr::mainMenu::view::showMainIndex::icon, CResMgr::mainMenu::view::showMainIndex::icon,
CResMgr::mainMenu::view::showMainIndex::accel, CResMgr::mainMenu::view::showMainIndex::accel,
this, TQT_SLOT(slotToggleMainIndex()), actionCollection(), this, TQ_SLOT(slotToggleMainIndex()), actionCollection(),
CResMgr::mainMenu::view::showMainIndex::actionName); CResMgr::mainMenu::view::showMainIndex::actionName);
m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip ); m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip );
@ -162,7 +162,7 @@ void BibleTime::initActions() {
m_viewInfoDisplay_action = new TDEToggleAction(i18n("Show &mag"), m_viewInfoDisplay_action = new TDEToggleAction(i18n("Show &mag"),
CResMgr::mainMenu::view::showInfoDisplay::icon, CResMgr::mainMenu::view::showInfoDisplay::icon,
CResMgr::mainMenu::view::showInfoDisplay::accel, CResMgr::mainMenu::view::showInfoDisplay::accel,
this, TQT_SLOT(slotToggleInfoDisplay()), actionCollection(), this, TQ_SLOT(slotToggleInfoDisplay()), actionCollection(),
CResMgr::mainMenu::view::showInfoDisplay::actionName); CResMgr::mainMenu::view::showInfoDisplay::actionName);
m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip ); m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip );
@ -171,7 +171,7 @@ void BibleTime::initActions() {
m_viewInfoDisplay_action->plugAccel( accel() ); m_viewInfoDisplay_action->plugAccel( accel() );
#endif #endif
action = KStdAction::preferences(this, TQT_SLOT( slotSettingsOptions() ), actionCollection()); action = KStdAction::preferences(this, TQ_SLOT( slotSettingsOptions() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip ); action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip );
#if TDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
@ -182,7 +182,7 @@ void BibleTime::initActions() {
action = new TDEAction(i18n("Bookshelf &Manager"), action = new TDEAction(i18n("Bookshelf &Manager"),
CResMgr::mainMenu::settings::swordSetupDialog::icon, CResMgr::mainMenu::settings::swordSetupDialog::icon,
CResMgr::mainMenu::settings::swordSetupDialog::accel, CResMgr::mainMenu::settings::swordSetupDialog::accel,
this, TQT_SLOT( slotSwordSetupDialog() ), actionCollection(), this, TQ_SLOT( slotSwordSetupDialog() ), actionCollection(),
CResMgr::mainMenu::settings::swordSetupDialog::actionName CResMgr::mainMenu::settings::swordSetupDialog::actionName
); );
action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip ); action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip );
@ -198,7 +198,7 @@ void BibleTime::initActions() {
KStdAction::stdName(KStdAction::ConfigureToolbars)) KStdAction::stdName(KStdAction::ConfigureToolbars))
); );
} }
action = KStdAction::configureToolbars(this, TQT_SLOT( slotSettingsToolbar() ), actionCollection()); action = KStdAction::configureToolbars(this, TQ_SLOT( slotSettingsToolbar() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip ); action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip );
#if TDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
@ -214,7 +214,7 @@ void BibleTime::initActions() {
m_windowManualMode_action = new TDEToggleAction(i18n("&Manual mode"), m_windowManualMode_action = new TDEToggleAction(i18n("&Manual mode"),
CResMgr::mainMenu::window::arrangementMode::manual::icon, CResMgr::mainMenu::window::arrangementMode::manual::icon,
CResMgr::mainMenu::window::arrangementMode::manual::accel, CResMgr::mainMenu::window::arrangementMode::manual::accel,
this, TQT_SLOT(slotManualArrangementMode()), actionCollection(), this, TQ_SLOT(slotManualArrangementMode()), actionCollection(),
CResMgr::mainMenu::window::arrangementMode::manual::actionName CResMgr::mainMenu::window::arrangementMode::manual::actionName
); );
m_windowManualMode_action->setToolTip( m_windowManualMode_action->setToolTip(
@ -231,7 +231,7 @@ void BibleTime::initActions() {
m_windowAutoTileVertical_action = new TDEToggleAction(i18n("Auto-tile &vertically"), m_windowAutoTileVertical_action = new TDEToggleAction(i18n("Auto-tile &vertically"),
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon, CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon,
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel, CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel,
this, TQT_SLOT(slotAutoTileVertical()), actionCollection(), this, TQ_SLOT(slotAutoTileVertical()), actionCollection(),
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::actionName CResMgr::mainMenu::window::arrangementMode::autoTileVertical::actionName
); );
m_windowAutoTileVertical_action->setToolTip( m_windowAutoTileVertical_action->setToolTip(
@ -248,7 +248,7 @@ void BibleTime::initActions() {
m_windowAutoTileHorizontal_action = new TDEToggleAction(i18n("Auto-tile &horizontally"), m_windowAutoTileHorizontal_action = new TDEToggleAction(i18n("Auto-tile &horizontally"),
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon, CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon,
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel, CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel,
this, TQT_SLOT(slotAutoTileHorizontal()), actionCollection(), this, TQ_SLOT(slotAutoTileHorizontal()), actionCollection(),
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::actionName CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::actionName
); );
m_windowAutoTileHorizontal_action->setToolTip( m_windowAutoTileHorizontal_action->setToolTip(
@ -265,7 +265,7 @@ void BibleTime::initActions() {
m_windowAutoCascade_action = new TDEToggleAction(i18n("Auto-&cascade"), m_windowAutoCascade_action = new TDEToggleAction(i18n("Auto-&cascade"),
CResMgr::mainMenu::window::arrangementMode::autoCascade::icon, CResMgr::mainMenu::window::arrangementMode::autoCascade::icon,
CResMgr::mainMenu::window::arrangementMode::autoCascade::accel, CResMgr::mainMenu::window::arrangementMode::autoCascade::accel,
this, TQT_SLOT(slotAutoCascade()), actionCollection(), this, TQ_SLOT(slotAutoCascade()), actionCollection(),
CResMgr::mainMenu::window::arrangementMode::autoCascade::actionName CResMgr::mainMenu::window::arrangementMode::autoCascade::actionName
); );
m_windowAutoCascade_action->setToolTip( m_windowAutoCascade_action->setToolTip(
@ -281,7 +281,7 @@ void BibleTime::initActions() {
m_windowCascade_action = new TDEAction(i18n("&Cascade"), m_windowCascade_action = new TDEAction(i18n("&Cascade"),
CResMgr::mainMenu::window::cascade::icon, CResMgr::mainMenu::window::cascade::icon,
CResMgr::mainMenu::window::cascade::accel, CResMgr::mainMenu::window::cascade::accel,
this, TQT_SLOT(slotCascade()), actionCollection(), this, TQ_SLOT(slotCascade()), actionCollection(),
CResMgr::mainMenu::window::cascade::actionName CResMgr::mainMenu::window::cascade::actionName
); );
m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip ); m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip );
@ -295,7 +295,7 @@ void BibleTime::initActions() {
m_windowTileVertical_action = new TDEAction(i18n("Tile &vertically"), m_windowTileVertical_action = new TDEAction(i18n("Tile &vertically"),
CResMgr::mainMenu::window::tileVertical::icon, CResMgr::mainMenu::window::tileVertical::icon,
CResMgr::mainMenu::window::tileVertical::accel, CResMgr::mainMenu::window::tileVertical::accel,
this, TQT_SLOT(slotTileVertical()), actionCollection(), this, TQ_SLOT(slotTileVertical()), actionCollection(),
CResMgr::mainMenu::window::tileVertical::actionName CResMgr::mainMenu::window::tileVertical::actionName
); );
m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip ); m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip );
@ -307,7 +307,7 @@ void BibleTime::initActions() {
m_windowTileHorizontal_action = new TDEAction(i18n("Tile &horizontally"), m_windowTileHorizontal_action = new TDEAction(i18n("Tile &horizontally"),
CResMgr::mainMenu::window::tileHorizontal::icon, CResMgr::mainMenu::window::tileHorizontal::icon,
CResMgr::mainMenu::window::tileHorizontal::accel, CResMgr::mainMenu::window::tileHorizontal::accel,
this, TQT_SLOT(slotTileHorizontal()), actionCollection(), this, TQ_SLOT(slotTileHorizontal()), actionCollection(),
CResMgr::mainMenu::window::tileHorizontal::actionName CResMgr::mainMenu::window::tileHorizontal::actionName
); );
m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip ); m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip );
@ -321,7 +321,7 @@ void BibleTime::initActions() {
m_windowCloseAll_action = new TDEAction(i18n("Cl&ose all"), m_windowCloseAll_action = new TDEAction(i18n("Cl&ose all"),
CResMgr::mainMenu::window::closeAll::icon, CResMgr::mainMenu::window::closeAll::icon,
CResMgr::mainMenu::window::closeAll::accel, CResMgr::mainMenu::window::closeAll::accel,
m_mdi, TQT_SLOT(deleteAll()), actionCollection(), m_mdi, TQ_SLOT(deleteAll()), actionCollection(),
CResMgr::mainMenu::window::closeAll::actionName CResMgr::mainMenu::window::closeAll::actionName
); );
m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip ); m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip );
@ -347,7 +347,7 @@ void BibleTime::initActions() {
m_windowSaveToNewProfile_action = new TDEAction(i18n("Save as &new session"), m_windowSaveToNewProfile_action = new TDEAction(i18n("Save as &new session"),
CResMgr::mainMenu::window::saveToNewProfile::icon, CResMgr::mainMenu::window::saveToNewProfile::icon,
CResMgr::mainMenu::window::saveToNewProfile::accel, CResMgr::mainMenu::window::saveToNewProfile::accel,
this, TQT_SLOT(saveToNewProfile()), actionCollection(), this, TQ_SLOT(saveToNewProfile()), actionCollection(),
CResMgr::mainMenu::window::saveToNewProfile::actionName CResMgr::mainMenu::window::saveToNewProfile::actionName
); );
m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip ); m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip );
@ -384,7 +384,7 @@ void BibleTime::initActions() {
m_windowFullscreen_action = new TDEToggleAction(i18n("&Fullscreen mode"), m_windowFullscreen_action = new TDEToggleAction(i18n("&Fullscreen mode"),
CResMgr::mainMenu::window::showFullscreen::icon, CResMgr::mainMenu::window::showFullscreen::icon,
CResMgr::mainMenu::window::showFullscreen::accel, CResMgr::mainMenu::window::showFullscreen::accel,
this, TQT_SLOT(toggleFullscreen()), actionCollection(), this, TQ_SLOT(toggleFullscreen()), actionCollection(),
CResMgr::mainMenu::window::showFullscreen::actionName CResMgr::mainMenu::window::showFullscreen::actionName
); );
m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip ); m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip );
@ -399,9 +399,9 @@ void BibleTime::initActions() {
TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu(); TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu(); TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
connect(loadPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(loadProfile(int))); connect(loadPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(loadProfile(int)));
connect(savePopup, TQT_SIGNAL(activated(int)), TQT_SLOT(saveProfile(int))); connect(savePopup, TQ_SIGNAL(activated(int)), TQ_SLOT(saveProfile(int)));
connect(deletePopup, TQT_SIGNAL(activated(int)), TQT_SLOT(deleteProfile(int))); connect(deletePopup, TQ_SIGNAL(activated(int)), TQ_SLOT(deleteProfile(int)));
refreshProfileMenus(); refreshProfileMenus();
@ -413,7 +413,7 @@ void BibleTime::initActions() {
action = new TDEAction(i18n("&Handbook"), action = new TDEAction(i18n("&Handbook"),
CResMgr::mainMenu::help::handbook::icon, CResMgr::mainMenu::help::handbook::icon,
CResMgr::mainMenu::help::handbook::accel, CResMgr::mainMenu::help::handbook::accel,
this, TQT_SLOT(openOnlineHelp_Handbook()), actionCollection(), this, TQ_SLOT(openOnlineHelp_Handbook()), actionCollection(),
CResMgr::mainMenu::help::handbook::actionName CResMgr::mainMenu::help::handbook::actionName
); );
action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip ); action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip );
@ -426,7 +426,7 @@ void BibleTime::initActions() {
action = new TDEAction(i18n("&Bible Study Howto"), action = new TDEAction(i18n("&Bible Study Howto"),
CResMgr::mainMenu::help::bibleStudyHowTo::icon, CResMgr::mainMenu::help::bibleStudyHowTo::icon,
CResMgr::mainMenu::help::bibleStudyHowTo::accel, CResMgr::mainMenu::help::bibleStudyHowTo::accel,
this, TQT_SLOT(openOnlineHelp_Howto()), actionCollection(), this, TQ_SLOT(openOnlineHelp_Howto()), actionCollection(),
CResMgr::mainMenu::help::bibleStudyHowTo::actionName CResMgr::mainMenu::help::bibleStudyHowTo::actionName
); );
action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip ); action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip );
@ -447,7 +447,7 @@ void BibleTime::initActions() {
actionCollection()->remove actionCollection()->remove
(actionCollection()->action(KStdAction::stdName( KStdAction::ReportBug ))); (actionCollection()->action(KStdAction::stdName( KStdAction::ReportBug )));
} }
action = KStdAction::reportBug(m_helpMenu, TQT_SLOT(reportBug()), actionCollection()); action = KStdAction::reportBug(m_helpMenu, TQ_SLOT(reportBug()), actionCollection());
action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip); action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip);
#if TDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
@ -457,7 +457,7 @@ void BibleTime::initActions() {
action = new TDEAction(i18n("&Daily tip"), action = new TDEAction(i18n("&Daily tip"),
CResMgr::mainMenu::help::dailyTip::icon, CResMgr::mainMenu::help::dailyTip::icon,
CResMgr::mainMenu::help::dailyTip::accel, CResMgr::mainMenu::help::dailyTip::accel,
this, TQT_SLOT(slotHelpTipOfDay()), actionCollection(), this, TQ_SLOT(slotHelpTipOfDay()), actionCollection(),
CResMgr::mainMenu::help::dailyTip::actionName CResMgr::mainMenu::help::dailyTip::actionName
); );
action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip); action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip);
@ -470,7 +470,7 @@ void BibleTime::initActions() {
actionCollection()->remove actionCollection()->remove
(actionCollection()->action(KStdAction::stdName( KStdAction::AboutApp ))); (actionCollection()->action(KStdAction::stdName( KStdAction::AboutApp )));
} }
action = KStdAction::aboutApp(m_helpMenu, TQT_SLOT(aboutApplication()), actionCollection()); action = KStdAction::aboutApp(m_helpMenu, TQ_SLOT(aboutApplication()), actionCollection());
action->setToolTip(CResMgr::mainMenu::help::aboutBibleTime::tooltip); action->setToolTip(CResMgr::mainMenu::help::aboutBibleTime::tooltip);
//delete About KDE action if KDE created it already //delete About KDE action if KDE created it already
@ -478,7 +478,7 @@ void BibleTime::initActions() {
actionCollection()->remove actionCollection()->remove
(actionCollection()->action(KStdAction::stdName( KStdAction::AboutKDE ))); (actionCollection()->action(KStdAction::stdName( KStdAction::AboutKDE )));
} }
action = KStdAction::aboutKDE(m_helpMenu, TQT_SLOT(aboutKDE()), actionCollection()); action = KStdAction::aboutKDE(m_helpMenu, TQ_SLOT(aboutKDE()), actionCollection());
action->setToolTip(CResMgr::mainMenu::help::aboutKDE::tooltip); action->setToolTip(CResMgr::mainMenu::help::aboutKDE::tooltip);
} }
@ -488,17 +488,17 @@ void BibleTime::initMenubar() {
m_windowMenu = dynamic_cast<TQPopupMenu*>(m_windowCloseAll_action->container(0)); m_windowMenu = dynamic_cast<TQPopupMenu*>(m_windowCloseAll_action->container(0));
} }
/** Initializes the TQT_SIGNAL / TQT_SLOT connections */ /** Initializes the signal / slot connections */
void BibleTime::initConnections() { void BibleTime::initConnections() {
connect(m_mdi, TQT_SIGNAL(sigSetToplevelCaption(const TQString&)), connect(m_mdi, TQ_SIGNAL(sigSetToplevelCaption(const TQString&)),
this, TQT_SLOT(setPlainCaption(const TQString&))); this, TQ_SLOT(setPlainCaption(const TQString&)));
connect(m_mdi, TQT_SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)), connect(m_mdi, TQ_SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)),
this, TQT_SLOT(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&))); this, TQ_SLOT(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)));
Q_ASSERT(m_windowMenu); Q_ASSERT(m_windowMenu);
if (m_windowMenu) { if (m_windowMenu) {
connect(m_windowMenu, TQT_SIGNAL(aboutToShow()), connect(m_windowMenu, TQ_SIGNAL(aboutToShow()),
this, TQT_SLOT(slotWindowMenuAboutToShow())); this, TQ_SLOT(slotWindowMenuAboutToShow()));
} }
else { else {
tqWarning("Main window: can't find window menu"); tqWarning("Main window: can't find window menu");
@ -506,14 +506,14 @@ void BibleTime::initConnections() {
connect( connect(
m_mainIndex, TQT_SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)), m_mainIndex, TQ_SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const TQString&)),
this, TQT_SLOT(createReadDisplayWindow(ListCSwordModuleInfo,const TQString&)) this, TQ_SLOT(createReadDisplayWindow(ListCSwordModuleInfo,const TQString&))
); );
connect( connect(
m_mainIndex, TQT_SIGNAL(createWriteDisplayWindow(CSwordModuleInfo*, const TQString&, const CDisplayWindow::WriteWindowType&)), m_mainIndex, TQ_SIGNAL(createWriteDisplayWindow(CSwordModuleInfo*, const TQString&, const CDisplayWindow::WriteWindowType&)),
this, TQT_SLOT(createWriteDisplayWindow(CSwordModuleInfo*,const TQString&, const CDisplayWindow::WriteWindowType&)) this, TQ_SLOT(createWriteDisplayWindow(CSwordModuleInfo*,const TQString&, const CDisplayWindow::WriteWindowType&))
); );
connect(m_mainIndex, TQT_SIGNAL(signalSwordSetupChanged()), this, TQT_SLOT(slotSwordSetupChanged())); connect(m_mainIndex, TQ_SIGNAL(signalSwordSetupChanged()), this, TQ_SLOT(slotSwordSetupChanged()));
} }
/** Initializes the backend */ /** Initializes the backend */

@ -86,7 +86,7 @@ private:
/** Opens the optionsdialog of BibleTime. */ /** Opens the optionsdialog of BibleTime. */
void BibleTime::slotSettingsOptions() { void BibleTime::slotSettingsOptions() {
COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", actionCollection()); COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", actionCollection());
connect(dlg, TQT_SIGNAL(signalSettingsChanged()), TQT_SLOT(slotSettingsChanged()) ); connect(dlg, TQ_SIGNAL(signalSettingsChanged()), TQ_SLOT(slotSettingsChanged()) );
dlg->exec(); dlg->exec();
dlg->delayedDestruct(); dlg->delayedDestruct();
@ -113,7 +113,7 @@ void BibleTime::slotSettingsChanged() {
/** Opens the sword setup dialog of BibleTime. */ /** Opens the sword setup dialog of BibleTime. */
void BibleTime::slotSwordSetupDialog() { void BibleTime::slotSwordSetupDialog() {
BookshelfManager::CSwordSetupDialog *dlg = new BookshelfManager::CSwordSetupDialog(this, "CSwordSetupDialog"); BookshelfManager::CSwordSetupDialog *dlg = new BookshelfManager::CSwordSetupDialog(this, "CSwordSetupDialog");
connect(dlg, TQT_SIGNAL(signalSwordSetupChanged()), TQT_SLOT(slotSwordSetupChanged()) ); connect(dlg, TQ_SIGNAL(signalSwordSetupChanged()), TQ_SLOT(slotSwordSetupChanged()) );
dlg->exec(); dlg->exec();
dlg->delayedDestruct(); dlg->delayedDestruct();
@ -188,7 +188,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
TQWidget* w = windows.at(i); TQWidget* w = windows.at(i);
Q_ASSERT(w); Q_ASSERT(w);
KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), this, TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection); KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), this, TQ_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
Q_ASSERT(action); Q_ASSERT(action);
action->setUserData(w); action->setUserData(w);

@ -55,12 +55,12 @@ namespace InfoDisplay {
m_htmlPart = CDisplay::createReadInstance(0, this); m_htmlPart = CDisplay::createReadInstance(0, this);
m_htmlPart->setMouseTracking(false); //we don't want strong/lemma/note mouse infos m_htmlPart->setMouseTracking(false); //we don't want strong/lemma/note mouse infos
KStdAction::copy(m_htmlPart->connectionsProxy(), TQT_SLOT(copySelection()), 0, "copyMagSelection"); KStdAction::copy(m_htmlPart->connectionsProxy(), TQ_SLOT(copySelection()), 0, "copyMagSelection");
connect( connect(
m_htmlPart->connectionsProxy(), m_htmlPart->connectionsProxy(),
TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), TQ_SIGNAL(referenceClicked(const TQString&, const TQString&)),
TQT_SLOT(lookup(const TQString&, const TQString&)) TQ_SLOT(lookup(const TQString&, const TQString&))
); );
layout->addWidget(headingLabel); layout->addWidget(headingLabel);

@ -50,21 +50,21 @@ CInputDialog::CInputDialog(const TQString& caption, const TQString& description,
TQPushButton* cancel = new TQPushButton(this); TQPushButton* cancel = new TQPushButton(this);
cancel->setText(i18n("&Cancel")); cancel->setText(i18n("&Cancel"));
connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
buttonLayout->addWidget(cancel,1); buttonLayout->addWidget(cancel,1);
buttonLayout->addSpacing(15); buttonLayout->addSpacing(15);
TQPushButton* clear = new TQPushButton(this); TQPushButton* clear = new TQPushButton(this);
clear->setText(i18n("C&lear")); clear->setText(i18n("C&lear"));
connect(clear, TQT_SIGNAL(clicked()),m_editWidget, TQT_SLOT(clear())); connect(clear, TQ_SIGNAL(clicked()),m_editWidget, TQ_SLOT(clear()));
buttonLayout->addWidget(clear,1); buttonLayout->addWidget(clear,1);
buttonLayout->addSpacing(15); buttonLayout->addSpacing(15);
TQPushButton* ok = new TQPushButton(this); TQPushButton* ok = new TQPushButton(this);
ok->setText(i18n("&Ok")); ok->setText(i18n("&Ok"));
connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
buttonLayout->addWidget(ok,1); buttonLayout->addWidget(ok,1);
m_editWidget->setFocus(); m_editWidget->setFocus();

@ -78,8 +78,8 @@ void CManageIndicesWidget::initView()
m_deleteIndicesButton->setIconSet(SmallIcon("remove", 16)); m_deleteIndicesButton->setIconSet(SmallIcon("remove", 16));
// connect our signals/slots // connect our signals/slots
connect(m_createIndicesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(createIndices())); connect(m_createIndicesButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(createIndices()));
connect(m_deleteIndicesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteIndices())); connect(m_deleteIndicesButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteIndices()));
} }
/** Populates the module list with installed modules and orphaned indices */ /** Populates the module list with installed modules and orphaned indices */

@ -48,8 +48,8 @@ void CMDIArea::initView() {
/** Initilizes the connectiosn to SIGNALS */ /** Initilizes the connectiosn to SIGNALS */
void CMDIArea::initConnections() { void CMDIArea::initConnections() {
connect(this, TQT_SIGNAL(windowActivated(TQWidget*)), connect(this, TQ_SIGNAL(windowActivated(TQWidget*)),
this, TQT_SLOT(slotClientActivated(TQWidget*))); this, TQ_SLOT(slotClientActivated(TQWidget*)));
} }
/** Called whan a client window was activated */ /** Called whan a client window was activated */
@ -315,13 +315,13 @@ void CMDIArea::triggerWindowUpdate() {
if (isUpdatesEnabled() && usableWindowList().count() ) { if (isUpdatesEnabled() && usableWindowList().count() ) {
switch (m_guiOption) { switch (m_guiOption) {
case autoTileVertical: case autoTileVertical:
TQTimer::singleShot(0, this, TQT_SLOT(myTileVertical())); TQTimer::singleShot(0, this, TQ_SLOT(myTileVertical()));
break; break;
case autoTileHorizontal: case autoTileHorizontal:
TQTimer::singleShot(0, this, TQT_SLOT(myTileHorizontal())); TQTimer::singleShot(0, this, TQ_SLOT(myTileHorizontal()));
break; break;
case autoCascade: case autoCascade:
TQTimer::singleShot(0, this, TQT_SLOT(myCascade())); TQTimer::singleShot(0, this, TQ_SLOT(myCascade()));
break; break;
default: default:
tqDebug("CMDIArea::triggerWindowUpdate: no known m_guiType"); tqDebug("CMDIArea::triggerWindowUpdate: no known m_guiType");

@ -47,8 +47,8 @@ void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules )
ListCSwordModuleInfo::const_iterator end_it = modules.end(); ListCSwordModuleInfo::const_iterator end_it = modules.end();
for( ListCSwordModuleInfo::const_iterator it = modules.begin(); it != end_it; ++it) { for( ListCSwordModuleInfo::const_iterator it = modules.begin(); it != end_it; ++it) {
(*it)->connectIndexingFinished(this, TQT_SLOT(slotFinished())); (*it)->connectIndexingFinished(this, TQ_SLOT(slotFinished()));
(*it)->connectIndexingProgress(this, TQT_SLOT(slotModuleProgress(int))); (*it)->connectIndexingProgress(this, TQ_SLOT(slotModuleProgress(int)));
progress->setLabel(i18n("Creating index for work %1").arg((*it)->name())); progress->setLabel(i18n("Creating index for work %1").arg((*it)->name()));
tqDebug("Building index for work %s", (*it)->name().latin1()); tqDebug("Building index for work %s", (*it)->name().latin1());

@ -176,8 +176,8 @@ void COptionsDialog::initDisplay() {
TQHBoxLayout* hboxlayout = new TQHBoxLayout(); TQHBoxLayout* hboxlayout = new TQHBoxLayout();
m_settings.displayStyle.styleChooser = new TQComboBox( page ); //create first to enable buddy for label m_settings.displayStyle.styleChooser = new TQComboBox( page ); //create first to enable buddy for label
connect( m_settings.displayStyle.styleChooser, TQT_SIGNAL( activated( int ) ), connect( m_settings.displayStyle.styleChooser, TQ_SIGNAL( activated( int ) ),
this, TQT_SLOT( updateStylePreview() ) ); this, TQ_SLOT( updateStylePreview() ) );
hboxlayout->addWidget( hboxlayout->addWidget(
new TQLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page) new TQLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page)
@ -335,7 +335,7 @@ void COptionsDialog::initLanguages() {
} }
m_settings.fonts.useOwnFontBox = new TQCheckBox(i18n("Use custom font"), page, "font checkbox"); m_settings.fonts.useOwnFontBox = new TQCheckBox(i18n("Use custom font"), page, "font checkbox");
connect(m_settings.fonts.useOwnFontBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(useOwnFontClicked(bool))); connect(m_settings.fonts.useOwnFontBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(useOwnFontClicked(bool)));
hLayout->addWidget(m_settings.fonts.useOwnFontBox); hLayout->addWidget(m_settings.fonts.useOwnFontBox);
layout->addLayout(hLayout); layout->addLayout(hLayout);
@ -345,8 +345,8 @@ void COptionsDialog::initLanguages() {
m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog.")); m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog."));
layout->addWidget(m_settings.fonts.fontChooser); layout->addWidget(m_settings.fonts.fontChooser);
connect(m_settings.fonts.fontChooser, TQT_SIGNAL(fontSelected(const TQFont&)), TQT_SLOT(newDisplayWindowFontSelected(const TQFont&))); connect(m_settings.fonts.fontChooser, TQ_SIGNAL(fontSelected(const TQFont&)), TQ_SLOT(newDisplayWindowFontSelected(const TQFont&)));
connect(m_settings.fonts.usage, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(newDisplayWindowFontAreaSelected(const TQString&))); connect(m_settings.fonts.usage, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(newDisplayWindowFontAreaSelected(const TQString&)));
m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].second ); m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].second );
useOwnFontClicked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first ); useOwnFontClicked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first );
@ -369,8 +369,8 @@ void COptionsDialog::initAccelerators() {
TQLabel* label = new TQLabel(i18n("Choose type:"), hbox); TQLabel* label = new TQLabel(i18n("Choose type:"), hbox);
m_settings.keys.typeChooser = new TQComboBox(hbox); m_settings.keys.typeChooser = new TQComboBox(hbox);
connect( connect(
m_settings.keys.typeChooser, TQT_SIGNAL(activated(const TQString&)), m_settings.keys.typeChooser, TQ_SIGNAL(activated(const TQString&)),
TQT_SLOT(slotKeyChooserTypeChanged(const TQString&)) TQ_SLOT(slotKeyChooserTypeChanged(const TQString&))
); );
TQLabel* dummy = new TQLabel( hbox ); // empty label for stretch TQLabel* dummy = new TQLabel( hbox ); // empty label for stretch

@ -96,22 +96,22 @@ namespace BookshelfManager {
m_swordPathListBox = new TQListView(page); m_swordPathListBox = new TQListView(page);
// m_swordPathListBox->setFullWidth(true); // m_swordPathListBox->setFullWidth(true);
m_swordPathListBox->addColumn(i18n("Path to bookshelf")); m_swordPathListBox->addColumn(i18n("Path to bookshelf"));
connect(m_swordPathListBox, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slot_swordPathSelected())); connect(m_swordPathListBox, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slot_swordPathSelected()));
layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1); layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1);
m_swordEditPathButton = new TQPushButton(i18n("Edit Entry"), page); m_swordEditPathButton = new TQPushButton(i18n("Edit Entry"), page);
m_swordEditPathButton->setIconSet(SmallIcon("edit", 16)); m_swordEditPathButton->setIconSet(SmallIcon("edit", 16));
connect(m_swordEditPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordEditClicked())); connect(m_swordEditPathButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_swordEditClicked()));
layout->addWidget(m_swordEditPathButton, 2, 3); layout->addWidget(m_swordEditPathButton, 2, 3);
m_swordAddPathButton = new TQPushButton(i18n("Add Entry"), page); m_swordAddPathButton = new TQPushButton(i18n("Add Entry"), page);
m_swordAddPathButton->setIconSet(SmallIcon("edit_add", 16)); m_swordAddPathButton->setIconSet(SmallIcon("edit_add", 16));
connect(m_swordAddPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordAddClicked())); connect(m_swordAddPathButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_swordAddClicked()));
layout->addWidget(m_swordAddPathButton, 3,3); layout->addWidget(m_swordAddPathButton, 3,3);
m_swordRemovePathButton = new TQPushButton(i18n("Remove Entry"), page); m_swordRemovePathButton = new TQPushButton(i18n("Remove Entry"), page);
m_swordRemovePathButton->setIconSet(SmallIcon("edit-delete", 16)); m_swordRemovePathButton->setIconSet(SmallIcon("edit-delete", 16));
connect(m_swordRemovePathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordRemoveClicked())); connect(m_swordRemovePathButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_swordRemoveClicked()));
layout->addWidget(m_swordRemovePathButton, 4,3); layout->addWidget(m_swordRemovePathButton, 4,3);
setupSwordPathListBox(); setupSwordPathListBox();
@ -157,12 +157,12 @@ the module remote installation feature!</b>")
TQPushButton* deleteSourceButton = new TQPushButton(i18n("Delete library"), m_installSourcePage); TQPushButton* deleteSourceButton = new TQPushButton(i18n("Delete library"), m_installSourcePage);
deleteSourceButton->setIconSet(SmallIcon("remove", 16)); deleteSourceButton->setIconSet(SmallIcon("remove", 16));
connect(deleteSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installDeleteSource())); connect(deleteSourceButton, TQ_SIGNAL(clicked()), TQ_SLOT(slot_installDeleteSource()));
layout->addWidget(deleteSourceButton, 2, 1, TQt::AlignLeft); layout->addWidget(deleteSourceButton, 2, 1, TQt::AlignLeft);
TQPushButton* addSourceButton = new TQPushButton(i18n("Add library"), m_installSourcePage); TQPushButton* addSourceButton = new TQPushButton(i18n("Add library"), m_installSourcePage);
addSourceButton->setIconSet(SmallIcon("folder-new", 16)); addSourceButton->setIconSet(SmallIcon("folder-new", 16));
connect(addSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installAddSource())); connect(addSourceButton, TQ_SIGNAL(clicked()), TQ_SLOT(slot_installAddSource()));
layout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft); layout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft);
m_sourceLabel = new TQLabel(m_installSourcePage); m_sourceLabel = new TQLabel(m_installSourcePage);
@ -190,13 +190,13 @@ the module remote installation feature!</b>")
m_installContinueButton = new TQPushButton(i18n("Connect to library"), m_installPage); m_installContinueButton = new TQPushButton(i18n("Connect to library"), m_installPage);
m_installContinueButton->setIconSet(SmallIcon("forward",16)); m_installContinueButton->setIconSet(SmallIcon("forward",16));
connect(m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource())); connect(m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_connectToSource()));
myHBox->addWidget(m_installContinueButton); myHBox->addWidget(m_installContinueButton);
m_installBackButton->setEnabled(false); m_installBackButton->setEnabled(false);
connect(m_sourceCombo, TQT_SIGNAL( highlighted(const TQString&) ), TQT_SLOT( slot_sourceSelected( const TQString&) )); connect(m_sourceCombo, TQ_SIGNAL( highlighted(const TQString&) ), TQ_SLOT( slot_sourceSelected( const TQString&) ));
connect(m_targetCombo, TQT_SIGNAL( highlighted(const TQString&) ), TQT_SLOT( slot_targetSelected( const TQString&) )); connect(m_targetCombo, TQ_SIGNAL( highlighted(const TQString&) ), TQ_SLOT( slot_targetSelected( const TQString&) ));
populateInstallCombos(); populateInstallCombos();
slot_sourceSelected( m_sourceCombo->currentText() ); slot_sourceSelected( m_sourceCombo->currentText() );
@ -230,8 +230,8 @@ the module remote installation feature!</b>")
m_removeRemoveButton->setIconSet( SmallIcon("edittrash", 16) ); m_removeRemoveButton->setIconSet( SmallIcon("edittrash", 16) );
layout->addWidget(m_removeRemoveButton, 3, 3, TQt::AlignRight); layout->addWidget(m_removeRemoveButton, 3, 3, TQt::AlignRight);
connect(m_removeRemoveButton, TQT_SIGNAL(clicked()), connect(m_removeRemoveButton, TQ_SIGNAL(clicked()),
this, TQT_SLOT(slot_doRemoveModules())); this, TQ_SLOT(slot_doRemoveModules()));
populateRemoveModuleListView(); populateRemoveModuleListView();
} }
@ -490,12 +490,12 @@ the module remote installation feature!</b>")
TDEApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
connect( connect(
m_progressDialog, TQT_SIGNAL(cancelClicked()), m_progressDialog, TQ_SIGNAL(cancelClicked()),
TQT_SLOT(slot_moduleRefreshProgressCancelClicked()) TQ_SLOT(slot_moduleRefreshProgressCancelClicked())
); );
connect( connect(
&iMgr, TQT_SIGNAL(completed(const int, const int)), &iMgr, TQ_SIGNAL(completed(const int, const int)),
TQT_SLOT(slot_moduleRefreshCompleted(const int, const int)) TQ_SLOT(slot_moduleRefreshCompleted(const int, const int))
); );
@ -635,21 +635,21 @@ the module remote installation feature!</b>")
layout->setColStretch(0,5); layout->setColStretch(0,5);
layout->setRowStretch(1,5); layout->setRowStretch(1,5);
connect(m_installModuleListView, TQT_SIGNAL(selectedModulesChanged()), TQT_SLOT(slot_installModulesChanged())); connect(m_installModuleListView, TQ_SIGNAL(selectedModulesChanged()), TQ_SLOT(slot_installModulesChanged()));
} }
if (populateInstallModuleListView( currentInstallSource() ) ){ if (populateInstallModuleListView( currentInstallSource() ) ){
//code valid for already existing and newly created widgets //code valid for already existing and newly created widgets
disconnect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource())); disconnect( m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_connectToSource()));
connect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_installModules())); connect( m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_installModules()));
m_installContinueButton->setText(i18n("Install works")); m_installContinueButton->setText(i18n("Install works"));
m_installContinueButton->setEnabled(false); m_installContinueButton->setEnabled(false);
m_installWidgetStack->raiseWidget(m_installModuleListPage); m_installWidgetStack->raiseWidget(m_installModuleListPage);
connect( m_installBackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_showInstallSourcePage())); connect( m_installBackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_showInstallSourcePage()));
m_installBackButton->setEnabled(true); m_installBackButton->setEnabled(true);
} }
} }
@ -730,12 +730,12 @@ the module remote installation feature!</b>")
TDEApplication::kApplication()->processEvents(); TDEApplication::kApplication()->processEvents();
connect( connect(
m_progressDialog, TQT_SIGNAL(cancelClicked()), m_progressDialog, TQ_SIGNAL(cancelClicked()),
TQT_SLOT(slot_installProgressCancelClicked()) TQ_SLOT(slot_installProgressCancelClicked())
); );
connect( connect(
&iMgr, TQT_SIGNAL(completed(const int, const int)), &iMgr, TQ_SIGNAL(completed(const int, const int)),
TQT_SLOT(installCompleted(const int, const int)) TQ_SLOT(installCompleted(const int, const int))
); );
for ( TQStringList::Iterator it = moduleList.begin(); (it != moduleList.end()) && !m_progressDialog->wasCancelled(); ++it, ++m_installedModuleCount ) { for ( TQStringList::Iterator it = moduleList.begin(); (it != moduleList.end()) && !m_progressDialog->wasCancelled(); ++it, ++m_installedModuleCount ) {
@ -801,8 +801,8 @@ the module remote installation feature!</b>")
} }
void CSwordSetupDialog::slot_showInstallSourcePage() { void CSwordSetupDialog::slot_showInstallSourcePage() {
connect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource())); connect( m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_connectToSource()));
disconnect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_installModules())); disconnect( m_installContinueButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slot_installModules()));
m_installBackButton->setEnabled(false); m_installBackButton->setEnabled(false);
m_installContinueButton->setText(i18n("Connect to library")); m_installContinueButton->setText(i18n("Connect to library"));

@ -84,9 +84,9 @@ namespace BookshelfManager {
buttonLayout->addWidget( okButton); buttonLayout->addWidget( okButton);
buttonLayout->addStretch(); buttonLayout->addStretch();
connect( okButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); connect( okButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOk() ) );
connect( discardButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); connect( discardButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
connect( m_protocolCombo, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotProtocolChanged() ) ); connect( m_protocolCombo, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotProtocolChanged() ) );
} }
void CSwordSetupInstallSourcesDialog::slotOk() { void CSwordSetupInstallSourcesDialog::slotOk() {

@ -124,9 +124,9 @@ namespace BookshelfManager {
m_categoryDevotionals->setOpen(true); m_categoryDevotionals->setOpen(true);
m_categoryGlossaries->setOpen(true); m_categoryGlossaries->setOpen(true);
// connect(this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); // connect(this, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*)));
connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); //items have to be clicked only once in double click mode connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); //items have to be clicked only once in double click mode
connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*)));
} }
void CSwordSetupModuleListView::finish() { void CSwordSetupModuleListView::finish() {

@ -205,7 +205,7 @@ void CHTMLReadDisplay::moveToAnchor( const TQString& anchor ) {
m_currentAnchorCache = anchor; m_currentAnchorCache = anchor;
//This is an ugly hack to work around a KDE problem in KDE including 3.3.1 (no later versions tested so far) //This is an ugly hack to work around a KDE problem in KDE including 3.3.1 (no later versions tested so far)
TQTimer::singleShot(0, this, TQT_SLOT(slotGoToAnchor())); TQTimer::singleShot(0, this, TQ_SLOT(slotGoToAnchor()));
// instead of: // instead of:
// slotGoToAnchor(); // slotGoToAnchor();
@ -442,8 +442,8 @@ void CHTMLReadDisplayView::popupMenu( const TQString& url, const TQPoint& pos) {
/** Reimplementation from TQScrollView. Sets the right slots */ /** Reimplementation from TQScrollView. Sets the right slots */
void CHTMLReadDisplayView::polish() { void CHTMLReadDisplayView::polish() {
TDEHTMLView::polish(); TDEHTMLView::polish();
connect( part(), TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), connect( part(), TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
this, TQT_SLOT(popupMenu(const TQString&, const TQPoint&))); this, TQ_SLOT(popupMenu(const TQString&, const TQPoint&)));
} }
/** Reimplementatiob from TQScrollView. */ /** Reimplementatiob from TQScrollView. */

@ -138,7 +138,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
m_actions.fontChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontFamily::tooltip ); m_actions.fontChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontFamily::tooltip );
m_actions.fontChooser->plug(bar); m_actions.fontChooser->plug(bar);
connect(m_actions.fontChooser, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setFamily(const TQString&))); connect(m_actions.fontChooser, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setFamily(const TQString&)));
m_actions.fontSizeChooser = new TDEFontSizeAction( i18n("Choose a font size"), m_actions.fontSizeChooser = new TDEFontSizeAction( i18n("Choose a font size"),
@ -149,10 +149,10 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
m_actions.fontSizeChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontSize::tooltip ); m_actions.fontSizeChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontSize::tooltip );
m_actions.fontSizeChooser->plug(bar); m_actions.fontSizeChooser->plug(bar);
connect(m_actions.fontSizeChooser, TQT_SIGNAL(fontSizeChanged(int)), this, TQT_SLOT(setPointSize(int))); connect(m_actions.fontSizeChooser, TQ_SIGNAL(fontSizeChanged(int)), this, TQ_SLOT(setPointSize(int)));
m_colorButton = new KColorButton(bar); m_colorButton = new KColorButton(bar);
connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotColorSelected(const TQColor&))); connect(m_colorButton, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotColorSelected(const TQColor&)));
bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton); bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton);
TQToolTip::add TQToolTip::add
(m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip ); (m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip );
@ -164,7 +164,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
m_actions.bold = new TDEToggleAction( i18n("Bold"), m_actions.bold = new TDEToggleAction( i18n("Bold"),
CResMgr::displaywindows::writeWindow::boldText::icon, CResMgr::displaywindows::writeWindow::boldText::icon,
CResMgr::displaywindows::writeWindow::boldText::accel, CResMgr::displaywindows::writeWindow::boldText::accel,
this, TQT_SLOT(toggleBold()), this, TQ_SLOT(toggleBold()),
actions, actions,
CResMgr::displaywindows::writeWindow::boldText::actionName CResMgr::displaywindows::writeWindow::boldText::actionName
); );
@ -175,7 +175,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
m_actions.italic = new TDEToggleAction( i18n("Italic"), m_actions.italic = new TDEToggleAction( i18n("Italic"),
CResMgr::displaywindows::writeWindow::italicText::icon, CResMgr::displaywindows::writeWindow::italicText::icon,
CResMgr::displaywindows::writeWindow::italicText::accel, CResMgr::displaywindows::writeWindow::italicText::accel,
this, TQT_SLOT(toggleItalic()), this, TQ_SLOT(toggleItalic()),
actions, actions,
CResMgr::displaywindows::writeWindow::italicText::actionName CResMgr::displaywindows::writeWindow::italicText::actionName
); );
@ -186,7 +186,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
m_actions.underline = new TDEToggleAction( i18n("Underline"), m_actions.underline = new TDEToggleAction( i18n("Underline"),
CResMgr::displaywindows::writeWindow::underlinedText::icon, CResMgr::displaywindows::writeWindow::underlinedText::icon,
CResMgr::displaywindows::writeWindow::underlinedText::accel, CResMgr::displaywindows::writeWindow::underlinedText::accel,
this, TQT_SLOT(toggleUnderline()), this, TQ_SLOT(toggleUnderline()),
actions, actions,
CResMgr::displaywindows::writeWindow::underlinedText::actionName CResMgr::displaywindows::writeWindow::underlinedText::actionName
); );
@ -200,7 +200,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
m_actions.alignLeft = new TDEToggleAction( i18n("Left"), m_actions.alignLeft = new TDEToggleAction( i18n("Left"),
CResMgr::displaywindows::writeWindow::alignLeft::icon, CResMgr::displaywindows::writeWindow::alignLeft::icon,
CResMgr::displaywindows::writeWindow::alignLeft::accel, CResMgr::displaywindows::writeWindow::alignLeft::accel,
this, TQT_SLOT( alignLeft() ), this, TQ_SLOT( alignLeft() ),
actions, actions,
CResMgr::displaywindows::writeWindow::alignLeft::actionName CResMgr::displaywindows::writeWindow::alignLeft::actionName
); );
@ -211,7 +211,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
m_actions.alignCenter = new TDEToggleAction( i18n("Center"), m_actions.alignCenter = new TDEToggleAction( i18n("Center"),
CResMgr::displaywindows::writeWindow::alignCenter::icon, CResMgr::displaywindows::writeWindow::alignCenter::icon,
CResMgr::displaywindows::writeWindow::alignCenter::accel, CResMgr::displaywindows::writeWindow::alignCenter::accel,
this, TQT_SLOT(alignCenter()), this, TQ_SLOT(alignCenter()),
actions, actions,
CResMgr::displaywindows::writeWindow::alignCenter::actionName CResMgr::displaywindows::writeWindow::alignCenter::actionName
); );
@ -222,7 +222,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
m_actions.alignRight = new TDEToggleAction( i18n("Right"), m_actions.alignRight = new TDEToggleAction( i18n("Right"),
CResMgr::displaywindows::writeWindow::alignRight::icon, CResMgr::displaywindows::writeWindow::alignRight::icon,
CResMgr::displaywindows::writeWindow::alignRight::accel, CResMgr::displaywindows::writeWindow::alignRight::accel,
this, TQT_SLOT(alignRight()), this, TQ_SLOT(alignRight()),
actions, actions,
CResMgr::displaywindows::writeWindow::alignRight::actionName CResMgr::displaywindows::writeWindow::alignRight::actionName
); );
@ -233,7 +233,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
// m_actions.alignJustify = new TDEToggleAction( i18n("Justify"), // m_actions.alignJustify = new TDEToggleAction( i18n("Justify"),
// CResMgr::displaywindows::writeWindow::alignJustify::icon, // CResMgr::displaywindows::writeWindow::alignJustify::icon,
// CResMgr::displaywindows::writeWindow::alignJustify::accel, // CResMgr::displaywindows::writeWindow::alignJustify::accel,
// this, TQT_SLOT( alignJustify() ), // this, TQ_SLOT( alignJustify() ),
// actions // actions
// ); // );
// m_actions.alignJustify->setToolTip( CResMgr::displaywindows::writeWindow::alignJustify::tooltip ); // m_actions.alignJustify->setToolTip( CResMgr::displaywindows::writeWindow::alignJustify::tooltip );
@ -241,9 +241,9 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
// m_actions.alignJustify->plug(bar); // m_actions.alignJustify->plug(bar);
connect(this, TQT_SIGNAL(currentFontChanged(const TQFont&)), TQT_SLOT(slotFontChanged(const TQFont&))); connect(this, TQ_SIGNAL(currentFontChanged(const TQFont&)), TQ_SLOT(slotFontChanged(const TQFont&)));
connect(this, TQT_SIGNAL(currentAlignmentChanged(int)), TQT_SLOT(slotAlignmentChanged(int))); connect(this, TQ_SIGNAL(currentAlignmentChanged(int)), TQ_SLOT(slotAlignmentChanged(int)));
connect(this, TQT_SIGNAL(currentColorChanged(const TQColor&)), TQT_SLOT(slotColorChanged(const TQColor&))); connect(this, TQ_SIGNAL(currentColorChanged(const TQColor&)), TQ_SLOT(slotColorChanged(const TQColor&)));
//set initial values for toolbar items //set initial values for toolbar items
@ -255,7 +255,7 @@ void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * act
/** Reimplementation to show a popup menu if the right mouse butoon was clicked. */ /** Reimplementation to show a popup menu if the right mouse butoon was clicked. */
TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) { TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) {
if (!m_actions.selectAll) { if (!m_actions.selectAll) {
m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), this, TQT_SLOT(selectAll()), this); m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), this, TQ_SLOT(selectAll()), this);
} }
TDEPopupMenu* popup = new TDEPopupMenu(this); TDEPopupMenu* popup = new TDEPopupMenu(this);

@ -28,8 +28,8 @@ CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* par
setAcceptDrops(true); setAcceptDrops(true);
viewport()->setAcceptDrops(true); viewport()->setAcceptDrops(true);
connect(this, TQT_SIGNAL(textChanged()), connect(this, TQ_SIGNAL(textChanged()),
connectionsProxy(), TQT_SLOT(emitTextChanged())); connectionsProxy(), TQ_SLOT(emitTextChanged()));
} }
CPlainWriteDisplay::~CPlainWriteDisplay() {} CPlainWriteDisplay::~CPlainWriteDisplay() {}

@ -133,37 +133,37 @@ void CBibleReadWindow::initActions() {
new TDEAction( new TDEAction(
i18n("Next book"), i18n("Next book"),
CResMgr::displaywindows::bibleWindow::nextBook::accel, CResMgr::displaywindows::bibleWindow::nextBook::accel,
this, TQT_SLOT(nextBook()), this, TQ_SLOT(nextBook()),
actionCollection(), "nextBook" actionCollection(), "nextBook"
); );
new TDEAction( new TDEAction(
i18n("Previous book"), i18n("Previous book"),
CResMgr::displaywindows::bibleWindow::previousBook::accel, CResMgr::displaywindows::bibleWindow::previousBook::accel,
this, TQT_SLOT(previousBook()), this, TQ_SLOT(previousBook()),
actionCollection(), "previousBook" actionCollection(), "previousBook"
); );
new TDEAction( new TDEAction(
i18n("Next chapter"), i18n("Next chapter"),
CResMgr::displaywindows::bibleWindow::nextChapter::accel, CResMgr::displaywindows::bibleWindow::nextChapter::accel,
this, TQT_SLOT(nextChapter()), this, TQ_SLOT(nextChapter()),
actionCollection(), "nextChapter" actionCollection(), "nextChapter"
); );
new TDEAction( new TDEAction(
i18n("Previous chapter"), i18n("Previous chapter"),
CResMgr::displaywindows::bibleWindow::previousChapter::accel, CResMgr::displaywindows::bibleWindow::previousChapter::accel,
this, TQT_SLOT(previousChapter()), this, TQ_SLOT(previousChapter()),
actionCollection(), "previousChapter" actionCollection(), "previousChapter"
); );
new TDEAction( new TDEAction(
i18n("Next verse"), i18n("Next verse"),
CResMgr::displaywindows::bibleWindow::nextVerse::accel, CResMgr::displaywindows::bibleWindow::nextVerse::accel,
this, TQT_SLOT(nextVerse()), this, TQ_SLOT(nextVerse()),
actionCollection(), "nextVerse" actionCollection(), "nextVerse"
); );
new TDEAction( new TDEAction(
i18n("Previous verse"), i18n("Previous verse"),
CResMgr::displaywindows::bibleWindow::previousVerse::accel, CResMgr::displaywindows::bibleWindow::previousVerse::accel,
this, TQT_SLOT(previousVerse()), this, TQ_SLOT(previousVerse()),
actionCollection(), "previousVerse" actionCollection(), "previousVerse"
); );
@ -177,31 +177,31 @@ void CBibleReadWindow::initActions() {
i18n("Strong's Search"), i18n("Strong's Search"),
CResMgr::displaywindows::general::findStrongs::icon, CResMgr::displaywindows::general::findStrongs::icon,
CResMgr::displaywindows::general::findStrongs::accel, CResMgr::displaywindows::general::findStrongs::accel,
this, TQT_SLOT(openSearchStrongsDialog()), this, TQ_SLOT(openSearchStrongsDialog()),
actionCollection(), actionCollection(),
CResMgr::displaywindows::general::findStrongs::actionName); CResMgr::displaywindows::general::findStrongs::actionName);
m_actions.copy.referenceOnly = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); m_actions.copy.referenceOnly = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
m_actions.copy.referenceTextOnly = new TDEAction(i18n("Text of reference"), TDEShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference"); m_actions.copy.referenceTextOnly = new TDEAction(i18n("Text of reference"), TDEShortcut(0),displayWidget()->connectionsProxy(), TQ_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
m_actions.copy.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText"); m_actions.copy.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter"); m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQ_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
m_actions.copy.selectedText = actionCollection()->action("copySelectedText"); m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
Q_ASSERT(m_actions.copy.selectedText); Q_ASSERT(m_actions.copy.selectedText);
m_actions.save.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText"); m_actions.save.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.save.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), this, TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText"); m_actions.save.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), this, TQ_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), this, TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML"); m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), this, TQ_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText"); m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printChapter"); m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), this, TQ_SLOT(printAll()), actionCollection(), "printChapter");
CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection()); CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection());
} }
@ -210,7 +210,7 @@ void CBibleReadWindow::initConnections() {
CLexiconReadWindow::initConnections(); CLexiconReadWindow::initConnections();
/* if (m_transliterationButton) { // Transliteration is not always available /* if (m_transliterationButton) { // Transliteration is not always available
connect(m_transliterationButton, TQT_SIGNAL(sigChanged()), TQT_SLOT(lookup())); connect(m_transliterationButton, TQ_SIGNAL(sigChanged()), TQ_SLOT(lookup()));
}*/ }*/
} }
@ -424,7 +424,7 @@ bool CBibleReadWindow::eventFilter( TQObject* o, TQEvent* e) {
* This is not really in a TDEHTML event handler but works anyway. * This is not really in a TDEHTML event handler but works anyway.
* Sometime KDE/TQt is hard to use ... * Sometime KDE/TQt is hard to use ...
*/ */
TQTimer::singleShot(0, this, TQT_SLOT(syncWindows())); TQTimer::singleShot(0, this, TQ_SLOT(syncWindows()));
} }
return ret; return ret;

@ -65,7 +65,7 @@ void CBookReadWindow::initActions() {
i18n("Toggle tree view"), i18n("Toggle tree view"),
CResMgr::displaywindows::bookWindow::toggleTree::icon, CResMgr::displaywindows::bookWindow::toggleTree::icon,
CResMgr::displaywindows::bookWindow::toggleTree::accel, CResMgr::displaywindows::bookWindow::toggleTree::accel,
this, TQT_SLOT(treeToggled()), this, TQ_SLOT(treeToggled()),
actionCollection(), "toggleTree"); actionCollection(), "toggleTree");
CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection()); CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection());
@ -92,12 +92,12 @@ void CBookReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
void CBookReadWindow::initConnections() { void CBookReadWindow::initConnections() {
CLexiconReadWindow::initConnections(); CLexiconReadWindow::initConnections();
connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)), connect(m_treeChooser, TQ_SIGNAL(keyChanged(CSwordKey*)),
this, TQT_SLOT(lookup(CSwordKey*))); this, TQ_SLOT(lookup(CSwordKey*)));
connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)), connect(m_treeChooser, TQ_SIGNAL(keyChanged(CSwordKey*)),
keyChooser(), TQT_SLOT(updateKey(CSwordKey*))); keyChooser(), TQ_SLOT(updateKey(CSwordKey*)));
connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), connect(keyChooser(), TQ_SIGNAL(keyChanged(CSwordKey*)),
m_treeChooser, TQT_SLOT(updateKey(CSwordKey*))); m_treeChooser, TQ_SLOT(updateKey(CSwordKey*)));
} }
/** Init the view */ /** Init the view */

@ -34,7 +34,7 @@
// setPopup(m_popup); // setPopup(m_popup);
// setPopupDelay(0001); // setPopupDelay(0001);
// //
// connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(optionSelected(int))); // connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(optionSelected(int)));
// populateMenu(); // populateMenu();
// } // }
// //
@ -97,7 +97,7 @@ CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *di
setPopup(m_popup); setPopup(m_popup);
setPopupDelay(0001); //Fix, O only opens menu on mouse release or move setPopupDelay(0001); //Fix, O only opens menu on mouse release or move
connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(optionToggled(int))); connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(optionToggled(int)));
populateMenu(); populateMenu();
} }

@ -110,37 +110,37 @@ void CCommentaryReadWindow::initActions() {
new TDEAction( new TDEAction(
i18n("Next book"), i18n("Next book"),
CResMgr::displaywindows::bibleWindow::nextBook::accel, CResMgr::displaywindows::bibleWindow::nextBook::accel,
this, TQT_SLOT(nextBook()), this, TQ_SLOT(nextBook()),
actionCollection(), "nextBook" actionCollection(), "nextBook"
); );
new TDEAction( new TDEAction(
i18n("Previous book"), i18n("Previous book"),
CResMgr::displaywindows::bibleWindow::previousBook::accel, CResMgr::displaywindows::bibleWindow::previousBook::accel,
this, TQT_SLOT(previousBook()), this, TQ_SLOT(previousBook()),
actionCollection(), "previousBook" actionCollection(), "previousBook"
); );
new TDEAction( new TDEAction(
i18n("Next chapter"), i18n("Next chapter"),
CResMgr::displaywindows::bibleWindow::nextChapter::accel, CResMgr::displaywindows::bibleWindow::nextChapter::accel,
this, TQT_SLOT(nextChapter()), this, TQ_SLOT(nextChapter()),
actionCollection(), "nextChapter" actionCollection(), "nextChapter"
); );
new TDEAction( new TDEAction(
i18n("Previous chapter"), i18n("Previous chapter"),
CResMgr::displaywindows::bibleWindow::previousChapter::accel, CResMgr::displaywindows::bibleWindow::previousChapter::accel,
this, TQT_SLOT(previousChapter()), this, TQ_SLOT(previousChapter()),
actionCollection(), "previousChapter" actionCollection(), "previousChapter"
); );
new TDEAction( new TDEAction(
i18n("Next verse"), i18n("Next verse"),
CResMgr::displaywindows::bibleWindow::nextVerse::accel, CResMgr::displaywindows::bibleWindow::nextVerse::accel,
this, TQT_SLOT(nextVerse()), this, TQ_SLOT(nextVerse()),
actionCollection(), "nextVerse" actionCollection(), "nextVerse"
); );
new TDEAction( new TDEAction(
i18n("Previous verse"), i18n("Previous verse"),
CResMgr::displaywindows::bibleWindow::previousVerse::accel, CResMgr::displaywindows::bibleWindow::previousVerse::accel,
this, TQT_SLOT(previousVerse()), this, TQ_SLOT(previousVerse()),
actionCollection(), "previousVerse" actionCollection(), "previousVerse"
); );

@ -161,47 +161,47 @@ void CDisplayWindow::initActions() {
new TDEAction(i18n("Search"), new TDEAction(i18n("Search"),
CResMgr::displaywindows::general::search::icon, CResMgr::displaywindows::general::search::icon,
CResMgr::displaywindows::general::search::accel, CResMgr::displaywindows::general::search::accel,
this, TQT_SLOT(slotSearchInModules()), this, TQ_SLOT(slotSearchInModules()),
actionCollection(), CResMgr::displaywindows::general::search::actionName actionCollection(), CResMgr::displaywindows::general::search::actionName
); );
KStdAction::zoomIn( KStdAction::zoomIn(
displayWidget()->connectionsProxy(), TQT_SLOT(zoomIn()), displayWidget()->connectionsProxy(), TQ_SLOT(zoomIn()),
actionCollection(), "zoomIn" actionCollection(), "zoomIn"
); );
KStdAction::zoomOut( KStdAction::zoomOut(
displayWidget()->connectionsProxy(), TQT_SLOT(zoomOut()), displayWidget()->connectionsProxy(), TQ_SLOT(zoomOut()),
actionCollection(), "zoomOut" actionCollection(), "zoomOut"
); );
KStdAction::close( KStdAction::close(
this, TQT_SLOT(close()), this, TQ_SLOT(close()),
actionCollection(), "closeWindow" actionCollection(), "closeWindow"
); );
KStdAction::selectAll( KStdAction::selectAll(
displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), displayWidget()->connectionsProxy(), TQ_SLOT(selectAll()),
actionCollection(), "selectAll" actionCollection(), "selectAll"
); );
KStdAction::copy( KStdAction::copy(
displayWidget()->connectionsProxy(), TQT_SLOT(copySelection()), displayWidget()->connectionsProxy(), TQ_SLOT(copySelection()),
actionCollection(), "copySelectedText" actionCollection(), "copySelectedText"
); );
KStdAction::find( KStdAction::find(
displayWidget()->connectionsProxy(), TQT_SLOT(openFindTextDialog()), displayWidget()->connectionsProxy(), TQ_SLOT(openFindTextDialog()),
actionCollection(), "findText" actionCollection(), "findText"
); );
new TDEToolBarPopupAction( new TDEToolBarPopupAction(
i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel, i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel,
keyChooser(), TQT_SLOT( backInHistory() ), keyChooser(), TQ_SLOT( backInHistory() ),
actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName
); );
new TDEToolBarPopupAction( new TDEToolBarPopupAction(
i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel, i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel,
keyChooser(), TQT_SLOT( forwardInHistory() ), keyChooser(), TQ_SLOT( forwardInHistory() ),
actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName
); );
@ -323,13 +323,13 @@ CModuleChooserBar* const CDisplayWindow::moduleChooserBar() const {
/** Sets the module chooser bar. */ /** Sets the module chooser bar. */
void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ) { void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ) {
if (m_moduleChooserBar) { if (m_moduleChooserBar) {
disconnect(m_moduleChooserBar, TQT_SIGNAL(sigChanged()), this, TQT_SLOT(modulesChanged())); disconnect(m_moduleChooserBar, TQ_SIGNAL(sigChanged()), this, TQ_SLOT(modulesChanged()));
} }
//if a new bar should be set! //if a new bar should be set!
if (bar) { if (bar) {
m_moduleChooserBar = bar; m_moduleChooserBar = bar;
connect(bar, TQT_SIGNAL(sigChanged()), TQT_SLOT(modulesChanged())); connect(bar, TQ_SIGNAL(sigChanged()), TQ_SLOT(modulesChanged()));
} }
} }
@ -397,10 +397,10 @@ CDisplaySettingsButton* const CDisplayWindow::displaySettingsButton() const {
/** Sets the display settings button. */ /** Sets the display settings button. */
void CDisplayWindow::setDisplaySettingsButton( CDisplaySettingsButton* button ) { void CDisplayWindow::setDisplaySettingsButton( CDisplaySettingsButton* button ) {
if (m_displaySettingsButton) if (m_displaySettingsButton)
disconnect(m_displaySettingsButton, TQT_SIGNAL( sigChanged() ),this, TQT_SLOT(lookup() )); disconnect(m_displaySettingsButton, TQ_SIGNAL( sigChanged() ),this, TQ_SLOT(lookup() ));
m_displaySettingsButton = button; m_displaySettingsButton = button;
connect(m_displaySettingsButton, TQT_SIGNAL(sigChanged()),this, TQT_SLOT(lookup())); connect(m_displaySettingsButton, TQ_SIGNAL(sigChanged()),this, TQ_SLOT(lookup()));
} }
/** Lookup the current key. Used to refresh the display. */ /** Lookup the current key. Used to refresh the display. */
@ -453,7 +453,7 @@ TDEPopupMenu* const CDisplayWindow::popup() {
// tqWarning("CReadWindow::popup()"); // tqWarning("CReadWindow::popup()");
if (!m_popupMenu) { if (!m_popupMenu) {
m_popupMenu = new TDEPopupMenu(this); m_popupMenu = new TDEPopupMenu(this);
connect(m_popupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updatePopupMenu())); connect(m_popupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(updatePopupMenu()));
if (displayWidget()) { if (displayWidget()) {
displayWidget()->installPopup(m_popupMenu); displayWidget()->installPopup(m_popupMenu);
} }

@ -48,10 +48,10 @@ void CHTMLWriteWindow::initView() {
void CHTMLWriteWindow::initConnections() { void CHTMLWriteWindow::initConnections() {
CWriteWindow::initConnections(); CWriteWindow::initConnections();
connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), connect(keyChooser(), TQ_SIGNAL(keyChanged(CSwordKey*)),
this, TQT_SLOT(lookup(CSwordKey*))); this, TQ_SLOT(lookup(CSwordKey*)));
connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()), connect(displayWidget()->connectionsProxy(), TQ_SIGNAL(textChanged()),
this, TQT_SLOT(textChanged()) ); this, TQ_SLOT(textChanged()) );
}; };
void CHTMLWriteWindow::initToolbars() { void CHTMLWriteWindow::initToolbars() {
@ -68,7 +68,7 @@ void CHTMLWriteWindow::initToolbars() {
m_actions.saveText = new TDEAction( i18n("Save text"), m_actions.saveText = new TDEAction( i18n("Save text"),
CResMgr::displaywindows::writeWindow::saveText::icon, CResMgr::displaywindows::writeWindow::saveText::icon,
CResMgr::displaywindows::writeWindow::saveText::accel, CResMgr::displaywindows::writeWindow::saveText::accel,
this, TQT_SLOT( saveCurrentText() ), this, TQ_SLOT( saveCurrentText() ),
actionCollection(), actionCollection(),
CResMgr::displaywindows::writeWindow::saveText::actionName CResMgr::displaywindows::writeWindow::saveText::actionName
); );
@ -78,7 +78,7 @@ void CHTMLWriteWindow::initToolbars() {
m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"), m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"),
CResMgr::displaywindows::writeWindow::deleteEntry::icon, CResMgr::displaywindows::writeWindow::deleteEntry::icon,
CResMgr::displaywindows::writeWindow::deleteEntry::accel, CResMgr::displaywindows::writeWindow::deleteEntry::accel,
this, TQT_SLOT(deleteEntry()), this, TQ_SLOT(deleteEntry()),
actionCollection(), actionCollection(),
CResMgr::displaywindows::writeWindow::deleteEntry::actionName CResMgr::displaywindows::writeWindow::deleteEntry::actionName
); );
@ -88,7 +88,7 @@ void CHTMLWriteWindow::initToolbars() {
m_actions.restoreText = new TDEAction(i18n("Restore original text"), m_actions.restoreText = new TDEAction(i18n("Restore original text"),
CResMgr::displaywindows::writeWindow::restoreText::icon, CResMgr::displaywindows::writeWindow::restoreText::icon,
CResMgr::displaywindows::writeWindow::restoreText::accel, CResMgr::displaywindows::writeWindow::restoreText::accel,
this, TQT_SLOT(restoreText()), actionCollection(), this, TQ_SLOT(restoreText()), actionCollection(),
CResMgr::displaywindows::writeWindow::restoreText::actionName CResMgr::displaywindows::writeWindow::restoreText::actionName
); );
m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip ); m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip );

@ -81,12 +81,12 @@ void CLexiconReadWindow::initActions() {
new TDEAction( new TDEAction(
i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel, i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel,
this, TQT_SLOT( nextEntry() ), this, TQ_SLOT( nextEntry() ),
actionCollection(), "nextEntry" actionCollection(), "nextEntry"
); );
new TDEAction( new TDEAction(
i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel, i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel,
this, TQT_SLOT( previousEntry() ), this, TQ_SLOT( previousEntry() ),
actionCollection(), "previousEntry" actionCollection(), "previousEntry"
); );
@ -96,29 +96,29 @@ void CLexiconReadWindow::initActions() {
m_actions.findText = actionCollection()->action("findText"); m_actions.findText = actionCollection()->action("findText");
Q_ASSERT(m_actions.findText); Q_ASSERT(m_actions.findText);
//m_actions.findStrongs = new TDEAction(i18n("Strong's Search"), TDEShortcut(0),this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs"); //m_actions.findStrongs = new TDEAction(i18n("Strong's Search"), TDEShortcut(0),this, TQ_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs");
m_actions.findStrongs = new TDEAction( m_actions.findStrongs = new TDEAction(
i18n("Strong's Search"), i18n("Strong's Search"),
CResMgr::displaywindows::general::findStrongs::icon, CResMgr::displaywindows::general::findStrongs::icon,
CResMgr::displaywindows::general::findStrongs::accel, CResMgr::displaywindows::general::findStrongs::accel,
this, TQT_SLOT(openSearchStrongsDialog()), this, TQ_SLOT(openSearchStrongsDialog()),
actionCollection(), actionCollection(),
CResMgr::displaywindows::general::findStrongs::actionName); CResMgr::displaywindows::general::findStrongs::actionName);
m_actions.copy.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); m_actions.copy.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
m_actions.copy.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAll()), actionCollection(), "copyEntryWithText"); m_actions.copy.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(copyAll()), actionCollection(), "copyEntryWithText");
m_actions.copy.selectedText = actionCollection()->action("copySelectedText"); m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
Q_ASSERT(m_actions.copy.selectedText); Q_ASSERT(m_actions.copy.selectedText);
m_actions.save.entryAsPlain = new TDEAction(i18n("Entry as plain text"), TDEShortcut(0), this, TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain"); m_actions.save.entryAsPlain = new TDEAction(i18n("Entry as plain text"), TDEShortcut(0), this, TQ_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
m_actions.save.entryAsHTML = new TDEAction(i18n("Entry as HTML"), TDEShortcut(0), this, TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML"); m_actions.save.entryAsHTML = new TDEAction(i18n("Entry as HTML"), TDEShortcut(0), this, TQ_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
m_actions.print.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly"); m_actions.print.reference = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
m_actions.print.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printEntryWithText"); m_actions.print.entry = new TDEAction(i18n("Entry with text"), TDEShortcut(0), this, TQ_SLOT(printAll()), actionCollection(), "printEntryWithText");
// init with the user defined settings // init with the user defined settings
CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection()); CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection());
@ -128,27 +128,27 @@ void CLexiconReadWindow::initActions() {
void CLexiconReadWindow::initConnections() { void CLexiconReadWindow::initConnections() {
Q_ASSERT(keyChooser()); Q_ASSERT(keyChooser());
connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), connect(keyChooser(), TQ_SIGNAL(keyChanged(CSwordKey*)),
this, TQT_SLOT(lookup(CSwordKey*))); this, TQ_SLOT(lookup(CSwordKey*)));
connect(keyChooser(), TQT_SIGNAL(historyChanged()), connect(keyChooser(), TQ_SIGNAL(historyChanged()),
this, TQT_SLOT(slotUpdateHistoryButtons())); this, TQ_SLOT(slotUpdateHistoryButtons()));
//connect the history actions to the right slots //connect the history actions to the right slots
connect( connect(
m_actions.backInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()), m_actions.backInHistory->popupMenu(), TQ_SIGNAL(aboutToShow()),
this, TQT_SLOT(slotFillBackHistory()) this, TQ_SLOT(slotFillBackHistory())
); );
connect( connect(
m_actions.backInHistory->popupMenu(), TQT_SIGNAL(activated(int)), m_actions.backInHistory->popupMenu(), TQ_SIGNAL(activated(int)),
keyChooser(), TQT_SLOT(backInHistory(int)) keyChooser(), TQ_SLOT(backInHistory(int))
); );
connect( connect(
m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()), m_actions.forwardInHistory->popupMenu(), TQ_SIGNAL(aboutToShow()),
this, TQT_SLOT(slotFillForwardHistory()) this, TQ_SLOT(slotFillForwardHistory())
); );
connect( connect(
m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(activated(int)), m_actions.forwardInHistory->popupMenu(), TQ_SIGNAL(activated(int)),
keyChooser(), TQT_SLOT(forwardInHistory(int)) keyChooser(), TQ_SLOT(forwardInHistory(int))
); );
@ -199,7 +199,7 @@ void CLexiconReadWindow::initToolbars() {
void CLexiconReadWindow::setupPopupMenu() { void CLexiconReadWindow::setupPopupMenu() {
popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window")); popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window"));
// m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection()); // m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQ_SLOT(selectAll()), actionCollection());
m_actions.findText->plug(popup()); m_actions.findText->plug(popup());
m_actions.findStrongs->plug(popup()); m_actions.findStrongs->plug(popup());

@ -44,12 +44,12 @@ CModuleChooserButton* const CModuleChooserBar::addButton( CSwordModuleInfo* cons
insertWidget( m_idCounter, b->size().width(), b ); insertWidget( m_idCounter, b->size().width(), b );
m_buttonList.append(b); m_buttonList.append(b);
connect( b, TQT_SIGNAL(sigAddButton()), this, TQT_SLOT(addButton()) ); connect( b, TQ_SIGNAL(sigAddButton()), this, TQ_SLOT(addButton()) );
connect( b, TQT_SIGNAL(sigRemoveButton(const int)), this, TQT_SLOT(removeButton(const int)) ); connect( b, TQ_SIGNAL(sigRemoveButton(const int)), this, TQ_SLOT(removeButton(const int)) );
connect( b, TQT_SIGNAL(sigChanged()), TQT_SIGNAL(sigChanged()) ); connect( b, TQ_SIGNAL(sigChanged()), TQ_SIGNAL(sigChanged()) );
connect( b, TQT_SIGNAL(sigChanged()), TQT_SLOT(updateMenuItems()) ); connect( b, TQ_SIGNAL(sigChanged()), TQ_SLOT(updateMenuItems()) );
b->show(); b->show();

@ -162,7 +162,7 @@ void CModuleChooserButton::populateMenu() {
} }
m_popup->insertSeparator(); m_popup->insertSeparator();
connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int))); connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleChosen(int)));
setPopup(m_popup, true); setPopup(m_popup, true);
TQStringList languages; TQStringList languages;
@ -203,7 +203,7 @@ void CModuleChooserButton::populateMenu() {
TDEPopupMenu* menu = new TDEPopupMenu; TDEPopupMenu* menu = new TDEPopupMenu;
langdict.insert(lang, menu ); langdict.insert(lang, menu );
m_submenus.append(menu); m_submenus.append(menu);
connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int))); connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleChosen(int)));
} }
} }

@ -65,7 +65,7 @@ void CPlainWriteWindow::initToolbars() {
m_actions.saveText = new TDEAction(i18n("Save text"), m_actions.saveText = new TDEAction(i18n("Save text"),
CResMgr::displaywindows::writeWindow::saveText::icon, CResMgr::displaywindows::writeWindow::saveText::icon,
CResMgr::displaywindows::writeWindow::saveText::accel, CResMgr::displaywindows::writeWindow::saveText::accel,
this, TQT_SLOT(saveCurrentText()), this, TQ_SLOT(saveCurrentText()),
actionCollection(), actionCollection(),
CResMgr::displaywindows::writeWindow::saveText::actionName CResMgr::displaywindows::writeWindow::saveText::actionName
); );
@ -76,7 +76,7 @@ void CPlainWriteWindow::initToolbars() {
m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"), m_actions.deleteEntry = new TDEAction(i18n("Delete current entry"),
CResMgr::displaywindows::writeWindow::deleteEntry::icon, CResMgr::displaywindows::writeWindow::deleteEntry::icon,
CResMgr::displaywindows::writeWindow::deleteEntry::accel, CResMgr::displaywindows::writeWindow::deleteEntry::accel,
this, TQT_SLOT(deleteEntry()), this, TQ_SLOT(deleteEntry()),
actionCollection(), actionCollection(),
CResMgr::displaywindows::writeWindow::deleteEntry::actionName CResMgr::displaywindows::writeWindow::deleteEntry::actionName
); );
@ -87,7 +87,7 @@ void CPlainWriteWindow::initToolbars() {
m_actions.restoreText = new TDEAction(i18n("Restore original text"), m_actions.restoreText = new TDEAction(i18n("Restore original text"),
CResMgr::displaywindows::writeWindow::restoreText::icon, CResMgr::displaywindows::writeWindow::restoreText::icon,
CResMgr::displaywindows::writeWindow::restoreText::accel, CResMgr::displaywindows::writeWindow::restoreText::accel,
this, TQT_SLOT(restoreText()), this, TQ_SLOT(restoreText()),
actionCollection(), actionCollection(),
CResMgr::displaywindows::writeWindow::restoreText::actionName CResMgr::displaywindows::writeWindow::restoreText::actionName
); );
@ -97,11 +97,11 @@ void CPlainWriteWindow::initToolbars() {
void CPlainWriteWindow::initConnections() { void CPlainWriteWindow::initConnections() {
CWriteWindow::initConnections(); CWriteWindow::initConnections();
connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), connect(keyChooser(), TQ_SIGNAL(keyChanged(CSwordKey*)),
this, TQT_SLOT(lookup(CSwordKey*))); this, TQ_SLOT(lookup(CSwordKey*)));
connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()), connect(displayWidget()->connectionsProxy(), TQ_SIGNAL(textChanged()),
this, TQT_SLOT(textChanged()) ); this, TQ_SLOT(textChanged()) );
} }
void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) { void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {

@ -55,24 +55,24 @@ CReadDisplay* const CReadWindow::displayWidget() {
void CReadWindow::setDisplayWidget( CReadDisplay* newDisplay ) { void CReadWindow::setDisplayWidget( CReadDisplay* newDisplay ) {
CDisplayWindow::setDisplayWidget(newDisplay); CDisplayWindow::setDisplayWidget(newDisplay);
if (m_displayWidget) { if (m_displayWidget) {
disconnect(m_displayWidget->connectionsProxy(), TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), this, TQT_SLOT(lookup(const TQString&, const TQString&))); disconnect(m_displayWidget->connectionsProxy(), TQ_SIGNAL(referenceClicked(const TQString&, const TQString&)), this, TQ_SLOT(lookup(const TQString&, const TQString&)));
disconnect(m_displayWidget->connectionsProxy(), TQT_SIGNAL(referenceDropped(const TQString&)), this, TQT_SLOT(lookup(const TQString&))); disconnect(m_displayWidget->connectionsProxy(), TQ_SIGNAL(referenceDropped(const TQString&)), this, TQ_SLOT(lookup(const TQString&)));
} }
m_displayWidget = newDisplay; m_displayWidget = newDisplay;
connect( connect(
m_displayWidget->connectionsProxy(), m_displayWidget->connectionsProxy(),
TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), TQ_SIGNAL(referenceClicked(const TQString&, const TQString&)),
this, this,
TQT_SLOT(lookup(const TQString&, const TQString&)) TQ_SLOT(lookup(const TQString&, const TQString&))
); );
connect( connect(
m_displayWidget->connectionsProxy(), m_displayWidget->connectionsProxy(),
TQT_SIGNAL(referenceDropped(const TQString&)), TQ_SIGNAL(referenceDropped(const TQString&)),
this, this,
TQT_SLOT(lookup(const TQString&)) TQ_SLOT(lookup(const TQString&))
); );
} }

@ -42,8 +42,8 @@ void CWriteWindow::initConnections() {
// tqWarning("CWriteWindow::initConnections()"); // tqWarning("CWriteWindow::initConnections()");
Q_ASSERT(keyChooser()); Q_ASSERT(keyChooser());
connect(keyChooser(), TQT_SIGNAL(beforeKeyChange(const TQString&)), connect(keyChooser(), TQ_SIGNAL(beforeKeyChange(const TQString&)),
this, TQT_SLOT(beforeKeyChange(const TQString&)) this, TQ_SLOT(beforeKeyChange(const TQString&))
); );
}; };

@ -44,7 +44,7 @@ m_key(dynamic_cast<CSwordVerseKey*>(key)) {
w_ref = new CKeyReferenceWidget(dynamic_cast<CSwordBibleModuleInfo*>(m_modules.first()), m_key, this); w_ref = new CKeyReferenceWidget(dynamic_cast<CSwordBibleModuleInfo*>(m_modules.first()), m_key, this);
layout->addWidget(w_ref); layout->addWidget(w_ref);
connect(w_ref,TQT_SIGNAL(changed(CSwordVerseKey *)),TQT_SLOT(refChanged(CSwordVerseKey *))); connect(w_ref,TQ_SIGNAL(changed(CSwordVerseKey *)),TQ_SLOT(refChanged(CSwordVerseKey *)));
setKey(m_key); //set the key without changing it, setKey(key()) would change it setKey(m_key); //set the key without changing it, setKey(key()) would change it
} }

@ -162,8 +162,8 @@ void CBookKeyChooser::setModules(const ListCSwordModuleInfo& modules, const bool
w->comboBox()->setMaximumWidth(maxWidth); w->comboBox()->setMaximumWidth(maxWidth);
w->comboBox()->setCurrentItem(0); w->comboBox()->setCurrentItem(0);
connect(w, TQT_SIGNAL(changed(int)), TQT_SLOT(keyChooserChanged(int))); connect(w, TQ_SIGNAL(changed(int)), TQ_SLOT(keyChooserChanged(int)));
connect(w, TQT_SIGNAL(focusOut(int)), TQT_SLOT(keyChooserChanged(int))); connect(w, TQ_SIGNAL(focusOut(int)), TQ_SLOT(keyChooserChanged(int)));
m_layout->addWidget(w); m_layout->addWidget(w);
boxes[w] = i; boxes[w] = i;

@ -144,7 +144,7 @@ m_key( dynamic_cast<CSwordTreeKey*>(key) ) {
m_treeView->setSorting(-1); m_treeView->setSorting(-1);
m_treeView->setRootIsDecorated(true); m_treeView->setRootIsDecorated(true);
m_treeView->setFullWidth(true); m_treeView->setFullWidth(true);
connect(m_treeView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(itemActivated(TQListViewItem*))); connect(m_treeView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(itemActivated(TQListViewItem*)));
setKey(key); setKey(key);
adjustFont(); adjustFont();

@ -145,7 +145,7 @@ void CKeyChooser::polish() {
TQWidget::polish(); TQWidget::polish();
//connect the history calls just before we show, we want an empty history //connect the history calls just before we show, we want an empty history
connect(this, TQT_SIGNAL(keyChanged(CSwordKey*)), TQT_SLOT(addToHistory(CSwordKey*))); connect(this, TQ_SIGNAL(keyChanged(CSwordKey*)), TQ_SLOT(addToHistory(CSwordKey*)));
} }
#include "ckeychooser.moc" #include "ckeychooser.moc"

@ -200,14 +200,14 @@ void CKeyChooserWidget::init() {
setTabOrder(m_comboBox, 0); setTabOrder(m_comboBox, 0);
connect(m_scroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(lock())); connect(m_scroller, TQ_SIGNAL(scroller_pressed()), TQ_SLOT(lock()));
connect(m_scroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(unlock())); connect(m_scroller, TQ_SIGNAL(scroller_released()), TQ_SLOT(unlock()));
connect(m_scroller, TQT_SIGNAL(change(int)), TQT_SLOT(changeCombo(int)) ); connect(m_scroller, TQ_SIGNAL(change(int)), TQ_SLOT(changeCombo(int)) );
connect(m_comboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboChanged(int))); connect(m_comboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboChanged(int)));
// connect(m_comboBox, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&))); // connect(m_comboBox, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotReturnPressed(const TQString&)));
connect(m_comboBox->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); connect(m_comboBox->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
connect(m_comboBox, TQT_SIGNAL(focusOut(int)), TQT_SIGNAL(focusOut(int))); connect(m_comboBox, TQ_SIGNAL(focusOut(int)), TQ_SIGNAL(focusOut(int)));
updatelock = false; updatelock = false;
isResetting = false; isResetting = false;

@ -92,7 +92,7 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers
erase_picture.setIconName("locationbar_erase"); erase_picture.setIconName("locationbar_erase");
KPushButton *clearRef = new KPushButton(this); KPushButton *clearRef = new KPushButton(this);
clearRef->setGuiItem(erase_picture); clearRef->setGuiItem(erase_picture);
connect(clearRef, TQT_SIGNAL(clicked( ) ), TQT_SLOT(slotClearRef( ))); connect(clearRef, TQ_SIGNAL(clicked( ) ), TQ_SLOT(slotClearRef( )));
m_bookScroller = new CScrollerWidgetSet(this); m_bookScroller = new CScrollerWidgetSet(this);
@ -131,16 +131,16 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers
// signals and slots connections // signals and slots connections
connect(m_bookScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotBookChange(int))); connect(m_bookScroller, TQ_SIGNAL(change(int)), TQ_SLOT(slotBookChange(int)));
connect(m_bookScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock())); connect(m_bookScroller, TQ_SIGNAL(scroller_pressed()), TQ_SLOT(slotUpdateLock()));
connect(m_bookScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock())); connect(m_bookScroller, TQ_SIGNAL(scroller_released()), TQ_SLOT(slotUpdateUnlock()));
connect(m_textbox, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); connect(m_textbox, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
connect(m_chapterScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotChapterChange(int))); connect(m_chapterScroller, TQ_SIGNAL(change(int)), TQ_SLOT(slotChapterChange(int)));
connect(m_chapterScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock())); connect(m_chapterScroller, TQ_SIGNAL(scroller_pressed()), TQ_SLOT(slotUpdateLock()));
connect(m_chapterScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock())); connect(m_chapterScroller, TQ_SIGNAL(scroller_released()), TQ_SLOT(slotUpdateUnlock()));
connect(m_verseScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotVerseChange(int))); connect(m_verseScroller, TQ_SIGNAL(change(int)), TQ_SLOT(slotVerseChange(int)));
connect(m_verseScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock())); connect(m_verseScroller, TQ_SIGNAL(scroller_pressed()), TQ_SLOT(slotUpdateLock()));
connect(m_verseScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock())); connect(m_verseScroller, TQ_SIGNAL(scroller_released()), TQ_SLOT(slotUpdateUnlock()));
} }
void CKeyReferenceWidget::setModule(CSwordBibleModuleInfo *m) { void CKeyReferenceWidget::setModule(CSwordBibleModuleInfo *m) {

@ -61,8 +61,8 @@ m_key(dynamic_cast<CSwordLDKey*>(key)) {
m_layout->addWidget(m_widget,0,TQt::AlignLeft); m_layout->addWidget(m_widget,0,TQt::AlignLeft);
connect(m_widget,TQT_SIGNAL(changed(int)),TQT_SLOT(activated(int))); connect(m_widget,TQ_SIGNAL(changed(int)),TQ_SLOT(activated(int)));
connect(m_widget,TQT_SIGNAL(focusOut(int)),TQT_SLOT(activated(int))); connect(m_widget,TQ_SIGNAL(focusOut(int)),TQ_SLOT(activated(int)));
setModules(modules, true); setModules(modules, true);
setKey(key); setKey(key);

@ -47,8 +47,8 @@
// m_oldParent = NULL; // m_oldParent = NULL;
// setMainWidget(m_page); // setMainWidget(m_page);
// //
// connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotPressedOk())); // connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotPressedOk()));
// connect(this, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotPressedCancel())); // connect(this, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotPressedCancel()));
//} //}
// //
//CRefSelectDialog::~CRefSelectDialog() { //CRefSelectDialog::~CRefSelectDialog() {

@ -26,8 +26,8 @@ CScrollButton::CScrollButton(TQWidget *parent, const char *name ) : TQToolButton
setCursor( splitVCursor ); setCursor( splitVCursor );
m_isLocked = false; m_isLocked = false;
connect(this, TQT_SIGNAL(pressed() ), TQT_SLOT(was_pressed() )); connect(this, TQ_SIGNAL(pressed() ), TQ_SLOT(was_pressed() ));
connect(this, TQT_SIGNAL(released()), TQT_SLOT(was_released())); connect(this, TQ_SIGNAL(released()), TQ_SLOT(was_released()));
} }
const bool CScrollButton::isLocked( ) const { const bool CScrollButton::isLocked( ) const {

@ -57,11 +57,11 @@ CScrollerWidgetSet::CScrollerWidgetSet(TQWidget *parent, const char *name) : TQW
m_layout->addWidget( btn_down,0 ); m_layout->addWidget( btn_down,0 );
setMinimumWidth(WIDTH+4); // Kludge to add some spacing but seems to work. setMinimumWidth(WIDTH+4); // Kludge to add some spacing but seems to work.
connect(btn_fx, TQT_SIGNAL(lock()), TQT_SLOT(slotLock())); connect(btn_fx, TQ_SIGNAL(lock()), TQ_SLOT(slotLock()));
connect(btn_fx, TQT_SIGNAL(unlock()), TQT_SLOT(slotUnlock())); connect(btn_fx, TQ_SIGNAL(unlock()), TQ_SLOT(slotUnlock()));
connect(btn_fx, TQT_SIGNAL(change_requested(int)), TQT_SLOT(slotScroller(int))); connect(btn_fx, TQ_SIGNAL(change_requested(int)), TQ_SLOT(slotScroller(int)));
connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUpClick())); connect(btn_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUpClick()));
connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownClick())); connect(btn_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDownClick()));
} }
/** Sets the tooltips for the given entries using the parameters as text. */ /** Sets the tooltips for the given entries using the parameters as text. */

@ -146,24 +146,24 @@ void CMainIndex::initView() {
m_popup = new TDEPopupMenu(viewport()); m_popup = new TDEPopupMenu(viewport());
m_popup->insertTitle(i18n("Bookshelf")); m_popup->insertTitle(i18n("Bookshelf"));
m_actions.newFolder = new TDEAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, TQT_SLOT(createNewFolder()), this); m_actions.newFolder = new TDEAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, TQ_SLOT(createNewFolder()), this);
m_actions.changeFolder = new TDEAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, TQT_SLOT(changeFolder()), this); m_actions.changeFolder = new TDEAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, TQ_SLOT(changeFolder()), this);
m_actions.changeBookmark = new TDEAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, this, TQT_SLOT(changeBookmark()), this); m_actions.changeBookmark = new TDEAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, this, TQ_SLOT(changeBookmark()), this);
m_actions.importBookmarks = new TDEAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, TQT_SLOT(importBookmarks()), this); m_actions.importBookmarks = new TDEAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, TQ_SLOT(importBookmarks()), this);
m_actions.exportBookmarks = new TDEAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, TQT_SLOT(exportBookmarks()), this); m_actions.exportBookmarks = new TDEAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, TQ_SLOT(exportBookmarks()), this);
m_actions.printBookmarks = new TDEAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, TQT_SLOT(printBookmarks()), this); m_actions.printBookmarks = new TDEAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, TQ_SLOT(printBookmarks()), this);
m_actions.deleteEntries = new TDEAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, TQT_SLOT(deleteEntries()), this); m_actions.deleteEntries = new TDEAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, TQ_SLOT(deleteEntries()), this);
m_actions.editModuleMenu = new TDEActionMenu(i18n("Edit this work"),CResMgr::mainIndex::editModuleMenu::icon, this); m_actions.editModuleMenu = new TDEActionMenu(i18n("Edit this work"),CResMgr::mainIndex::editModuleMenu::icon, this);
m_actions.editModuleMenu->setDelayed(false); m_actions.editModuleMenu->setDelayed(false);
m_actions.editModulePlain = new TDEAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, TQT_SLOT(editModulePlain()), this); m_actions.editModulePlain = new TDEAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, TQ_SLOT(editModulePlain()), this);
m_actions.editModuleHTML = new TDEAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, TQT_SLOT(editModuleHTML()), this); m_actions.editModuleHTML = new TDEAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, TQ_SLOT(editModuleHTML()), this);
m_actions.searchInModules = new TDEAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, this, TQT_SLOT(searchInModules()), this); m_actions.searchInModules = new TDEAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, this, TQ_SLOT(searchInModules()), this);
m_actions.unlockModule = new TDEAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, this, TQT_SLOT(unlockModule()), this); m_actions.unlockModule = new TDEAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, this, TQ_SLOT(unlockModule()), this);
m_actions.aboutModule = new TDEAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, this, TQT_SLOT(aboutModule()), this); m_actions.aboutModule = new TDEAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, this, TQ_SLOT(aboutModule()), this);
//fill the popup menu itself //fill the popup menu itself
@ -188,16 +188,16 @@ void CMainIndex::initView() {
m_actions.aboutModule->plug(m_popup); m_actions.aboutModule->plug(m_popup);
} }
/** Initialize the SIGNAL<->TQT_SLOT connections */ /** Initialize the signal<->slot connections */
void CMainIndex::initConnections() { void CMainIndex::initConnections() {
connect(this, TQT_SIGNAL(executed(TQListViewItem*)), connect(this, TQ_SIGNAL(executed(TQListViewItem*)),
TQT_SLOT(slotExecuted(TQListViewItem*))); TQ_SLOT(slotExecuted(TQListViewItem*)));
connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
TQT_SLOT(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); TQ_SLOT(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
TQT_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); TQ_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
connect(&m_autoOpenTimer, TQT_SIGNAL(timeout()), connect(&m_autoOpenTimer, TQ_SIGNAL(timeout()),
this, TQT_SLOT(autoOpenTimeout())); this, TQ_SLOT(autoOpenTimeout()));
} }
/** Is called when an item was clicked/double clicked. */ /** Is called when an item was clicked/double clicked. */

@ -81,7 +81,7 @@ protected: // Protected methods
*/ */
virtual void addGroup( const CItemBase::Type type, const TQString language); virtual void addGroup( const CItemBase::Type type, const TQString language);
/** /**
* Initialize the SIGNAL<->TQT_SLOT connections * Initialize the signal<->slot connections
*/ */
void initConnections(); void initConnections();
/** /**

@ -62,23 +62,23 @@ void CModuleResultView::initView() {
m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon, m_popup); m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon, m_popup);
m_actions.copyMenu->setDelayed(false); m_actions.copyMenu->setDelayed(false);
m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(copyResult()), this); m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(copyResult()), this);
m_actions.copyMenu->insert(m_actions.copy.result); m_actions.copyMenu->insert(m_actions.copy.result);
m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(copyResultWithText()), this); m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(copyResultWithText()), this);
m_actions.copyMenu->insert(m_actions.copy.resultWithText); m_actions.copyMenu->insert(m_actions.copy.resultWithText);
m_actions.copyMenu->plug(m_popup); m_actions.copyMenu->plug(m_popup);
m_actions.saveMenu = new TDEActionMenu(i18n("Save..."), CResMgr::searchdialog::result::moduleList::saveMenu::icon, m_popup); m_actions.saveMenu = new TDEActionMenu(i18n("Save..."), CResMgr::searchdialog::result::moduleList::saveMenu::icon, m_popup);
m_actions.saveMenu->setDelayed( false ); m_actions.saveMenu->setDelayed( false );
m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(saveResult()), this); m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(saveResult()), this);
m_actions.saveMenu->insert(m_actions.save.result); m_actions.saveMenu->insert(m_actions.save.result);
m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(saveResultWithText()), this); m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(saveResultWithText()), this);
m_actions.saveMenu->insert(m_actions.save.resultWithText); m_actions.saveMenu->insert(m_actions.save.resultWithText);
m_actions.saveMenu->plug(m_popup); m_actions.saveMenu->plug(m_popup);
m_actions.printMenu = new TDEActionMenu(i18n("Print..."), CResMgr::searchdialog::result::moduleList::printMenu::icon, m_popup); m_actions.printMenu = new TDEActionMenu(i18n("Print..."), CResMgr::searchdialog::result::moduleList::printMenu::icon, m_popup);
m_actions.printMenu->setDelayed(false); m_actions.printMenu->setDelayed(false);
m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printResult()), this); m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(printResult()), this);
m_actions.printMenu->insert(m_actions.print.result); m_actions.printMenu->insert(m_actions.print.result);
@ -87,10 +87,10 @@ void CModuleResultView::initView() {
/** Initializes the connections of this widget, */ /** Initializes the connections of this widget, */
void CModuleResultView::initConnections() { void CModuleResultView::initConnections() {
connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
this, TQT_SLOT(executed(TQListViewItem*))); this, TQ_SLOT(executed(TQListViewItem*)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&))); this, TQ_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
} }
/** Setups the tree using the given list of modules. */ /** Setups the tree using the given list of modules. */

@ -108,11 +108,11 @@ void CRangeChooserDialog::initView() {
grid->addMultiCellWidget(m_rangeList,0,4,0,1); grid->addMultiCellWidget(m_rangeList,0,4,0,1);
m_newRangeButton = new TQPushButton(i18n("Add new range"),plainPage()); m_newRangeButton = new TQPushButton(i18n("Add new range"),plainPage());
connect(m_newRangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewRange())); connect(m_newRangeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewRange()));
grid->addWidget(m_newRangeButton,5,0); grid->addWidget(m_newRangeButton,5,0);
m_deleteRangeButton = new TQPushButton(i18n("Delete current range"),plainPage()); m_deleteRangeButton = new TQPushButton(i18n("Delete current range"),plainPage());
connect(m_deleteRangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentRange())); connect(m_deleteRangeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentRange()));
grid->addWidget(m_deleteRangeButton,5,1); grid->addWidget(m_deleteRangeButton,5,1);
grid->addColSpacing(2, 5); grid->addColSpacing(2, 5);
@ -147,16 +147,16 @@ void CRangeChooserDialog::initView() {
/** Initializes the connections of this widget. */ /** Initializes the connections of this widget. */
void CRangeChooserDialog::initConnections() { void CRangeChooserDialog::initConnections() {
connect(m_rangeList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), connect(m_rangeList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
this, TQT_SLOT(editRange(TQListViewItem*))); this, TQ_SLOT(editRange(TQListViewItem*)));
connect(m_rangeEdit, TQT_SIGNAL(textChanged()), connect(m_rangeEdit, TQ_SIGNAL(textChanged()),
this, TQT_SLOT(parseRange())); this, TQ_SLOT(parseRange()));
connect(m_rangeEdit, TQT_SIGNAL(textChanged()), connect(m_rangeEdit, TQ_SIGNAL(textChanged()),
this, TQT_SLOT(rangeChanged())); this, TQ_SLOT(rangeChanged()));
connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)), connect(m_nameEdit, TQ_SIGNAL(textChanged(const TQString&)),
this, TQT_SLOT(nameChanged(const TQString&))); this, TQ_SLOT(nameChanged(const TQString&)));
} }
/** Adds a new range to the list. */ /** Adds a new range to the list. */

@ -94,10 +94,10 @@ void CSearchAnalysisDialog::initView() {
m_analysisView->show(); m_analysisView->show();
layout->addWidget(m_analysisView); layout->addWidget(m_analysisView);
connect(button, TQT_SIGNAL(clicked()), m_analysis, TQT_SLOT(saveAsHTML())); connect(button, TQ_SIGNAL(clicked()), m_analysis, TQ_SLOT(saveAsHTML()));
} }
/** Initializes the widgets TQT_SIGNAL and TQT_SLOT connections,. */ /** Initializes the widgets signal and slot connections. */
void CSearchAnalysisDialog::initConnections() {} void CSearchAnalysisDialog::initConnections() {}
/****************************/ /****************************/
@ -113,7 +113,7 @@ CSearchAnalysis::CSearchAnalysis(TQObject *parent, const char *name )
m_canvasItemList.resize(67); m_canvasItemList.resize(67);
m_canvasItemList.setAutoDelete(true); m_canvasItemList.setAutoDelete(true);
resize(1,1); resize(1,1);
connect(this, TQT_SIGNAL(resized()), TQT_SLOT(slotResized())); connect(this, TQ_SIGNAL(resized()), TQ_SLOT(slotResized()));
} }
CSearchAnalysis::~CSearchAnalysis() {} CSearchAnalysis::~CSearchAnalysis() {}

@ -109,7 +109,7 @@ public:
protected: // Protected methods protected: // Protected methods
/** /**
* Initializes the widgets TQT_SIGNAL and TQT_SLOT connections,. * Initializes the widgets signal and slot connections.
*/ */
void initConnections(); void initConnections();

@ -87,7 +87,7 @@ CSearchDialog::CSearchDialog(TQWidget *parent)
setWFlags( getWFlags() | TQt::WStyle_MinMax ); setWFlags( getWFlags() | TQt::WStyle_MinMax );
setIcon(CResMgr::searchdialog::icon); setIcon(CResMgr::searchdialog::icon);
m_searcher.connectFinished( this, TQT_SLOT(searchFinished())); m_searcher.connectFinished( this, TQ_SLOT(searchFinished()));
initView(); initView();
initConnections(); initConnections();
@ -244,8 +244,8 @@ void CSearchDialog::showModulesSelector() {
/** Initializes the signal slot connections */ /** Initializes the signal slot connections */
void CSearchDialog::initConnections() { void CSearchDialog::initConnections() {
connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(startSearch())); connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(startSearch()));
connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(slotDelayedDestruct())); connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(slotDelayedDestruct()));
} }
/** Resets the parts to the default. */ /** Resets the parts to the default. */

@ -553,16 +553,16 @@ const TQString CSearchResultPage::highlightSearchedText(const TQString& content,
/** Initializes the signal slot conections of the child widgets, */ /** Initializes the signal slot conections of the child widgets, */
void CSearchResultPage::initConnections() { void CSearchResultPage::initConnections() {
connect(m_resultListBox, TQT_SIGNAL(keySelected(const TQString&)), connect(m_resultListBox, TQ_SIGNAL(keySelected(const TQString&)),
this, TQT_SLOT(updatePreview(const TQString&))); this, TQ_SLOT(updatePreview(const TQString&)));
connect(m_moduleListBox, TQT_SIGNAL(moduleSelected(CSwordModuleInfo*)), connect(m_moduleListBox, TQ_SIGNAL(moduleSelected(CSwordModuleInfo*)),
m_resultListBox, TQT_SLOT(setupTree(CSwordModuleInfo*))); m_resultListBox, TQ_SLOT(setupTree(CSwordModuleInfo*)));
connect(m_moduleListBox, TQT_SIGNAL(moduleChanged()), connect(m_moduleListBox, TQ_SIGNAL(moduleChanged()),
m_previewDisplay->connectionsProxy(), TQT_SLOT(clear())); m_previewDisplay->connectionsProxy(), TQ_SLOT(clear()));
connect(m_analyseButton, TQT_SIGNAL(clicked()), TQT_SLOT(showAnalysis())); connect(m_analyseButton, TQ_SIGNAL(clicked()), TQ_SLOT(showAnalysis()));
// connect the strongs list // connect the strongs list
connect(m_moduleListBox, TQT_SIGNAL(strongsSelected(CSwordModuleInfo*, TQStringList*)), connect(m_moduleListBox, TQ_SIGNAL(strongsSelected(CSwordModuleInfo*, TQStringList*)),
m_resultListBox, TQT_SLOT(setupStrongsTree(CSwordModuleInfo*, TQStringList*))); m_resultListBox, TQ_SLOT(setupStrongsTree(CSwordModuleInfo*, TQStringList*)));
} }
/** Shows a dialog with the search analysis of the current search. */ /** Shows a dialog with the search analysis of the current search. */
@ -616,20 +616,20 @@ void CSearchOptionsPage::setSearchText(const TQString& text) {
/** Initializes this page. */ /** Initializes this page. */
void CSearchOptionsPage::initView() { void CSearchOptionsPage::initView() {
connect( m_searchTextCombo, TQT_SIGNAL(activated( const TQString& )), connect( m_searchTextCombo, TQ_SIGNAL(activated( const TQString& )),
m_searchTextCombo, TQT_SLOT( addToHistory( const TQString& )) m_searchTextCombo, TQ_SLOT( addToHistory( const TQString& ))
); );
connect( m_searchTextCombo, TQT_SIGNAL(returnPressed ( const TQString& )), connect( m_searchTextCombo, TQ_SIGNAL(returnPressed ( const TQString& )),
m_searchTextCombo, TQT_SLOT(addToHistory(const TQString&)) m_searchTextCombo, TQ_SLOT(addToHistory(const TQString&))
); );
TQToolTip::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::tooltip); TQToolTip::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::tooltip);
m_syntaxButton->setIconSet(SmallIconSet("contexthelp")); m_syntaxButton->setIconSet(SmallIconSet("contexthelp"));
connect( m_syntaxButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(syntaxHelp())); connect( m_syntaxButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(syntaxHelp()));
m_chooseModulesButton->setIconSet(SmallIconSet("wizard")); m_chooseModulesButton->setIconSet(SmallIconSet("wizard"));
connect(m_chooseModulesButton, TQT_SIGNAL(clicked()), connect(m_chooseModulesButton, TQ_SIGNAL(clicked()),
this, TQT_SLOT(chooseModules())); this, TQ_SLOT(chooseModules()));
TQToolTip::add TQToolTip::add
(m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::tooltip); (m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::tooltip);
@ -638,8 +638,8 @@ void CSearchOptionsPage::initView() {
refreshRanges(); refreshRanges();
m_chooseRangeButton->setIconSet(SmallIconSet("configure")); m_chooseRangeButton->setIconSet(SmallIconSet("configure"));
connect(m_chooseRangeButton, TQT_SIGNAL(clicked()), connect(m_chooseRangeButton, TQ_SIGNAL(clicked()),
this, TQT_SLOT(setupRanges())); this, TQ_SLOT(setupRanges()));
//set the initial focus //set the initial focus
m_searchTextCombo->setFocus(); m_searchTextCombo->setFocus();
@ -673,8 +673,8 @@ void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) {
/** Opens the modules chooser dialog. */ /** Opens the modules chooser dialog. */
void CSearchOptionsPage::chooseModules() { void CSearchOptionsPage::chooseModules() {
CModuleChooserDialog* dlg = new CModuleChooserDialog(this, modules()); CModuleChooserDialog* dlg = new CModuleChooserDialog(this, modules());
connect(dlg, TQT_SIGNAL(modulesChanged(ListCSwordModuleInfo)), connect(dlg, TQ_SIGNAL(modulesChanged(ListCSwordModuleInfo)),
this, TQT_SLOT(setModules(ListCSwordModuleInfo))); this, TQ_SLOT(setModules(ListCSwordModuleInfo)));
dlg->exec(); dlg->exec();
} }

@ -50,36 +50,36 @@ void CSearchResultView::initView() {
m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon, m_popup); m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon, m_popup);
m_actions.copyMenu->setDelayed(false); m_actions.copyMenu->setDelayed(false);
m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(copyItems()), this); m_actions.copy.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(copyItems()), this);
m_actions.copyMenu->insert(m_actions.copy.result); m_actions.copyMenu->insert(m_actions.copy.result);
m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(copyItemsWithText()), this); m_actions.copy.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(copyItemsWithText()), this);
m_actions.copyMenu->insert(m_actions.copy.resultWithText); m_actions.copyMenu->insert(m_actions.copy.resultWithText);
m_actions.copyMenu->plug(m_popup); m_actions.copyMenu->plug(m_popup);
m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon, m_popup); m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon, m_popup);
m_actions.saveMenu->setDelayed( false ); m_actions.saveMenu->setDelayed( false );
m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQT_SLOT(saveItems()), this); m_actions.save.result = new TDEAction(i18n("Reference only"), TDEShortcut(0), this, TQ_SLOT(saveItems()), this);
m_actions.saveMenu->insert(m_actions.save.result); m_actions.saveMenu->insert(m_actions.save.result);
m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(saveItemsWithText()), this); m_actions.save.resultWithText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(saveItemsWithText()), this);
m_actions.saveMenu->insert(m_actions.save.resultWithText); m_actions.saveMenu->insert(m_actions.save.resultWithText);
m_actions.saveMenu->plug(m_popup); m_actions.saveMenu->plug(m_popup);
m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon, m_popup); m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon, m_popup);
m_actions.printMenu->setDelayed(false); m_actions.printMenu->setDelayed(false);
m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQT_SLOT(printItems()), this); m_actions.print.result = new TDEAction(i18n("Reference with text"), TDEShortcut(0), this, TQ_SLOT(printItems()), this);
m_actions.printMenu->insert(m_actions.print.result); m_actions.printMenu->insert(m_actions.print.result);
m_actions.printMenu->plug(m_popup); m_actions.printMenu->plug(m_popup);
} }
/** No descriptions */ /** No descriptions */
void CSearchResultView::initConnections() { void CSearchResultView::initConnections() {
// connect(this, TQT_SIGNAL(executed(TQListViewItem*)), // connect(this, TQ_SIGNAL(executed(TQListViewItem*)),
// this, TQT_SLOT(executed(TQListViewItem*))); // this, TQ_SLOT(executed(TQListViewItem*)));
connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)),
this, TQT_SLOT(executed(TQListViewItem*))); this, TQ_SLOT(executed(TQListViewItem*)));
connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
this, TQT_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&))); this, TQ_SLOT(showPopup(TDEListView*, TQListViewItem*, const TQPoint&)));
} }
/** Setups the list with the given module. */ /** Setups the list with the given module. */

Loading…
Cancel
Save