summaryrefslogtreecommitdiffstats
path: root/twin-styles/glow
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:18 -0600
commit48afe4d8df11f862f7ccc60f0594991f857f81db (patch)
tree3f24a7c318e7f7dd10ada3a918006ad495ad9245 /twin-styles/glow
parent5c194e6e7059ddcc96b0e0166ce6157c35fc183e (diff)
downloadtdeartwork-48afe4d8df11f862f7ccc60f0594991f857f81db.tar.gz
tdeartwork-48afe4d8df11f862f7ccc60f0594991f857f81db.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 5c194e6e7059ddcc96b0e0166ce6157c35fc183e.
Diffstat (limited to 'twin-styles/glow')
-rw-r--r--twin-styles/glow/config/glowconfigdialog.cpp8
-rw-r--r--twin-styles/glow/glowbutton.cpp18
-rw-r--r--twin-styles/glow/glowbutton.h4
-rw-r--r--twin-styles/glow/glowclient.cpp32
-rw-r--r--twin-styles/glow/glowclient.h2
5 files changed, 32 insertions, 32 deletions
diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp
index 633cc0bf..f8ff62fd 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 <layout.h>
+#include <tqlayout.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->setAlignment(TQt::AlignTop | TQt::AlignLeft);
+ main_group_boxLayout->tqsetAlignment(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->layout());
+ new TQHBoxLayout(_button_glow_color_group_box->tqlayout());
// 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::fromLatin1("WM") );
+ KConfigGroupSaver cgs( c, TQString::tqfromLatin1("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 79a9f546..87079c2e 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_timerStatus = Stop;
+ m_timertqStatus = Stop;
setTipText (tip);
setCursor(arrowCursor);
@@ -132,7 +132,7 @@ void GlowButton::setPixmapName(const TQString& pixmapName)
// set steps
_steps = pixmap->height()/pixmap->width() - 1;
- repaint(false);
+ tqrepaint(false);
}
void GlowButton::paintEvent( TQPaintEvent *e )
@@ -160,7 +160,7 @@ void GlowButton::enterEvent( TQEvent *e )
{
if( m_pos<0 )
m_pos=-m_pos;
- m_timerStatus = Run;
+ m_timertqStatus = 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_timerStatus = Stop;
+ m_timertqStatus = 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;
- repaint(false);
+ tqrepaint(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( ! geometry().contains(p) ) {
- m_timerStatus = Stop;
+ if( ! tqgeometry().contains(p) ) {
+ m_timertqStatus = 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()
{
- repaint(false);
+ tqrepaint(false);
if( m_pos>=_steps-1 ) {
m_pos = -m_pos;
}
- if( m_timerStatus==Stop ) {
+ if( m_timertqStatus==Stop ) {
if( m_pos==0 ) {
m_timer->stop();
return;
diff --git a/twin-styles/glow/glowbutton.h b/twin-styles/glow/glowbutton.h
index e3d159dd..d2e83beb 100644
--- a/twin-styles/glow/glowbutton.h
+++ b/twin-styles/glow/glowbutton.h
@@ -73,7 +73,7 @@ protected slots:
void slotTimeout();
private:
- enum TimerStatus { Run, Stop };
+ enum TimertqStatus { Run, Stop };
int m_updateTime;
int _steps;
@@ -81,7 +81,7 @@ private:
TQTimer *m_timer;
int m_pos;
- TimerStatus m_timerStatus;
+ TimertqStatus m_timertqStatus;
int m_realizeButtons;
ButtonState _last_button;
diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp
index 1140ae81..98133221 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 <layout.h>
+#include <tqlayout.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <kconfig.h>
@@ -404,20 +404,20 @@ GlowClient::~GlowClient()
void GlowClient::resizeEvent( TQResizeEvent * )
{
doShape();
- widget()->repaint(false);
+ widget()->tqrepaint(false);
}
void GlowClient::paintEvent( TQPaintEvent * )
{
GlowClientConfig *conf = GlowClientGlobals::instance()->config();
TQRect r_this = widget()->rect();
- TQRect r_title = _title_spacer->geometry();
- TQColorGroup titleCg = options()->colorGroup(ColorTitleBar, isActive());
- TQColorGroup titleBlendCg=options()->colorGroup(ColorTitleBlend, isActive());
- TQColorGroup cg = widget()->colorGroup();
+ TQRect r_title = _title_spacer->tqgeometry();
+ TQColorGroup titleCg = options()->tqcolorGroup(ColorTitleBar, isActive());
+ TQColorGroup titleBlendCg=options()->tqcolorGroup(ColorTitleBlend, isActive());
+ TQColorGroup cg = widget()->tqcolorGroup();
TQColor titleColor = options()->color(ColorTitleBar, isActive());
TQColor titleBlendColor = options()->color(ColorTitleBlend, isActive());
- TQColor bgColor = widget()->colorGroup().background();
+ TQColor bgColor = widget()->tqcolorGroup().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]->repaint(false);
+ m_buttonList[i]->tqrepaint(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()->colorGroup(ColorFrame, isActive()).background());
+ options()->tqcolorGroup(ColorFrame, isActive()).background());
p.end();
// paint resize handle if necessary
@@ -521,12 +521,12 @@ void GlowClient::paintEvent( TQPaintEvent * )
void GlowClient::showEvent( TQShowEvent * )
{
doShape();
- widget()->repaint(false);
+ widget()->tqrepaint(false);
}
void GlowClient::mouseDoubleClickEvent( TQMouseEvent *e )
{
- if(e->button() == Qt::LeftButton && _title_spacer->geometry().contains(e->pos()))
+ if(e->button() == Qt::LeftButton && _title_spacer->tqgeometry().contains(e->pos()))
titlebarDblClickOperation();
}
@@ -539,7 +539,7 @@ void GlowClient::wheelEvent( TQWheelEvent *e )
void GlowClient::activeChange()
{
updateButtonPixmaps();
- widget()->repaint(false);
+ widget()->tqrepaint(false);
}
void GlowClient::iconChange()
@@ -553,12 +553,12 @@ void GlowClient::shadeChange()
void GlowClient::captionChange()
{
- widget()->update(_title_spacer->geometry());
+ widget()->update(_title_spacer->tqgeometry());
}
-TQSize GlowClient::minimumSize() const
+TQSize GlowClient::tqminimumSize() const
{
- return widget()->minimumSize();
+ return widget()->tqminimumSize();
}
void GlowClient::resize( const TQSize& s )
@@ -746,7 +746,7 @@ void GlowClient::updateButtonPositions()
m_leftButtonList.clear();
m_rightButtonList.clear();
- // reset left and right button layout
+ // reset left and right button tqlayout
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 7e0e15ee..9129dce0 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 minimumSize() const;
+ virtual TQSize tqminimumSize() const;
protected:
virtual void resizeEvent( TQResizeEvent * );