summaryrefslogtreecommitdiffstats
path: root/arts
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commit914b4db5c94848135cd675ffdb5fa4049cbe33e4 (patch)
tree051d5d44af2695f6066f38bee804dfae1ad62490 /arts
parentf949c4652e0aae023b4306f3550914811743698e (diff)
downloadtdemultimedia-914b4db5c94848135cd675ffdb5fa4049cbe33e4.tar.gz
tdemultimedia-914b4db5c94848135cd675ffdb5fa4049cbe33e4.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'arts')
-rw-r--r--arts/builder/propertypanelbase.ui10
-rw-r--r--arts/gui/common/artsgui.idl6
-rw-r--r--arts/gui/kde/klayoutbox_impl.cpp8
-rw-r--r--arts/gui/kde/klayoutbox_impl.h4
-rw-r--r--arts/gui/kde/kpoti.cpp20
-rw-r--r--arts/modules/effects/fivebandmonocomplexeq_impl.cc2
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.cpp2
-rw-r--r--arts/modules/effects/stereocompressorguifactory_impl.cc2
-rw-r--r--arts/runtime/artsbuilder.idl2
-rw-r--r--arts/runtime/structures_impl.cc4
-rw-r--r--arts/tools/midimanagerdlg.ui6
-rw-r--r--arts/tools/midimanagerwidget.ui6
12 files changed, 36 insertions, 36 deletions
diff --git a/arts/builder/propertypanelbase.ui b/arts/builder/propertypanelbase.ui
index 056b9a72..b327b33f 100644
--- a/arts/builder/propertypanelbase.ui
+++ b/arts/builder/propertypanelbase.ui
@@ -13,9 +13,9 @@
<height>484</height>
</rect>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
- <property name="tqlayoutSpacing" stdset="0">
+ <property name="layoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
<property name="frameShadow">
<enum>Plain</enum>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
<vbox>
<property name="name">
@@ -63,7 +63,7 @@
<property name="name">
<cstring>spacerLayout</cstring>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
<vbox>
<property name="name">
@@ -358,5 +358,5 @@
<Q_SLOTS>
<slot access="protected">setTitleFont()</slot>
</Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl
index 2cf5b614..de6da9e7 100644
--- a/arts/gui/common/artsgui.idl
+++ b/arts/gui/common/artsgui.idl
@@ -94,7 +94,7 @@ module Arts {
};
/**
- Some tqalignmentflags used by various widgets.
+ Some alignmentflags used by various widgets.
Taken from Qt. (akrille)
*/
enum Align {
@@ -117,7 +117,7 @@ module Arts {
/** The LayoutBox. - Arrange your widgets vertical or horizontal.
Usage is quite simple: Add the widgets you have in the right order
- to the tqlayoutbox by calling addWidget().
+ to the layoutbox by calling addWidget().
Thats it, no ._addChild or .tqparent with this widget.
For more information see QBoxLayout.
@@ -156,7 +156,7 @@ module Arts {
/// The spacing between all widgets.
attribute long spacing;
/// The margin at the outsideborder.
- attribute long tqlayoutmargin;
+ attribute long layoutmargin;
};
/** IMHO (akrille) this should be removed and everywhere replaced with the LayoutBox... */
diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp
index e94ed1ec..6cbe9873 100644
--- a/arts/gui/kde/klayoutbox_impl.cpp
+++ b/arts/gui/kde/klayoutbox_impl.cpp
@@ -41,14 +41,14 @@ KLayoutBox_impl::~KLayoutBox_impl() {
void KLayoutBox_impl::addWidget( Arts::Widget widget, long stretch, long align ) {
widget.tqparent( self() );
- this->_addChild( widget, "tqlayoutbox_item" );
+ this->_addChild( widget, "layoutbox_item" );
TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
_layout->addWidget( tmp, stretch, align );
}
void KLayoutBox_impl::insertWidget( long index, Arts::Widget widget, long stretch, long align ) {
widget.tqparent( self() );
- this->_addChild( widget, "tqlayoutbox_item" );
+ this->_addChild( widget, "layoutbox_item" );
TQWidget * tmp = KWidgetRepo::the()->lookupTQWidget( widget.widgetID() );
_layout->insertWidget( index, tmp, stretch, align );
}
@@ -66,8 +66,8 @@ void KLayoutBox_impl::addLine( long width, long space, long stretch, long align
long KLayoutBox_impl::spacing() { return _layout->spacing(); }
void KLayoutBox_impl::spacing( long n ) { _layout->setSpacing( n ); }
-long KLayoutBox_impl::tqlayoutmargin() { return _layout->margin(); }
-void KLayoutBox_impl::tqlayoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); }
+long KLayoutBox_impl::layoutmargin() { return _layout->margin(); }
+void KLayoutBox_impl::layoutmargin( long n ) { _layout->setMargin( n ); this->margin( n ); }
Direction KLayoutBox_impl::direction() { return Arts::Direction( _layout->direction() ); }
void KLayoutBox_impl::direction( Direction d ) { _layout->setDirection( TQBoxLayout::Direction( d ) ); }
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index a8272fe3..d4a2ec59 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -72,8 +72,8 @@ public:
long spacing();
void spacing( long );
- long tqlayoutmargin();
- void tqlayoutmargin( long );
+ long layoutmargin();
+ void layoutmargin( long );
}; // class
} // namespace
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index 6beed787..d7cf50df 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -64,11 +64,11 @@ struct KPoti::KPotiPrivate
// create tqmask
TQBitmap tqmask( bgdb.size(), true );
- TQPainter tqmaskpainter( &tqmask );
- tqmaskpainter.setPen( TQt::NoPen );
- tqmaskpainter.setBrush( TQt::color1 );
- tqmaskpainter.drawEllipse( drawRect );
- tqmaskpainter.end();
+ TQPainter maskpainter( &tqmask );
+ maskpainter.setPen( TQt::NoPen );
+ maskpainter.setBrush( TQt::color1 );
+ maskpainter.drawEllipse( drawRect );
+ maskpainter.end();
bgdb.setMask( tqmask );
// inset shadow
@@ -104,11 +104,11 @@ struct KPoti::KPotiPrivate
// create tqmask
TQBitmap tqmask( potidb.size(), true );
- TQPainter tqmaskpainter( &tqmask );
- tqmaskpainter.setPen( TQt::NoPen );
- tqmaskpainter.setBrush( TQt::color1 );
- tqmaskpainter.drawEllipse( drawRect );
- tqmaskpainter.end();
+ TQPainter maskpainter( &tqmask );
+ maskpainter.setPen( TQt::NoPen );
+ maskpainter.setBrush( TQt::color1 );
+ maskpainter.drawEllipse( drawRect );
+ maskpainter.end();
potidb.setMask( tqmask );
KPixmap gradient( potidb.size() );
diff --git a/arts/modules/effects/fivebandmonocomplexeq_impl.cc b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
index 0891458c..827687e2 100644
--- a/arts/modules/effects/fivebandmonocomplexeq_impl.cc
+++ b/arts/modules/effects/fivebandmonocomplexeq_impl.cc
@@ -110,7 +110,7 @@ public:
Arts::LayoutBox hbox;
hbox.direction( Arts::LeftToRight );
- hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 );
+ hbox.layoutmargin( 5 ); hbox.spacing( 5 );
Arts::Poti lowgain; lowgain.caption( i18n( "Low Gain" ).utf8().data() );
lowgain.min( -24 ); lowgain.max( 24 );
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index f0fa3690..e6e0c54c 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -47,7 +47,7 @@ KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayo
this->dbmax( 6 );
_left.framestyle( Arts::Raised|Arts::Panel ); _left.linewidth( 4 );
_right.framestyle( Arts::Raised|Arts::Panel ); _right.linewidth( 4 );
- this->tqlayoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised );
+ this->layoutmargin( 1 ); this->linewidth( 1 ); this->framestyle( Arts::Panel|Arts::Raised );
}
void KStereoVolumeControlGui_impl::constructor( Arts::StereoVolumeControl svc ) {
diff --git a/arts/modules/effects/stereocompressorguifactory_impl.cc b/arts/modules/effects/stereocompressorguifactory_impl.cc
index d5209ebd..e5a985fc 100644
--- a/arts/modules/effects/stereocompressorguifactory_impl.cc
+++ b/arts/modules/effects/stereocompressorguifactory_impl.cc
@@ -85,7 +85,7 @@ public:
connect( bon, "pressed_changed", comp, "thru" );
LayoutBox hbox;
- hbox.direction( LeftToRight ); hbox.tqlayoutmargin( 5 ); hbox.spacing( 5 );
+ hbox.direction( LeftToRight ); hbox.layoutmargin( 5 ); hbox.spacing( 5 );
PopupBox timesbox;
timesbox.name( "Timings" ); timesbox.direction( LeftToRight );
LayoutBox times;
diff --git a/arts/runtime/artsbuilder.idl b/arts/runtime/artsbuilder.idl
index 17332ee5..7fe75949 100644
--- a/arts/runtime/artsbuilder.idl
+++ b/arts/runtime/artsbuilder.idl
@@ -189,7 +189,7 @@ module Arts {
// Position: how the port is positioned when the structure is used
// as module - 0 is leftmost, higher numbers are more right
readonly attribute long x, y, position;
- readonly attribute StructureDesc tqparentStructure;
+ readonly attribute StructureDesc parentStructure;
// if the port is associated with an inherited interface of the
// tqparent structure, then it should be setup here
diff --git a/arts/runtime/structures_impl.cc b/arts/runtime/structures_impl.cc
index 72de0de7..5c392e91 100644
--- a/arts/runtime/structures_impl.cc
+++ b/arts/runtime/structures_impl.cc
@@ -169,7 +169,7 @@ public:
void inheritedInterface(const string& iface);
void internalSetPosition(long position);
- StructureDesc tqparentStructure();
+ StructureDesc parentStructure();
bool moveTo( long X, long Y );
void loadFromList(const vector<string>& list);
@@ -1202,7 +1202,7 @@ void StructurePortDesc_impl::internalSetPosition(long position)
_position = position;
}
-StructureDesc StructurePortDesc_impl::tqparentStructure()
+StructureDesc StructurePortDesc_impl::parentStructure()
{
return _parentStructure;
}
diff --git a/arts/tools/midimanagerdlg.ui b/arts/tools/midimanagerdlg.ui
index 5ec555a8..cef2d36b 100644
--- a/arts/tools/midimanagerdlg.ui
+++ b/arts/tools/midimanagerdlg.ui
@@ -64,9 +64,9 @@
<property name="lineWidth">
<number>0</number>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
- <property name="tqlayoutSpacing" stdset="0">
+ <property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@@ -147,5 +147,5 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/arts/tools/midimanagerwidget.ui b/arts/tools/midimanagerwidget.ui
index b487c09d..8dc70f95 100644
--- a/arts/tools/midimanagerwidget.ui
+++ b/arts/tools/midimanagerwidget.ui
@@ -64,9 +64,9 @@
<property name="lineWidth">
<number>0</number>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
- <property name="tqlayoutSpacing" stdset="0">
+ <property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@@ -131,5 +131,5 @@
</widget>
</grid>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>