summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-24 07:08:32 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-24 07:08:32 +0000
commitf1fdec42303ca53d085302ea2af9110cd1d79570 (patch)
tree6fbc7d845deb57ffaff27e03fc2c7058ebead321
parent841194d1bffdf87bcdbae758777e6c88aef6bf1d (diff)
downloadtdebase-f1fdec42303ca53d085302ea2af9110cd1d79570.tar.gz
tdebase-f1fdec42303ca53d085302ea2af9110cd1d79570.zip
Fix a number of runtime object identification problems which led to an even larger array of minor glitches
NOTE: kdevelop and kdewebdev still need to be fully repaired git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kcontrol/kcontrol/global.cpp2
-rw-r--r--kcontrol/locale/toplevel.cpp12
-rw-r--r--kcontrol/style/stylepreview.ui.h2
-rw-r--r--kioslave/media/medianotifier/medianotifier.cpp2
-rw-r--r--konqueror/konq_view.cc2
-rw-r--r--kpersonalizer/stylepreview.ui.h2
-rw-r--r--ksysguard/gui/KSysGuardApplet.cc10
-rw-r--r--nsplugins/viewer/kxt.cpp6
8 files changed, 19 insertions, 19 deletions
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index ed892ac70..d5f103cd5 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -105,7 +105,7 @@ TQString KCGlobal::baseGroup()
void KCGlobal::repairAccels( TQWidget * tw )
{
- TQObjectList * l = tw->queryList( "TQAccel" );
+ TQObjectList * l = tw->queryList( TQACCEL_OBJECT_NAME_STRING );
TQObjectListIt it( *l ); // iterate over the buttons
TQObject * obj;
while ( (obj=it.current()) != 0 ) { // for each found object...
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 523fa50ea..e53b52ed5 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -227,7 +227,7 @@ void KLocaleApplication::slotTranslate()
// The untranslated string for TQLabel are stored in
// the name() so we use that when retranslating
TQObject *wc;
- TQObjectList *list = queryList("TQWidget");
+ TQObjectList *list = queryList(TQWIDGET_OBJECT_NAME_STRING);
TQObjectListIt it(*list);
while ( (wc = it.current()) != 0 )
{
@@ -243,15 +243,15 @@ void KLocaleApplication::slotTranslate()
if (::qstrcmp(wc->name(), "unnamed") == 0)
continue;
- if (::qstrcmp(wc->className(), "TQLabel") == 0)
+ if (::qstrcmp(wc->className(), TQLABEL_OBJECT_NAME_STRING) == 0)
((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) );
- else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 ||
- ::qstrcmp(wc->className(), "TQVGroupBox") == 0)
+ else if (::qstrcmp(wc->className(), TQGROUPBOX_OBJECT_NAME_STRING) == 0 ||
+ ::qstrcmp(wc->className(), TQVGROUPBOX_OBJECT_NAME_STRING) == 0)
((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) );
- else if (::qstrcmp(wc->className(), "TQPushButton") == 0 ||
+ else if (::qstrcmp(wc->className(), TQPUSHBUTTON_OBJECT_NAME_STRING) == 0 ||
::qstrcmp(wc->className(), "KMenuButton") == 0)
((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) );
- else if (::qstrcmp(wc->className(), "TQCheckBox") == 0)
+ else if (::qstrcmp(wc->className(), TQCHECKBOX_OBJECT_NAME_STRING) == 0)
((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) );
}
delete list;
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index 9f5188afe..edf38650e 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -33,7 +33,7 @@ void StylePreview::init()
{
// Ensure that the user can't toy with the child widgets.
// Method borrowed from Qt's qtconfig.
- TQObjectList* l = queryList("TQWidget");
+ TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
TQObjectListIt it(*l);
TQObject* obj;
while ((obj = it.current()) != 0)
diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp
index ad9d00db8..f28c9ab95 100644
--- a/kioslave/media/medianotifier/medianotifier.cpp
+++ b/kioslave/media/medianotifier/medianotifier.cpp
@@ -369,7 +369,7 @@ void MediaNotifier::slotFreeCancel()
void MediaNotifier::slotFreeFinished( KMessageBox::ButtonCode res )
{
- TQCheckBox *checkbox = ::tqqt_cast<TQCheckBox*>( m_freeDialog->child( 0, "TQCheckBox" ) );
+ TQCheckBox *checkbox = ::tqqt_cast<TQCheckBox*>( m_freeDialog->child( 0, TQCHECKBOX_OBJECT_NAME_STRING ) );
if ( checkbox && checkbox->isChecked() )
KMessageBox::saveDontShowAgainYesNo("dontagainfreespace", res);
m_freeDialog->delayedDestruct();
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index d23982437..873ba8242 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -1265,7 +1265,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e )
KURL::List lstDragURLs;
bool ok = KURLDrag::decode( ev, lstDragURLs );
- TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" );
+ TQObjectList *children = m_pPart->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING );
if ( ok &&
!lstDragURLs.first().url().tqcontains( "javascript:", false ) && // ### this looks like a hack to me
diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h
index 048f9fba9..66388024f 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -41,7 +41,7 @@ void StylePreview::init()
{
// Ensure that the user can't toy with the child widgets.
// Method borrowed from Qt's qtconfig.
- TQObjectList* l = queryList("TQWidget");
+ TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
TQObjectListIt it(*l);
TQObject* obj;
while ((obj = it.current()) != 0)
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc
index 2dff511e3..236be8110 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cc
@@ -142,7 +142,7 @@ void KSysGuardApplet::applySettings()
resizeDocks( mSettingsDlg->numDisplay() );
for ( uint i = 0; i < mDockCount; ++i )
- if ( !mDockList[ i ]->isA( "TQFrame" ) )
+ if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
((KSGRD::SensorDisplay*)mDockList[ i ])->setUpdateInterval( updateInterval() );
save();
@@ -201,7 +201,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
return;
int dock = findDock( e->pos() );
- if ( mDockList[ dock ]->isA( "TQFrame" ) ) {
+ if ( mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
if ( sensorType == "integer" || sensorType == "float" ) {
KPopupMenu popup;
TQWidget *wdg = 0;
@@ -246,7 +246,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
}
}
- if ( !mDockList[ dock ]->isA( "TQFrame" ) )
+ if ( !mDockList[ dock ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
((KSGRD::SensorDisplay*)mDockList[ dock ])->
addSensor( hostName, sensorName, sensorType, sensorDescr );
}
@@ -429,7 +429,7 @@ bool KSysGuardApplet::save()
TQStringList hosts;
uint i;
for ( i = 0; i < mDockCount; ++i )
- if ( !mDockList[ i ]->isA( "TQFrame" ) )
+ if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) )
((KSGRD::SensorDisplay*)mDockList[ i ])->hosts( hosts );
// save host information (name, shell, etc.)
@@ -449,7 +449,7 @@ bool KSysGuardApplet::save()
}
for ( i = 0; i < mDockCount; ++i )
- if ( !mDockList[ i ]->isA( "TQFrame" ) ) {
+ if ( !mDockList[ i ]->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
TQDomElement element = doc.createElement( "display" );
ws.appendChild( element );
element.setAttribute( "dock", i );
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index dbc865fb5..c9c535957 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -177,7 +177,7 @@ static
QWidgetClassRec qwidgetClassRec = {
{ /* core fields */
/* superclass */ (WidgetClass) &widgetClassRec,
- /* class_name */ (char*)"TQWidget",
+ /* class_name */ (char*)TQWIDGET_OBJECT_NAME_STRING,
/* widget_size */ sizeof(QWidgetRec),
/* class_initialize */ 0,
/* class_part_initialize */ 0,
@@ -438,7 +438,7 @@ void KXtWidget::init(const char* name, WidgetClass widget_class,
/*!
Constructs a KXtWidget of the special Xt widget class known as
- "TQWidget" to the resource manager.
+ TQWIDGET_OBJECT_NAME_STRING to the resource manager.
Use this constructor to utilize Qt widgets in an Xt/Motif
application. The KXtWidget is a TQWidget, so you can create
@@ -492,7 +492,7 @@ KXtWidget::~KXtWidget()
{
// Delete children first, as Xt will destroy their windows
//
- TQObjectList* list = queryList("TQWidget", 0, FALSE, FALSE);
+ TQObjectList* list = queryList(TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE);
if ( list ) {
TQWidget* c;
TQObjectListIt it( *list );