diff options
| -rw-r--r-- | kate/app/katemdi.cpp | 2 | ||||
| -rw-r--r-- | kate/app/kateviewspacecontainer.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/keys/modifiers.cpp | 10 | ||||
| -rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewPartFactory.h | 2 | ||||
| -rw-r--r-- | kdm/kfrontend/themer/kdmitem.cpp | 2 | ||||
| -rw-r--r-- | kdm/kfrontend/themer/kdmthemer.cpp | 2 | ||||
| -rw-r--r-- | kicker/menuext/tom/tom.h | 2 | ||||
| -rw-r--r-- | libkonq/konq_sound.cc | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index c01d9c137..d214def27 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -256,7 +256,7 @@ bool ToolView::visible () const void ToolView::childEvent ( TQChildEvent *ev ) { // set the widget to be focus proxy if possible - if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->qt_cast("TQWidget")) { + if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->qt_cast(TQWIDGET_OBJECT_NAME_STRING)) { setFocusProxy (::tqqt_cast<QWidget*>(TQT_TQOBJECT(ev->child()))); } diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index 58686a45c..d92c5b6ab 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -450,7 +450,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, TQValueList<int> psizes; if ( ! isFirstTime ) - if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast("TQSplitter")) ) + if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) ) psizes = ps->sizes(); Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal; @@ -471,7 +471,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, s->moveToFirst( vsNew ); if (!isFirstTime) - if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast("TQSplitter")) ) + if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast(TQSPLITTER_OBJECT_NAME_STRING)) ) ps->setSizes( psizes ); s->show(); diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index d17e1619e..02ec7dc4d 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -182,13 +182,13 @@ void ModifiersModule::initGUI() plbl = new TQLabel( i18n("X11-Mod"), pGroup ); plbl->setFont( font ); - new TQLabel( i18n("TQAccel", "Shift"), pGroup ); + new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Shift"), pGroup ); new TQLabel( "shift", pGroup ); - m_plblCtrl = new TQLabel( i18n("TQAccel", "Ctrl"), pGroup ); + m_plblCtrl = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl"), pGroup ); new TQLabel( "control", pGroup ); - m_plblAlt = new TQLabel( i18n("TQAccel", "Alt"), pGroup ); + m_plblAlt = new TQLabel( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt"), pGroup ); new TQLabel( "mod1", pGroup ); m_plblWin = new TQLabel( i18n("Win"), pGroup ); @@ -285,8 +285,8 @@ void ModifiersModule::updateWidgets() } m_pchkMacSwap->setEnabled( true ); } else { - m_plblCtrl->setText( i18n("TQAccel", "Ctrl") ); - m_plblAlt->setText( i18n("TQAccel", "Alt") ); + m_plblCtrl->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Ctrl") ); + m_plblAlt->setText( i18n(TQACCEL_OBJECT_NAME_STRING, "Alt") ); m_plblWin->setText( i18n("Win") ); m_pchkMacSwap->setEnabled( false ); } diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h index d5999d8b0..44b213632 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h @@ -45,7 +45,7 @@ class CFontViewPartFactory : public KLibFactory CFontViewPartFactory(); virtual ~CFontViewPartFactory(); - virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = "TQObject", const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static KInstance * instance(); diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 2d3f841f4..1b2d7af1d 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -621,7 +621,7 @@ KdmItem::tqparentWidget() const if (!this->parent()) return 0; - if (tqparent()->qt_cast("TQWidget")) + if (tqparent()->qt_cast(TQWIDGET_OBJECT_NAME_STRING)) return (TQWidget*)parent(); return ((KdmItem*)parent())->tqparentWidget(); } diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp index 5ff9b6711..5cab6a0cd 100644 --- a/kdm/kfrontend/themer/kdmthemer.cpp +++ b/kdm/kfrontend/themer/kdmthemer.cpp @@ -358,7 +358,7 @@ KdmThemer::slotActivated( const TQString &id ) return; item->widget()->setFocus(); - TQLineEdit *le = (TQLineEdit*)item->widget()->qt_cast("TQLineEdit"); + TQLineEdit *le = (TQLineEdit*)item->widget()->qt_cast(TQLINEEDIT_OBJECT_NAME_STRING); if (le) le->selectAll(); } diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h index 55a1e927e..b42feb536 100644 --- a/kicker/menuext/tom/tom.h +++ b/kicker/menuext/tom/tom.h @@ -102,7 +102,7 @@ class TOMFactory : public KLibFactory protected: TQObject* createObject(TQObject *parent = 0, const char *name = 0, - const char *classname = "TQObject", + const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList()); }; diff --git a/libkonq/konq_sound.cc b/libkonq/konq_sound.cc index 31448a57e..1a31daed8 100644 --- a/libkonq/konq_sound.cc +++ b/libkonq/konq_sound.cc @@ -115,7 +115,7 @@ public: protected: virtual TQObject *createObject(TQObject * = 0, const char * = 0, - const char *className = "TQObject", const TQStringList &args = TQStringList()); + const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); }; TQObject *KonqSoundFactory::createObject(TQObject *, const char *, |