Rename a number of old tq methods that are no longer tq specific

6 files changed, 18 insertions, 18 deletions

diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp
index bc3aad9..485a6c4 100644
--- a/bibletime/frontend/display/cdisplay.cpp
+++ b/bibletime/frontend/display/cdisplay.cpp
@@ -20,7 +20,7 @@
 
 
 //TQt includes
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpopupmenu.h>
 #include <tqtimer.h>
 
@@ -139,7 +139,7 @@ CDisplay::~CDisplay() {
 const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::TextPart part  ) {
 	const TQString content = text(format, part);
 
-	TQClipboard* cb = KApplication::tqclipboard();
+	TQClipboard* cb = KApplication::clipboard();
 	cb->setText(content);
 	return true;
 }
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index 2e8b126..06cd21d 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -33,7 +33,7 @@
 #include <tqwidget.h>
 #include <tqdragobject.h>
 #include <tqpopupmenu.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #if TDE_VERSION < 0x030300
 //We will need to show the error message.
@@ -168,9 +168,9 @@ const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CD
 					.append(key->module()->name())
 					.append(")");
 				/*    ("%1\n(%2, %3)")
-					.tqarg()
-					.tqarg(key->key())
-					.tqarg(key->module()->name());*/
+					.arg()
+					.arg(key->key())
+					.arg(key->module()->name());*/
 			}
 			return TQString();
 		}
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
index 73997db..b1a74c8 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ b/bibletime/frontend/display/chtmlwritedisplay.cpp
@@ -66,19 +66,19 @@ void CHTMLWriteDisplay::toggleUnderline() {
 
 
 void CHTMLWriteDisplay::alignLeft() {
-	tqsetAlignment(TQt::AlignLeft);
+	setAlignment(TQt::AlignLeft);
 };
 
 void CHTMLWriteDisplay::alignCenter() {
-	tqsetAlignment(TQt::AlignHCenter);
+	setAlignment(TQt::AlignHCenter);
 };
 
 void CHTMLWriteDisplay::alignRight() {
-	tqsetAlignment(TQt::AlignRight);
+	setAlignment(TQt::AlignRight);
 };
 
 
-/** The text's tqalignment changed. Enable the right buttons. */
+/** The text's alignment changed. Enable the right buttons. */
 void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
 	bool alignLeft = false;
 	bool alignCenter = false;
@@ -99,7 +99,7 @@ void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
 	//  }
 	else {
 		alignLeft = true;
-		qWarning("unknown tqalignment %i", a);
+		qWarning("unknown alignment %i", a);
 	}
 
 	m_actions.alignLeft->setChecked( alignLeft );
@@ -153,7 +153,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
 
 	m_colorButton = new KColorButton(bar);
 	connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), TQT_TQOBJECT(this), TQT_SLOT(slotColorSelected(const TQColor&)));
-	bar->insertWidget(50, m_colorButton->tqsizeHint().width(), m_colorButton);
+	bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton);
 	TQToolTip::add
 		(m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip );
 
@@ -195,7 +195,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
 	m_actions.underline->plug(bar);
 
 
-	(new KActionSeparator())->plug(bar); //seperate formatting from tqalignment buttons
+	(new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
 
 	m_actions.alignLeft = new KToggleAction( i18n("Left"),
 						  CResMgr::displaywindows::writeWindow::alignLeft::icon,
@@ -248,7 +248,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
 
 	//set initial values for toolbar items
 	slotFontChanged( font() );
-	slotAlignmentChanged( tqalignment() );
+	slotAlignmentChanged( alignment() );
 	slotColorChanged( color() );
 }
 
diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h
index 9058e4b..c95ce4c 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.h
+++ b/bibletime/frontend/display/chtmlwritedisplay.h
@@ -17,7 +17,7 @@
 
 //TQt includes
 #include <tqwidget.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 class CWriteWindow;
 
@@ -70,7 +70,7 @@ protected slots:
 
 	void slotFontChanged( const TQFont& );
 	/**
-	* The text's tqalignment changed. Enable the right buttons.
+	* The text's alignment changed. Enable the right buttons.
 	*/
 	void slotAlignmentChanged( int );
 	/**
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
index 012591a..ec4dd2e 100644
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ b/bibletime/frontend/display/cplainwritedisplay.cpp
@@ -138,7 +138,7 @@ void CPlainWriteDisplay::contentsDropEvent( TQDropEvent* e ) {
 
 					TQString moduleText = key->strippedText();
 
-					const TQString text = TQString::tqfromLatin1("%1\n(%2, %3)\n").tqarg(moduleText).tqarg((*it).bookmarkKey()).tqarg((*it).bookmarkModule());
+					const TQString text = TQString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule());
 
 					placeCursor( e->pos() );
 					insert( text );
diff --git a/bibletime/frontend/display/cplainwritedisplay.h b/bibletime/frontend/display/cplainwritedisplay.h
index 897eb85..4b82fa3 100644
--- a/bibletime/frontend/display/cplainwritedisplay.h
+++ b/bibletime/frontend/display/cplainwritedisplay.h
@@ -17,7 +17,7 @@
 
 //TQt includes
 #include <tqwidget.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 class CHTMLWriteDisplay;
 class KAction;