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

5 files changed, 32 insertions, 32 deletions

diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp
index f8ff62fd..633cc0bf 100644
--- a/twin-styles/glow/config/glowconfigdialog.cpp
+++ b/twin-styles/glow/config/glowconfigdialog.cpp
@@ -23,7 +23,7 @@
 #include <tqfileinfo.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tqsignalmapper.h>
@@ -59,7 +59,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 
 	_main_group_box = new TQWidget(parent);
 	TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box);
-	main_group_boxLayout->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
+	main_group_boxLayout->setAlignment(TQt::AlignTop | TQt::AlignLeft);
 	main_group_boxLayout->setSpacing(6);
 
 	//-------------------------------------------------------------------------
@@ -79,7 +79,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 	_button_glow_color_group_box = new TQGroupBox(
 		0, Qt::Horizontal, i18n("Button Glow Colors"), _main_group_box);
 	TQHBoxLayout *colorHBoxLayout =
-		new TQHBoxLayout(_button_glow_color_group_box->tqlayout());
+		new TQHBoxLayout(_button_glow_color_group_box->layout());
 
 	// create buttons
 	TQSize buttonSize(BITMAP_SIZE, BITMAP_SIZE);
@@ -139,7 +139,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
 	_titlebarGradientTypeComboBox = new TQComboBox(_main_group_box);
 
     KConfig *c = KGlobal::config();
-    KConfigGroupSaver cgs( c, TQString::tqfromLatin1("WM") );
+    KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") );
     TQColor activeBackground = c->readColorEntry("activeBackground");
     TQColor activeBlend = c->readColorEntry("activeBlend");
 
diff --git a/twin-styles/glow/glowbutton.cpp b/twin-styles/glow/glowbutton.cpp
index 87079c2e..79a9f546 100644
--- a/twin-styles/glow/glowbutton.cpp
+++ b/twin-styles/glow/glowbutton.cpp
@@ -92,7 +92,7 @@ GlowButton::GlowButton(TQWidget *parent, const char *name,
 	m_timer = new TQTimer(this);
 	connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
 	m_pos = 0;
-	m_timertqStatus = Stop;
+	m_timerStatus = Stop;
 
 	setTipText (tip);
 	setCursor(arrowCursor);
@@ -132,7 +132,7 @@ void GlowButton::setPixmapName(const TQString& pixmapName)
 	// set steps
 	_steps = pixmap->height()/pixmap->width() - 1;
 
-	tqrepaint(false);
+	repaint(false);
 }
 
 void GlowButton::paintEvent( TQPaintEvent *e )
@@ -160,7 +160,7 @@ void GlowButton::enterEvent( TQEvent *e )
 {
 	if( m_pos<0 )
 		m_pos=-m_pos;
-	m_timertqStatus = Run;
+	m_timerStatus = Run;
 	if( ! m_timer->isActive() )
 		m_timer->start(m_updateTime);
 	TQButton::enterEvent(e);
@@ -168,7 +168,7 @@ void GlowButton::enterEvent( TQEvent *e )
 
 void GlowButton::leaveEvent( TQEvent *e )
 {
-	m_timertqStatus = Stop;
+	m_timerStatus = Stop;
 	if( ! m_timer->isActive() )
 		m_timer->start(m_updateTime);
 	TQButton::leaveEvent(e);
@@ -180,7 +180,7 @@ void GlowButton::mousePressEvent( TQMouseEvent *e )
 	if( m_timer->isActive() )
 		m_timer->stop();
 	m_pos = _steps;
-	tqrepaint(false);
+	repaint(false);
 	// without pretending LeftButton, clicking on the button with MidButton
 	// or RightButton would cause unwanted titlebar action
 	TQMouseEvent me (e->type(), e->pos(), e->globalPos(),
@@ -195,8 +195,8 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e )
 	if( ! m_timer->isActive() ) {
 		m_timer->start(m_updateTime);
 	}
-	if( ! tqgeometry().contains(p) ) {
-		m_timertqStatus = Stop;
+	if( ! geometry().contains(p) ) {
+		m_timerStatus = Stop;
 	}
 	TQMouseEvent me (e->type(), e->pos(), e->globalPos(),
 			(e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state());
@@ -205,12 +205,12 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e )
 
 void GlowButton::slotTimeout()
 {
-	tqrepaint(false);
+	repaint(false);
 
 	if( m_pos>=_steps-1 ) {
 		m_pos = -m_pos;
 	}
-	if( m_timertqStatus==Stop ) {
+	if( m_timerStatus==Stop ) {
 		if( m_pos==0 ) {
 			m_timer->stop();
 			return;
diff --git a/twin-styles/glow/glowbutton.h b/twin-styles/glow/glowbutton.h
index d2e83beb..e3d159dd 100644
--- a/twin-styles/glow/glowbutton.h
+++ b/twin-styles/glow/glowbutton.h
@@ -73,7 +73,7 @@ protected slots:
 	void slotTimeout();
 
 private:
-	enum TimertqStatus { Run, Stop };
+	enum TimerStatus { Run, Stop };
 
 	int m_updateTime;
 	int _steps;
@@ -81,7 +81,7 @@ private:
 
 	TQTimer *m_timer;
 	int m_pos;
-	TimertqStatus m_timertqStatus;
+	TimerStatus m_timerStatus;
 
 	int m_realizeButtons;
 	ButtonState _last_button;
diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp
index 98133221..1140ae81 100644
--- a/twin-styles/glow/glowclient.cpp
+++ b/twin-styles/glow/glowclient.cpp
@@ -18,7 +18,7 @@
 #include <tqapplication.h>
 #include <tqbitmap.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <kconfig.h>
@@ -404,20 +404,20 @@ GlowClient::~GlowClient()
 void GlowClient::resizeEvent( TQResizeEvent * )
 {
 	doShape();
-	widget()->tqrepaint(false);
+	widget()->repaint(false);
 }
 
 void GlowClient::paintEvent( TQPaintEvent * )
 {
 	GlowClientConfig *conf = GlowClientGlobals::instance()->config();
 	TQRect r_this = widget()->rect();
-	TQRect r_title = _title_spacer->tqgeometry();
-	TQColorGroup titleCg = options()->tqcolorGroup(ColorTitleBar, isActive());
-	TQColorGroup titleBlendCg=options()->tqcolorGroup(ColorTitleBlend, isActive());
-	TQColorGroup cg = widget()->tqcolorGroup();
+	TQRect r_title = _title_spacer->geometry();
+	TQColorGroup titleCg = options()->colorGroup(ColorTitleBar, isActive());
+	TQColorGroup titleBlendCg=options()->colorGroup(ColorTitleBlend, isActive());
+	TQColorGroup cg = widget()->colorGroup();
 	TQColor titleColor = options()->color(ColorTitleBar, isActive());
 	TQColor titleBlendColor = options()->color(ColorTitleBlend, isActive());
-	TQColor bgColor = widget()->tqcolorGroup().background();
+	TQColor bgColor = widget()->colorGroup().background();
 	TQPainter p;
 	TQPointArray pArray, pArray2, pArray3, pArray4;
 
@@ -489,7 +489,7 @@ void GlowClient::paintEvent( TQPaintEvent * )
 
 	bitBlt(widget(), 0, 0, title_buffer);
 	for (unsigned int i=0; i<m_buttonList.size(); ++i)
-		m_buttonList[i]->tqrepaint(false);
+		m_buttonList[i]->repaint(false);
 
 	p.begin(widget());
 	p.setPen(TQt::black);
@@ -503,7 +503,7 @@ void GlowClient::paintEvent( TQPaintEvent * )
 	// fill content widget
 	p.fillRect(1, tBSize.height(),
 		r_this.width()-2, r_this.height()-tBSize.height()-1,
-		options()->tqcolorGroup(ColorFrame, isActive()).background());
+		options()->colorGroup(ColorFrame, isActive()).background());
 	p.end();
 
 	// paint resize handle if necessary
@@ -521,12 +521,12 @@ void GlowClient::paintEvent( TQPaintEvent * )
 void GlowClient::showEvent( TQShowEvent * )
 {
 	doShape();
-	widget()->tqrepaint(false);
+	widget()->repaint(false);
 }
 
 void GlowClient::mouseDoubleClickEvent( TQMouseEvent *e )
 {
-	if(e->button() == Qt::LeftButton && _title_spacer->tqgeometry().contains(e->pos()))
+	if(e->button() == Qt::LeftButton && _title_spacer->geometry().contains(e->pos()))
 		titlebarDblClickOperation();
 }
 
@@ -539,7 +539,7 @@ void GlowClient::wheelEvent( TQWheelEvent *e )
 void GlowClient::activeChange()
 {
 	updateButtonPixmaps();
-	widget()->tqrepaint(false);
+	widget()->repaint(false);
 }
 
 void GlowClient::iconChange()
@@ -553,12 +553,12 @@ void GlowClient::shadeChange()
 
 void GlowClient::captionChange()
 {
-    widget()->update(_title_spacer->tqgeometry());
+    widget()->update(_title_spacer->geometry());
 }
 
-TQSize GlowClient::tqminimumSize() const
+TQSize GlowClient::minimumSize() const
 {
-    return widget()->tqminimumSize();
+    return widget()->minimumSize();
 }
 
 void GlowClient::resize( const TQSize& s )
@@ -746,7 +746,7 @@ void GlowClient::updateButtonPositions()
 	m_leftButtonList.clear();
 	m_rightButtonList.clear();
 
-	// reset left and right button tqlayout
+	// reset left and right button layout
 	if(m_leftButtonLayout)
 		delete m_leftButtonLayout;
 	m_leftButtonLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0);
diff --git a/twin-styles/glow/glowclient.h b/twin-styles/glow/glowclient.h
index 9129dce0..7e0e15ee 100644
--- a/twin-styles/glow/glowclient.h
+++ b/twin-styles/glow/glowclient.h
@@ -152,7 +152,7 @@ public:
 	virtual void init();
 	virtual void borders( int&, int&, int&, int& ) const;
 	virtual void resize( const TQSize& );
-	virtual TQSize tqminimumSize() const;
+	virtual TQSize minimumSize() const;
 
 protected:
 	virtual void resizeEvent( TQResizeEvent * );