Browse Source

Rename a number of old tq methods that are no longer tq specific

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
13281e2856
100 changed files with 518 additions and 518 deletions
  1. +1
    -1
      KDE2PORTING.html
  2. +3
    -3
      KDE3PORTING.html
  3. +3
    -3
      arts/kde/kartsserver.cpp
  4. +1
    -1
      arts/kde/kioinputstream_impl.cpp
  5. +4
    -4
      arts/kde/kplayobject.cc
  6. +1
    -1
      arts/kde/kvideowidget.cpp
  7. +3
    -3
      arts/knotify/knotify.cpp
  8. +2
    -2
      dcop/KDE-ICE/ICEmsg.h
  9. +3
    -3
      dcop/client/dcop.cpp
  10. +2
    -2
      dcop/client/dcopfind.cpp
  11. +1
    -1
      dcop/client/dcopstart.cpp
  12. +14
    -14
      dcop/dcopclient.cpp
  13. +1
    -1
      dcop/dcopidl2cpp/main.cpp
  14. +1
    -1
      dcop/dcopidl2cpp/skel.cpp
  15. +1
    -1
      dcop/dcopidl2cpp/stub.cpp
  16. +1
    -1
      dcop/dcopidl2cpp/stubimpl.cpp
  17. +1
    -1
      dcop/dcopidl2cpp/type.h
  18. +1
    -1
      dcop/dcopref.h
  19. +5
    -5
      dcop/dcopserver.cpp
  20. +2
    -2
      interfaces/khexedit/byteseditinterface.h
  21. +1
    -1
      interfaces/kimproxy/interface/kimiface.h
  22. +1
    -1
      interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  23. +1
    -1
      interfaces/ktexteditor/editinterfaceext.h
  24. +2
    -2
      interfaces/ktexteditor/editorchooser.cpp
  25. +2
    -2
      interfaces/ktexteditor/editorchooser_ui.ui
  26. +1
    -1
      interfaces/ktexteditor/templateinterface.cpp
  27. +1
    -1
      kab/addressbook.h
  28. +1
    -1
      kab/kabapi.cc
  29. +4
    -4
      kab/qconfigDB.cc
  30. +2
    -2
      kabc/address.cpp
  31. +1
    -1
      kabc/addressbook.cpp
  32. +1
    -1
      kabc/addresseedialog.cpp
  33. +1
    -1
      kabc/distributionlistdialog.cpp
  34. +1
    -1
      kabc/distributionlisteditor.cpp
  35. +1
    -1
      kabc/formats/binaryformat.cpp
  36. +11
    -11
      kabc/kab2kabc.cpp
  37. +2
    -2
      kabc/ldapclient.cpp
  38. +1
    -1
      kabc/ldapconfigwidget.cpp
  39. +57
    -57
      kabc/ldifconverter.cpp
  40. +1
    -1
      kabc/ldifconverter.h
  41. +1
    -1
      kabc/plugins/dir/resourcedirconfig.cpp
  42. +1
    -1
      kabc/plugins/file/resourcefileconfig.cpp
  43. +1
    -1
      kabc/plugins/ldapkio/resourceldapkioconfig.cpp
  44. +1
    -1
      kabc/plugins/net/resourcenetconfig.cpp
  45. +1
    -1
      kabc/plugins/sql/resourcesqlconfig.cpp
  46. +2
    -2
      kabc/resourceselectdialog.cpp
  47. +1
    -1
      kabc/tests/kabcargl.cpp
  48. +40
    -40
      kabc/tests/testaddresseelist.cpp
  49. +1
    -1
      kabc/tests/testlock.cpp
  50. +7
    -7
      kabc/vcard/AdrValue.cpp
  51. +1
    -1
      kabc/vcard/ContentLine.cpp
  52. +1
    -1
      kabc/vcard/LangValue.cpp
  53. +5
    -5
      kabc/vcard/NValue.cpp
  54. +1
    -1
      kabc/vcard/OrgValue.cpp
  55. +1
    -1
      kabc/vcard/TextListValue.cpp
  56. +1
    -1
      kabc/vcard/VCard.cpp
  57. +1
    -1
      kabc/vcard/testread.cpp
  58. +1
    -1
      kabc/vcardparser/testread.cpp
  59. +2
    -2
      kabc/vcardparser/testwrite.cpp
  60. +2
    -2
      kabc/vcardparser/vcardparser.cpp
  61. +1
    -1
      kabc/vcardtool.cpp
  62. +12
    -12
      kate/part/kateautoindent.cpp
  63. +5
    -5
      kate/part/katebookmarks.cpp
  64. +16
    -16
      kate/part/katebuffer.cpp
  65. +2
    -2
      kate/part/katebuffer.h
  66. +5
    -5
      kate/part/katecmds.cpp
  67. +1
    -1
      kate/part/katecmds.h
  68. +2
    -2
      kate/part/katecodecompletion.cpp
  69. +6
    -6
      kate/part/katecodefoldinghelpers.cpp
  70. +8
    -8
      kate/part/kateconfig.cpp
  71. +6
    -6
      kate/part/katedialogs.cpp
  72. +29
    -29
      kate/part/katedocument.cpp
  73. +1
    -1
      kate/part/katefactory.cpp
  74. +26
    -26
      kate/part/katefiletype.cpp
  75. +30
    -30
      kate/part/katehighlight.cpp
  76. +5
    -5
      kate/part/katejscript.cpp
  77. +3
    -3
      kate/part/kateprinter.cpp
  78. +12
    -12
      kate/part/katerenderer.cpp
  79. +14
    -14
      kate/part/kateschema.cpp
  80. +4
    -4
      kate/part/katesearch.cpp
  81. +5
    -5
      kate/part/katetemplatehandler.cpp
  82. +22
    -22
      kate/part/katetextline.cpp
  83. +3
    -3
      kate/part/katetextline.h
  84. +4
    -4
      kate/part/kateundo.cpp
  85. +9
    -9
      kate/part/kateview.cpp
  86. +1
    -1
      kate/part/kateviewhelpers.cpp
  87. +14
    -14
      kate/part/kateviewinternal.cpp
  88. +1
    -1
      kate/part/kateviewinternal.h
  89. +6
    -6
      kate/part/test_regression.cpp
  90. +2
    -2
      kate/plugins/autobookmarker/autobookmarker.cpp
  91. +3
    -3
      kate/plugins/insertfile/insertfileplugin.cpp
  92. +2
    -2
      kate/plugins/isearch/ISearchPlugin.cpp
  93. +4
    -4
      kate/plugins/kdatatool/kate_kdatatool.cpp
  94. +3
    -3
      kate/plugins/wordcompletion/docwordcompletion.cpp
  95. +6
    -6
      kcert/kcertpart.cc
  96. +2
    -2
      kconf_update/kconf_update.cpp
  97. +7
    -7
      kded/kbuildservicefactory.cpp
  98. +3
    -3
      kded/kbuildservicegroupfactory.cpp
  99. +9
    -9
      kded/kbuildservicetypefactory.cpp
  100. +8
    -8
      kded/kbuildsycoca.cpp

+ 1
- 1
KDE2PORTING.html View File

@@ -189,7 +189,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
to klocale-&gt;translate with i18n.<P>

The return value of i18n is also no longer a const char*,
but a tqunicode TQString.<P>
but a unicode TQString.<P>

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>



+ 3
- 3
KDE3PORTING.html View File

@@ -647,13 +647,13 @@ For more details please consult the HOWTO file in the kcontrol directory.

<p>The API for Kicker panel applets and extensions has changed. Panels can now be
left/top, center, or right/bottom aligned, and applets and extensions may receive
notification about a change in tqalignment.
notification about a change in alignment.

<H4>KPanelApplet</H4>

<p>The virtual methods orientationChange() and popupDirectionChange() are deprecated.
Instead you should reimplement positionChange() and alignmentChange() to be
notified of changes in the position and tqalignment of the panel on which your applet
notified of changes in the position and alignment of the panel on which your applet
resides. In addition, the popupDirection() method and the Direction enum are
deprecated. Instead you should use the position() method and Position enum. Applets that use
the deprecated methods will still work with KDE 3, but may not compile or work with
@@ -662,7 +662,7 @@ a future version.
<H4>KPanelExtension</H4>

<p>There is a new method alignmentChange() that your extension should reimplement if
it needs to know about changes in tqalignment.
it needs to know about changes in alignment.

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
<p>


+ 3
- 3
arts/kde/kartsserver.cpp View File

@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)

X11CommConfig.sync();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("tdeinit_wrapper"))).data();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper"))).data();

if(rt)
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper"))).data();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper"))).data();
else
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd"))).data();
proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd"))).data();

proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );



+ 1
- 1
arts/kde/kioinputstream_impl.cpp View File

@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
m_job = KIO::get(m_url, false, false);

m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));

TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));


+ 4
- 4
arts/kde/kplayobject.cc View File

@@ -65,7 +65,7 @@ void KPlayObject::halt()

TQString KPlayObject::description()
{
return TQString::tqfromLatin1(object().description().c_str());
return TQString::fromLatin1(object().description().c_str());
}

Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()

TQString KPlayObject::mediaName()
{
return TQString::tqfromLatin1(object().mediaName().c_str());
return TQString::fromLatin1(object().mediaName().c_str());
}

Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
{
if ( object().isNull() )
return TQString();
return TQString::tqfromLatin1(object().description().c_str());
return TQString::fromLatin1(object().description().c_str());
}

Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
{
if ( object().isNull() )
return TQString();
return TQString::tqfromLatin1(object().mediaName().c_str());
return TQString::fromLatin1(object().mediaName().c_str());
}

Arts::poState KDE::PlayObject::state()


+ 1
- 1
arts/kde/kvideowidget.cpp View File

@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
}

setBackgroundMode( PaletteBackground );
tqrepaint();
repaint();

// Resize GUI
videoWidth = 0;


+ 3
- 3
arts/knotify/knotify.cpp View File

@@ -40,7 +40,7 @@
#include <tqfile.h>
#include <tqfileinfo.h>
#include <tqstringlist.h>
#include <tqtextstream.h>
#include <textstream.h>

// KDE headers
#include <dcopclient.h>
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)

// append msg
TQTextStream strm( &logFile );
strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << text << endl;

// close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
TQTextStream strm( stderr, IO_WriteOnly );

// output msg
strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
strm << text << endl;

return true;


+ 2
- 2
dcop/KDE-ICE/ICEmsg.h View File

@@ -221,7 +221,7 @@ extern void _IceErrorBadValue (


/*
* Write pad bytes. Used to force 32 or 64 bit tqalignment.
* Write pad bytes. Used to force 32 or 64 bit alignment.
* A maxium of 7 pad bytes can be specified.
*/

@@ -306,7 +306,7 @@ extern void _IceErrorBadValue (


/*
* Read pad bytes (for 32 or 64 bit tqalignment).
* Read pad bytes (for 32 or 64 bit alignment).
* A maxium of 7 pad bytes can be specified.
*/



+ 3
- 3
dcop/client/dcop.cpp View File

@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqimage.h>
#include <tqmap.h>
#include <tqstringlist.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqvariant.h>

#include "../dcopclient.h"
@@ -158,7 +158,7 @@ void queryFunctions( const char* app, const char* obj )

int callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
{
TQString f = func; // Qt is better with tqunicode strings, so use one.
TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );

@@ -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.tqat(s));
partl.remove(partl.at(s));
}

lt = partl.join(" ");


+ 2
- 2
dcop/client/dcopfind.cpp View File

@@ -40,7 +40,7 @@ static bool bLaunchApp = 0;

bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
{
TQString f = func; // Qt is better with tqunicode strings, so use one.
TQString f = func; // Qt is better with unicode strings, so use one.
int left = f.find( '(' );
int right = f.find( ')' );

@@ -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.tqat(s));
partl.remove(partl.at(s));
}

lt = partl.join(" ");


+ 1
- 1
dcop/client/dcopstart.cpp View File

@@ -33,7 +33,7 @@ static DCOPClient* dcop = 0;
void startApp(const char *_app, int argc, const char **args)
{
const char *function = 0;
TQString app = TQString::tqfromLatin1(_app);
TQString app = TQString::fromLatin1(_app);
if (app.endsWith(".desktop"))
function = "start_service_by_desktop_path(TQString,TQStringList)";
else


+ 14
- 14
dcop/dcopclient.cpp View File

@@ -54,7 +54,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define QT_CLEAN_NAMESPACE
#endif
#include <tqguardedptr.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqfile.h>
#include <tqdir.h>
#include <tqapplication.h>
@@ -764,7 +764,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
DCOPAuthCount,
const_cast<char **>(DCOPAuthNames),
DCOPClientAuthProcs, 0L)) < 0) {
emit attachFailed(TQString::tqfromLatin1( "Communications could not be established." ));
emit attachFailed(TQString::fromLatin1( "Communications could not be established." ));
return false;
}

@@ -779,7 +779,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
TQCString fName = dcopServerFile();
TQFile f(TQFile::decodeName(fName));
if (!f.open(IO_ReadOnly)) {
emit attachFailed(TQString::tqfromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
return false;
}
int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file
@@ -819,7 +819,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
emit attachFailed(TQString::tqfromLatin1( errBuf ));
emit attachFailed(TQString::fromLatin1( errBuf ));
return false;
}
fcntl(socket(), F_SETFL, FD_CLOEXEC);
@@ -845,7 +845,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
emit attachFailed(TQString::tqfromLatin1( errBuf ));
emit attachFailed(TQString::fromLatin1( errBuf ));
return false;
} else if (setupstat == IceProtocolAlreadyActive) {
if (bClearServerAddr) {
@@ -853,7 +853,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
d->serverAddr = 0;
}
/* should not happen because 3rd arg to IceOpenConnection was 0. */
emit attachFailed(TQString::tqfromLatin1( "internal error in IceOpenConnection" ));
emit attachFailed(TQString::fromLatin1( "internal error in IceOpenConnection" ));
return false;
}

@@ -863,7 +863,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
delete [] d->serverAddr;
d->serverAddr = 0;
}
emit attachFailed(TQString::tqfromLatin1( "DCOP server did not accept the connection." ));
emit attachFailed(TQString::fromLatin1( "DCOP server did not accept the connection." ));
return false;
}

@@ -1470,10 +1470,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
l << "QCStringList properties()";
l << "bool setProperty(TQCString,TQVariant)";
l << "TQVariant property(TQCString)";
TQStrList lst = o->tqmetaObject()->slotNames( true );
TQStrList lst = o->metaObject()->slotNames( true );
int i = 0;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
if ( o->tqmetaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
if ( o->metaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
continue;
TQCString slot = it.current();
if ( slot.contains( "()" ) ) {
@@ -1487,10 +1487,10 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
replyType = "QCStringList";
TQDataStream reply( replyData, IO_WriteOnly );
QCStringList l;
TQMetaObject *meta = o->tqmetaObject();
TQMetaObject *meta = o->metaObject();
while ( meta ) {
l.prepend( meta->className() );
meta = meta->tqsuperClass();
meta = meta->superClass();
}
reply << l;
return true;
@@ -1498,9 +1498,9 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
replyType = "QCStringList";
TQDataStream reply( replyData, IO_WriteOnly );
QCStringList l;
TQStrList lst = o->tqmetaObject()->propertyNames( true );
TQStrList lst = o->metaObject()->propertyNames( true );
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
TQMetaObject *mo = o->tqmetaObject();
TQMetaObject *mo = o->metaObject();
const TQMetaProperty* p = mo->property( mo->findProperty( it.current(), true ), true );
if ( !p )
continue;
@@ -1532,7 +1532,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
reply << (TQ_INT8) o->setProperty( name, value );
return true;
} else {
int slot = o->tqmetaObject()->findSlot( fun, true );
int slot = o->metaObject()->findSlot( fun, true );
if ( slot != -1 ) {
replyType = "void";
TQUObject uo[ 1 ];


+ 1
- 1
dcop/dcopidl2cpp/main.cpp View File

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqstring.h>

#include <string.h>


+ 1
- 1
dcop/dcopidl2cpp/skel.cpp View File

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqstring.h>
#include <tqstringlist.h>



+ 1
- 1
dcop/dcopidl2cpp/stub.cpp View File

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqstring.h>
#include <tqstringlist.h>



+ 1
- 1
dcop/dcopidl2cpp/stubimpl.cpp View File

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
#include <tqdom.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqstring.h>
#include <tqstringlist.h>



+ 1
- 1
dcop/dcopidl2cpp/type.h View File

@@ -1,7 +1,7 @@
#ifndef TYPE_H
#define TYPE_H

#include <tqtextstream.h>
#include <textstream.h>
#include <tqdom.h>

static TQString writeType( TQTextStream& str, const TQDomElement& r )


+ 1
- 1
dcop/dcopref.h View File

@@ -396,7 +396,7 @@ public:
* Flag for allowing entering the event loop if the call blocks too long.
* @p NoEventLoop disables entering the event loop.
* @p UseEventLoop allows entering the event loop while waiting for long
* blocking DCOP call, thus making the GUI tqrepaint if needed, and possibly
* blocking DCOP call, thus making the GUI repaint if needed, and possibly
* allowing also other code in the application to be executed.
* @see DCOPClient::call()
*/


+ 5
- 5
dcop/dcopserver.cpp View File

@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#define QT_CLEAN_NAMESPACE 1
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqdatastream.h>
#include <tqptrstack.h>
#include <tqtimer.h>
@@ -126,8 +126,8 @@ static TQCString readQCString(TQDataStream &ds)
TQCString result;
TQ_UINT32 len;
ds >> len;
TQIODevice *device = ds.tqdevice();
int bytesLeft = device->size()-device->tqat();
TQIODevice *device = ds.device();
int bytesLeft = device->size()-device->at();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{
qWarning("Corrupt data!\n");
@@ -145,8 +145,8 @@ static TQByteArray readQByteArray(TQDataStream &ds)
TQByteArray result;
TQ_UINT32 len;
ds >> len;
TQIODevice *device = ds.tqdevice();
int bytesLeft = device->size()-device->tqat();
TQIODevice *device = ds.device();
int bytesLeft = device->size()-device->at();
if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
{
qWarning("Corrupt data!\n");


+ 2
- 2
interfaces/khexedit/byteseditinterface.h View File

@@ -143,7 +143,7 @@ class BytesEditInterface
virtual bool isModified() const = 0;

public: // call for action
/** tqrepaint the indizes from i1 to i2 */
/** repaint the indizes from i1 to i2 */
virtual void repaintRange( int i1, int i2 ) = 0;
};

@@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
{
return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
( TQString::tqfromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
}

}


+ 1
- 1
interfaces/kimproxy/interface/kimiface.h View File

@@ -467,7 +467,7 @@ k_dcop_signals:
/**
* @brief Indicates that a contact's presence has changed
*
* Notifies connected DCOP tqreceivers about a change in a contact's
* Notifies connected DCOP receivers about a change in a contact's
* presence.
*
* Implementations just have to call this method with the appropriate


+ 1
- 1
interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp View File

@@ -2,7 +2,7 @@

#include <tqcheckbox.h>
#include <tqhbox.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>

#include <kglobal.h>


+ 1
- 1
interfaces/ktexteditor/editinterfaceext.h View File

@@ -44,7 +44,7 @@ class KTEXTEDITOR_EXPORT EditInterfaceExt
/**
* Begin an editing sequence. Edit commands during this sequence will be
* bunched together such that they represent a single undo command in the
* editor, and so that tqrepaint events do not occur inbetween.
* editor, and so that repaint events do not occur inbetween.
*
* Your application should not return control to the event loop while it
* has an unterminated (no matching editEnd() call) editing sequence


+ 2
- 2
interfaces/ktexteditor/editorchooser.cpp View File

@@ -9,7 +9,7 @@
#include <klocale.h>
#include <tqlabel.h>
#include <kapplication.h>
#include <tqlayout.h>
#include <layout.h>

#include "editorchooser_ui.h"

@@ -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.tqat(d->chooser->editorCombo->currentItem()-1)));
TQString::null : (*d->elements.at(d->chooser->editorCombo->currentItem()-1)));
cfg->sync();
cfg->setGroup(previousGroup);



+ 2
- 2
interfaces/ktexteditor/editorchooser_ui.ui View File

@@ -31,7 +31,7 @@
<property name="name">
<cstring>TextLabel1</cstring>
</property>
<property name="tqminimumSize">
<property name="minimumSize">
<size>
<width>460</width>
<height>0</height>
@@ -40,7 +40,7 @@
<property name="text">
<string>Please choose the default text editing component that you wish to use in this application. If you choose &lt;B&gt;System Default&lt;/B&gt;, the application will honor your changes in the Control Center. All other choices will override that setting.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>


+ 1
- 1
interfaces/ktexteditor/templateinterface.cpp View File

@@ -74,7 +74,7 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
{
KABC::StdAddressBook *addrBook = 0;
KABC::Addressee userAddress;
TQDateTime datetime = TQDateTime::tqcurrentDateTime();
TQDateTime datetime = TQDateTime::currentDateTime();
TQDate date = TQT_TQDATE_OBJECT(datetime.date());
TQTime time = TQT_TQTIME_OBJECT(datetime.time());



+ 1
- 1
kab/addressbook.h View File

@@ -127,7 +127,7 @@ class CategoriesMap : public TQMap<int, TQString>
* keys). Of course, in different files a key might be used twice. <BR>
* The keys are objects of the type KabKey and define the section in the
* addressbook database where the entry is stored (see QConfigDB
* reference). Keys tqinvalidate on file changes, so keep track of the
* reference). Keys invalidate on file changes, so keep track of the
* signal ::changed. <BR>
* kab watches file changes. If the opened file changes on disk, it is
* automatically reloaded and ::changed() is emitted.


+ 1
- 1
kab/kabapi.cc View File

@@ -74,7 +74,7 @@ int KabAPI::exec()
}
listbox->setMinimumSize(listbox->sizeHint());
adjustSize();
resize(tqminimumSize());
resize(minimumSize());
return KDialogBase::exec();
} else {
kdDebug(KAB_KDEBUG_AREA) << "KabAPI::exec: error creating interface."


+ 4
- 4
kab/qconfigDB.cc View File

@@ -25,7 +25,7 @@ extern "C" {
}

// #include <tqstring.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqfile.h>
#include <tqtimer.h>
#include <tqdatetime.h>
@@ -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).tqat(count));
temp=makeComplexString(((TQStrList)values).at(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.tqat(count)));
values.append(TQString::fromUtf8(temp.at(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.tqat(count)).utf8());
utf8strings.append((*values.at(count)).utf8());
}
kdDebug(GUARD, KAB_KDEBUG_AREA) << "KeyValueMap::insert[QStringList]: done." << endl;
return insert(key, utf8strings, force);


+ 2
- 2
kabc/address.cpp View File

@@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname )
return it.data();

TQString mapfile = KGlobal::dirs()->findResource( "data",
TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
TQString::fromLatin1( "kabc/countrytransl.map" ) );

TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
return TQString::null;

TQString mapfile = KGlobal::dirs()->findResource( "data",
TQString::tqfromLatin1( "kabc/countrytransl.map" ) );
TQString::fromLatin1( "kabc/countrytransl.map" ) );

TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {


+ 1
- 1
kabc/addressbook.cpp View File

@@ -527,7 +527,7 @@ void AddressBook::insertAddressee( const Addressee &a )
Addressee addr( a );
if ( !fAddr.isEmpty() ) {
if ( fAddr != a )
addr.setRevision( TQDateTime::tqcurrentDateTime() );
addr.setRevision( TQDateTime::currentDateTime() );
else {
if ( fAddr.resource() == 0 ) {
fAddr.setResource( resource );


+ 1
- 1
kabc/addresseedialog.cpp View File

@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/

#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqgroupbox.h>
#include <tqregexp.h>


+ 1
- 1
kabc/distributionlistdialog.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqlistview.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqlabel.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>


+ 1
- 1
kabc/distributionlisteditor.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqlistview.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>
#include <tqbuttongroup.h>


+ 1
- 1
kabc/formats/binaryformat.cpp View File

@@ -113,7 +113,7 @@ void BinaryFormat::saveAll( AddressBook*, Resource *resource, TQFile *file )
}

// set real number of entries
stream.tqdevice()->tqat( 2 * sizeof( TQ_UINT32 ) );
stream.device()->at( 2 * sizeof( TQ_UINT32 ) );
stream << counter;
}



+ 11
- 11
kabc/kab2kabc.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>

#include <kabapi.h>
#include <kaboutdata.h>
@@ -57,12 +57,12 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
TQString name;
TQString comment;

if ( entry.tqat( entry.length() -1 ) == ')' ) {
if ( entry.at( entry.length() -1 ) == ')' ) {
int br = entry.findRev( '(' );
if ( br >= 0 ) {
comment = entry.mid( br + 1, entry.length() - br - 2 );
entry.truncate( br );
if ( entry.tqat( entry.length() - 1 ).isSpace() ) {
if ( entry.at( 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.tqat( 0 ) == '<' && email.tqat( email.length() - 1) == '>' ) {
if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) {
email = email.mid( 1, email.length() - 2 );
}
if ( name.tqat( 0 ) == '"' && name.tqat( name.length() - 1) == '"' ) {
if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) {
name = name.mid( 1, name.length() - 2 );
}
if ( name.tqat( 0 ) == '\'' && name.tqat( name.length() - 1) == '\'' ) {
if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) {
name = name.mid( 1, name.length() - 2 );
}

if ( name.tqat( name.length() -1 ) == ')' ) {
if ( name.at( name.length() -1 ) == ')' ) {
int br = name.findRev( '(' );
if ( br >= 0 ) {
comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
name.truncate( br );
if ( name.tqat( name.length() - 1 ).isSpace() ) {
if ( name.at( 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).tqat( 0 ) == '#' ) continue;
if ( (*it).at( 0 ) == '#' ) continue;
bool insideQuote = false;
int end = (*it).length() - 1;
for ( int i = end; i; i-- ) {
if ( (*it).tqat( i ) == '"' ) {
if ( (*it).at( i ) == '"' ) {
if ( insideQuote )
insideQuote = false;
else
insideQuote = true;
} else if ( (*it).tqat( i ) == ',' && !insideQuote ) {
} else if ( (*it).at( i ) == ',' && !insideQuote ) {
readKMailEntry( (*it).mid( i + 1, end - i ), ab );
end = i - 1;
}


+ 2
- 2
kabc/ldapclient.cpp View File

@@ -26,7 +26,7 @@
#include <tqimage.h>
#include <tqlabel.h>
#include <tqpixmap.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqurl.h>

#include <kapplication.h>
@@ -50,7 +50,7 @@ public:

TQString LdapObject::toString() const
{
TQString result = TQString::tqfromLatin1( "\ndn: %1\n" ).arg( dn );
TQString result = TQString::fromLatin1( "\ndn: %1\n" ).arg( dn );
for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) {
TQString attr = it.key();
for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) {


+ 1
- 1
kabc/ldapconfigwidget.cpp View File

@@ -22,7 +22,7 @@
#include <tqobjectlist.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
#include <tqvgroupbox.h>


+ 57
- 57
kabc/ldifconverter.cpp View File

@@ -36,7 +36,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqregexp.h>
#include <tqtextstream.h>
#include <textstream.h>

#include <klocale.h>
#include <kdebug.h>
@@ -183,7 +183,7 @@ bool LDIFConverter::LDIFToAddressee( const TQString &str, AddresseeList &addrLis
data.setRawData( latinstr, latinstrlen );
ldif.setLDIF( data );
if (!dt.isValid())
dt = TQDateTime::tqcurrentDateTime();
dt = TQDateTime::currentDateTime();
a.setRevision(dt);
homeAddr = Address( Address::Home );
workAddr = Address( Address::Work );
@@ -235,7 +235,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
Address &workAddr,
TQString &fieldname, TQString &value )
{
if ( fieldname == TQString::tqfromLatin1( "dn" ) ) // ignore & return false!
if ( fieldname == TQString::fromLatin1( "dn" ) ) // ignore & return false!
return false;

if ( fieldname.startsWith("#") ) {
@@ -249,56 +249,56 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
return true;
}

if ( fieldname == TQString::tqfromLatin1( "givenname" ) ) {
if ( fieldname == TQString::fromLatin1( "givenname" ) ) {
a.setGivenName( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "xmozillanickname") ||
fieldname == TQString::tqfromLatin1( "nickname") ) {
if ( fieldname == TQString::fromLatin1( "xmozillanickname") ||
fieldname == TQString::fromLatin1( "nickname") ) {
a.setNickName( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "sn" ) ) {
if ( fieldname == TQString::fromLatin1( "sn" ) ) {
a.setFamilyName( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "uid" ) ) {
if ( fieldname == TQString::fromLatin1( "uid" ) ) {
a.setUid( value );
return true;
}
if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "mail" ) ||
fieldname == TQString::fromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( a.emails().findIndex( value ) == -1 )
a.insertEmail( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "title" ) ) {
if ( fieldname == TQString::fromLatin1( "title" ) ) {
a.setTitle( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "vocation" ) ) {
if ( fieldname == TQString::fromLatin1( "vocation" ) ) {
a.setPrefix( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "cn" ) ) {
if ( fieldname == TQString::fromLatin1( "cn" ) ) {
a.setFormattedName( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "o" ) ||
fieldname == TQString::tqfromLatin1( "organization" ) || // Exchange
fieldname == TQString::tqfromLatin1( "organizationname" ) ) { // Exchange
if ( fieldname == TQString::fromLatin1( "o" ) ||
fieldname == TQString::fromLatin1( "organization" ) || // Exchange
fieldname == TQString::fromLatin1( "organizationname" ) ) { // Exchange
a.setOrganization( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "description" ) ) {
if ( fieldname == TQString::fromLatin1( "description" ) ) {
addComment:
if ( !a.note().isEmpty() )
a.setNote( a.note() + "\n" );
@@ -306,15 +306,15 @@ addComment:
return true;
}

if ( fieldname == TQString::tqfromLatin1( "custom1" ) ||
fieldname == TQString::tqfromLatin1( "custom2" ) ||
fieldname == TQString::tqfromLatin1( "custom3" ) ||
fieldname == TQString::tqfromLatin1( "custom4" ) ) {
if ( fieldname == TQString::fromLatin1( "custom1" ) ||
fieldname == TQString::fromLatin1( "custom2" ) ||
fieldname == TQString::fromLatin1( "custom3" ) ||
fieldname == TQString::fromLatin1( "custom4" ) ) {
goto addComment;
}

if ( fieldname == TQString::tqfromLatin1( "homeurl" ) ||
fieldname == TQString::tqfromLatin1( "workurl" ) ) {
if ( fieldname == TQString::fromLatin1( "homeurl" ) ||
fieldname == TQString::fromLatin1( "workurl" ) ) {
if (a.url().isEmpty()) {
a.setUrl( KURL( value ) );
return true;
@@ -325,139 +325,139 @@ addComment:
// TODO: change this with KDE 4
}

if ( fieldname == TQString::tqfromLatin1( "homephone" ) ) {
if ( fieldname == TQString::fromLatin1( "homephone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Home ) );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "telephonenumber" ) ) {
if ( fieldname == TQString::fromLatin1( "telephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "mobile" ) ) { // mozilla/Netscape 7
if ( fieldname == TQString::fromLatin1( "mobile" ) ) { // mozilla/Netscape 7
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "cellphone" ) ) {
if ( fieldname == TQString::fromLatin1( "cellphone" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Cell ) );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "pager" ) || // mozilla
fieldname == TQString::tqfromLatin1( "pagerphone" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "pager" ) || // mozilla
fieldname == TQString::fromLatin1( "pagerphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Pager ) );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "facsimiletelephonenumber" ) ) {
if ( fieldname == TQString::fromLatin1( "facsimiletelephonenumber" ) ) {
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Fax ) );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "xmozillaanyphone" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "xmozillaanyphone" ) ) { // mozilla
a.insertPhoneNumber( PhoneNumber( value, PhoneNumber::Work ) );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "street" ) ||
fieldname == TQString::tqfromLatin1( "streethomeaddress" ) ) {
if ( fieldname == TQString::fromLatin1( "street" ) ||
fieldname == TQString::fromLatin1( "streethomeaddress" ) ) {
homeAddr.setStreet( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "postaladdress" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "postaladdress" ) ) { // mozilla
workAddr.setStreet( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "mozillapostaladdress2" ) ) { // mozilla
workAddr.setStreet( workAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
if ( fieldname == TQString::fromLatin1( "mozillapostaladdress2" ) ) { // mozilla
workAddr.setStreet( workAddr.street() + TQString::fromLatin1( "\n" ) + value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "postalcode" ) ) {
if ( fieldname == TQString::fromLatin1( "postalcode" ) ) {
workAddr.setPostalCode( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "postofficebox" ) ) {
if ( fieldname == TQString::fromLatin1( "postofficebox" ) ) {
workAddr.setPostOfficeBox( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "homepostaladdress" ) ) { // Netscape 7
if ( fieldname == TQString::fromLatin1( "homepostaladdress" ) ) { // Netscape 7
homeAddr.setStreet( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
homeAddr.setStreet( homeAddr.street() + TQString::tqfromLatin1( "\n" ) + value );
if ( fieldname == TQString::fromLatin1( "mozillahomepostaladdress2" ) ) { // mozilla
homeAddr.setStreet( homeAddr.street() + TQString::fromLatin1( "\n" ) + value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "mozillahomelocalityname" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "mozillahomelocalityname" ) ) { // mozilla
homeAddr.setLocality( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "mozillahomestate" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "mozillahomestate" ) ) { // mozilla
homeAddr.setRegion( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "mozillahomepostalcode" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "mozillahomepostalcode" ) ) { // mozilla
homeAddr.setPostalCode( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "mozillahomecountryname" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "mozillahomecountryname" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
homeAddr.setCountry( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "locality" ) ) {
if ( fieldname == TQString::fromLatin1( "locality" ) ) {
workAddr.setLocality( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "streetaddress" ) ) { // Netscape 4.x
if ( fieldname == TQString::fromLatin1( "streetaddress" ) ) { // Netscape 4.x
workAddr.setStreet( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "countryname" ) ||
fieldname == TQString::tqfromLatin1( "c" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "countryname" ) ||
fieldname == TQString::fromLatin1( "c" ) ) { // mozilla
if ( value.length() <= 2 )
value = Address::ISOtoCountry(value);
workAddr.setCountry( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "l" ) ) { // mozilla
if ( fieldname == TQString::fromLatin1( "l" ) ) { // mozilla
workAddr.setLocality( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "st" ) ) {
if ( fieldname == TQString::fromLatin1( "st" ) ) {
workAddr.setRegion( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "ou" ) ) {
if ( fieldname == TQString::fromLatin1( "ou" ) ) {
a.setRole( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "department" ) ) {
if ( fieldname == TQString::fromLatin1( "department" ) ) {
a.setDepartment( value );
return true;
}

if ( fieldname == TQString::tqfromLatin1( "member" ) ) {
if ( fieldname == TQString::fromLatin1( "member" ) ) {
// this is a mozilla list member (cn=xxx, mail=yyy)
TQStringList list( TQStringList::split( ',', value ) );
TQString name, email;
@@ -476,8 +476,8 @@ addComment:
return true;
}

if ( fieldname == TQString::tqfromLatin1( "modifytimestamp" ) ) {
if (value == TQString::tqfromLatin1("0Z")) // ignore
if ( fieldname == TQString::fromLatin1( "modifytimestamp" ) ) {
if (value == TQString::fromLatin1("0Z")) // ignore
return true;
TQDateTime dt = VCardStringToDate( value );
if ( dt.isValid() ) {
@@ -486,7 +486,7 @@ addComment:
}
}

if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
if ( fieldname == TQString::fromLatin1( "objectclass" ) ) // ignore
return true;

kdWarning() << TQString(TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")


+ 1
- 1
kabc/ldifconverter.h View File

@@ -44,7 +44,7 @@ namespace KABC {
* @param dt The date & time value of the last modification (e.g. file modification time).
* @since 3.2
*/
KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::tqcurrentDateTime() );
KABC_EXPORT bool LDIFToAddressee( const TQString &str, AddresseeList &addrList, TQDateTime dt = TQDateTime::currentDateTime() );

/**
* Converts a list of addressees to a LDIF string.


+ 1
- 1
kabc/plugins/dir/resourcedirconfig.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>

#include <kdebug.h>
#include <klocale.h>


+ 1
- 1
kabc/plugins/file/resourcefileconfig.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>

#include <kdebug.h>
#include <klocale.h>


+ 1
- 1
kabc/plugins/ldapkio/resourceldapkioconfig.cpp View File

@@ -21,7 +21,7 @@

#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqspinbox.h>
#include <tqvbox.h>


+ 1
- 1
kabc/plugins/net/resourcenetconfig.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>

#include <kdebug.h>
#include <klocale.h>


+ 1
- 1
kabc/plugins/sql/resourcesqlconfig.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqspinbox.h>
#include <tqvbox.h>



+ 2
- 2
kabc/resourceselectdialog.cpp View File

@@ -24,7 +24,7 @@
#include <kstdguiitem.h>

#include <tqgroupbox.h>
#include <tqlayout.h>
#include <layout.h>

#include "resource.h"
#include "addressbook.h"
@@ -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.tqat( i );
Resource *resource = list.at( i );
if ( resource && !resource->readOnly() ) {
mResourceMap.insert( counter, resource );
mResourceId->insertItem( resource->resourceName() );


+ 1
- 1
kabc/tests/kabcargl.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqregexp.h>

#include <kaboutdata.h>


+ 40
- 40
kabc/tests/testaddresseelist.cpp View File

@@ -64,12 +64,12 @@ int main(int /*argc*/,char /* **argv*/)
list.append(f);

list.sortBy(FamilyName);
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"
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"
) ) {
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.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"
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"
) ) {
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.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"
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"
) ) {
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.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"
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"
) ) {
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.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"
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"
) ) {
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.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"
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"
) ) {
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.tqat(0)).uid()=="78ze"
&& (*list2.tqat(1)).uid()=="Asdf"
if ( !( (*list2.at(0)).uid()=="78ze"
&& (*list2.at(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.tqat(1)).uid()=="78ze"
&& (*list2.tqat(0)).uid()=="Asdf"
if ( !( (*list2.at(1)).uid()=="78ze"
&& (*list2.at(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;


+ 1
- 1
kabc/tests/testlock.cpp View File

@@ -35,7 +35,7 @@

#include <tqwidget.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqpushbutton.h>
#include <tqlistview.h>
#include <tqdir.h>


+ 7
- 7
kabc/vcard/AdrValue.cpp View File

@@ -112,13 +112,13 @@ AdrValue::_parse()
switch (i) {
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;
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;
default: break;
}
}


+ 1
- 1
kabc/vcard/ContentLine.cpp View File

@@ -174,7 +174,7 @@ ContentLine::_parse()
return;
}
name_ = l.tqat(0);
name_ = l.at(0);

// Now we have the name, so the rest of 'l' is the params.
// Remove the name part.


+ 1
- 1
kabc/vcard/LangValue.cpp View File

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


+ 5
- 5
kabc/vcard/NValue.cpp View File

@@ -106,11 +106,11 @@ NValue::_parse()
for (unsigned int i = 0; i < l.count(); i++) {

switch (i) {
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;
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;
default: break;
}
}


+ 1
- 1
kabc/vcard/OrgValue.cpp View File

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


+ 1
- 1
kabc/vcard/TextListValue.cpp View File

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


+ 1
- 1
kabc/vcard/VCard.cpp View File

@@ -95,7 +95,7 @@ VCard::_parse()
}

// Get the first line
TQCString beginLine = TQCString(l.tqat(0)).stripWhiteSpace();
TQCString beginLine = TQCString(l.at(0)).stripWhiteSpace();

vDebug("Begin line == \"" + beginLine + "\"");



+ 1
- 1
kabc/vcard/testread.cpp View File

@@ -3,7 +3,7 @@
#include <assert.h>

#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>

#include <VCard.h>



+ 1
- 1
kabc/vcardparser/testread.cpp View File

@@ -21,7 +21,7 @@
#include <stdlib.h>

#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>

#include <kprocess.h>
#include <kdebug.h>


+ 2
- 2
kabc/vcardparser/testwrite.cpp View File

@@ -29,7 +29,7 @@
#include <kcmdlineargs.h>

#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>

#include "vcardconverter.h"

@@ -60,7 +60,7 @@ int main( int argc, char **argv )
addressee.setOrganization( "KDE" );
addressee.setNote( "nerver\ntouch a running system" );
addressee.setProductId( "testId" );
addressee.setRevision( TQDateTime::tqcurrentDateTime() );
addressee.setRevision( TQDateTime::currentDateTime() );
addressee.setSortString( "koenig" );
addressee.setUrl( KURL( "http://wgess16.dyndns.org") );
addressee.setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) );


+ 2
- 2
kabc/vcardparser/vcardparser.cpp View File

@@ -19,7 +19,7 @@
*/

#include <tqregexp.h>
#include <tqtextcodec.h>
#include <textcodec.h>

#include <kmdcodec.h>

@@ -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.tqat( value.length() - 1 ) == '=' && it != linesEnd ) {
while ( value.at( value.length() - 1 ) == '=' && it != linesEnd ) {
value = value.remove( value.length() - 1, 1 ) + (*it);
++it;
}


+ 1
- 1
kabc/vcardtool.cpp View File

@@ -36,7 +36,7 @@ static bool needsEncoding( const TQString &value )
{
uint length = value.length();
for ( uint i = 0; i < length; ++i ) {
char c = value.tqat( i ).latin1();
char c = value.at( i ).latin1();
if ( (c < 33 || c > 126) && c != ' ' && c != '=' )
return true;
}


+ 12
- 12
kate/part/kateautoindent.cpp View File

@@ -223,7 +223,7 @@ void KateNormalIndent::updateConfig ()

for (uint i=0; i<items.count(); i++)
{
TQString name = items.tqat(i)->name;
TQString name = items.at(i)->name;
if (name.find("Comment") != -1 && commentAttrib == 255)
{
commentAttrib = i;
@@ -748,7 +748,7 @@ void KateCSmartIndent::processChar(TQChar c)

if (c == 'n')
{
if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::tqfromLatin1("regio"))
if (firstChar != '#' || textLine->string(curCol-5, 5) != TQString::fromLatin1("regio"))
return;
}

@@ -1411,7 +1411,7 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
uint pos, len = text.length();
bool seenOpen = false;
for(pos = 0; pos < len; ++pos) {
int ch = text.tqat(pos).tqunicode();
int ch = text.at(pos).unicode();
switch(ch) {
case '<':
seenOpen = true;
@@ -1467,11 +1467,11 @@ void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags,
if(unclosedTag) {
// find the start of the next attribute, so we can align with it
do {
lastCh = text.tqat(++attrCol).tqunicode();
lastCh = text.at(++attrCol).unicode();
}while(lastCh && lastCh != ' ' && lastCh != '\t');

while(lastCh == ' ' || lastCh == '\t') {
lastCh = text.tqat(++attrCol).tqunicode();
lastCh = text.at(++attrCol).unicode();
}

attrCol = prevLine->cursorX(attrCol, tabWidth);
@@ -1917,8 +1917,8 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
// if the line starts with # (but isn't a c# region thingy), no indentation at all.
if( currLineFirst >= 0 && currLine->getChar(currLineFirst) == '#' )
{
if( !currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("region") ) &&
!currLine->stringAtPos( currLineFirst+1, TQString::tqfromLatin1("endregion") ) )
if( !currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("region") ) &&
!currLine->stringAtPos( currLineFirst+1, TQString::fromLatin1("endregion") ) )
return TQString::null;
}

@@ -1974,10 +1974,10 @@ TQString KateCSAndSIndent::calcIndent (const KateDocCursor &begin)
{
#define ARRLEN( array ) ( sizeof(array)/sizeof(array[0]) )
for( uint n = 0; n < ARRLEN(scopeKeywords); ++n )
if( textLine->stringAtPos(pos, TQString::tqfromLatin1(scopeKeywords[n]) ) )
if( textLine->stringAtPos(pos, TQString::fromLatin1(scopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, false );
for( uint n = 0; n < ARRLEN(blockScopeKeywords); ++n )
if( textLine->stringAtPos(pos, TQString::tqfromLatin1(blockScopeKeywords[n]) ) )
if( textLine->stringAtPos(pos, TQString::fromLatin1(blockScopeKeywords[n]) ) )
return calcIndentAfterKeyword( begin, cur, pos, true );
#undef ARRLEN
}
@@ -2070,7 +2070,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
// beginning 'namespace'. that's 99% of usage, I'd guess.
{
if( braceFirst >= 0 && braceLine->attribute(braceFirst) == keywordAttrib &&
braceLine->stringAtPos( braceFirst, TQString::tqfromLatin1( "namespace" ) ) )
braceLine->stringAtPos( braceFirst, TQString::fromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;

if( braceCursor.line() > 0 )
@@ -2078,7 +2078,7 @@ TQString KateCSAndSIndent::calcIndentInBrace(const KateDocCursor &indentCursor,
KateTextLine::Ptr prevLine = doc->plainKateTextLine(braceCursor.line() - 1);
int firstPrev = prevLine->firstChar();
if( firstPrev >= 0 && prevLine->attribute(firstPrev) == keywordAttrib &&
prevLine->stringAtPos( firstPrev, TQString::tqfromLatin1( "namespace" ) ) )
prevLine->stringAtPos( firstPrev, TQString::fromLatin1( "namespace" ) ) )
return continuationIndent(indentCursor) + whitespaceToOpenBrace;
}
}
@@ -2384,7 +2384,7 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va

for (uint i=0; i<items.count(); i++)
{
if ( items.tqat(i)->name.section( ':', 1 ) == val )
if ( items.at(i)->name.section( ':', 1 ) == val )
{
d->coupleAttrib = i;
break;


+ 5
- 5
kate/part/katebookmarks.cpp View File

@@ -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.tqat(i)->line, KTextEditor::MarkInterface::markType01 );
m_view->getDoc()->removeMark( m.at(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.tqat(z)->line > line) && ((found == -1) || (uint(found) > m.tqat(z)->line)) )
found = m.tqat(z)->line;
if ( (m.at(z)->line > line) && ((found == -1) || (uint(found) > m.at(z)->line)) )
found = m.at(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.tqat(z)->line < line) && ((found == -1) || (uint(found) < m.tqat(z)->line)))
found = m.tqat(z)->line;
if ((m.at(z)->line < line) && ((found == -1) || (uint(found) < m.at(z)->line)))
found = m.at(z)->line;

if (found != -1)
m_view->gotoLineNumber ( found );


+ 16
- 16
kate/part/katebuffer.cpp View File

@@ -36,9 +36,9 @@

#include <tqpopupmenu.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tqtimer.h>
#include <tqtextcodec.h>
#include <textcodec.h>
#include <tqcstring.h>
#include <tqdatetime.h>

@@ -172,10 +172,10 @@ class KateFileLoader
// should spaces be ignored at end of line?
inline bool removeTrailingSpaces () const { return m_removeTrailingSpaces; }

// internal tqunicode data array
inline const TQChar *tqunicode () const { return m_text.tqunicode(); }
// internal unicode data array
inline const TQChar *unicode () const { return m_text.unicode(); }

// read a line, return length + offset in tqunicode data
// read a line, return length + offset in unicode data
void readLine (uint &offset, uint &length)
{
length = 0;
@@ -543,7 +543,7 @@ bool KateBuffer::canEncode ()

kdDebug(13020) << "ENC NAME: " << codec->name() << endl;

// hardcode some tqunicode encodings which can encode all chars
// hardcode some unicode encodings which can encode all chars
if ((TQString(codec->name()) == "UTF-8") || (TQString(codec->name()) == "ISO-10646-UCS-2"))
return true;

@@ -860,12 +860,12 @@ void KateBuffer::setHighlight(uint hlMode)
// aha, hl will change
if (h != m_highlight)
{
bool tqinvalidate = !h->noHighlighting();
bool invalidate = !h->noHighlighting();

if (m_highlight)
{
m_highlight->release();
tqinvalidate = true;
invalidate = true;
}

h->use();
@@ -880,7 +880,7 @@ void KateBuffer::setHighlight(uint hlMode)

m_highlight = h;

if (tqinvalidate)
if (invalidate)
invalidateHighlighting();

// inform the document that the hl was really changed
@@ -949,7 +949,7 @@ void KateBuffer::addIndentBasedFoldingInformation(TQMemArray<uint> &foldingList,
}
}

bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool tqinvalidate)
bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, bool invalidate)
{
// no hl around, no stuff to do
if (!m_highlight)
@@ -971,7 +971,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
//kdDebug (13020) << "HL UNTIL LINE: " << m_lineHighlighted << " MAX: " << m_lineHighlightedMax << endl;
//kdDebug (13020) << "HL DYN COUNT: " << KateHlManager::self()->countDynamicCtxs() << " MAX: " << m_maxDynamicContexts << endl;

// see if there are too many dynamic contexts; if yes, tqinvalidate HL of all documents
// see if there are too many dynamic contexts; if yes, invalidate HL of all documents
if (KateHlManager::self()->countDynamicCtxs() >= m_maxDynamicContexts)
{
{
@@ -1240,7 +1240,7 @@ bool KateBuffer::doHighlight (KateBufBlock *buf, uint startLine, uint endLine, b
buf->markDirty ();