Rename a number of classes to enhance compatibility with KDE4

1 files changed, 14 insertions, 14 deletions

diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
index 111eb19..7c93755 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ b/bibletime/frontend/display/chtmlwritedisplay.cpp
@@ -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);