Rename a number of classes to enhance compatibility with KDE4

5 files changed, 33 insertions, 33 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);
 
diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h
index 739eb94..0d81610 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.h
+++ b/bibletime/frontend/display/chtmlwritedisplay.h
@@ -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;
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
index 6db1d1d..2619974 100644
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ b/bibletime/frontend/display/cplainwritedisplay.cpp
@@ -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 ) {
diff --git a/bibletime/frontend/display/cplainwritedisplay.h b/bibletime/frontend/display/cplainwritedisplay.h
index 897eb85..85cf17b 100644
--- a/bibletime/frontend/display/cplainwritedisplay.h
+++ b/bibletime/frontend/display/cplainwritedisplay.h
@@ -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;
diff --git a/bibletime/frontend/display/cwritedisplay.h b/bibletime/frontend/display/cwritedisplay.h
index f33b4d7..50df09a 100644
--- a/bibletime/frontend/display/cwritedisplay.h
+++ b/bibletime/frontend/display/cwritedisplay.h
@@ -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