Browse Source

Allow kdelibs to function correctly with TQt for Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1220926 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 10 years ago
parent
commit
374d939d8a
  1. 2
      dcop/client/dcop.cpp
  2. 2
      dcop/client/dcopfind.cpp
  3. 5
      dcop/dcopclient.cpp
  4. 4
      dcop/dcopserver.cpp
  5. 2
      interfaces/ktexteditor/editorchooser.cpp
  6. 6
      kab/qconfigDB.cc
  7. 2
      kabc/formats/binaryformat.cpp
  8. 20
      kabc/kab2kabc.cpp
  9. 2
      kabc/resourceselectdialog.cpp
  10. 80
      kabc/tests/testaddresseelist.cpp
  11. 14
      kabc/vcard/AdrValue.cpp
  12. 2
      kabc/vcard/ContentLine.cpp
  13. 2
      kabc/vcard/LangValue.cpp
  14. 10
      kabc/vcard/NValue.cpp
  15. 2
      kabc/vcard/OrgValue.cpp
  16. 2
      kabc/vcard/TextListValue.cpp
  17. 2
      kabc/vcard/VCard.cpp
  18. 2
      kabc/vcardparser/vcardparser.cpp
  19. 2
      kate/data/cpp.xml
  20. 4
      kate/part/kateautoindent.cpp
  21. 10
      kate/part/katebookmarks.cpp
  22. 12
      kate/part/katecodefoldinghelpers.cpp
  23. 12
      kate/part/kateconfig.cpp
  24. 6
      kate/part/katedialogs.cpp
  25. 40
      kate/part/katedocument.cpp
  26. 2
      kate/part/katefactory.cpp
  27. 50
      kate/part/katefiletype.cpp
  28. 50
      kate/part/katehighlight.cpp
  29. 4
      kate/part/katejscript.cpp
  30. 2
      kate/part/kateprinter.cpp
  31. 4
      kate/part/katerenderer.cpp
  32. 10
      kate/part/kateschema.cpp
  33. 6
      kate/part/katesearch.cpp
  34. 10
      kate/part/katetemplatehandler.cpp
  35. 8
      kate/part/kateundo.cpp
  36. 2
      kate/plugins/autobookmarker/autobookmarker.cpp
  37. 4
      kate/plugins/insertfile/insertfileplugin.cpp
  38. 4
      kate/plugins/isearch/ISearchPlugin.cpp
  39. 8
      kate/plugins/kdatatool/kate_kdatatool.cpp
  40. 4
      kate/plugins/wordcompletion/docwordcompletion.cpp
  41. 2
      kcert/kcertpart.cc
  42. 2
      kdecore/kapplication.cpp
  43. 4
      kdecore/kcalendarsystem.cpp
  44. 4
      kdecore/kclipboard.cpp
  45. 2
      kdecore/kclipboard.h
  46. 2
      kdecore/kcmdlineargs.cpp
  47. 16
      kdecore/kcompletion.cpp
  48. 4
      kdecore/kcompletion_private.h
  49. 2
      kdecore/kconfigbackend.cpp
  50. 14
      kdecore/kconfigbase.cpp
  51. 2
      kdecore/kdebug.cpp
  52. 4
      kdecore/kdebug.h
  53. 2
      kdecore/kkeyserver_x11.cpp
  54. 14
      kdecore/klibloader.cpp
  55. 44
      kdecore/klocale.cpp
  56. 6
      kdecore/kpalette.cpp
  57. 2
      kdecore/krfcdate.cpp
  58. 26
      kdecore/kstandarddirs.cpp
  59. 10
      kdecore/kstringhandler.cpp
  60. 12
      kdecore/ksycoca.cpp
  61. 22
      kdecore/ksycocadict.cpp
  62. 2
      kdecore/ksycocaentry.h
  63. 20
      kdecore/ksycocafactory.cpp
  64. 10
      kdecore/kurl.cpp
  65. 2
      kdecore/network/ksrvresolverworker.cpp
  66. 4
      kdecore/svgicons/ksvgiconengine.cpp
  67. 2
      kdecore/tests/kurltest.cpp
  68. 14
      kded/kbuildservicefactory.cpp
  69. 6
      kded/kbuildservicegroupfactory.cpp
  70. 18
      kded/kbuildservicetypefactory.cpp
  71. 8
      kded/kbuildsycoca.cpp
  72. 8
      kded/kctimefactory.cpp
  73. 4
      kded/vfolder_menu.cpp
  74. 12
      kdefx/kimageeffect.cpp
  75. 4
      kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
  76. 2
      kdeprint/cups/cupsdconf2/locationdialog.cpp
  77. 4
      kdeprint/cups/kmcupsconfigwidget.cpp
  78. 6
      kdeprint/cups/kpimagepage.cpp
  79. 2
      kdeprint/driver.cpp
  80. 2
      kdeprint/kmjobmanager.cpp
  81. 2
      kdeprint/kmmanager.cpp
  82. 4
      kdeprint/kpcopiespage.cpp
  83. 14
      kdeprint/kpgeneralpage.cpp
  84. 8
      kdeprint/kpqtpage.cpp
  85. 8
      kdeprint/kprintdialog.cpp
  86. 2
      kdeprint/management/kmiconview.cpp
  87. 6
      kdeprint/management/kmjobviewer.cpp
  88. 2
      kdeprint/management/kmlistview.cpp
  89. 2
      kdeprint/management/kmspecialprinterdlg.cpp
  90. 6
      kdeprint/management/kmwdriverselect.cpp
  91. 12
      kdeprint/management/kmwinfobase.cpp
  92. 10
      kdeprint/management/kxmlcommanddlg.cpp
  93. 2
      kdeprint/rlpr/kmproxywidget.cpp
  94. 2
      kdesu/process.cpp
  95. 14
      kdeui/kaction.cpp
  96. 14
      kdeui/kactionclasses.cpp
  97. 8
      kdeui/kactioncollection.cpp
  98. 2
      kdeui/kcolorbutton.cpp
  99. 2
      kdeui/kcombobox.cpp
  100. 2
      kdeui/kcursor.cpp
  101. 50
      kdeui/kdockwidget.cpp
  102. 24
      kdeui/kdockwidget_private.cpp
  103. 2
      kdeui/keditlistbox.cpp
  104. 4
      kdeui/kiconview.cpp
  105. 2
      kdeui/kjanuswidget.cpp
  106. 8
      kdeui/klanguagebutton.cpp
  107. 10
      kdeui/klineedit.cpp
  108. 4
      kdeui/klistbox.cpp
  109. 6
      kdeui/klistview.cpp
  110. 22
      kdeui/klistviewsearchline.cpp
  111. 4
      kdeui/kmainwindow.cpp
  112. 2
      kdeui/kmainwindowiface.cpp
  113. 4
      kdeui/kmenubar.cpp
  114. 4
      kdeui/kpassdlg.cpp
  115. 8
      kdeui/ksharedpixmap.cpp
  116. 1
      kdeui/ksharedpixmap.h
  117. 2
      kdeui/kspell.cpp
  118. 4
      kdeui/ktabbar.cpp
  119. 6
      kdeui/ktabwidget.cpp
  120. 2
      kdeui/ktextedit.cpp
  121. 73
      kdeui/ktoolbar.cpp
  122. 6
      kdeui/ktoolbarbutton.cpp
  123. 4
      kdeui/ktoolbarhandler.cpp
  124. 2
      kdeui/kwordwrap.cpp
  125. 2
      kdeui/kxmlguifactory.cpp
  126. 16
      kdeui/kxmlguifactory_p.cpp
  127. 4
      kdeui/qxembed.cpp
  128. 4
      kdeui/tests/kdockwidgetdemo.cpp
  129. 4
      kdoctools/kio_help.cpp
  130. 8
      kdoctools/xslt.cpp
  131. 2
      khtml/css/css_base.h
  132. 2
      khtml/css/css_ruleimpl.h
  133. 6
      khtml/css/css_valueimpl.cpp
  134. 2
      khtml/css/css_valueimpl.h
  135. 8
      khtml/css/cssstyleselector.cpp
  136. 14
      khtml/ecma/kjs_debugwin.cpp
  137. 14
      khtml/ecma/kjs_navigator.cpp
  138. 4
      khtml/ecma/kjs_window.cpp
  139. 2
      khtml/html/html_formimpl.cpp
  140. 10
      khtml/html/html_miscimpl.cpp
  141. 2
      khtml/java/kjavaappletviewer.cpp
  142. 8
      khtml/java/kjavaprocess.cpp
  143. 6
      khtml/khtml_caret.cpp
  144. 8
      khtml/khtml_ext.cpp
  145. 2
      khtml/khtml_pagecache.cpp
  146. 12
      khtml/khtml_part.cpp
  147. 2
      khtml/rendering/bidi.cpp
  148. 4
      khtml/rendering/render_form.cpp
  149. 36
      khtml/rendering/render_layer.cpp
  150. 2
      khtml/rendering/render_table.cpp
  151. 4
      khtml/rendering/render_text.cpp
  152. 2
      khtml/test_regression.cpp
  153. 2
      khtml/xml/dom_nodeimpl.cpp
  154. 4
      kimgio/dds.cpp
  155. 4
      kimgio/eps.cpp
  156. 2
      kimgio/hdr.cpp
  157. 12
      kimgio/ico.cpp
  158. 2
      kimgio/jp2.cpp
  159. 8
      kimgio/pcx.cpp
  160. 6
      kimgio/psd.cpp
  161. 2
      kimgio/tga.cpp
  162. 6
      kimgio/tiffr.cpp
  163. 20
      kimgio/xcf.cpp
  164. 2
      kinit/klauncher.cpp
  165. 8
      kio/bookmarks/kbookmarkbar.cc
  166. 24
      kio/bookmarks/kbookmarkmenu.cc
  167. 4
      kio/kfile/kdiroperator.cpp
  168. 4
      kio/kfile/kencodingfiledialog.cpp
  169. 10
      kio/kfile/kfiledialog.cpp
  170. 2
      kio/kfile/kfilefiltercombo.cpp
  171. 6
      kio/kfile/kfileiconview.cpp
  172. 10
      kio/kfile/kicondialog.cpp
  173. 2
      kio/kfile/knotifydialog.cpp
  174. 28
      kio/kfile/kpropertiesdialog.cpp
  175. 2
      kio/kfile/kurlbar.cpp
  176. 4
      kio/kfile/kurlcombobox.cpp
  177. 2
      kio/kio/job.cpp
  178. 8
      kio/kio/kar.cpp
  179. 2
      kio/kio/karchive.cpp
  180. 8
      kio/kio/klimitediodevice.h
  181. 12
      kio/kio/kservicefactory.cpp
  182. 4
      kio/kio/kservicegroupfactory.cpp
  183. 8
      kio/kio/kservicetypefactory.cpp
  184. 6
      kio/kio/kshred.cpp
  185. 24
      kio/kio/ktar.cpp
  186. 10
      kio/kio/kurlcompletion.cpp
  187. 2
      kio/kio/kurlpixmapprovider.cpp
  188. 54
      kio/kio/kzip.cpp
  189. 2
      kio/kio/paste.cpp
  190. 2
      kio/kio/paste.h
  191. 2
      kio/kio/pastedialog.cpp
  192. 4
      kio/kio/scheduler.cpp
  193. 2
      kio/kssl/ksslcertificate.cc
  194. 2
      kio/kssl/ksslinfodlg.cc
  195. 2
      kio/kssl/ksslsettings.cc
  196. 4
      kio/misc/ksendbugmail/main.cpp
  197. 4
      kio/misc/kssld/kssld.cpp
  198. 4
      kio/misc/uiserver.cpp
  199. 2
      kio/misc/uiserver.h
  200. 4
      kio/tests/kfiltertest.cpp
  201. 4
      kioslave/http/http.cc
  202. 2
      kioslave/http/kcookiejar/kcookiejar.cpp
  203. 2
      kioslave/iso/kiso.cpp
  204. 2
      kioslave/iso/kisofile.cpp
  205. 10
      kmdi/kmdi/dockcontainer.cpp
  206. 6
      kmdi/kmdi/guiclient.cpp
  207. 6
      kmdi/kmdi/mainwindow.cpp
  208. 2
      kmdi/kmdi/toolviewaccessor.cpp
  209. 10
      kmdi/kmdidockcontainer.cpp
  210. 6
      kmdi/kmdiguiclient.cpp
  211. 12
      kmdi/kmdimainfrm.cpp
  212. 2
      kmdi/kmditoolviewaccessor.cpp
  213. 22
      knewstuff/downloaddialog.cpp
  214. 2
      kparts/browserextension.cpp
  215. 6
      kparts/componentfactory.h
  216. 4
      kparts/dockmainwindow.cpp
  217. 2
      kparts/factory.cpp
  218. 6
      kparts/genericfactory.h
  219. 4
      kparts/mainwindow.cpp
  220. 2
      kparts/partmanager.h
  221. 2
      kparts/statusbarextension.cpp
  222. 4
      krandr/randr.cpp
  223. 8
      kresources/configpage.cpp
  224. 2
      kresources/selectdialog.cpp
  225. 2
      kstyles/kthemestyle/kthemebase.cpp
  226. 20
      kutils/kfinddialog.cpp
  227. 32
      kutils/kmultitabbar.cpp
  228. 2
      kwallet/backend/kwalletbackend.cc
  229. 2
      kwallet/backend/kwalletbackend.h
  230. 2
      win/qeventloopex.cpp

2
dcop/client/dcop.cpp

@ -262,7 +262,7 @@ int callFunction( const char* app, const char* obj, const char* func, const QCSt
}
if ( s == static_cast<int>(partl.count())-1)
{
partl.remove(partl.at(s));
partl.remove(partl.tqat(s));
}
lt = partl.join(" ");

2
dcop/client/dcopfind.cpp

@ -98,7 +98,7 @@ bool findObject( const char* app, const char* obj, const char* func, QCStringLis
}
if (s==(int)partl.count()-1)
{
partl.remove(partl.at(s));
partl.remove(partl.tqat(s));
}
lt = partl.join(" ");

5
dcop/dcopclient.cpp

@ -483,7 +483,7 @@ void DCOPProcessInternal( DCOPClientPrivate *d, int opcode, CARD32 key, const TQ
int datalen = reply.size();
pMsg->key = key;
pMsg->length += datalen;
IceSendData( iceConn, datalen, const_cast<char *>(reply.data()));
IceSendData( iceConn, datalen, reply.data());
return;
}
@ -1617,7 +1617,8 @@ bool DCOPClient::receive(const TQCString &/*app*/, const TQCString &objId,
// fall through and send to object proxies
}
if (!objId.isEmpty() && objId[objId.length()-1] == '*') {
// if (!objId.isEmpty() && objId[objId.length()-1] == '*') {
if (!objId.isEmpty() && ((objId.length()>0)?(objId[objId.length()-1] == '*'):0)) {
// handle a multicast to several objects.
// doesn't handle proxies currently. should it?
TQPtrList<DCOPObject> matchList =

4
dcop/dcopserver.cpp

@ -127,7 +127,7 @@ static TQCString readQCString(TQDataStream &ds)
TQ_UINT32 len;
ds >> len;
TQIODevice *device = ds.tqdevice();
int bytesLeft = device->size()-device->at();
int bytesLeft = device->size()-device->tqat();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{
qWarning("Corrupt data!\n");
@ -146,7 +146,7 @@ static TQByteArray readQByteArray(TQDataStream &ds)
TQ_UINT32 len;
ds >> len;
TQIODevice *device = ds.tqdevice();
int bytesLeft = device->size()-device->at();
int bytesLeft = device->size()-device->tqat();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{
qWarning("Corrupt data!\n");

2
interfaces/ktexteditor/editorchooser.cpp

@ -95,7 +95,7 @@ void EditorChooser::writeAppSetting(const TQString& postfix){
cfg->setGroup("KTEXTEDITOR:"+postfix);
cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES");
cfg->writePathEntry("editor", (d->chooser->editorCombo->currentItem()==0) ?
TQString::null : (*d->elements.at(d->chooser->editorCombo->currentItem()-1)));
TQString::null : (*d->elements.tqat(d->chooser->editorCombo->currentItem()-1)));
cfg->sync();
cfg->setGroup(previousGroup);

6
kab/qconfigDB.cc

@ -1188,7 +1188,7 @@ KeyValueMap::insert(const TQCString& key, const TQStrList& values, bool force)
// ----- create coded string list:
for(count=0; count<values.count(); ++count)
{ // create strings like "abc\efgh\eijk":
temp=makeComplexString(((TQStrList)values).at(count));
temp=makeComplexString(((TQStrList)values).tqat(count));
temp.remove(0, 1); // remove the leading "\""
temp.remove(temp.length()-1, 1); // the trailing "\""
value+=temp;
@ -1231,7 +1231,7 @@ KeyValueMap::get(const TQCString& key, TQStringList& values) const
// ----- do the conversion:
for(count=0; count<temp.count(); ++count)
{
values.append(TQString::fromUtf8(temp.at(count)));
values.append(TQString::fromUtf8(temp.tqat(count)));
}
// -----
kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::get[QStringList]: done." << endl;
@ -1252,7 +1252,7 @@ KeyValueMap::insert(const TQCString& key, const TQStringList& values, bool force
// ----- create TQCString list:
for(count=0; count<values.count(); ++count)
{
utf8strings.append((*values.at(count)).utf8());
utf8strings.append((*values.tqat(count)).utf8());
}
kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::insert[QStringList]: done." << endl;
return insert(key, utf8strings, force);

2
kabc/formats/binaryformat.cpp

@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
}
// set real number of entries
stream.tqdevice()->at( 2 * sizeof( TQ_UINT32 ) );
stream.tqdevice()->tqat( 2 * sizeof( TQ_UINT32 ) );
stream << counter;
}

20
kabc/kab2kabc.cpp

@ -57,12 +57,12 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
TQString name;
TQString comment;
if ( entry.at( entry.length() -1 ) == ')' ) {
if ( entry.tqat( entry.length() -1 ) == ')' ) {
int br = entry.tqfindRev( '(' );
if ( br >= 0 ) {
comment = entry.mid( br + 1, entry.length() - br - 2 );
entry.truncate( br );
if ( entry.at( entry.length() - 1 ).isSpace() ) {
if ( entry.tqat( entry.length() - 1 ).isSpace() ) {
entry.truncate( br - 1 );
}
}
@ -80,22 +80,22 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
name = entry.left( posSpace );
}
if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) {
if ( email.tqat( 0 ) == '<' && email.tqat( email.length() - 1) == '>' ) {
email = email.mid( 1, email.length() - 2 );
}
if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) {
if ( name.tqat( 0 ) == '"' && name.tqat( name.length() - 1) == '"' ) {
name = name.mid( 1, name.length() - 2 );
}
if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) {
if ( name.tqat( 0 ) == '\'' && name.tqat( name.length() - 1) == '\'' ) {
name = name.mid( 1, name.length() - 2 );
}
if ( name.at( name.length() -1 ) == ')' ) {
if ( name.tqat( name.length() -1 ) == ')' ) {
int br = name.tqfindRev( '(' );
if ( br >= 0 ) {
comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
name.truncate( br );
if ( name.at( name.length() - 1 ).isSpace() ) {
if ( name.tqat( name.length() - 1 ).isSpace() ) {
name.truncate( br - 1 );
}
}
@ -148,16 +148,16 @@ void importKMailAddressBook( KABC::AddressBook *ab )
TQStringList::ConstIterator it;
for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) {
if ( (*it).at( 0 ) == '#' ) continue;
if ( (*it).tqat( 0 ) == '#' ) continue;
bool insideQuote = false;
int end = (*it).length() - 1;
for ( int i = end; i; i-- ) {
if ( (*it).at( i ) == '"' ) {
if ( (*it).tqat( i ) == '"' ) {
if ( insideQuote )
insideQuote = false;
else
insideQuote = true;
} else if ( (*it).at( i ) == ',' && !insideQuote ) {
} else if ( (*it).tqat( i ) == ',' && !insideQuote ) {
readKMailEntry( (*it).mid( i + 1, end - i ), ab );
end = i - 1;
}

2
kabc/resourceselectdialog.cpp

@ -64,7 +64,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
uint counter = 0;
TQPtrList<Resource> list = ab->resources();
for ( uint i = 0; i < list.count(); ++i ) {
Resource *resource = list.at( i );
Resource *resource = list.tqat( i );
if ( resource && !resource->readOnly() ) {
mResourceMap.insert( counter, resource );
mResourceId->insertItem( resource->resourceName() );

80
kabc/tests/testaddresseelist.cpp

@ -64,12 +64,12 @@ int main(int /*argc*/,char /* **argv*/)
list.append(f);
list.sortBy(FamilyName);
if ( !( (*list.at(0)).uid()=="78ze"
&& (*list.at(1)).uid()=="Rsdf"
&& (*list.at(2)).uid()=="Fhwn"
&& (*list.at(3)).uid()=="kk45"
&& (*list.at(4)).uid()=="Asdf"
&& (*list.at(5)).uid()=="Z2hk"
if ( !( (*list.tqat(0)).uid()=="78ze"
&& (*list.tqat(1)).uid()=="Rsdf"
&& (*list.tqat(2)).uid()=="Fhwn"
&& (*list.tqat(3)).uid()=="kk45"
&& (*list.tqat(4)).uid()=="Asdf"
&& (*list.tqat(5)).uid()=="Z2hk"
) ) {
kdError() << "SORTING BY FAMILY NAME NOT CORRECT!" << endl;
kdDebug() << "list sorted by family name:" << endl;
@ -79,12 +79,12 @@ int main(int /*argc*/,char /* **argv*/)
}
list.setReverseSorting(true);
list.sort();
if ( !( (*list.at(5)).uid()=="78ze"
&& (*list.at(4)).uid()=="Rsdf"
&& (*list.at(3)).uid()=="Fhwn"
&& (*list.at(2)).uid()=="kk45"
&& (*list.at(1)).uid()=="Asdf"
&& (*list.at(0)).uid()=="Z2hk"
if ( !( (*list.tqat(5)).uid()=="78ze"
&& (*list.tqat(4)).uid()=="Rsdf"
&& (*list.tqat(3)).uid()=="Fhwn"
&& (*list.tqat(2)).uid()=="kk45"
&& (*list.tqat(1)).uid()=="Asdf"
&& (*list.tqat(0)).uid()=="Z2hk"
) ) {
kdError() << "REVERSE SORTING BY FAMILY NAME NOT CORRECT!" << endl;
kdDebug() << "list reverse sorted by family name:" << endl;
@ -95,12 +95,12 @@ int main(int /*argc*/,char /* **argv*/)
list.setReverseSorting(false);
list.sortBy(FormattedName);
if ( !( (*list.at(0)).uid()=="78ze"
&& (*list.at(1)).uid()=="Rsdf"
&& (*list.at(2)).uid()=="Fhwn"
&& (*list.at(3)).uid()=="kk45"
&& (*list.at(4)).uid()=="Z2hk"
&& (*list.at(5)).uid()=="Asdf"
if ( !( (*list.tqat(0)).uid()=="78ze"
&& (*list.tqat(1)).uid()=="Rsdf"
&& (*list.tqat(2)).uid()=="Fhwn"
&& (*list.tqat(3)).uid()=="kk45"
&& (*list.tqat(4)).uid()=="Z2hk"
&& (*list.tqat(5)).uid()=="Asdf"
) ) {
kdError() << "SORTING BY FORMATTED NAME NOT CORRECT!" << endl;
kdDebug() << "list sorted by formatted name:" << endl;
@ -110,12 +110,12 @@ int main(int /*argc*/,char /* **argv*/)
}
list.setReverseSorting(true);
list.sort();
if ( !( (*list.at(5)).uid()=="78ze"
&& (*list.at(4)).uid()=="Rsdf"
&& (*list.at(3)).uid()=="Fhwn"
&& (*list.at(2)).uid()=="kk45"
&& (*list.at(1)).uid()=="Z2hk"
&& (*list.at(0)).uid()=="Asdf"
if ( !( (*list.tqat(5)).uid()=="78ze"
&& (*list.tqat(4)).uid()=="Rsdf"
&& (*list.tqat(3)).uid()=="Fhwn"
&& (*list.tqat(2)).uid()=="kk45"
&& (*list.tqat(1)).uid()=="Z2hk"
&& (*list.tqat(0)).uid()=="Asdf"
) ) {
kdError() << "REVERSE SORTING BY FORMATTED NAME NOT CORRECT!" << endl;
kdDebug() << "list reverse sorted by formatted name:" << endl;
@ -127,12 +127,12 @@ int main(int /*argc*/,char /* **argv*/)
list.setReverseSorting(false);
list.sortBy(Uid);
if ( !( (*list.at(0)).uid()=="78ze"
&& (*list.at(1)).uid()=="Asdf"
&& (*list.at(2)).uid()=="Fhwn"
&& (*list.at(3)).uid()=="Rsdf"
&& (*list.at(4)).uid()=="Z2hk"
&& (*list.at(5)).uid()=="kk45"
if ( !( (*list.tqat(0)).uid()=="78ze"
&& (*list.tqat(1)).uid()=="Asdf"
&& (*list.tqat(2)).uid()=="Fhwn"
&& (*list.tqat(3)).uid()=="Rsdf"
&& (*list.tqat(4)).uid()=="Z2hk"
&& (*list.tqat(5)).uid()=="kk45"
) ) {
kdError() << "SORTING BY UID NOT CORRECT!" << endl;
kdDebug() << "list sorted by Uid:" << endl;
@ -142,12 +142,12 @@ int main(int /*argc*/,char /* **argv*/)
}
list.setReverseSorting(true);
list.sortBy(Uid);
if ( !( (*list.at(5)).uid()=="78ze"
&& (*list.at(4)).uid()=="Asdf"
&& (*list.at(3)).uid()=="Fhwn"
&& (*list.at(2)).uid()=="Rsdf"
&& (*list.at(1)).uid()=="Z2hk"
&& (*list.at(0)).uid()=="kk45"
if ( !( (*list.tqat(5)).uid()=="78ze"
&& (*list.tqat(4)).uid()=="Asdf"
&& (*list.tqat(3)).uid()=="Fhwn"
&& (*list.tqat(2)).uid()=="Rsdf"
&& (*list.tqat(1)).uid()=="Z2hk"
&& (*list.tqat(0)).uid()=="kk45"
) ) {
kdError() << "REVERSE SORTING BY UID NOT CORRECT!" << endl;
kdDebug() << "list sorted by Uid:" << endl;
@ -170,8 +170,8 @@ int main(int /*argc*/,char /* **argv*/)
list2.append(f);
list2.setReverseSorting(false);
list2.sort();
if ( !( (*list2.at(0)).uid()=="78ze"
&& (*list2.at(1)).uid()=="Asdf"
if ( !( (*list2.tqat(0)).uid()=="78ze"
&& (*list2.tqat(1)).uid()=="Asdf"
) ) {
kdError() << "SORTING BY FORMATTED NAME IN A TWO ENTRY LIST NOT CORRECT!" << endl;
kdDebug() << "list sorted by formatted name, two entries:" << endl;
@ -181,8 +181,8 @@ int main(int /*argc*/,char /* **argv*/)
}
list2.setReverseSorting(true);
list2.sort();
if ( !( (*list2.at(1)).uid()=="78ze"
&& (*list2.at(0)).uid()=="Asdf"
if ( !( (*list2.tqat(1)).uid()=="78ze"
&& (*list2.tqat(0)).uid()=="Asdf"
) ) {
kdError() << "REVERSE SORTING BY FORMATTED NAME IN A TWO ENTRY LIST NOT CORRECT!" << endl;
kdDebug() << "list reverse sorted by formatted name, two entries:" << endl;

14
kabc/vcard/AdrValue.cpp

@ -112,13 +112,13 @@ AdrValue::_parse()
switch (i) {
case 0: poBox_ = l.at(0); break;
case 1: extAddress_ = l.at(1); break;
case 2: street_ = l.at(2); break;
case 3: locality_ = l.at(3); break;
case 4: region_ = l.at(4); break;
case 5: postCode_ = l.at(5); break;
case 6: countryName_ = l.at(6); break;
case 0: poBox_ = l.tqat(0); break;
case 1: extAddress_ = l.tqat(1); break;
case 2: street_ = l.tqat(2); break;
case 3: locality_ = l.tqat(3); break;
case 4: region_ = l.tqat(4); break;
case 5: postCode_ = l.tqat(5); break;
case 6: countryName_ = l.tqat(6); break;
default: break;
}
}

2
kabc/vcard/ContentLine.cpp

@ -174,7 +174,7 @@ ContentLine::_parse()
return;
}
name_ = l.at(0);
name_ = l.tqat(0);
// Now we have the name, so the rest of 'l' is the params.
// Remove the name part.

2
kabc/vcard/LangValue.cpp

@ -79,7 +79,7 @@ LangValue::_parse()
if (l.count() == 0) return;
primary_ = l.at(0);
primary_ = l.tqat(0);
l.remove(0u);

10
kabc/vcard/NValue.cpp

@ -106,11 +106,11 @@ NValue::_parse()
for (unsigned int i = 0; i < l.count(); i++) {
switch (i) {
case 0: family_ = l.at(0); break;
case 1: given_ = l.at(1); break;
case 2: middle_ = l.at(2); break;
case 3: prefix_ = l.at(3); break;
case 4: suffix_ = l.at(4); break;
case 0: family_ = l.tqat(0); break;
case 1: given_ = l.tqat(1); break;
case 2: middle_ = l.tqat(2); break;
case 3: prefix_ = l.tqat(3); break;
case 4: suffix_ = l.tqat(4); break;
default: break;
}
}

2
kabc/vcard/OrgValue.cpp

@ -102,6 +102,6 @@ OrgValue::numValues()
OrgValue::value(unsigned int i)
{
parse();
return valueList_.at(i);
return valueList_.tqat(i);
}

2
kabc/vcard/TextListValue.cpp

@ -102,6 +102,6 @@ TextListValue::numValues()
TextListValue::value(unsigned int i)
{
parse();
return valueList_.at(i);
return valueList_.tqat(i);
}

2
kabc/vcard/VCard.cpp

@ -95,7 +95,7 @@ VCard::_parse()
}
// Get the first line
TQCString beginLine = TQCString(l.at(0)).stripWhiteSpace();
TQCString beginLine = TQCString(l.tqat(0)).stripWhiteSpace();
vDebug("Begin line == \"" + beginLine + "\"");

2
kabc/vcardparser/vcardparser.cpp

@ -144,7 +144,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
}
else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) {
// join any qp-folded lines
while ( value.at( value.length() - 1 ) == '=' && it != linesEnd ) {
while ( value.tqat( value.length() - 1 ) == '=' && it != linesEnd ) {
value = value.remove( value.length() - 1, 1 ) + (*it);
++it;
}

2
kate/data/cpp.xml

@ -113,6 +113,7 @@
<item> Q_INVOKABLE </item>
<item> Q_NOREPLY </item>
<item> Q_OBJECT </item>
<item> TQ_OBJECT </item>
<item> Q_OVERRIDE </item>
<item> Q_PRIVATE_SLOT </item>
<item> Q_PROPERTY </item>
@ -134,6 +135,7 @@
<item> slots </item>
<item> foreach </item>
<item> forever </item>
<item> tqt_dynamic_cast</item>
<item> qint8 </item>
<item> qint16 </item>

4
kate/part/kateautoindent.cpp

@ -223,7 +223,7 @@ void KateNormalIndent::updateConfig ()
for (uint i=0; i<items.count(); i++)
{
TQString name = items.at(i)->name;
TQString name = items.tqat(i)->name;
if (name.tqfind("Comment") != -1 && commentAttrib == 255)
{
commentAttrib = i;
@ -2384,7 +2384,7 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va
for (uint i=0; i<items.count(); i++)
{
if ( items.at(i)->name.section( ':', 1 ) == val )
if ( items.tqat(i)->name.section( ':', 1 ) == val )
{
d->coupleAttrib = i;
break;

10
kate/part/katebookmarks.cpp

@ -128,7 +128,7 @@ void KateBookmarks::clearBookmarks ()
TQPtrList<KTextEditor::Mark> m = m_view->getDoc()->marks();
for (uint i=0; i < m.count(); i++)
m_view->getDoc()->removeMark( m.at(i)->line, KTextEditor::MarkInterface::markType01 );
m_view->getDoc()->removeMark( m.tqat(i)->line, KTextEditor::MarkInterface::markType01 );
// just to be sure ;)
marksChanged ();
@ -255,8 +255,8 @@ void KateBookmarks::goNext()
int found = -1;
for (uint z=0; z < m.count(); z++)
if ( (m.at(z)->line > line) && ((found == -1) || (uint(found) > m.at(z)->line)) )
found = m.at(z)->line;
if ( (m.tqat(z)->line > line) && ((found == -1) || (uint(found) > m.tqat(z)->line)) )
found = m.tqat(z)->line;
if (found != -1)
m_view->gotoLineNumber ( found );
@ -272,8 +272,8 @@ void KateBookmarks::goPrevious()
int found = -1;
for (uint z=0; z < m.count(); z++)
if ((m.at(z)->line < line) && ((found == -1) || (uint(found) < m.at(z)->line)))
found = m.at(z)->line;
if ((m.tqat(z)->line < line) && ((found == -1) || (uint(found) < m.tqat(z)->line)))
found = m.tqat(z)->line;
if (found != -1)
m_view->gotoLineNumber ( found );

12
kate/part/katecodefoldinghelpers.cpp

@ -1259,7 +1259,7 @@ void KateCodeFoldingTree::cleanupUnneededNodes(unsigned int line)
for (int i=0; i<(int)markedForDeleting.count(); i++)
{
KateCodeFoldingNode *node = markedForDeleting.at(i);
KateCodeFoldingNode *node = markedForDeleting.tqat(i);
if (node->deleteOpening)
kdDebug(13000)<<"DELETE OPENING SET"<<endl;
if (node->deleteEnding)
@ -1335,7 +1335,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)
findAllNodesOpenedOrClosedAt(line);
for (int i=0; i<(int)nodesForLine.count(); i++)
{
KateCodeFoldingNode *node=nodesForLine.at(i);
KateCodeFoldingNode *node=nodesForLine.tqat(i);
if ( (!node->startLineValid) || (getStartLine(node) != line) )
{
nodesForLine.remove(i);
@ -1346,10 +1346,10 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)
if (nodesForLine.isEmpty())
return;
nodesForLine.at(0)->visible = !nodesForLine.at(0)->visible;
nodesForLine.tqat(0)->visible = !nodesForLine.tqat(0)->visible;
if (!nodesForLine.at(0)->visible)
addHiddenLineBlock(nodesForLine.at(0),line);
if (!nodesForLine.tqat(0)->visible)
addHiddenLineBlock(nodesForLine.tqat(0),line);
else
{
for (TQValueList<KateHiddenLineBlock>::Iterator it=hiddenLines.begin(); it!=hiddenLines.end();++it)
@ -1359,7 +1359,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)
break;
}
updateHiddenSubNodes(nodesForLine.at(0));
updateHiddenSubNodes(nodesForLine.tqat(0));
}
emit regionVisibilityChangedAt(line);

12
kate/part/kateconfig.cpp

@ -237,7 +237,7 @@ void KateDocumentConfig::updateConfig ()
{
for (uint z=0; z < KateFactory::self()->documents()->count(); z++)
{
KateFactory::self()->documents()->at(z)->updateConfig ();
KateFactory::self()->documents()->tqat(z)->updateConfig ();
}
}
}
@ -570,8 +570,8 @@ bool KateDocumentConfig::plugin (uint index) const
if (index >= m_plugins.size())
return false;
if (m_pluginsSet.at(index) || isGlobal())
return m_plugins.at(index);
if (m_pluginsSet.tqat(index) || isGlobal())
return m_plugins.tqat(index);
return s_global->plugin (index);
}
@ -734,7 +734,7 @@ void KateViewConfig::updateConfig ()
{
for (uint z=0; z < KateFactory::self()->views()->count(); z++)
{
KateFactory::self()->views()->at(z)->updateConfig ();
KateFactory::self()->views()->tqat(z)->updateConfig ();
}
}
}
@ -1088,7 +1088,7 @@ void KateRendererConfig::updateConfig ()
{
for (uint z=0; z < KateFactory::self()->renderers()->count(); z++)
{
KateFactory::self()->renderers()->at(z)->updateConfig ();
KateFactory::self()->renderers()->tqat(z)->updateConfig ();
}
}
}
@ -1114,7 +1114,7 @@ void KateRendererConfig::reloadSchema()
{
if ( isGlobal() )
for ( uint z=0; z < KateFactory::self()->renderers()->count(); z++ )
KateFactory::self()->renderers()->at(z)->config()->reloadSchema();
KateFactory::self()->renderers()->tqat(z)->config()->reloadSchema();
else if ( m_renderer && m_schemaSet )
setSchemaInternal( m_schema );

6
kate/part/katedialogs.cpp

@ -819,7 +819,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * )
if (!m_ready)
{
(new TQVBoxLayout(this))->setAutoAdd(true);
KateView* view = (KateView*)m_doc->views().at(0);
KateView* view = (KateView*)m_doc->views().tqat(0);
m_ac = view->editActionCollection();
m_keyChooser = new KKeyChooser( m_ac, this, false );
connect( m_keyChooser, TQT_SIGNAL( keyChange() ), this, TQT_SLOT( slotChanged() ) );
@ -1154,7 +1154,7 @@ void KatePartPluginConfigPage::apply ()
KateDocumentConfig::global()->configStart ();
for (uint i=0; i < m_items.count(); i++)
KateDocumentConfig::global()->setPlugin (m_items.at(i)->pluginIndex(), m_items.at(i)->isOn());
KateDocumentConfig::global()->setPlugin (m_items.tqat(i)->pluginIndex(), m_items.tqat(i)->isOn());
KateDocumentConfig::global()->configEnd ();
}
@ -1243,7 +1243,7 @@ void KatePartPluginConfigPage::slotConfigure()
for( uint i=0; i<editorPages.count(); i++ )
{
editorPages.at( i )->apply();
editorPages.tqat( i )->apply();
}
}

40
kate/part/katedocument.cpp

@ -323,7 +323,7 @@ void KateDocument::enablePluginGUI (KTextEditor::Plugin *plugin)
if (!KTextEditor::pluginViewInterface(plugin)) return;
for (uint i=0; i< m_views.count(); i++)
enablePluginGUI (plugin, m_views.at(i));
enablePluginGUI (plugin, m_views.tqat(i));
}
void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin, KateView *view)
@ -347,7 +347,7 @@ void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin)
if (!KTextEditor::pluginViewInterface(plugin)) return;
for (uint i=0; i< m_views.count(); i++)
disablePluginGUI (plugin, m_views.at(i));
disablePluginGUI (plugin, m_views.tqat(i));
}
//END
@ -641,7 +641,7 @@ bool KateDocument::setText(const TQString &s)
TQValueList<KTextEditor::Mark> msave;
for (uint i=0; i < m.count(); i++)
msave.append (*m.at(i));
msave.append (*m.tqat(i));
editStart ();
@ -924,7 +924,7 @@ void KateDocument::editStart (bool withUndo)
for (uint z = 0; z < m_views.count(); z++)
{
m_views.at(z)->editStart ();
m_views.tqat(z)->editStart ();
}
m_buffer->editStart ();
@ -1029,7 +1029,7 @@ void KateDocument::editEnd ()
// edit end for all views !!!!!!!!!
for (uint z = 0; z < m_views.count(); z++)
m_views.at(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom());
m_views.tqat(z)->editEnd (m_buffer->editTagStart(), m_buffer->editTagEnd(), m_buffer->editTagFrom());
if (m_buffer->editChanged())
{
@ -2011,7 +2011,7 @@ void KateDocument::configDialog()
for (uint i=0; i<editorPages.count(); i++)
{
editorPages.at(i)->apply();
editorPages.tqat(i)->apply();
}
KateDocumentConfig::global()->configEnd ();
@ -2869,7 +2869,7 @@ void KateDocument::setModified(bool m) {
void KateDocument::makeAttribs(bool needInvalidate)
{
for (uint z = 0; z < m_views.count(); z++)
m_views.at(z)->renderer()->updateAttributes ();
m_views.tqat(z)->renderer()->updateAttributes ();
if (needInvalidate)
m_buffer->tqinvalidateHighlighting();
@ -3227,7 +3227,7 @@ void KateDocument::del( KateView *view, const KateTextCursor& c )
void KateDocument::paste ( KateView* view )
{
TQString s = TQApplication::clipboard()->text();
TQString s = TQApplication::tqclipboard()->text();
if (s.isEmpty())
return;
@ -3981,7 +3981,7 @@ void KateDocument::transform( KateView *v, const KateTextCursor &c,
if ( ( ! start && ! p ) ||
( ( ln == selstart.line() || v->blockSelectionMode() ) &&
! p && ! highlight()->isInWord( l->getChar( start - 1 )) ) ||
( p && ! highlight()->isInWord( s.at( p-1 ) ) )
( p && ! highlight()->isInWord( s.tqat( p-1 ) ) )
)
s[p] = s.tqat(p).upper();
p++;
@ -4096,7 +4096,7 @@ TQString KateDocument::getWord( const KateTextCursor& cursor ) {
void KateDocument::tagLines(int start, int end)
{
for (uint z = 0; z < m_views.count(); z++)
m_views.at(z)->tagLines (start, end, true);
m_views.tqat(z)->tagLines (start, end, true);
}
void KateDocument::tagLines(KateTextCursor start, KateTextCursor end)
@ -4109,21 +4109,21 @@ void KateDocument::tagLines(KateTextCursor start, KateTextCursor end)
}
for (uint z = 0; z < m_views.count(); z++)
m_views.at(z)->tagLines(start, end, true);
m_views.tqat(z)->tagLines(start, end, true);
}
void KateDocument::tqrepaintViews(bool paintOnlyDirty)
{
for (uint z = 0; z < m_views.count(); z++)
m_views.at(z)->tqrepaintText(paintOnlyDirty);
m_views.tqat(z)->tqrepaintText(paintOnlyDirty);
}
void KateDocument::tagAll()
{
for (uint z = 0; z < m_views.count(); z++)
{
m_views.at(z)->tagAll();
m_views.at(z)->updateView (true);
m_views.tqat(z)->tagAll();
m_views.tqat(z)->updateView (true);
}
}
@ -4287,9 +4287,9 @@ void KateDocument::setDocName (TQString name )
for (uint z=0; z < KateFactory::self()->documents()->count(); z++)
{
if ( (KateFactory::self()->documents()->at(z) != this) && (KateFactory::self()->documents()->at(z)->url().filename() == url().filename()) )
if ( KateFactory::self()->documents()->at(z)->m_docNameNumber > count )
count = KateFactory::self()->documents()->at(z)->m_docNameNumber;
if ( (KateFactory::self()->documents()->tqat(z) != this) && (KateFactory::self()->documents()->tqat(z)->url().filename() == url().filename()) )
if ( KateFactory::self()->documents()->tqat(z)->m_docNameNumber > count )
count = KateFactory::self()->documents()->tqat(z)->m_docNameNumber;
}
m_docNameNumber = count + 1;
@ -4437,14 +4437,14 @@ void KateDocument::reloadFile()
TQValueList<int> lines, cols;
for ( uint i=0; i < m_views.count(); i++ )
{
lines.append( m_views.at( i )->cursorLine() );
cols.append( m_views.at( i )->cursorColumn() );
lines.append( m_views.tqat( i )->cursorLine() );
cols.append( m_views.tqat( i )->cursorColumn() );
}
KateDocument::openURL( url() );
for ( uint i=0; i < m_views.count(); i++ )
m_views.at( i )->setCursorPositionInternal( lines[ i ], cols[ i ], m_config->tabWidth(), false );
m_views.tqat( i )->setCursorPositionInternal( lines[ i ], cols[ i ], m_config->tabWidth(), false );
m_reloading = false;

2
kate/part/katefactory.cpp

@ -267,7 +267,7 @@ KateIndentScript KateFactory::indentScript (const TQString &scriptname)
KateIndentScript result;
for(uint i=0;i<m_indentScriptManagers.count();i++)
{
result=m_indentScriptManagers.at(i)->script(scriptname);
result=m_indentScriptManagers.tqat(i)->script(scriptname);
if (!result.isNull()) return result;
}
return result;

50
kate/part/katefiletype.cpp

@ -106,20 +106,20 @@ void KateFileTypeManager::save (TQPtrList<KateFileType> *v)
TQStringList newg;
for (uint z=0; z < v->count(); z++)
{
config.setGroup (v->at(z)->name);
config.setGroup (v->tqat(z)->name);
config.writeEntry ("Section", v->at(z)->section);
config.writeEntry ("Wildcards", v->at(z)->wildcards, ';');
config.writeEntry ("Mimetypes", v->at(z)->mimetypes, ';');
config.writeEntry ("Priority", v->at(z)->priority);
config.writeEntry ("Section", v->tqat(z)->section);
config.writeEntry ("Wildcards", v->tqat(z)->wildcards, ';');
config.writeEntry ("Mimetypes", v->tqat(z)->mimetypes, ';');
config.writeEntry ("Priority", v->tqat(z)->priority);
TQString varLine = v->at(z)->varLine;
TQString varLine = v->tqat(z)->varLine;
if (TQRegExp("kate:(.*)").search(varLine) < 0)
varLine.prepend ("kate: ");
config.writeEntry ("Variables", varLine);
newg << v->at(z)->name;
newg << v->tqat(z)->name;
}
TQStringList g (config.groupList());
@ -187,8 +187,8 @@ int KateFileTypeManager::fileType (KateDocument *doc)
for (uint z=0; z < m_types.count(); z++)
{
if (m_types.at(z)->mimetypes.tqfindIndex (mt->name()) > -1)
types.append (m_types.at(z));
if (m_types.tqat(z)->mimetypes.tqfindIndex (mt->name()) > -1)
types.append (m_types.tqat(z));
}
if ( !types.isEmpty() )
@ -218,13 +218,13 @@ int KateFileTypeManager::wildcardsFind (const TQString &fileName)
for (uint z=0; z < m_types.count(); z++)
{
for( TQStringList::Iterator it = m_types.at(z)->wildcards.begin(); it != m_types.at(z)->wildcards.end(); ++it )
for( TQStringList::Iterator it = m_types.tqat(z)->wildcards.begin(); it != m_types.tqat(z)->wildcards.end(); ++it )
{
// anders: we need to be sure to match the end of string, as eg a css file
// would otherwise end up with the c hl
TQRegExp re(*it, true, true);
if ( ( re.search( fileName ) > -1 ) && ( re.matchedLength() == (int)fileName.length() ) )
types.append (m_types.at(z));
types.append (m_types.tqat(z));
}
}
@ -251,7 +251,7 @@ int KateFileTypeManager::wildcardsFind (const TQString &fileName)
const KateFileType *KateFileTypeManager::fileType (uint number)
{
if (number < m_types.count())
return m_types.at(number);
return m_types.tqat(number);
return 0;
}
@ -373,7 +373,7 @@ void KateFileTypeConfigTab::reload()
{
KateFileType *type = new KateFileType ();
*type = *KateFactory::self()->fileTypeManager()->list()->at(z);
*type = *KateFactory::self()->fileTypeManager()->list()->tqat(z);
m_types.append (type);
}
@ -398,10 +398,10 @@ void KateFileTypeConfigTab::update ()
typeCombo->clear ();
for( uint i = 0; i < m_types.count(); i++) {
if (m_types.at(i)->section.length() > 0)
typeCombo->insertItem(m_types.at(i)->section + TQString ("/") + m_types.at(i)->name);
if (m_types.tqat(i)->section.length() > 0)
typeCombo->insertItem(m_types.tqat(i)->section + TQString ("/") + m_types.tqat(i)->name);
else
typeCombo->insertItem(m_types.at(i)->name);
typeCombo->insertItem(m_types.tqat(i)->name);
}
typeCombo->setCurrentItem (0);
@ -427,7 +427,7 @@ void KateFileTypeConfigTab::newType ()
TQString newN = i18n("New Filetype");
for( uint i = 0; i < m_types.count(); i++) {
if (m_types.at(i)->name == newN)
if (m_types.tqat(i)->name == newN)
{
typeCombo->setCurrentItem (i);
typeChanged (i);
@ -464,7 +464,7 @@ void KateFileTypeConfigTab::typeChanged (int type)
KateFileType *t = 0;
if ((type > -1) && ((uint)type < m_types.count()))
t = m_types.at(type);
t = m_types.tqat(type);
if (t)
{
@ -536,8 +536,8 @@ void KateViewFileTypeAction::slotAboutToShow()
for (int z=0; z<count; z++)
{
TQString hlName = KateFactory::self()->fileTypeManager()->list()->at(z)->name;
TQString hlSection = KateFactory::self()->fileTypeManager()->list()->at(z)->section;
TQString hlName = KateFactory::self()->fileTypeManager()->list()->tqat(z)->name;
TQString hlSection = KateFactory::self()->fileTypeManager()->list()->tqat(z)->section;
if ( !hlSection.isEmpty() && (names.tqcontains(hlName) < 1) )
{
@ -551,7 +551,7 @@ void KateViewFileTypeAction::slotAboutToShow()
int m = subMenusName.tqfindIndex (hlSection);
names << hlName;
subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1);
subMenus.tqat(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1);
}
else if (names.tqcontains(hlName) < 1)
{
@ -564,8 +564,8 @@ void KateViewFileTypeAction::slotAboutToShow()
for (uint i=0;i<subMenus.count();i++)
{
for (uint i2=0;i2<subMenus.at(i)->count();i2++)
subMenus.at(i)->setItemChecked(subMenus.at(i)->idAt(i2),false);
for (uint i2=0;i2<subMenus.tqat(i)->count();i2++)
subMenus.tqat(i)->setItemChecked(subMenus.tqat(i)->idAt(i2),false);
}
popupMenu()->setItemChecked (0, false);
@ -577,8 +577,8 @@ void KateViewFileTypeAction::slotAboutToShow()
if ((t = KateFactory::self()->fileTypeManager()->fileType (doc->fileType())))
{
int i = subMenusName.tqfindIndex (t->section);
if (i >= 0 && subMenus.at(i))
subMenus.at(i)->setItemChecked (doc->fileType()+1, true);
if (i >= 0 && subMenus.tqat(i))
subMenus.tqat(i)->setItemChecked (doc->fileType()+1, true);
else
popupMenu()->setItemChecked (0, true);
}

50
kate/part/katehighlight.cpp

@ -815,7 +815,7 @@ int KateHlCOct::checkHgl(const TQString& text, int offset, int len)
int offset2 = offset;
while ((len > 0) && (text.at(offset2) >= '0' && text.at(offset2) <= '7'))
while ((len > 0) && (text.tqat(offset2) >= TQChar('0') && text.tqat(offset2) <= TQChar('7')))
{
offset2++;
len--;
@ -1038,7 +1038,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len)
// replaced with something else but
// for right now they work
// check for hexdigits
for (i = 0; (len > 0) && (i < 2) && (text.at(offset) >= '0' && text.at(offset) <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++)
for (i = 0; (len > 0) && (i < 2) && (static_cast<const char>(text.tqat(offset)) >= '0' && static_cast<const char>(text.tqat(offset)) <= '9' || (text[offset] & 0xdf) >= 'A' && (text[offset] & 0xdf) <= 'F'); i++)
{
offset++;
len--;
@ -1051,7 +1051,7 @@ static int checkEscapedChar(const TQString& text, int offset, int& len)
case '0': case '1': case '2': case '3' :
case '4': case '5': case '6': case '7' :
for (i = 0; (len > 0) && (i < 3) && (text.at(offset) >='0'&& text.at(offset) <='7'); i++)
for (i = 0; (len > 0) && (i < 3) && (static_cast<const char>(text.tqat(offset)) >= '0' && static_cast<const char>(text.tqat(offset)) <= '7'); i++)
{
offset++;
len--;
@ -1890,7 +1890,7 @@ void KateHighlighting::addToKateHlItemDataList()
int KateHighlighting::lookupAttrName(const TQString& name, KateHlItemDataList &iDl)
{
for (uint i = 0; i < iDl.count(); i++)
if (iDl.at(i)->name == buildPrefix+name)
if (iDl.tqat(i)->name == buildPrefix+name)
return i;
kdDebug(13010)<<"Couldn't resolve itemDataName:"<<name<<endl;
@ -2885,13 +2885,13 @@ void KateHighlighting::clearAttributeArrays ()
for (uint z = 0; z < nAttribs; z++)
{