Rename a number of classes to enhance compatibility with KDE4

r14.0.x
Timothy Pearson 11 years ago
parent c908e40b49
commit 9791ea5701

@ -423,7 +423,7 @@
2003-01-18 Joachim Ansorg <junkmail@joachim.ansorgs.de>
* Removed install instructions from CResMgr and the actions XML file
* Fixed missing insertion of KAction objects into our KAccel object
* Fixed missing insertion of TDEAction objects into our TDEAccel object
2003-01-17 Joachim Ansorg <junkmail@joachim.ansorgs.de>
* Removed installation instructions, the webpage and README/INSTALL files are good enough
@ -704,7 +704,7 @@
1999-12-19 Joachim Ansorg <Jockel123@gmx.de>
*Fontmanagementdialog uses now a XFonts list, not the list provided by KDE. This solves the problems on
systems without KFontManager
systems without TDEFontManager
*Added files global.h and global.cpp which should contain global functions
*Fixed some typos in the german translation
@ -850,7 +850,7 @@
*Added some text to the handbook
*Removed the german index.sgml file, because it makes no senss.
We will add this if the english one is ready to translate it into german.
*Cleaned up KListView::addChildItem()
*Cleaned up TDEListView::addChildItem()
*Finished dialog of the link manager, needs implementation of functions to work
1999-10-05 Joachim Ansorg <Jockel123@gmx.de>

@ -56,9 +56,9 @@ using namespace Profile;
BibleTime::BibleTime()
: BibleTimeInterface("BibleTimeInterface"),
#if TDE_VERSION >= 0x030200
KMainWindow(KMainWindow::NoDCOPObject, 0,0, WType_TopLevel),
TDEMainWindow(TDEMainWindow::NoDCOPObject, 0,0, WType_TopLevel),
#else
KMainWindow(0,0, WType_TopLevel),
TDEMainWindow(0,0, WType_TopLevel),
#endif
m_windowActionCollection(0),
m_initialized(false),
@ -277,12 +277,12 @@ void BibleTime::restoreWorkspace() {
/** Sets the caption of the mainwindow */
void BibleTime::setCaption( const TQString& ) {
KMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
TDEMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
}
/** Sets the plain caption of the main window */
void BibleTime::setPlainCaption( const TQString& ) {
KMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
TDEMainWindow::setPlainCaption( TDEApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
}
/** Processes the commandline options given to BibleTime. */
@ -323,7 +323,7 @@ void BibleTime::processCommandline() {
void BibleTime::polish() {
m_initialized = true;
KMainWindow::polish();
TDEMainWindow::polish();
applyMainWindowSettings(CBTConfig::getConfig(), TQString::fromLatin1("MainWindow"));
}

@ -36,12 +36,12 @@ namespace InfoDisplay {
}
//KDE classes
class KToggleAction;
class KAccel;
class KPopupMenu;
class KAction;
class KActionMenu;
class KActionCollection;
class TDEToggleAction;
class TDEAccel;
class TDEPopupMenu;
class TDEAction;
class TDEActionMenu;
class TDEActionCollection;
//QT classes
class TQPopupMenu;
@ -125,14 +125,14 @@ class TQSplitter;
/** BibleTime's main class.
* The main class of BibleTime. Here are the main widgets created.
*
* This is the main class of BibleTime! This class creates the GUI, the KAction objects
* This is the main class of BibleTime! This class creates the GUI, the TDEAction objects
* and connects to some slots. Please insert the creation of actions in initActions,
* the creation of widgets into initView and the connect(...) calls into initConnections.
* Reading from a config file on creation time should go into readSettings(), saving into
* saveSettings().
* This is the general way of all BibleTime classes.
*/
class BibleTime : public KMainWindow, virtual public BibleTimeInterface {
class BibleTime : public TDEMainWindow, virtual public BibleTimeInterface {
friend class CMDIArea;
Q_OBJECT
@ -267,7 +267,7 @@ protected slots:
* This slot is connected with the windowAutoCascade_action object
*/
void slotAutoCascade();
void slotUpdateWindowArrangementActions( KAction* );
void slotUpdateWindowArrangementActions( TDEAction* );
void slotCascade();
void slotTileVertical();
@ -352,30 +352,30 @@ private:
TQPopupMenu* m_editMenu;
/** VIEW menu actions */
KToggleAction* m_viewToolbar_action;
KToggleAction* m_viewMainIndex_action;
KToggleAction* m_viewInfoDisplay_action;
TDEToggleAction* m_viewToolbar_action;
TDEToggleAction* m_viewMainIndex_action;
TDEToggleAction* m_viewInfoDisplay_action;
/** WINDOW menu actions */
KAction* m_windowCascade_action;
KAction* m_windowTileHorizontal_action;
KAction* m_windowTileVertical_action;
KActionMenu* m_windowArrangementMode_action;
KToggleAction* m_windowManualMode_action;
KToggleAction* m_windowAutoCascade_action;
KToggleAction* m_windowAutoTileVertical_action;
KToggleAction* m_windowAutoTileHorizontal_action;
KAction* m_windowCloseAll_action;
KActionCollection* m_windowActionCollection;
KActionMenu* m_windowSaveProfile_action;
KAction* m_windowSaveToNewProfile_action;
KActionMenu* m_windowLoadProfile_action;
KActionMenu* m_windowDeleteProfile_action;
KToggleAction* m_windowFullscreen_action;
TQPtrList<KAction> m_windowOpenWindowsList;
TDEAction* m_windowCascade_action;
TDEAction* m_windowTileHorizontal_action;
TDEAction* m_windowTileVertical_action;
TDEActionMenu* m_windowArrangementMode_action;
TDEToggleAction* m_windowManualMode_action;
TDEToggleAction* m_windowAutoCascade_action;
TDEToggleAction* m_windowAutoTileVertical_action;
TDEToggleAction* m_windowAutoTileHorizontal_action;
TDEAction* m_windowCloseAll_action;
TDEActionCollection* m_windowActionCollection;
TDEActionMenu* m_windowSaveProfile_action;
TDEAction* m_windowSaveToNewProfile_action;
TDEActionMenu* m_windowLoadProfile_action;
TDEActionMenu* m_windowDeleteProfile_action;
TDEToggleAction* m_windowFullscreen_action;
TQPtrList<TDEAction> m_windowOpenWindowsList;
KHelpMenu* m_helpMenu;

@ -102,7 +102,7 @@ void BibleTime::initView() {
/** Initializes the action objects of the GUI */
void BibleTime::initActions() {
TDEStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
KAction* action = 0;
TDEAction* action = 0;
action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
@ -112,7 +112,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("Search in &open work(s)"),
action = new TDEAction(i18n("Search in &open work(s)"),
CResMgr::mainMenu::mainIndex::search::icon,
CResMgr::mainMenu::mainIndex::search::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotSearchModules()), actionCollection(),
@ -125,7 +125,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("Search in standard &Bible"),
action = new TDEAction(i18n("Search in standard &Bible"),
CResMgr::mainMenu::mainIndex::searchdefaultbible::icon,
CResMgr::mainMenu::mainIndex::searchdefaultbible::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotSearchDefaultBible()), actionCollection(),
@ -147,7 +147,7 @@ void BibleTime::initActions() {
#endif
m_viewMainIndex_action = new KToggleAction(i18n("&Show bookshelf"),
m_viewMainIndex_action = new TDEToggleAction(i18n("&Show bookshelf"),
CResMgr::mainMenu::view::showMainIndex::icon,
CResMgr::mainMenu::view::showMainIndex::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotToggleMainIndex()), actionCollection(),
@ -159,7 +159,7 @@ void BibleTime::initActions() {
m_viewMainIndex_action->plugAccel( accel() );
#endif
m_viewInfoDisplay_action = new KToggleAction(i18n("Show &mag"),
m_viewInfoDisplay_action = new TDEToggleAction(i18n("Show &mag"),
CResMgr::mainMenu::view::showInfoDisplay::icon,
CResMgr::mainMenu::view::showInfoDisplay::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotToggleInfoDisplay()), actionCollection(),
@ -179,7 +179,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("Bookshelf &Manager"),
action = new TDEAction(i18n("Bookshelf &Manager"),
CResMgr::mainMenu::settings::swordSetupDialog::icon,
CResMgr::mainMenu::settings::swordSetupDialog::accel,
TQT_TQOBJECT(this), TQT_SLOT( slotSwordSetupDialog() ), actionCollection(),
@ -205,13 +205,13 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
m_windowArrangementMode_action = new KActionMenu(i18n("&Arrangement mode"),
m_windowArrangementMode_action = new TDEActionMenu(i18n("&Arrangement mode"),
CResMgr::mainMenu::window::arrangementMode::icon,
actionCollection(),
CResMgr::mainMenu::window::arrangementMode::actionName);
m_windowArrangementMode_action->setDelayed( false );
m_windowManualMode_action = new KToggleAction(i18n("&Manual mode"),
m_windowManualMode_action = new TDEToggleAction(i18n("&Manual mode"),
CResMgr::mainMenu::window::arrangementMode::manual::icon,
CResMgr::mainMenu::window::arrangementMode::manual::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotManualArrangementMode()), actionCollection(),
@ -228,7 +228,7 @@ void BibleTime::initActions() {
m_windowArrangementMode_action->insert( m_windowManualMode_action );
m_windowAutoTileVertical_action = new KToggleAction(i18n("Auto-tile &vertically"),
m_windowAutoTileVertical_action = new TDEToggleAction(i18n("Auto-tile &vertically"),
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon,
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileVertical()), actionCollection(),
@ -245,7 +245,7 @@ void BibleTime::initActions() {
m_windowArrangementMode_action->insert( m_windowAutoTileVertical_action );
m_windowAutoTileHorizontal_action = new KToggleAction(i18n("Auto-tile &horizontally"),
m_windowAutoTileHorizontal_action = new TDEToggleAction(i18n("Auto-tile &horizontally"),
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon,
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileHorizontal()), actionCollection(),
@ -262,7 +262,7 @@ void BibleTime::initActions() {
m_windowArrangementMode_action->insert( m_windowAutoTileHorizontal_action );
m_windowAutoCascade_action = new KToggleAction(i18n("Auto-&cascade"),
m_windowAutoCascade_action = new TDEToggleAction(i18n("Auto-&cascade"),
CResMgr::mainMenu::window::arrangementMode::autoCascade::icon,
CResMgr::mainMenu::window::arrangementMode::autoCascade::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotAutoCascade()), actionCollection(),
@ -278,7 +278,7 @@ void BibleTime::initActions() {
m_windowArrangementMode_action->insert( m_windowAutoCascade_action );
m_windowCascade_action = new KAction(i18n("&Cascade"),
m_windowCascade_action = new TDEAction(i18n("&Cascade"),
CResMgr::mainMenu::window::cascade::icon,
CResMgr::mainMenu::window::cascade::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotCascade()), actionCollection(),
@ -292,7 +292,7 @@ void BibleTime::initActions() {
#endif
m_windowTileVertical_action = new KAction(i18n("Tile &vertically"),
m_windowTileVertical_action = new TDEAction(i18n("Tile &vertically"),
CResMgr::mainMenu::window::tileVertical::icon,
CResMgr::mainMenu::window::tileVertical::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotTileVertical()), actionCollection(),
@ -304,7 +304,7 @@ void BibleTime::initActions() {
m_windowTileVertical_action->plugAccel( accel() );
#endif
m_windowTileHorizontal_action = new KAction(i18n("Tile &horizontally"),
m_windowTileHorizontal_action = new TDEAction(i18n("Tile &horizontally"),
CResMgr::mainMenu::window::tileHorizontal::icon,
CResMgr::mainMenu::window::tileHorizontal::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotTileHorizontal()), actionCollection(),
@ -318,7 +318,7 @@ void BibleTime::initActions() {
#endif
m_windowCloseAll_action = new KAction(i18n("Cl&ose all"),
m_windowCloseAll_action = new TDEAction(i18n("Cl&ose all"),
CResMgr::mainMenu::window::closeAll::icon,
CResMgr::mainMenu::window::closeAll::accel,
TQT_TQOBJECT(m_mdi), TQT_SLOT(deleteAll()), actionCollection(),
@ -331,7 +331,7 @@ void BibleTime::initActions() {
#endif
m_windowSaveProfile_action = new KActionMenu(i18n("&Save session"),
m_windowSaveProfile_action = new TDEActionMenu(i18n("&Save session"),
CResMgr::mainMenu::window::saveProfile::icon,
actionCollection(),
CResMgr::mainMenu::window::saveProfile::actionName
@ -344,7 +344,7 @@ void BibleTime::initActions() {
#endif
m_windowSaveToNewProfile_action = new KAction(i18n("Save as &new session"),
m_windowSaveToNewProfile_action = new TDEAction(i18n("Save as &new session"),
CResMgr::mainMenu::window::saveToNewProfile::icon,
CResMgr::mainMenu::window::saveToNewProfile::accel,
TQT_TQOBJECT(this), TQT_SLOT(saveToNewProfile()), actionCollection(),
@ -357,7 +357,7 @@ void BibleTime::initActions() {
#endif
m_windowLoadProfile_action = new KActionMenu(i18n("&Load session"),
m_windowLoadProfile_action = new TDEActionMenu(i18n("&Load session"),
CResMgr::mainMenu::window::loadProfile::icon,
actionCollection(),
CResMgr::mainMenu::window::loadProfile::actionName
@ -369,7 +369,7 @@ void BibleTime::initActions() {
m_windowLoadProfile_action->plugAccel( accel() );
#endif
m_windowDeleteProfile_action = new KActionMenu(i18n("&Delete session"),
m_windowDeleteProfile_action = new TDEActionMenu(i18n("&Delete session"),
CResMgr::mainMenu::window::deleteProfile::icon,
actionCollection(),
CResMgr::mainMenu::window::deleteProfile::actionName
@ -381,7 +381,7 @@ void BibleTime::initActions() {
m_windowDeleteProfile_action->plugAccel( accel() );
#endif
m_windowFullscreen_action = new KToggleAction(i18n("&Fullscreen mode"),
m_windowFullscreen_action = new TDEToggleAction(i18n("&Fullscreen mode"),
CResMgr::mainMenu::window::showFullscreen::icon,
CResMgr::mainMenu::window::showFullscreen::accel,
TQT_TQOBJECT(this), TQT_SLOT(toggleFullscreen()), actionCollection(),
@ -395,9 +395,9 @@ void BibleTime::initActions() {
#endif
//connect the profile popups to the right slots
KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
KPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
TDEPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
connect(loadPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(loadProfile(int)));
connect(savePopup, TQT_SIGNAL(activated(int)), TQT_SLOT(saveProfile(int)));
@ -410,7 +410,7 @@ void BibleTime::initActions() {
(actionCollection()->action(KStdAction::stdName(KStdAction::HelpContents)) );
}
action = new KAction(i18n("&Handbook"),
action = new TDEAction(i18n("&Handbook"),
CResMgr::mainMenu::help::handbook::icon,
CResMgr::mainMenu::help::handbook::accel,
TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Handbook()), actionCollection(),
@ -423,7 +423,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("&Bible Study Howto"),
action = new TDEAction(i18n("&Bible Study Howto"),
CResMgr::mainMenu::help::bibleStudyHowTo::icon,
CResMgr::mainMenu::help::bibleStudyHowTo::accel,
TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Howto()), actionCollection(),
@ -437,7 +437,7 @@ void BibleTime::initActions() {
#endif
if ( actionCollection()->action( KStdAction::stdName( KStdAction::WhatsThis ) ) ) { //delete "What's this" action if KDE created it already
KAction* action = actionCollection()->action(KStdAction::stdName( KStdAction::WhatsThis ));
TDEAction* action = actionCollection()->action(KStdAction::stdName( KStdAction::WhatsThis ));
actionCollection()->remove
( action );
}
@ -454,7 +454,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
action = new KAction(i18n("&Daily tip"),
action = new TDEAction(i18n("&Daily tip"),
CResMgr::mainMenu::help::dailyTip::icon,
CResMgr::mainMenu::help::dailyTip::accel,
TQT_TQOBJECT(this), TQT_SLOT(slotHelpTipOfDay()), actionCollection(),
@ -586,11 +586,11 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
//first Main Window state
m_windowFullscreen_action->setChecked( p->fullscreen() ); //set the fullscreen button state
toggleFullscreen(); //either showFullscreen or showNormal
if (p->maximized()) KMainWindow::showMaximized(); //if maximized, then also call showMaximized
if (p->maximized()) TDEMainWindow::showMaximized(); //if maximized, then also call showMaximized
//Then Main Window geometry
KMainWindow::resize( p->geometry().size() ); //Don't use KMainWindowInterface::resize
KMainWindow::move( p->geometry().topLeft() );//Don't use KMainWindowInterface::move
TDEMainWindow::resize( p->geometry().size() ); //Don't use TDEMainWindowInterface::resize
TDEMainWindow::move( p->geometry().topLeft() );//Don't use TDEMainWindowInterface::move
}
}
@ -600,7 +600,7 @@ void BibleTime::storeProfileSettings( CProfile* p ) {
if (!p || !m_windowFullscreen_action) return;
p->setFullscreen( m_windowFullscreen_action->isChecked() );
p->setMaximized( this->KMainWindow::isMaximized() );
p->setMaximized( this->TDEMainWindow::isMaximized() );
TQRect geometry;
geometry.setTopLeft(pos());

@ -66,10 +66,10 @@ using namespace Profile;
/* An action which stores a user defined pointer to a widget.
* @author Joachim Ansorg
*/
class KUserDataAction : public KToggleAction {
class KUserDataAction : public TDEToggleAction {
public:
KUserDataAction( TQString caption, const KShortcut& shortcut, const TQObject* receiver, const char* slot, KActionCollection* actionCollection)
: KToggleAction(caption, shortcut, receiver, slot, actionCollection), m_userData(0) { /* no impl */
KUserDataAction( TQString caption, const TDEShortcut& shortcut, const TQObject* receiver, const char* slot, TDEActionCollection* actionCollection)
: TDEToggleAction(caption, shortcut, receiver, slot, actionCollection), m_userData(0) { /* no impl */
};
void setUserData(TQWidget* const data) {
@ -171,15 +171,15 @@ void BibleTime::slotWindowMenuAboutToShow() {
m_windowCloseAll_action->setEnabled( true );
}
TQPtrList<KAction>::iterator end = m_windowOpenWindowsList.end();
for (TQPtrList<KAction>::iterator it = m_windowOpenWindowsList.begin(); it != end; ++it ) {
TQPtrList<TDEAction>::iterator end = m_windowOpenWindowsList.end();
for (TQPtrList<TDEAction>::iterator it = m_windowOpenWindowsList.begin(); it != end; ++it ) {
(*it)->unplugAll();
}
m_windowOpenWindowsList.setAutoDelete(true);
m_windowOpenWindowsList.clear();
if (!m_windowActionCollection) {
m_windowActionCollection = new KActionCollection(this);
m_windowActionCollection = new TDEActionCollection(this);
}
TQWidgetList windows = m_mdi->windowList();
@ -188,7 +188,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
TQWidget* w = windows.at(i);
Q_ASSERT(w);
KUserDataAction* action = new KUserDataAction(w->caption(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
KUserDataAction* action = new KUserDataAction(w->caption(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
Q_ASSERT(action);
action->setUserData(w);
@ -199,7 +199,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
}
/** This slot is connected with the windowAutoTile_action object */
void BibleTime::slotUpdateWindowArrangementActions( KAction* clickedAction ) {
void BibleTime::slotUpdateWindowArrangementActions( TDEAction* clickedAction ) {
/* If a toggle action was clicked we see if it checked ot unchecked and
* enable/disable the simple cascade and tile options accordingly
*/
@ -396,7 +396,7 @@ void BibleTime::openOnlineHelp_Howto() {
void BibleTime::saveProfile(int ID) {
m_mdi->setUpdatesEnabled(false);
KPopupMenu* popup = m_windowSaveProfile_action->popupMenu();
TDEPopupMenu* popup = m_windowSaveProfile_action->popupMenu();
const TQString profileName = popup->text(ID).remove("&");
CProfile* p = m_profileMgr.profile( profileName );
Q_ASSERT(p);
@ -435,8 +435,8 @@ void BibleTime::saveProfile(CProfile* profile) {
}
void BibleTime::loadProfile(int ID) {
KPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
//HACK: workaround the inserted & char by KPopupMenu
TDEPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
//HACK: workaround the inserted & char by TDEPopupMenu
const TQString profileName = popup->text(ID).remove("&");
CProfile* p = m_profileMgr.profile( profileName );
// tqWarning("requesting popup: %s", popup->text(ID).latin1());
@ -505,8 +505,8 @@ void BibleTime::loadProfile(CProfile* p) {
}
void BibleTime::deleteProfile(int ID) {
KPopupMenu* popup = m_windowDeleteProfile_action->popupMenu();
//HACK: work around the inserted & char by KPopupMenu
TDEPopupMenu* popup = m_windowDeleteProfile_action->popupMenu();
//HACK: work around the inserted & char by TDEPopupMenu
const TQString profileName = popup->text(ID).remove("&");
CProfile* p = m_profileMgr.profile( profileName );
Q_ASSERT(p);
@ -536,13 +536,13 @@ void BibleTime::saveToNewProfile() {
/** Slot to refresh the save profile and load profile menus. */
void BibleTime::refreshProfileMenus() {
KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
TDEPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
savePopup->clear();
KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
TDEPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
loadPopup->clear();
KPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
TDEPopupMenu* deletePopup = m_windowDeleteProfile_action->popupMenu();
deletePopup->clear();
//refresh the load, save and delete profile menus

@ -555,7 +555,7 @@ const CSwordBackend::FilterOptions CBTConfig::getFilterOptionDefaults() {
return options;
}
void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) {
void CBTConfig::setupAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection) {
TQString groupName;
switch (type) {
case allWindows : {
@ -596,7 +596,7 @@ void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection
actionCollection->readShortcutSettings(groupName, CBTConfig::getConfig());
}
void CBTConfig::saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) {
void CBTConfig::saveAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection) {
TQString groupName;
switch (type) {
case allWindows : {

@ -22,8 +22,8 @@
#include <tqmap.h>
//Forward declarations
class KAccel;
class KActionCollection;
class TDEAccel;
class TDEActionCollection;
class TDEConfig;
/**
@ -162,8 +162,8 @@ public:
static const CSwordBackend::FilterOptions getFilterOptionDefaults();
static const CSwordBackend::DisplayOptions getDisplayOptionDefaults();
static void setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection);
static void saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection);
static void setupAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection);
static void saveAccelSettings(const CBTConfig::keys type, TDEActionCollection* const actionCollection);
static const TQString getModuleEncryptionKey( const TQString& name );
static void setModuleEncryptionKey( const TQString& name, const TQString& key );

@ -22,7 +22,7 @@
#include <tqstrlist.h>
#include <tqevent.h>
class KPopupMenu;
class TDEPopupMenu;
class CSwordModuleInfo;
class CSwordKey;

@ -71,7 +71,7 @@
using std::string;
using std::list;
COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection )
COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, TDEActionCollection* actionCollection )
: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, TQString(), TQString(), TQString()) {
m_settings.keys.application.actionCollection = actionCollection;
@ -341,7 +341,7 @@ void COptionsDialog::initLanguages() {
layout->addLayout(hLayout);
//#warning TODO: remember the last selected font and jump there.
m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, TQStringList(), true, 5);
m_settings.fonts.fontChooser = new TDEFontChooser(page, "fonts", false, TQStringList(), true, 5);
m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog."));
layout->addWidget(m_settings.fonts.fontChooser);
@ -407,7 +407,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- All display windows ------ //
m_settings.keys.general.actionCollection = new KActionCollection(this, "displayActions", 0);
m_settings.keys.general.actionCollection = new TDEActionCollection(this, "displayActions", 0);
CDisplayWindow::insertKeyboardActions( m_settings.keys.general.actionCollection);
CBTConfig::setupAccelSettings(
CBTConfig::allWindows,
@ -419,7 +419,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- Bible windows ------ //
m_settings.keys.bible.actionCollection = new KActionCollection(this, "bibleActions", 0);
m_settings.keys.bible.actionCollection = new TDEActionCollection(this, "bibleActions", 0);
CBibleReadWindow::insertKeyboardActions( m_settings.keys.bible.actionCollection);
CBTConfig::setupAccelSettings(
CBTConfig::bibleWindow,
@ -427,7 +427,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- Commentary windows ------ //
m_settings.keys.commentary.actionCollection= new KActionCollection(this, "commentaryActions", 0);
m_settings.keys.commentary.actionCollection= new TDEActionCollection(this, "commentaryActions", 0);
CCommentaryReadWindow::insertKeyboardActions( m_settings.keys.commentary.actionCollection);
CBTConfig::setupAccelSettings(
CBTConfig::commentaryWindow,
@ -435,7 +435,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- Lexicon windows ------ //
m_settings.keys.lexicon.actionCollection = new KActionCollection(this, "lexiconActions", 0);
m_settings.keys.lexicon.actionCollection = new TDEActionCollection(this, "lexiconActions", 0);
CLexiconReadWindow::insertKeyboardActions( m_settings.keys.lexicon.actionCollection );
CBTConfig::setupAccelSettings(
CBTConfig::lexiconWindow,
@ -443,7 +443,7 @@ void COptionsDialog::initAccelerators() {
);
// ----- Book windows ------ //
m_settings.keys.book.actionCollection= new KActionCollection(this, "bookActions", 0);
m_settings.keys.book.actionCollection= new TDEActionCollection(this, "bookActions", 0);
CBookReadWindow::insertKeyboardActions( m_settings.keys.book.actionCollection);
CBTConfig::setupAccelSettings(
CBTConfig::bookWindow,

@ -40,11 +40,11 @@ class TQComboBox;
class TQRadioButton;
class TQWidgetStack;
class KListBox;
class TDEListBox;
class KKeyChooser;
class KTabCtl;
class TDEHTMLPart;
class KActionCollection;
class TDEActionCollection;
/**
* The optionsdialog of BibleTime
@ -55,7 +55,7 @@ class COptionsDialog : public KDialogBase, public CPointers {
public:
COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection);
COptionsDialog(TQWidget *parent, const char *name, TDEActionCollection* actionCollection);
virtual ~COptionsDialog();
enum Parts {
@ -104,7 +104,7 @@ private:
struct WindowType {
TQGuardedPtr<KKeyChooser> keyChooser;
KActionCollection* actionCollection;
TDEActionCollection* actionCollection;
TQString title;
WindowType() {
@ -136,7 +136,7 @@ private:
struct FontSettings {
TQComboBox* swordLocaleCombo;
KFontChooser* fontChooser;
TDEFontChooser* fontChooser;
TQComboBox* usage;
TQCheckBox* useOwnFontBox;
//the pair os to check whether the standard font (bool == false) or whether an own font should be used (true)

@ -66,7 +66,7 @@ namespace BookshelfManager {
* @author Martin Gruner
*/
CSwordSetupModuleListView::CSwordSetupModuleListView(TQWidget *parent, bool is_remote, sword::InstallSource* installSource)
: KListView(parent), m_is_remote( is_remote ) {
: TDEListView(parent), m_is_remote( is_remote ) {
Q_ASSERT(installSource);
new BookshelfManager::ToolTip(this);
m_backend = installSource ? BTInstallMgr::Tool::backend(installSource) : CPointers::backend();

@ -27,7 +27,7 @@ class CSwordBackend;
namespace BookshelfManager {
class CSwordSetupModuleListView : public KListView {
class CSwordSetupModuleListView : public TDEListView {
Q_OBJECT

@ -129,8 +129,8 @@ void CHTMLWriteDisplay::slotFontChanged( const TQFont& font ) {
m_actions.underline->setChecked( font.underline() );
};
void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions) {
m_actions.fontChooser = new KFontAction( i18n("Choose a font"),
void CHTMLWriteDisplay::setupToolbar(TDEToolBar * bar, TDEActionCollection * actions) {
m_actions.fontChooser = new TDEFontAction( i18n("Choose a font"),
CResMgr::displaywindows::writeWindow::underlinedText::accel,
actions,
CResMgr::displaywindows::writeWindow::fontFamily::actionName
@ -141,7 +141,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
connect(m_actions.fontChooser, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(setFamily(const TQString&)));
m_actions.fontSizeChooser = new KFontSizeAction( i18n("Choose a font size"),
m_actions.fontSizeChooser = new TDEFontSizeAction( i18n("Choose a font size"),
CResMgr::displaywindows::writeWindow::fontSize::accel,
actions,
CResMgr::displaywindows::writeWindow::fontSize::actionName
@ -159,9 +159,9 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
(new KActionSeparator())->plug(bar); //seperate font options from formatting buttons
(new TDEActionSeparator())->plug(bar); //seperate font options from formatting buttons
m_actions.bold = new KToggleAction( i18n("Bold"),
m_actions.bold = new TDEToggleAction( i18n("Bold"),
CResMgr::displaywindows::writeWindow::boldText::icon,
CResMgr::displaywindows::writeWindow::boldText::accel,
TQT_TQOBJECT(this), TQT_SLOT(toggleBold()),
@ -172,7 +172,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.bold->plug(bar);
m_actions.italic = new KToggleAction( i18n("Italic"),
m_actions.italic = new TDEToggleAction( i18n("Italic"),
CResMgr::displaywindows::writeWindow::italicText::icon,
CResMgr::displaywindows::writeWindow::italicText::accel,
TQT_TQOBJECT(this), TQT_SLOT(toggleItalic()),
@ -183,7 +183,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.italic->plug(bar);
m_actions.underline = new KToggleAction( i18n("Underline"),
m_actions.underline = new TDEToggleAction( i18n("Underline"),
CResMgr::displaywindows::writeWindow::underlinedText::icon,
CResMgr::displaywindows::writeWindow::underlinedText::accel,
TQT_TQOBJECT(this), TQT_SLOT(toggleUnderline()),
@ -195,9 +195,9 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.underline->plug(bar);
(new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
(new TDEActionSeparator())->plug(bar); //seperate formatting from alignment buttons
m_actions.alignLeft = new KToggleAction( i18n("Left"),
m_actions.alignLeft = new TDEToggleAction( i18n("Left"),
CResMgr::displaywindows::writeWindow::alignLeft::icon,
CResMgr::displaywindows::writeWindow::alignLeft::accel,
TQT_TQOBJECT(this), TQT_SLOT( alignLeft() ),
@ -208,7 +208,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.alignLeft->plug(bar);
m_actions.alignCenter = new KToggleAction( i18n("Center"),
m_actions.alignCenter = new TDEToggleAction( i18n("Center"),
CResMgr::displaywindows::writeWindow::alignCenter::icon,
CResMgr::displaywindows::writeWindow::alignCenter::accel,
TQT_TQOBJECT(this), TQT_SLOT(alignCenter()),
@ -219,7 +219,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.alignCenter->plug(bar);
m_actions.alignRight = new KToggleAction( i18n("Right"),
m_actions.alignRight = new TDEToggleAction( i18n("Right"),
CResMgr::displaywindows::writeWindow::alignRight::icon,
CResMgr::displaywindows::writeWindow::alignRight::accel,
TQT_TQOBJECT(this), TQT_SLOT(alignRight()),
@ -230,7 +230,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.alignRight->plug(bar);
// m_actions.alignJustify = new KToggleAction( i18n("Justify"),
// m_actions.alignJustify = new TDEToggleAction( i18n("Justify"),
// CResMgr::displaywindows::writeWindow::alignJustify::icon,
// CResMgr::displaywindows::writeWindow::alignJustify::accel,
// this, TQT_SLOT( alignJustify() ),
@ -255,10 +255,10 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
/** Reimplementation to show a popup menu if the right mouse butoon was clicked. */
TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) {
if (!m_actions.selectAll) {
m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(selectAll()), TQT_TQOBJECT(this));
m_actions.selectAll = new TDEAction(i18n("Select all"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(selectAll()), TQT_TQOBJECT(this));
}
KPopupMenu* popup = new KPopupMenu(this);
TDEPopupMenu* popup = new TDEPopupMenu(this);
popup->insertTitle(i18n("HTML editor window"));
m_actions.selectAll->plug(popup);

@ -23,9 +23,9 @@ class CWriteWindow;
class TQPopupMenu;
class KToggleAction;
class KFontAction;
class KFontSizeAction;
class TDEToggleAction;
class TDEFontAction;
class TDEFontSizeAction;
class KColorButton;
@ -48,7 +48,7 @@ public:
/**
* Creates the necessary action objects and puts them on the toolbar.
*/
virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
virtual void setupToolbar(TDEToolBar * bar, TDEActionCollection * actionCollection);
protected:
friend class CDisplay;
@ -84,19 +84,19 @@ protected slots:
private:
struct {
KToggleAction* bold;
KToggleAction* italic;
KToggleAction* underline;
TDEToggleAction* bold;
TDEToggleAction* italic;
TDEToggleAction* underline;
KToggleAction* alignLeft;
KToggleAction* alignCenter;
KToggleAction* alignRight;
TDEToggleAction* alignLeft;
TDEToggleAction* alignCenter;
TDEToggleAction* alignRight;
KFontAction* fontChooser;
KFontSizeAction* fontSizeChooser;
TDEFontAction* fontChooser;
TDEFontSizeAction* fontSizeChooser;
//popup menu
KAction* selectAll;
TDEAction* selectAll;
}
m_actions;
KColorButton* m_colorButton;

@ -96,7 +96,7 @@ TQPopupMenu* CPlainWriteDisplay::createPopupMenu( ) {
}
/** Creates the necessary action objects and puts them on the toolbar. */
void CPlainWriteDisplay::setupToolbar(KToolBar* /*bar*/, KActionCollection* /*actionCollection*/) {}
void CPlainWriteDisplay::setupToolbar(TDEToolBar* /*bar*/, TDEActionCollection* /*actionCollection*/) {}
/** Reimplementation to insert the text of a dragged reference into the edit view. */
void CPlainWriteDisplay::contentsDragEnterEvent( TQDragEnterEvent* e ) {

@ -20,7 +20,7 @@
#include <tqtextedit.h>
class CHTMLWriteDisplay;
class KAction;
class TDEAction;
/** The write display implementation for plain source code editing.
* @author The BibleTime team
@ -60,7 +60,7 @@ public:
/**
* Creates the necessary action objects and puts them on the toolbar.
*/
virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
virtual void setupToolbar(TDEToolBar * bar, TDEActionCollection * actionCollection);
protected:
friend class CDisplay;

@ -14,8 +14,8 @@
#include "cdisplay.h"
class KActionCollection;
class KToolBar;
class TDEActionCollection;
class TDEToolBar;
/**The base class for all read/write-display classes.
*@author The BibleTime team
@ -44,7 +44,7 @@ public: // Public methods
/**
* Creates the necessary action objects and puts them on the toolbar.
*/
virtual void setupToolbar( KToolBar* bar, KActionCollection* actionCollection ) = 0;
virtual void setupToolbar( TDEToolBar* bar, TDEActionCollection* actionCollection ) = 0;
};
#endif

@ -77,50 +77,50 @@ void CBibleReadWindow::storeProfileSettings( CProfileWindow* const settings ) {
/** Reimplementation. */
void CBibleReadWindow::insertKeyboardActions( KActionCollection* const a ) {
new KAction(
void CBibleReadWindow::insertKeyboardActions( TDEActionCollection* const a ) {
new TDEAction(
i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel,
a, "nextBook"
);
new KAction(
new TDEAction(
i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel,
a, "previousBook"
);
new KAction(
new TDEAction(
i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel,
a, "nextChapter"
);
new KAction(
new TDEAction(
i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel,
a, "previousChapter"
);
new KAction(
new TDEAction(
i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel,
a, "nextVerse"
);
new KAction(
new TDEAction(
i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel,
a, "previousVerse"
);
//popup menu items
// new KAction(i18n("Select all"), KStdAccel::selectAll(), a, "selectAll");
// new TDEAction(i18n("Select all"), TDEStdAccel::selectAll(), a, "selectAll");
//copy menu items
// new KAction(i18n("Copy reference only"), KShortcut(0), a, "copyReferenceOnly");
// new KAction(i18n("Text of reference"), KShortcut(0), a, "copyTextOfReference");
// new KAction(i18n("Reference with text"), KShortcut(0), a, "copyReferenceWithText");
new KAction(i18n("Copy chapter"), KShortcut(0), a, "copyChapter");
// new KAction(i18n("Copy selected text"), KStdAccel::copy(), a, "copySelectedText");
// new TDEAction(i18n("Copy reference only"), TDEShortcut(0), a, "copyReferenceOnly");
// new TDEAction(i18n("Text of reference"), TDEShortcut(0), a, "copyTextOfReference");
// new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "copyReferenceWithText");
new TDEAction(i18n("Copy chapter"), TDEShortcut(0), a, "copyChapter");
// new TDEAction(i18n("Copy selected text"), TDEStdAccel::copy(), a, "copySelectedText");
//save menu
// new KAction(i18n("Reference with text"), KShortcut(0), a, "saveReferenceWithText");
new KAction(i18n("Save chapter as plain text"), KShortcut(0), a, "saveChapterAsPlainText");
new KAction(i18n("Save chapter as HTML"), KShortcut(0), a, "saveChapterAsHTML");
// new KAction(i18n("Reference with text"), KShortcut(0), a, "saveReferenceWithText");
// new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "saveReferenceWithText");
new TDEAction(i18n("Save chapter as plain text"), TDEShortcut(0), a, "saveChapterAsPlainText");
new TDEAction(i18n("Save chapter as HTML"), TDEShortcut(0), a, "saveChapterAsHTML");
// new TDEAction(i18n("Reference with text"), TDEShortcut(0), a, "saveReferenceWithText");
//print
new KAction(i18n("Print chapter"), KStdAccel::print(), a, "printChapter");
new TDEAction(i18n("Print chapter"), TDEStdAccel::print(), a, "printChapter");
}
void CBibleReadWindow::initActions() {
@ -130,37 +130,37 @@ void CBibleReadWindow::initActions() {
actionCollection()->action("nextEntry")->setEnabled(false);
actionCollection()->action("previousEntry")->setEnabled(false);
new KAction(
new TDEAction(
i18n("Next book"),
CResMgr::displaywindows::bibleWindow::nextBook::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
actionCollection(), "nextBook"
);
new KAction(
new TDEAction(
i18n("Previous book"),
CResMgr::displaywindows::bibleWindow::previousBook::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
actionCollection(), "previousBook"
);
new KAction(
new TDEAction(
i18n("Next chapter"),
CResMgr::displaywindows::bibleWindow::nextChapter::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
actionCollection(), "nextChapter"
);
new KAction(
new TDEAction(
i18n("Previous chapter"),
CResMgr::displaywindows::bibleWindow::previousChapter::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
actionCollection(), "previousChapter"
);
new KAction(
new TDEAction(
i18n("Next verse"),
CResMgr::displaywindows::bibleWindow::nextVerse::accel,
TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
actionCollection(), "nextVerse"
);
new KAction(
new TDEAction(
i18n("Previous verse"),
CResMgr::displaywindows::bibleWindow::previousVerse::accel,
TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),
@ -173,7 +173,7 @@ void CBibleReadWindow::initActions() {
m_actions.findText = actionCollection()->action("findText");
Q_ASSERT(m_actions.findText);
m_actions.findStrongs = new KAction(
m_actions.findStrongs = new TDEAction(
i18n("Strong's Search"),
CResMgr::displaywindows::general::findStrongs::icon,
CResMgr::displaywindows::general::findStrongs::accel,
@ -182,26 +182,26 @@ void CBibleReadWindow::initActions() {
CResMgr::displaywindows::general::findStrongs::actionName);
m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
m_actions.copy.referenceOnly = new TDEAction(i18n("Reference only"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly");
m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
m_actions.copy.referenceTextOnly = new TDEAction(i18n("Text of reference"), TDEShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference");
m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
m_actions.copy.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText");
m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
m_actions.copy.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
m_actions.copy.selectedText = actionCollection()->action("copySelectedText");
Q_ASSERT(m_actions.copy.selectedText);
m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.save.referenceAndText = new TDEAction(i18n("Reference with text"), TDEShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
m_actions.save.chapterAsPlain = new TDEAction(i18n("Chapter as plain text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
m_actions.save.chapterAsHTML = new TDEAction(i18n("Chapter as HTML"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.print.reference = new TDEAction(i18n("Reference with text"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printChapter");
m_actions.print.chapter = new TDEAction(i18n("Chapter"), TDEShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printChapter");
CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection());
}
@ -232,26 +232,26 @@ void CBibleReadWindow::setupPopupMenu() {
m_actions.findStrongs->plug(popup());
m_actions.selectAll->plug(popup());
(new KActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
(new TDEActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, TQT_TQOBJECT(popup()));
m_actions.copyMenu = new TDEActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, TQT_TQOBJECT(popup()));
m_actions.copyMenu->setDelayed( false );
m_actions.copyMenu->insert(m_actions.copy.referenceOnly);
m_actions.copyMenu->insert(m_actions.copy.referenceTextOnly);
m_actions.copyMenu->insert(m_actions.copy.referenceAndText);
m_actions.copyMenu->insert(m_actions.copy.chapter);
m_actions.copyMenu->insert(new KActionSeparator(TQT_TQOBJECT(this)));
m_actions.copyMenu->insert(new TDEActionSeparator(TQT_TQOBJECT(this)));
m_actions.copyMenu->insert(m_actions.copy.selectedText);
m_actions.copyMenu->plug(popup());
m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,TQT_TQOBJECT(popup()));
m_actions.saveMenu = new TDEActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,TQT_TQOBJECT(popup()));
m_actions.saveMenu->setDelayed( false );
m_actions.saveMenu->insert(m_actions.save.referenceAndText);
m_actions.saveMenu->insert(m_actions.save.chapterAsPlain);
m_actions.saveMenu->insert(m_actions.save.chapterAsHTML);
m_actions.saveMenu->plug(popup());
m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, TQT_TQOBJECT(popup()));
m_actions.printMenu = new TDEActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, TQT_TQOBJECT(popup()));
m_actions.printMenu->setDelayed(false);
m_actions.printMenu->insert(m_actions.print.reference);
m_actions.printMenu->insert(m_actions.print.chapter);

@ -48,7 +48,7 @@ public:
/**
* Reimplementation.
*/
static void insertKeyboardActions( KActionCollection* const a );
static void insertKeyboardActions( TDEActionCollection* const a );
protected:
virtual void initActions();
@ -69,32 +69,32 @@ protected:
virtual bool eventFilter( TQObject* o, TQEvent* e);
struct {
KAction* selectAll;
KAction* findText;
KAction* findStrongs;
TDEAction* selectAll;
TDEAction* findText;
TDEAction* findStrongs;
KActionMenu* copyMenu;