diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-02 23:45:34 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-02 23:45:34 +0000 |
| commit | 0a05b258faf9126cda33e19324126beb1975b19c (patch) | |
| tree | d5056c76c861461bffe8e7ce9bb5227ec1191028 /kcontrol | |
| parent | cbecd3a8a71c92976314479c9ce892ee8138da5d (diff) | |
| download | tdebase-0a05b258faf9126cda33e19324126beb1975b19c.tar.gz tdebase-0a05b258faf9126cda33e19324126beb1975b19c.zip | |
Change remaining kdebase inherits() and similar methods to use new object name define strings
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1226910 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/keys/modifiers.cpp | 10 | ||||
| -rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewPartFactory.h | 2 |
2 files changed, 6 insertions, 6 deletions
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(); |