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/kdevelop@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 78 insertions, 78 deletions

diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 70768b5b..eff7c84c 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -112,87 +112,87 @@ static struct {
     int key;
     const char* name;
 } keyname[] = {
-    { Qt::Key_Space,        QT_TRANSLATE_NOOP( "TQAccel", "Space" ) },
-    { Qt::Key_Escape,       QT_TRANSLATE_NOOP( "TQAccel", "Esc" ) },
-    { Qt::Key_Tab,          QT_TRANSLATE_NOOP( "TQAccel", "Tab" ) },
-    { Qt::Key_Backtab,      QT_TRANSLATE_NOOP( "TQAccel", "Backtab" ) },
-    { Qt::Key_Backspace,    QT_TRANSLATE_NOOP( "TQAccel", "Backspace" ) },
-    { Qt::Key_Return,       QT_TRANSLATE_NOOP( "TQAccel", "Return" ) },
-    { Qt::Key_Enter,        QT_TRANSLATE_NOOP( "TQAccel", "Enter" ) },
-    { Qt::Key_Insert,       QT_TRANSLATE_NOOP( "TQAccel", "Ins" ) },
-    { Qt::Key_Delete,       QT_TRANSLATE_NOOP( "TQAccel", "Del" ) },
-    { Qt::Key_Pause,        QT_TRANSLATE_NOOP( "TQAccel", "Pause" ) },
-    { Qt::Key_Print,        QT_TRANSLATE_NOOP( "TQAccel", "Print" ) },
-    { Qt::Key_SysReq,       QT_TRANSLATE_NOOP( "TQAccel", "SysReq" ) },
-    { Qt::Key_Home,         QT_TRANSLATE_NOOP( "TQAccel", "Home" ) },
-    { Qt::Key_End,          QT_TRANSLATE_NOOP( "TQAccel", "End" ) },
-    { Qt::Key_Left,         QT_TRANSLATE_NOOP( "TQAccel", "Left" ) },
-    { Qt::Key_Up,           QT_TRANSLATE_NOOP( "TQAccel", "Up" ) },
-    { Qt::Key_Right,        QT_TRANSLATE_NOOP( "TQAccel", "Right" ) },
-    { Qt::Key_Down,         QT_TRANSLATE_NOOP( "TQAccel", "Down" ) },
-    { Qt::Key_Prior,        QT_TRANSLATE_NOOP( "TQAccel", "PgUp" ) },
-    { Qt::Key_Next,         QT_TRANSLATE_NOOP( "TQAccel", "PgDown" ) },
-    { Qt::Key_CapsLock,     QT_TRANSLATE_NOOP( "TQAccel", "CapsLock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( "TQAccel", "NumLock" ) },
-    { Qt::Key_ScrollLock,   QT_TRANSLATE_NOOP( "TQAccel", "ScrollLock" ) },
-    { Qt::Key_Menu,         QT_TRANSLATE_NOOP( "TQAccel", "Menu" ) },
-    { Qt::Key_Help,         QT_TRANSLATE_NOOP( "TQAccel", "Help" ) },
+    { Qt::Key_Space,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Space" ) },
+    { Qt::Key_Escape,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Esc" ) },
+    { Qt::Key_Tab,          QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Tab" ) },
+    { Qt::Key_Backtab,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backtab" ) },
+    { Qt::Key_Backspace,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backspace" ) },
+    { Qt::Key_Return,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Return" ) },
+    { Qt::Key_Enter,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Enter" ) },
+    { Qt::Key_Insert,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Ins" ) },
+    { Qt::Key_Delete,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Del" ) },
+    { Qt::Key_Pause,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Pause" ) },
+    { Qt::Key_Print,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print" ) },
+    { Qt::Key_SysReq,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "SysReq" ) },
+    { Qt::Key_Home,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
+    { Qt::Key_End,          QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "End" ) },
+    { Qt::Key_Left,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Left" ) },
+    { Qt::Key_Up,           QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Up" ) },
+    { Qt::Key_Right,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Right" ) },
+    { Qt::Key_Down,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Down" ) },
+    { Qt::Key_Prior,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgUp" ) },
+    { Qt::Key_Next,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgDown" ) },
+    { Qt::Key_CapsLock,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "CapsLock" ) },
+    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "NumLock" ) },
+    { Qt::Key_ScrollLock,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "ScrollLock" ) },
+    { Qt::Key_Menu,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Menu" ) },
+    { Qt::Key_Help,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Help" ) },
 
     // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP( "TQAccel", "Back" ) },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP( "TQAccel", "Forward" ) },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP( "TQAccel", "Stop" ) },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP( "TQAccel", "Refresh" ) },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP( "TQAccel", "Volume Down" ) },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP( "TQAccel", "Volume Mute" ) },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP( "TQAccel", "Volume Up" ) },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP( "TQAccel", "Bass Boost" ) },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP( "TQAccel", "Bass Up" ) },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP( "TQAccel", "Bass Down" ) },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP( "TQAccel", "Treble Up" ) },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP( "TQAccel", "Treble Down" ) },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP( "TQAccel", "Media Play" ) },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP( "TQAccel", "Media Stop" ) },
-    { Qt::Key_MediaPrev,    QT_TRANSLATE_NOOP( "TQAccel", "Media Previous" ) },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP( "TQAccel", "Media Next" ) },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP( "TQAccel", "Media Record" ) },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP( "TQAccel", "Home" ) },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP( "TQAccel", "Favorites" ) },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP( "TQAccel", "Search" ) },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP( "TQAccel", "Standby" ) },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP( "TQAccel", "Open URL" ) },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP( "TQAccel", "Launch Mail" ) },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP( "TQAccel", "Launch Media" ) },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (0)" ) },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (1)" ) },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (2)" ) },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (3)" ) },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (4)" ) },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (5)" ) },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (6)" ) },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (7)" ) },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (8)" ) },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (9)" ) },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (A)" ) },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (B)" ) },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (C)" ) },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (D)" ) },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (E)" ) },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP( "TQAccel", "Launch (F)" ) },
+    { Qt::Key_Back,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Back" ) },
+    { Qt::Key_Forward,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Forward" ) },
+    { Qt::Key_Stop,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Stop" ) },
+    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Refresh" ) },
+    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Down" ) },
+    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Mute" ) },
+    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Up" ) },
+    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Boost" ) },
+    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Up" ) },
+    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Down" ) },
+    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Up" ) },
+    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Down" ) },
+    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Play" ) },
+    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Stop" ) },
+    { Qt::Key_MediaPrev,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Previous" ) },
+    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Next" ) },
+    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Record" ) },
+    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
+    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Favorites" ) },
+    { Qt::Key_Search,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Search" ) },
+    { Qt::Key_Standby,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Standby" ) },
+    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Open URL" ) },
+    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Mail" ) },
+    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Media" ) },
+    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (0)" ) },
+    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (1)" ) },
+    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (2)" ) },
+    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (3)" ) },
+    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (4)" ) },
+    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (5)" ) },
+    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (6)" ) },
+    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (7)" ) },
+    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (8)" ) },
+    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (9)" ) },
+    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (A)" ) },
+    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (B)" ) },
+    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (C)" ) },
+    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (D)" ) },
+    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (E)" ) },
+    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (F)" ) },
 
     // --------------------------------------------------------------
     // More consistent namings
-    { Qt::Key_Print,        QT_TRANSLATE_NOOP( "TQAccel", "Print Screen" ) },
-    { Qt::Key_Prior,        QT_TRANSLATE_NOOP( "TQAccel", "Page Up" ) },
-    { Qt::Key_Next,         QT_TRANSLATE_NOOP( "TQAccel", "Page Down" ) },
-    { Qt::Key_CapsLock,     QT_TRANSLATE_NOOP( "TQAccel", "Caps Lock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( "TQAccel", "Num Lock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( "TQAccel", "Number Lock" ) },
-    { Qt::Key_ScrollLock,   QT_TRANSLATE_NOOP( "TQAccel", "Scroll Lock" ) },
-    { Qt::Key_Insert,       QT_TRANSLATE_NOOP( "TQAccel", "Insert" ) },
-    { Qt::Key_Delete,       QT_TRANSLATE_NOOP( "TQAccel", "Delete" ) },
-    { Qt::Key_Escape,       QT_TRANSLATE_NOOP( "TQAccel", "Escape" ) },
-    { Qt::Key_SysReq,       QT_TRANSLATE_NOOP( "TQAccel", "System Request" ) },
+    { Qt::Key_Print,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print Screen" ) },
+    { Qt::Key_Prior,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Up" ) },
+    { Qt::Key_Next,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Down" ) },
+    { Qt::Key_CapsLock,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Caps Lock" ) },
+    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Num Lock" ) },
+    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Number Lock" ) },
+    { Qt::Key_ScrollLock,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Scroll Lock" ) },
+    { Qt::Key_Insert,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Insert" ) },
+    { Qt::Key_Delete,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Delete" ) },
+    { Qt::Key_Escape,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Escape" ) },
+    { Qt::Key_SysReq,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "System Request" ) },
 
     { 0, 0 }
 };
@@ -881,7 +881,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 
     if ( ::qt_cast<TQTabWidget*>(obj) ) {
 	TQTabWidget* tw = (TQTabWidget*) obj;
-	TQObjectList* tmpl = tw->queryList( "TQWidgetStack" );
+	TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING );
 	TQWidgetStack *ws = (TQWidgetStack*)tmpl->first();
 	TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar();
 	for ( int i = 0; i < tb->count(); ++i ) {
@@ -1772,7 +1772,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
     if ( colspan < 1 )
 	colspan = 1;
 
-    TQString className = e.attribute( "class", "TQWidget" );
+    TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING );
 #ifdef QT_CONTAINER_CUSTOM_WIDGETS
     TQString parentClassName = WidgetFactory::classNameOf( parent );
     bool isPlugin =