summaryrefslogtreecommitdiffstats
path: root/src/gui/kdeext
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:40:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:40:46 -0600
commit97f1c43c867725d49f3943a68ef08d7e71767e99 (patch)
treeece35be847c1fcc581a6db7b3d9fc6aa497590af /src/gui/kdeext
parentef13416bfc43e51ef4e20919e0fab81ae05e0fe2 (diff)
downloadrosegarden-97f1c43c867725d49f3943a68ef08d7e71767e99.tar.gz
rosegarden-97f1c43c867725d49f3943a68ef08d7e71767e99.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/gui/kdeext')
-rw-r--r--src/gui/kdeext/KLedButton.cpp4
-rw-r--r--src/gui/kdeext/KLedButton.h2
-rw-r--r--src/gui/kdeext/KStartupLogo.cpp2
-rw-r--r--src/gui/kdeext/KTmpStatusMsg.cpp2
-rw-r--r--src/gui/kdeext/QCanvasGroupableItem.h2
-rw-r--r--src/gui/kdeext/RGLed.cpp20
-rw-r--r--src/gui/kdeext/klearlook.cpp28
7 files changed, 30 insertions, 30 deletions
diff --git a/src/gui/kdeext/KLedButton.cpp b/src/gui/kdeext/KLedButton.cpp
index 3e2f460..bc67cd7 100644
--- a/src/gui/kdeext/KLedButton.cpp
+++ b/src/gui/kdeext/KLedButton.cpp
@@ -41,8 +41,8 @@ KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
{}
KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
- KLed::Shape tqshape, TQWidget *parent, const char *name)
- : KLed( col, st, look, tqshape, parent, name )
+ KLed::Shape shape, TQWidget *parent, const char *name)
+ : KLed( col, st, look, shape, parent, name )
{}
KLedButton::~KLedButton()
diff --git a/src/gui/kdeext/KLedButton.h b/src/gui/kdeext/KLedButton.h
index 197f96b..d3fa1fb 100644
--- a/src/gui/kdeext/KLedButton.h
+++ b/src/gui/kdeext/KLedButton.h
@@ -52,7 +52,7 @@ class KLedButton : public KLed {
TQ_OBJECT
public:
KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
- KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
+ KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
TQWidget *parent=0, const char *name=0);
~KLedButton();
diff --git a/src/gui/kdeext/KStartupLogo.cpp b/src/gui/kdeext/KStartupLogo.cpp
index f368d96..d1b4870 100644
--- a/src/gui/kdeext/KStartupLogo.cpp
+++ b/src/gui/kdeext/KStartupLogo.cpp
@@ -92,7 +92,7 @@ void KStartupLogo::paintEvent(TQPaintEvent*)
//TQString version(VERSION);
//int sepIdx = version.find("-");
TQString versionLabel(VERSION);
- //TQString("R%1 v%2").tqarg(version.left(sepIdx)).tqarg(version.mid(sepIdx + 1));
+ //TQString("R%1 v%2").arg(version.left(sepIdx)).arg(version.mid(sepIdx + 1));
int versionWidth = metrics.width(versionLabel);
paint.drawText(m_pixmap.width() - versionWidth - 18,
diff --git a/src/gui/kdeext/KTmpStatusMsg.cpp b/src/gui/kdeext/KTmpStatusMsg.cpp
index 8977c74..620d7c5 100644
--- a/src/gui/kdeext/KTmpStatusMsg.cpp
+++ b/src/gui/kdeext/KTmpStatusMsg.cpp
@@ -33,7 +33,7 @@ KTmpStatusMsg::KTmpStatusMsg(const TQString& msg, KMainWindow* window, int id)
: m_mainWindow(window),
m_id(id)
{
- m_mainWindow->statusBar()->changeItem(TQString(" %1").tqarg(msg), m_id);
+ m_mainWindow->statusBar()->changeItem(TQString(" %1").arg(msg), m_id);
Rosegarden::rgapp->refreshGUI(50);
}
diff --git a/src/gui/kdeext/QCanvasGroupableItem.h b/src/gui/kdeext/QCanvasGroupableItem.h
index b7d4fbb..d237524 100644
--- a/src/gui/kdeext/QCanvasGroupableItem.h
+++ b/src/gui/kdeext/QCanvasGroupableItem.h
@@ -27,7 +27,7 @@
class TQCanvasItemGroup;
/**
- * This class is meant to be inherited by TQCanvasItem tqchildren to make
+ * This class is meant to be inherited by TQCanvasItem children to make
* them groupable.
*
* On destruction, the item will remove itself from the group it's
diff --git a/src/gui/kdeext/RGLed.cpp b/src/gui/kdeext/RGLed.cpp
index 95772ca..a928ee5 100644
--- a/src/gui/kdeext/RGLed.cpp
+++ b/src/gui/kdeext/RGLed.cpp
@@ -160,7 +160,7 @@ KLed::KLed(TQWidget *parent, const char *name)
: TQWidget( parent, name),
led_state(On),
led_look(Raised),
- led_tqshape(Circular)
+ led_shape(Circular)
{
TQColor col(green);
d = new KLed::KLedPrivate;
@@ -177,7 +177,7 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
: TQWidget( parent, name),
led_state(On),
led_look(Raised),
- led_tqshape(Circular)
+ led_shape(Circular)
{
d = new KLed::KLedPrivate;
d->dark_factor = 300;
@@ -190,11 +190,11 @@ KLed::KLed(const TQColor& col, TQWidget *parent, const char *name)
}
KLed::KLed(const TQColor& col, KLed::State state,
- KLed::Look look, KLed::Shape tqshape, TQWidget *parent, const char *name )
+ KLed::Look look, KLed::Shape shape, TQWidget *parent, const char *name )
: TQWidget(parent, name),
led_state(state),
led_look(look),
- led_tqshape(tqshape)
+ led_shape(shape)
{
d = new KLed::KLedPrivate;
d->dark_factor = 300;
@@ -202,7 +202,7 @@ KLed::KLed(const TQColor& col, KLed::State state,
d->off_map = 0;
d->on_map = 0;
- //setShape(tqshape);
+ //setShape(shape);
setColor(col);
}
@@ -223,7 +223,7 @@ KLed::paintEvent(TQPaintEvent *)
t.start();
for (int i = 0; i < rounds; i++) {
#endif
- switch (led_tqshape) {
+ switch (led_shape) {
case Rectangular:
switch (led_look) {
case Sunken :
@@ -612,9 +612,9 @@ KLed::state() const
}
KLed::Shape
-KLed::tqshape() const
+KLed::shape() const
{
- return led_tqshape;
+ return led_shape;
}
TQColor
@@ -649,8 +649,8 @@ KLed::toggleState()
void
KLed::setShape(KLed::Shape s)
{
- if (led_tqshape != s) {
- led_tqshape = s;
+ if (led_shape != s) {
+ led_shape = s;
update();
}
}
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index c1e7cfc..ca595e1 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -722,7 +722,7 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
hoverWidget = ( TQWidget * ) object;
if ( hoverWidget && hoverWidget->isEnabled() ) {
if ( redrawHoverWidget() ) {
- hoverWidget->tqrepaint( false );
+ hoverWidget->repaint( false );
if ( APP_KICKER == themedApp )
hover = HOVER_NONE;
}
@@ -736,13 +736,13 @@ bool KlearlookStyle::eventFilter( TQObject *object, TQEvent *event ) {
oldCursor.setX( -1 );
oldCursor.setY( -1 );
hoverWidget = NULL;
- ( ( TQWidget * ) object ) ->tqrepaint( false );
+ ( ( TQWidget * ) object ) ->repaint( false );
}
break;
case TQEvent::MouseMove:
if ( hoverWidget && object->isWidgetType() ) {
if ( redrawHoverWidget() ) {
- hoverWidget->tqrepaint( false );
+ hoverWidget->repaint( false );
if ( APP_KICKER == themedApp )
hover = HOVER_NONE;
}
@@ -2225,7 +2225,7 @@ void KlearlookStyle::drawControl(
fr( r );
int offset = rounded ? 2 : 0;
- switch ( tb->tqshape() ) {
+ switch ( tb->shape() ) {
case TQTabBar::TriangularAbove:
case TQTabBar::RoundedAbove:
if ( flags & Style_Selected ) {
@@ -2380,7 +2380,7 @@ void KlearlookStyle::drawControl(
} else {
TQRect br( r );
- switch ( tb->tqshape() ) {
+ switch ( tb->shape() ) {
case TQTabBar::TriangularAbove:
case TQTabBar::RoundedAbove:
if ( flags & Style_Selected ) {
@@ -2465,10 +2465,10 @@ void KlearlookStyle::drawControl(
TQRect tr = r;
if ( t->identifier() == tb->currentTab() ) {
- if ( TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape() )
+ if ( TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape() )
tr.setBottom( tr.bottom() - pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
} else
- if ( TQTabBar::RoundedBelow == tb->tqshape() || TQTabBar::TriangularBelow == tb->tqshape() )
+ if ( TQTabBar::RoundedBelow == tb->shape() || TQTabBar::TriangularBelow == tb->shape() )
tr.setTop( tr.top() + pixelMetric( TQStyle::PM_TabBarTabShiftVertical, tb ) );
drawItem( p, tr, AlignCenter | ShowPrefix, cg, flags & Style_Enabled, 0, t->text() );
@@ -2922,9 +2922,9 @@ void KlearlookStyle::drawControl(
p->fillRect( checkbox->rect(), cg.background().light( TQTC_HIGHLIGHT_FACTOR ) );
p->setClipping( false );
}
- int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+ int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
- drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+ drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
flags & Style_Enabled, checkbox->pixmap(), checkbox->text() );
if ( checkbox->hasFocus() )
@@ -2956,9 +2956,9 @@ void KlearlookStyle::drawControl(
p->setClipping( false );
}
- int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
+ int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
- drawItem( p, r, tqalignment | AlignVCenter | ShowPrefix, cg,
+ drawItem( p, r, alignment | AlignVCenter | ShowPrefix, cg,
flags & Style_Enabled, radiobutton->pixmap(), radiobutton->text() );
if ( radiobutton->hasFocus() )
@@ -3408,7 +3408,7 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) co
case PM_TabBarTabShiftVertical: {
const TQTabBar *tb = ::tqqt_cast<const TQTabBar *>( widget );
- return TQTabBar::RoundedAbove == tb->tqshape() || TQTabBar::TriangularAbove == tb->tqshape()
+ return TQTabBar::RoundedAbove == tb->shape() || TQTabBar::TriangularAbove == tb->shape()
? 1
: -1;
}
@@ -3417,8 +3417,8 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) co
case PM_TabBarTabVSpace: {
const TQTabBar * tb = ( const TQTabBar * ) widget;
- if ( tb->tqshape() == TQTabBar::RoundedAbove ||
- tb->tqshape() == TQTabBar::RoundedBelow )
+ if ( tb->shape() == TQTabBar::RoundedAbove ||
+ tb->shape() == TQTabBar::RoundedBelow )
return 12;
else
return 4;