From 95b02a470fa233548b3c3be0cff13caf4c88ba21 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 18 Sep 2011 23:43:22 +0000 Subject: Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q* This fixes the Kopete MSN protocol among other things git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kjsembed/jsfactory.cpp | 10 +++++----- qtruby/rubylib/designer/rbuic/widgetdatabase.cpp | 2 +- qtruby/rubylib/designer/uilib/qui.cpp | 2 +- qtsharp/src/bindings/static/QtSupport.cs | 4 ++-- qtsharp/src/generator/QTypeMap.cs | 16 ++++++++-------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp index ebb4bf26..b33d9f81 100644 --- a/kjsembed/jsfactory.cpp +++ b/kjsembed/jsfactory.cpp @@ -974,7 +974,7 @@ namespace KJSEmbed { "QAxObject", "QAxWidget", "TQButton", - "TQCDEStyle", + "QCDEStyle", "QClipboard", "QColorDialog", "TQColorDrag", @@ -996,7 +996,7 @@ namespace KJSEmbed { "TQFileIconProvider", "QFontDialog", "TQFtp", - "TQGLWidget", + "QGLWidget", "TQGridLayout", "TQGridView", "TQHButtonGroup", @@ -1016,8 +1016,8 @@ namespace KJSEmbed { "TQMotifPlusStyle", "TQMotifStyle", "QMotifWidget", - "TQNPInstance", - "TQNPWidget", + "QNPInstance", + "QNPWidget", "TQNetworkOperation", "TQNetworkProtocol", "TQObjectCleanupHandler", @@ -1026,7 +1026,7 @@ namespace KJSEmbed { "TQPopupMenu", "TQProgressDialog", "TQRegExpValidator", - "TQSGIStyle", + "QSGIStyle", "TQServerSocket", "QSessionManager", "TQSignal", diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp index 17b5014c..2538d0ae 100644 --- a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp +++ b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp @@ -357,7 +357,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "lcdnumber.xpm"; - r->name = "TQLCDNumber"; + r->name = "QLCDNumber"; r->group = widgetGroup( "Display" ); r->toolTip = "LCD Number"; diff --git a/qtruby/rubylib/designer/uilib/qui.cpp b/qtruby/rubylib/designer/uilib/qui.cpp index e587eee8..c52a40f2 100644 --- a/qtruby/rubylib/designer/uilib/qui.cpp +++ b/qtruby/rubylib/designer/uilib/qui.cpp @@ -93,7 +93,7 @@ create(int argc, VALUE * argv, VALUE /*klass*/) TQIODevice * dev = 0; smokeruby_object *o = value_obj_info(argv[0]); - if (o != 0 && o->ptr != 0 && o->classId == qt_Smoke->idClass("TQIODevice")) { + if (o != 0 && o->ptr != 0 && o->classId == qt_Smoke->idClass("QIODevice")) { dev = (TQIODevice *) o->ptr; } else { rb_raise(rb_eArgError, "invalid argument type\n"); diff --git a/qtsharp/src/bindings/static/QtSupport.cs b/qtsharp/src/bindings/static/QtSupport.cs index 01031446..c0ad30ed 100644 --- a/qtsharp/src/bindings/static/QtSupport.cs +++ b/qtsharp/src/bindings/static/QtSupport.cs @@ -387,8 +387,8 @@ namespace Qt { remove { EventList.Remove ("TQDropEvent", value); } } public static event QIMHandler imHandler { - add { EventList.Add ("TQIMEvent", value); } - remove { EventList.Remove ("TQIMEvent", value); } + add { EventList.Add ("QIMEvent", value); } + remove { EventList.Remove ("QIMEvent", value); } } public static event QPaintHandler paintHandler { add { EventList.Add ("TQPaintEvent", value); } diff --git a/qtsharp/src/generator/QTypeMap.cs b/qtsharp/src/generator/QTypeMap.cs index fdba1342..321c4738 100644 --- a/qtsharp/src/generator/QTypeMap.cs +++ b/qtsharp/src/generator/QTypeMap.cs @@ -182,7 +182,7 @@ namespace QtCSharp { mastermap.Add ("ScaleMode", "TQImage.ScaleMode"); mastermap.Add ("PaintDeviceFlags", "TQInternal.PaintDeviceFlags"); mastermap.Add ("Rules", "TQJpUnicodeConv.Rules"); - mastermap.Add ("SegmentStyle", "TQLCDNumber.SegmentStyle"); + mastermap.Add ("SegmentStyle", "QLCDNumber.SegmentStyle"); mastermap.Add ("LayoutMode", "TQListBox.LayoutMode"); mastermap.Add ("WidthMode", "TQListView.WidthMode"); mastermap.Add ("RenameAction", "TQListView.RenameAction"); @@ -193,11 +193,11 @@ namespace QtCSharp { mastermap.Add ("Access", "QMetaData.Access"); mastermap.Add ("Flags", "TQMetaProperty.Flags"); mastermap.Add ("Status", "TQMovie.Status"); - mastermap.Add ("InstanceMode", "TQNPInstance.InstanceMode"); - mastermap.Add ("StreamMode", "TQNPInstance.StreamMode"); + mastermap.Add ("InstanceMode", "QNPInstance.InstanceMode"); + mastermap.Add ("StreamMode", "QNPInstance.StreamMode"); mastermap.Add ("Operation", "TQNetworkProtocol.Operation"); mastermap.Add ("ConnectionState", "TQNetworkProtocol.ConnectionState"); - mastermap.Add ("DisposalMethod", "TQPNGImageWriter.DisposalMethod"); + mastermap.Add ("DisposalMethod", "QPNGImageWriter.DisposalMethod"); mastermap.Add ("PDevCmd", "TQPaintDevice.PDevCmd"); mastermap.Add ("CoordinateMode", "TQPainter.CoordinateMode"); mastermap.Add ("TextDirection", "TQPainter.TextDirection"); @@ -287,7 +287,7 @@ namespace QtCSharp { mastermap.Add ("TQMimeSource", "IQMimeSource"); mastermap.Add ("TQLayoutItem", "IQLayoutItem"); mastermap.Add ("TQUrl", "IQUrl"); - mastermap.Add ("TQIODevice", "IQIODevice"); + mastermap.Add ("QIODevice", "IQIODevice"); mastermap.Add ("TQXmlContentHandler", "IQXmlContentHandler"); mastermap.Add ("TQXmlErrorHandler", "IQXmlErrorHandler"); mastermap.Add ("TQXmlDTDHandler", "IQXmlDTDHandler"); @@ -305,10 +305,10 @@ namespace QtCSharp { //mastermap.Add ("Direction", "TQChar.Direction"); //mastermap.Add ("Reason", "TQContextMenuEvent.Reason"); //mastermap.Add ("Reason", "TQFocusEvent.Reason"); - //mastermap.Add ("Reason", "TQNPInstance.Reason"); + //mastermap.Add ("Reason", "QNPInstance.Reason"); //mastermap.Add ("Mode", "TQFileDialog.Mode"); //mastermap.Add ("Mode", "TQIconSet.Mode"); - //mastermap.Add ("Mode", "TQLCDNumber.Mode"); + //mastermap.Add ("Mode", "QLCDNumber.Mode"); //mastermap.Add ("Mode", "TQSqlCursor.Mode"); //mastermap.Add ("Shape", "TQFrame.Shape"); //mastermap.Add ("Shape", "TQTabBar.Shape"); @@ -375,7 +375,7 @@ namespace QtCSharp { interfaces.Add ("TQMimeSource", "IQMimeSource"); interfaces.Add ("TQLayoutItem", "IQLayoutItem"); interfaces.Add ("TQUrl", "IQUrl"); - interfaces.Add ("TQIODevice", "IQIODevice"); + interfaces.Add ("QIODevice", "IQIODevice"); interfaces.Add ("TQXmlContentHandler", "IQXmlContentHandler"); interfaces.Add ("TQXmlErrorHandler", "IQXmlErrorHandler"); interfaces.Add ("TQXmlDTDHandler", "IQXmlDTDHandler"); -- cgit v1.2.3