summaryrefslogtreecommitdiffstats
path: root/arts/gui
diff options
context:
space:
mode:
Diffstat (limited to 'arts/gui')
-rw-r--r--arts/gui/common/CMakeLists.txt2
-rw-r--r--arts/gui/kde/dbtest.cpp2
-rw-r--r--arts/gui/kde/kartswidget.h2
-rw-r--r--arts/gui/kde/kbutton_impl.cpp8
-rw-r--r--arts/gui/kde/kcombobox_impl.cpp2
-rw-r--r--arts/gui/kde/kfader_impl.cpp2
-rw-r--r--arts/gui/kde/kframe_impl.h2
-rw-r--r--arts/gui/kde/klabel_impl.h2
-rw-r--r--arts/gui/kde/klayoutbox_impl.h4
-rw-r--r--arts/gui/kde/klevelmeter_linebars.cpp2
-rw-r--r--arts/gui/kde/klineedit_impl.cpp4
-rw-r--r--arts/gui/kde/kpoti.cpp24
-rw-r--r--arts/gui/kde/kpoti_impl.cpp2
-rw-r--r--arts/gui/kde/kspinbox_impl.cpp2
-rw-r--r--arts/gui/kde/kvolumefader_impl.cpp2
-rw-r--r--arts/gui/kde/kwidget_impl.cpp4
-rw-r--r--arts/gui/kde/kwidget_impl.h2
-rw-r--r--arts/gui/kde/tdepopupbox_impl.cpp6
-rw-r--r--arts/gui/kde/tdepopupbox_private.h4
19 files changed, 39 insertions, 39 deletions
diff --git a/arts/gui/common/CMakeLists.txt b/arts/gui/common/CMakeLists.txt
index 030e3c65..8c7d45ad 100644
--- a/arts/gui/common/CMakeLists.txt
+++ b/arts/gui/common/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
tde_add_library( artsgui_idl SHARED
SOURCES artsgui.cpp
VERSION 0.0.0
- LINK mcop ${DL_LIBRARIES} ${ARTS_LIBRARIES}
+ LINK mcop ${CMAKE_DL_LIBS} ${ARTS_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/arts/gui/kde/dbtest.cpp b/arts/gui/kde/dbtest.cpp
index e1933b17..57a03730 100644
--- a/arts/gui/kde/dbtest.cpp
+++ b/arts/gui/kde/dbtest.cpp
@@ -12,7 +12,7 @@
dBTestWidget::dBTestWidget( TQWidget* p, const char* n ) : TQWidget( p,n ), dB2VolCalc( -24,6 ) {
kdDebug() << k_funcinfo << endl;
- ( void* ) KStdAction::quit( this, TQT_SLOT( close() ), new TDEActionCollection( this ) );
+ ( void* ) KStdAction::quit( this, TQ_SLOT( close() ), new TDEActionCollection( this ) );
for ( float i=0; i<=1; i+=0.25 )
kdDebug() << i << " : " << amptodb( i ) << "dB" <<endl;
diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h
index d33efa15..43cb0b95 100644
--- a/arts/gui/kde/kartswidget.h
+++ b/arts/gui/kde/kartswidget.h
@@ -46,7 +46,7 @@ class KArtsWidgetPrivate;
* The KArtsWidget class keeps a reference to the content widget, so the
* content widget will not be freed until the KArtsWidget gets destroyed.
*/
-class KDE_EXPORT KArtsWidget : public TQWidget {
+class TDE_EXPORT KArtsWidget : public TQWidget {
private:
KArtsWidgetPrivate *d;
diff --git a/arts/gui/kde/kbutton_impl.cpp b/arts/gui/kde/kbutton_impl.cpp
index 752761b2..dfe4678f 100644
--- a/arts/gui/kde/kbutton_impl.cpp
+++ b/arts/gui/kde/kbutton_impl.cpp
@@ -33,10 +33,10 @@ KButtonMapper::KButtonMapper( KButton_impl *_impl, TQPushButton *but )
, impl( _impl )
, button( but )
{
- connect( but, TQT_SIGNAL( pressed() ), this, TQT_SLOT( pressed() ) );
- connect( but, TQT_SIGNAL( released() ), this, TQT_SLOT( released() ) );
- connect( but, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggled( bool ) ) );
- connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
+ connect( but, TQ_SIGNAL( pressed() ), this, TQ_SLOT( pressed() ) );
+ connect( but, TQ_SIGNAL( released() ), this, TQ_SLOT( released() ) );
+ connect( but, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggled( bool ) ) );
+ connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
}
void KButtonMapper::pressed()
diff --git a/arts/gui/kde/kcombobox_impl.cpp b/arts/gui/kde/kcombobox_impl.cpp
index 1bbc36c7..fced3445 100644
--- a/arts/gui/kde/kcombobox_impl.cpp
+++ b/arts/gui/kde/kcombobox_impl.cpp
@@ -34,7 +34,7 @@ ComboBoxIntMapper::ComboBoxIntMapper(KComboBox_impl *impl, KComboBox *co)
: TQObject( co, "map TQt signal to aRts" )
,impl(impl)
{
- connect(co, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(activated(const TQString &)));
+ connect(co, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(activated(const TQString &)));
}
void ComboBoxIntMapper::activated(const TQString & newValue)
diff --git a/arts/gui/kde/kfader_impl.cpp b/arts/gui/kde/kfader_impl.cpp
index cda42179..b667056d 100644
--- a/arts/gui/kde/kfader_impl.cpp
+++ b/arts/gui/kde/kfader_impl.cpp
@@ -34,7 +34,7 @@ using namespace std;
FaderIntMapper::FaderIntMapper(KFader_impl *impl, KFader *kp) :impl(impl)
{
- connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+ connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
}
void FaderIntMapper::valueChanged(int pos)
diff --git a/arts/gui/kde/kframe_impl.h b/arts/gui/kde/kframe_impl.h
index 60d0be6b..a55d8271 100644
--- a/arts/gui/kde/kframe_impl.h
+++ b/arts/gui/kde/kframe_impl.h
@@ -26,7 +26,7 @@ class TQFrame;
namespace Arts {
-class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
+class TDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
public Arts::KWidget_impl
{
protected:
diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h
index b27a4365..1b1c0a73 100644
--- a/arts/gui/kde/klabel_impl.h
+++ b/arts/gui/kde/klabel_impl.h
@@ -35,7 +35,7 @@ class RotateLabel;
namespace Arts {
-class KDE_EXPORT KLabel_impl : virtual public Arts::Label_skel,
+class TDE_EXPORT KLabel_impl : virtual public Arts::Label_skel,
public Arts::KFrame_impl
{
protected:
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index 976e89a2..c42fd146 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -32,7 +32,7 @@ class TQBoxLayout;
namespace Arts {
-class KDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel,
+class TDE_EXPORT KLayoutBox_impl : virtual public Arts::LayoutBox_skel,
public Arts::KFrame_impl
{
protected:
@@ -78,7 +78,7 @@ public:
} // namespace
-class KDE_EXPORT KLayoutBox_Separator : public TQWidget {
+class TDE_EXPORT KLayoutBox_Separator : public TQWidget {
TQ_OBJECT
public:
diff --git a/arts/gui/kde/klevelmeter_linebars.cpp b/arts/gui/kde/klevelmeter_linebars.cpp
index e3a15ca2..1f3cd450 100644
--- a/arts/gui/kde/klevelmeter_linebars.cpp
+++ b/arts/gui/kde/klevelmeter_linebars.cpp
@@ -94,7 +94,7 @@ void KLevelMeter_LineBars::paintEvent( TQPaintEvent* ) {
p.drawLine( 0, top, w, top );
}
- bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&pm), 0, 0, pm.width(), pm.height(), CopyROP, true );
+ bitBlt( this, 0, 0, &pm, 0, 0, pm.width(), pm.height(), CopyROP, true );
}
/**
diff --git a/arts/gui/kde/klineedit_impl.cpp b/arts/gui/kde/klineedit_impl.cpp
index 6c3c907b..3054270e 100644
--- a/arts/gui/kde/klineedit_impl.cpp
+++ b/arts/gui/kde/klineedit_impl.cpp
@@ -29,8 +29,8 @@ using namespace std;
KLineEditStringMapper::KLineEditStringMapper(KLineEdit_impl *impl, KLineEdit *ke)
:impl(impl)
{
- connect(ke, TQT_SIGNAL(textChanged(const TQString&)),
- this, TQT_SLOT(textChanged(const TQString&)));
+ connect(ke, TQ_SIGNAL(textChanged(const TQString&)),
+ this, TQ_SLOT(textChanged(const TQString&)));
}
void KLineEditStringMapper::textChanged(const TQString& newText)
diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp
index 8fc412a2..96a19e90 100644
--- a/arts/gui/kde/kpoti.cpp
+++ b/arts/gui/kde/kpoti.cpp
@@ -218,8 +218,8 @@ void KPoti::init(int value)
potiPos = positionFromValue(value);
clickOffset = 0;
state = Idle;
- track = TRUE;
- ticks = TRUE;
+ track = true;
+ ticks = true;
m_bLabel = true;
tickInt = 0;
@@ -263,8 +263,8 @@ void KPoti::initTicks()
/**
- Enables slider tracking if \e enable is TRUE, or disables tracking
- if \e enable is FALSE.
+ Enables slider tracking if \e enable is true, or disables tracking
+ if \e enable is false.
If tracking is enabled (default), the slider emits the
valueChanged() signal whenever the slider is being dragged. If
@@ -283,7 +283,7 @@ void KPoti::setTracking( bool enable )
/**
\fn bool KPoti::tracking() const
- Returns TRUE if tracking is enabled, or FALSE if tracking is disabled.
+ Returns true if tracking is enabled, or false if tracking is disabled.
Tracking is initially enabled.
@@ -495,15 +495,15 @@ void KPoti::mousePressEvent( TQMouseEvent *e )
subtractPage();
if ( !timer )
timer = new TQTimer( this );
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) );
- timer->start( thresholdTime, TRUE );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) );
+ timer->start( thresholdTime, true );
} else {
state = TimingUp;
addPage();
if ( !timer )
timer = new TQTimer( this );
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(repeatTimeout()) );
- timer->start( thresholdTime, TRUE );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(repeatTimeout()) );
+ timer->start( thresholdTime, true );
}
}
@@ -695,10 +695,10 @@ void KPoti::repeatTimeout()
Q_ASSERT( timer );
timer->disconnect();
if ( state == TimingDown )
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(subtractStep()) );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(subtractStep()) );
else if ( state == TimingUp )
- connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(addStep()) );
- timer->start( repeatTime, FALSE );
+ connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(addStep()) );
+ timer->start( repeatTime, false );
}
diff --git a/arts/gui/kde/kpoti_impl.cpp b/arts/gui/kde/kpoti_impl.cpp
index b5d4f043..fbf442f0 100644
--- a/arts/gui/kde/kpoti_impl.cpp
+++ b/arts/gui/kde/kpoti_impl.cpp
@@ -35,7 +35,7 @@ PotiIntMapper::PotiIntMapper(KPoti_impl *impl, KPoti *kp)
: TQObject( kp )
, impl( impl )
{
- connect(kp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+ connect(kp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
}
void PotiIntMapper::valueChanged(int pos)
diff --git a/arts/gui/kde/kspinbox_impl.cpp b/arts/gui/kde/kspinbox_impl.cpp
index e352033c..877c080f 100644
--- a/arts/gui/kde/kspinbox_impl.cpp
+++ b/arts/gui/kde/kspinbox_impl.cpp
@@ -32,7 +32,7 @@ using namespace std;
SpinBoxIntMapper::SpinBoxIntMapper(KSpinBox_impl *impl, TQSpinBox *sp)
:impl(impl)
{
- connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+ connect(sp, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
}
void SpinBoxIntMapper::valueChanged(int pos)
diff --git a/arts/gui/kde/kvolumefader_impl.cpp b/arts/gui/kde/kvolumefader_impl.cpp
index a45f91aa..4236e0cd 100644
--- a/arts/gui/kde/kvolumefader_impl.cpp
+++ b/arts/gui/kde/kvolumefader_impl.cpp
@@ -121,7 +121,7 @@ KVolumeFader_Widget::KVolumeFader_Widget( TQWidget* p, const char* n )
, _value( -1 )
, _dir( Arts::BottomToTop )
, _menu( new TDEPopupMenu( this ) )
- , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( exactValue() ), TQT_TQOBJECT(this) ) )
+ , _aExactValue( new TDEAction( i18n( "Set Exact Value..." ), TDEShortcut(), this, TQ_SLOT( exactValue() ), this ) )
{
//kdDebug() << k_funcinfo << endl;
setMinimumSize( 10,10 );
diff --git a/arts/gui/kde/kwidget_impl.cpp b/arts/gui/kde/kwidget_impl.cpp
index 53ccb8ad..e44a818f 100644
--- a/arts/gui/kde/kwidget_impl.cpp
+++ b/arts/gui/kde/kwidget_impl.cpp
@@ -39,8 +39,8 @@ KWidget_impl::KWidget_impl( TQWidget * widget )
* the panel got deleted, our widget will be gone, too)
*/
_guard = new KWidgetGuard(this);
- TQObject::connect(_qwidget, TQT_SIGNAL(destroyed()),
- _guard, TQT_SLOT(widgetDestroyed()));
+ TQObject::connect(_qwidget, TQ_SIGNAL(destroyed()),
+ _guard, TQ_SLOT(widgetDestroyed()));
}
KWidget_impl::~KWidget_impl()
diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h
index b0c74fa0..430e8c97 100644
--- a/arts/gui/kde/kwidget_impl.h
+++ b/arts/gui/kde/kwidget_impl.h
@@ -31,7 +31,7 @@
namespace Arts {
class KWidgetGuard;
-class KDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel {
+class TDE_EXPORT KWidget_impl : virtual public Arts::Widget_skel {
protected:
TQWidget * _qwidget;
KWidgetGuard * _guard;
diff --git a/arts/gui/kde/tdepopupbox_impl.cpp b/arts/gui/kde/tdepopupbox_impl.cpp
index 9263fc0d..150cccb7 100644
--- a/arts/gui/kde/tdepopupbox_impl.cpp
+++ b/arts/gui/kde/tdepopupbox_impl.cpp
@@ -64,11 +64,11 @@ TDEPopupBox_widget::TDEPopupBox_widget( TQWidget *parent, const char* name ) : T
_titlebarlayout->setAutoAdd( true );
_showbutton = new ShowButton( _titlebar );
- connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) );
+ connect( _showbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( hide( bool ) ) );
_drag = new HandleDrag( _titlebar );
- connect( _drag, TQT_SIGNAL( clicked() ), _showbutton, TQT_SLOT( toggle() ) );
+ connect( _drag, TQ_SIGNAL( clicked() ), _showbutton, TQ_SLOT( toggle() ) );
_ownbutton = new OwnButton( _titlebar );
- connect( _ownbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( own( bool ) ) );
+ connect( _ownbutton, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( own( bool ) ) );
_artswidget = new OwnWidget( _showbutton, this );
diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h
index 1df01f79..21fc3034 100644
--- a/arts/gui/kde/tdepopupbox_private.h
+++ b/arts/gui/kde/tdepopupbox_private.h
@@ -118,7 +118,7 @@ private:
public:
ShowButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name ), _dir( TQBoxLayout::LeftToRight )
{
- connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( owntoggle( bool ) ) );
+ connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( owntoggle( bool ) ) );
setToggleButton( true );
_pmleft = TQPixmap( const_cast<const char**>( left_xpm ) );
_pmright = TQPixmap( const_cast<const char**>( right_xpm ) );
@@ -174,7 +174,7 @@ private:
public:
OwnButton( TQWidget *parent, const char* name=0 ) : TQPushButton( parent,name )
{
- connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( toggle( bool ) ) );
+ connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( toggle( bool ) ) );
setToggleButton( true );
_pmown = TQPixmap( const_cast<const char**>( own_xpm ) );
_pminside = TQPixmap( const_cast<const char**>( inside_xpm ) );
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-20 17:49:18 +0000