Browse Source

Rename old tq methods that no longer need a unique name

tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
984c25aa69
100 changed files with 523 additions and 523 deletions
  1. +3
    -3
      arts/kde/kartsserver.cpp
  2. +1
    -1
      arts/kde/kioinputstream_impl.cpp
  3. +4
    -4
      arts/kde/kplayobject.cc
  4. +2
    -2
      arts/knotify/knotify.cpp
  5. +1
    -1
      dcop/client/dcopstart.cpp
  6. +13
    -13
      dcop/dcopclient.cpp
  7. +1
    -1
      interfaces/khexedit/byteseditinterface.h
  8. +1
    -1
      interfaces/ktexteditor/editorchooser_ui.ui
  9. +1
    -1
      interfaces/ktexteditor/templateinterface.cpp
  10. +1
    -1
      kab/kabapi.cc
  11. +2
    -2
      kabc/address.cpp
  12. +1
    -1
      kabc/addressbook.cpp
  13. +1
    -1
      kabc/ldapclient.cpp
  14. +56
    -56
      kabc/ldifconverter.cpp
  15. +1
    -1
      kabc/ldifconverter.h
  16. +1
    -1
      kabc/vcardparser/testwrite.cpp
  17. +7
    -7
      kate/part/kateautoindent.cpp
  18. +4
    -4
      kate/part/katecmds.cpp
  19. +1
    -1
      kate/part/katecodecompletion.cpp
  20. +1
    -1
      kate/part/kateconfig.cpp
  21. +2
    -2
      kate/part/katedocument.cpp
  22. +1
    -1
      kate/part/katehighlight.cpp
  23. +1
    -1
      kate/part/katejscript.cpp
  24. +1
    -1
      kate/part/kateprinter.cpp
  25. +3
    -3
      kate/part/katerenderer.cpp
  26. +5
    -5
      kate/part/kateschema.cpp
  27. +1
    -1
      kate/part/kateview.cpp
  28. +1
    -1
      kate/part/kateviewinternal.h
  29. +1
    -1
      kate/part/test_regression.cpp
  30. +4
    -4
      kcert/kcertpart.cc
  31. +1
    -1
      kconf_update/kconf_update.cpp
  32. +2
    -2
      kded/kbuildsycoca.cpp
  33. +8
    -8
      kdewidgets/makekdewidgets.cpp
  34. +4
    -4
      khtml/css/cssstyleselector.cpp
  35. +2
    -2
      khtml/dom/dom_doc.cpp
  36. +3
    -3
      khtml/ecma/kjs_debugwin.cpp
  37. +15
    -15
      khtml/ecma/kjs_navigator.cpp
  38. +5
    -5
      khtml/ecma/kjs_proxy.cpp
  39. +12
    -12
      khtml/ecma/kjs_window.cpp
  40. +1
    -1
      khtml/ecma/xmlhttprequest.cpp
  41. +4
    -4
      khtml/html/html_documentimpl.cpp
  42. +6
    -6
      khtml/html/html_formimpl.cpp
  43. +2
    -2
      khtml/html/htmltokenizer.cpp
  44. +8
    -8
      khtml/java/kjavaappletcontext.cpp
  45. +10
    -10
      khtml/java/kjavaappletserver.cpp
  46. +13
    -13
      khtml/java/kjavaappletviewer.cpp
  47. +2
    -2
      khtml/khtml_ext.cpp
  48. +65
    -65
      khtml/khtml_part.cpp
  49. +1
    -1
      khtml/khtml_run.cpp
  50. +15
    -15
      khtml/khtml_settings.cc
  51. +1
    -1
      khtml/khtmlview.cpp
  52. +2
    -2
      khtml/kmultipart/kmultipart.cpp
  53. +5
    -5
      khtml/misc/loader.cpp
  54. +1
    -1
      khtml/rendering/enumerate.cpp
  55. +1
    -1
      khtml/rendering/font.cpp
  56. +7
    -7
      khtml/rendering/render_applet.cpp
  57. +13
    -13
      khtml/rendering/render_form.cpp
  58. +21
    -21
      khtml/rendering/render_frames.cpp
  59. +1
    -1
      khtml/rendering/render_generated.cpp
  60. +3
    -3
      khtml/rendering/render_layer.cpp
  61. +6
    -6
      khtml/rendering/render_list.cpp
  62. +5
    -5
      khtml/rendering/render_object.cpp
  63. +2
    -2
      khtml/rendering/render_replaced.cpp
  64. +3
    -3
      khtml/test_regression.cpp
  65. +1
    -1
      khtml/test_regression_fontoverload.cpp
  66. +5
    -5
      khtml/testkhtml.cpp
  67. +3
    -3
      khtml/xml/dom2_eventsimpl.cpp
  68. +1
    -1
      khtml/xml/dom_docimpl.cpp
  69. +5
    -5
      kimgio/dds.cpp
  70. +2
    -2
      kimgio/eps.cpp
  71. +1
    -1
      kimgio/exr.cpp
  72. +4
    -4
      kimgio/hdr.cpp
  73. +1
    -1
      kimgio/ico.cpp
  74. +2
    -2
      kimgio/jp2.cpp
  75. +5
    -5
      kimgio/pcx.cpp
  76. +4
    -4
      kimgio/psd.cpp
  77. +4
    -4
      kimgio/rgb.cpp
  78. +5
    -5
      kimgio/tga.cpp
  79. +1
    -1
      kimgio/tiffr.cpp
  80. +2
    -2
      kimgio/xcf.cpp
  81. +2
    -2
      kimgio/xview.cpp
  82. +1
    -1
      kinit/klauncher.cpp
  83. +2
    -2
      kinit/tests/klaunchertest.cpp
  84. +1
    -1
      kio/bookmarks/kbookmark.cc
  85. +2
    -2
      kio/bookmarks/kbookmarkbar.cc
  86. +1
    -1
      kio/bookmarks/kbookmarkimporter_ns.cc
  87. +8
    -8
      kio/bookmarks/kbookmarkmanager.cc
  88. +1
    -1
      kio/httpfilter/httpfilter.cc
  89. +15
    -15
      kio/kfile/config-kfile.h
  90. +2
    -2
      kio/kfile/kacleditwidget.cpp
  91. +1
    -1
      kio/kfile/kcombiview.cpp
  92. +39
    -39
      kio/kfile/kdiroperator.cpp
  93. +2
    -2
      kio/kfile/kdirselectdialog.cpp
  94. +1
    -1
      kio/kfile/kdiskfreesp.cpp
  95. +1
    -1
      kio/kfile/kencodingfiledialog.cpp
  96. +1
    -1
      kio/kfile/kfiledetailview.h
  97. +12
    -12
      kio/kfile/kfiledialog.cpp
  98. +1
    -1
      kio/kfile/kfilefiltercombo.cpp
  99. +9
    -9
      kio/kfile/kfileiconview.cpp
  100. +2
    -2
      kio/kfile/kfiletreeview.cpp

+ 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()


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

@@ -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;


+ 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


+ 13
- 13
dcop/dcopclient.cpp View File

@@ -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
interfaces/khexedit/byteseditinterface.h View File

@@ -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/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>


+ 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/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."


+ 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/ldapclient.cpp View File

@@ -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 ) {


+ 56
- 56
kabc/ldifconverter.cpp View File

@@ -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/vcardparser/testwrite.cpp View File

@@ -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 ) );


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

@@ -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;
}

@@ -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;
}
}


+ 4
- 4
kate/part/katecmds.cpp View File

@@ -408,7 +408,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
TQString rep=repOld;

// now set the backreferences in the replacement
TQStringList backrefs=matcher.tqcapturedTexts();
TQStringList backrefs=matcher.capturedTexts();
int refnum=1;

TQStringList::Iterator i = backrefs.begin();
@@ -593,10 +593,10 @@ bool KateCommands::Date::exec (Kate::View *view, const TQString &cmd, TQString &
if (cmd.left(4) != "date")
return false;

if (TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
view->insertText(TQDateTime::tqcurrentDateTime().toString(cmd.mid(5, cmd.length()-5)));
if (TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)).length() > 0)
view->insertText(TQDateTime::currentDateTime().toString(cmd.mid(5, cmd.length()-5)));
else
view->insertText(TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
view->insertText(TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));

return true;
}


+ 1
- 1
kate/part/katecodecompletion.cpp View File

@@ -384,7 +384,7 @@ void KateCodeCompletion::showComment()
m_completionListBox->ensureCurrentVisible();

finalPoint.setY(
m_completionListBox->viewport()->mapToGlobal(m_completionListBox->tqitemRect(
m_completionListBox->viewport()->mapToGlobal(m_completionListBox->itemRect(
m_completionListBox->item(m_completionListBox->currentItem())).topLeft()).y());

m_commentLabel->move(finalPoint);


+ 1
- 1
kate/part/kateconfig.cpp View File

@@ -422,7 +422,7 @@ TQTextCodec *KateDocumentConfig::codec ()
if (m_encodingSet || isGlobal())
{
if (m_encoding.isEmpty() && isGlobal())
return KGlobal::charsets()->codecForName (TQString::tqfromLatin1(KGlobal::locale()->encoding()));
return KGlobal::charsets()->codecForName (TQString::fromLatin1(KGlobal::locale()->encoding()));
else if (m_encoding.isEmpty())
return s_global->codec ();
else


+ 2
- 2
kate/part/katedocument.cpp View File

@@ -2316,7 +2316,7 @@ bool KateDocument::openURL( const KURL &url )
w = m_views.first();

if (w)
m_job->setWindow (w->tqtopLevelWidget());
m_job->setWindow (w->topLevelWidget());

emit started( m_job );

@@ -3195,7 +3195,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c )
if (!textLine)
return;

if (config()->wordWrap() && textLine->endingWith(TQString::tqfromLatin1(" ")))
if (config()->wordWrap() && textLine->endingWith(TQString::fromLatin1(" ")))
{
// gg: in hard wordwrap mode, backspace must also eat the trailing space
removeText (line-1, textLine->length()-1, line, 0);


+ 1
- 1
kate/part/katehighlight.cpp View File

@@ -958,7 +958,7 @@ int KateHlRegExpr::checkHgl(const TQString& text, int offset, int /*len*/)

TQStringList *KateHlRegExpr::capturedTexts()
{
return new TQStringList(Expr->tqcapturedTexts());
return new TQStringList(Expr->capturedTexts());
}

KateHlItem *KateHlRegExpr::clone(const TQStringList *args)


+ 1
- 1
kate/part/katejscript.cpp View File

@@ -1135,7 +1135,7 @@ void KateIndentJScriptManager::parseScriptHeader(const TQString &filePath,
if (currentState==NOTHING)
{
if (keyValue.exactMatch(line)) {
TQStringList sl=keyValue.tqcapturedTexts();
TQStringList sl=keyValue.capturedTexts();
kdDebug(13050)<<"key:"<<sl[1]<<endl<<"value:"<<sl[2]<<endl;
kdDebug(13050)<<"key-length:"<<sl[1].length()<<endl<<"value-length:"<<sl[2].length()<<endl;
TQString key=sl[1];


+ 1
- 1
kate/part/kateprinter.cpp View File

@@ -184,7 +184,7 @@ bool KatePrinter::print (KateDocument *doc)
// This retrieves all tags, ued or not, but
// none of theese operations should be expensive,
// and searcing each tag in the format strings is avoided.
TQDateTime dt = TQDateTime::tqcurrentDateTime();
TQDateTime dt = TQDateTime::currentDateTime();
TQMap<TQString,TQString> tags;

KUser u (KUser::UseRealUserID);


+ 3
- 3
kate/part/katerenderer.cpp View File

@@ -537,13 +537,13 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && !isTab)
{
// input method selection
fillColor = m_view->tqcolorGroup().color(TQColorGroup::Foreground);
fillColor = m_view->colorGroup().color(TQColorGroup::Foreground);
}
else if (isIMEdit && !isTab)
{
// XIM support
// input method edit area
const TQColorGroup& cg = m_view->tqcolorGroup();
const TQColorGroup& cg = m_view->colorGroup();
int h1, s1, v1, h2, s2, v2;
TQColor(cg.color( TQColorGroup::Base )).hsv( &h1, &s1, &v1 );
TQColor(cg.color( TQColorGroup::Background )).hsv( &h2, &s2, &v2 );
@@ -576,7 +576,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
if (isIMSel && paintBackground && !isTab)
{
paint.save();
paint.setPen( m_view->tqcolorGroup().color( TQColorGroup::BrightText ) );
paint.setPen( m_view->colorGroup().color( TQColorGroup::BrightText ) );
}

// Draw indentation markers.


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

@@ -1088,9 +1088,9 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
TQPixmap scl(16,16);
scl.fill( i->style()->selectedTextColor() );
TQPixmap bgcl(16,16);
bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->tqcolorGroup().base() );
bgcl.fill( i->style()->itemSet(KateAttribute::BGColor) ? i->style()->bgColor() : viewport()->colorGroup().base() );
TQPixmap sbgcl(16,16);
sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->tqcolorGroup().base() );
sbgcl.fill( i->style()->itemSet(KateAttribute::SelectedBGColor) ? i->style()->selectedBGColor() : viewport()->colorGroup().base() );

if ( showtitle )
m.insertTitle( i->contextName(), KateStyleListItem::ContextName );
@@ -1156,7 +1156,7 @@ void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoi
if ( dynamic_cast<KateStyleListItem*>(i) ) {
if ( btn == Qt::LeftButton && c > 0 ) {
// map pos to item/column and call KateStyleListItem::activate(col, pos)
((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, tqitemRect(i).top() ) );
((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
}
}
}
@@ -1465,7 +1465,7 @@ void KateStyleListItem::paintCell( TQPainter *p, const TQColorGroup& /*cg*/, int
Q_ASSERT( lv ); //###

// use a private color group and set the text/highlighted text colors
TQColorGroup mcg = lv->viewport()->tqcolorGroup();
TQColorGroup mcg = lv->viewport()->colorGroup();

if ( col ) // col 0 is drawn by the superclass method
p->fillRect( 0, 0, width, height(), TQBrush( mcg.base() ) );
@@ -1602,7 +1602,7 @@ void KateStyleListCaption::paintCell( TQPainter *p, const TQColorGroup& /*cg*/,
Q_ASSERT( lv ); //###

// use the same colorgroup as the other items in the viewport
TQColorGroup mcg = lv->viewport()->tqcolorGroup();
TQColorGroup mcg = lv->viewport()->colorGroup();

TQListViewItem::paintCell( p, mcg, col, width, align );
}


+ 1
- 1
kate/part/kateview.cpp View File

@@ -793,7 +793,7 @@ void KateView::contextMenuEvent( TQContextMenuEvent *ev )
if ( !m_doc || !m_doc->browserExtension() )
return;
emit m_doc->browserExtension()->popupMenu( /*this, */ev->globalPos(), m_doc->url(),
TQString::tqfromLatin1( "text/plain" ) );
TQString::fromLatin1( "text/plain" ) );
ev->accept();
}



+ 1
- 1
kate/part/kateviewinternal.h View File

@@ -222,7 +222,7 @@ class KateViewInternal : public TQWidget
int scrollX;
int scrollY;

TQt::tqCursorShape m_mouseCursor;
TQt::CursorShape m_mouseCursor;

KateSuperCursor cursor;
KateTextCursor displayCursor;


+ 1
- 1
kate/part/test_regression.cpp View File

@@ -935,7 +935,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )

if ( failures & ResultFailure ) {
domDiff += "<pre>";
FILE *pipe = popen( TQString::tqfromLatin1( "diff -u baseline/%1-result %3/%2-result" )
FILE *pipe = popen( TQString::fromLatin1( "diff -u baseline/%1-result %3/%2-result" )
.arg ( test, test, relOutputDir ).latin1(), "r" );
TQTextIStream *is = new TQTextIStream( pipe );
for ( int line = 0; line < 100 && !is->eof(); ++line ) {


+ 4
- 4
kcert/kcertpart.cc View File

@@ -636,7 +636,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {

// Set the valid period
TQPalette cspl = _ca_validFrom->palette();
if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) {
if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -645,7 +645,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
_ca_validFrom->setText(c->getNotBefore());

cspl = _ca_validUntil->palette();
if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -677,7 +677,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {

// Set the valid period
TQPalette cspl = _p12_validFrom->palette();
if (TQDateTime::tqcurrentDateTime() < c->getQDTNotBefore()) {
if (TQDateTime::currentDateTime() < c->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -686,7 +686,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
_p12_validFrom->setText(c->getNotBefore());

cspl = _p12_validUntil->palette();
if (TQDateTime::tqcurrentDateTime() > c->getQDTNotAfter()) {
if (TQDateTime::currentDateTime() > c->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));


+ 1
- 1
kconf_update/kconf_update.cpp View File

@@ -201,7 +201,7 @@ KonfUpdate::log()
}
}
(*m_textStream) << TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ) << " ";
(*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " ";
return *m_textStream;
}


+ 2
- 2
kded/kbuildsycoca.cpp View File

@@ -160,12 +160,12 @@ void KBuildSycoca::processGnomeVfs()

if (line[0] != '\t')
{
app = TQString::tqfromLatin1(line);
app = TQString::fromLatin1(line);
app.truncate(app.length()-1);
}
else if (strncmp(line+1, "mime_types=", 11) == 0)
{
TQString mimetypes = TQString::tqfromLatin1(line+12);
TQString mimetypes = TQString::fromLatin1(line+12);
mimetypes.truncate(mimetypes.length()-1);
mimetypes.replace(TQRegExp("\\*"), "all");
KService *s = g_bsf->findServiceByName(app);


+ 8
- 8
kdewidgets/makekdewidgets.cpp View File

@@ -47,7 +47,7 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
" TQPixmap pix(m_widgets[key].iconSet);\n"
"#else\n"
" TQPixmap pix(locate( \"data\", \n"
" TQString::tqfromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
" TQString::fromLatin1(\"%PluginNameLower/pics/\") + m_widgets[key].iconSet));\n"
"#endif\n"
" return TQIconSet(pix);\n"
" }\n"
@@ -81,17 +81,17 @@ static const char classDef[] = "#ifndef EMBED_IMAGES\n"
"%PluginName::%PluginName()\n"
"{\n"
" WidgetInfo widget;\n";
static const char widgetDef[] = " widget.group = TQString::tqfromLatin1(\"%Group\");\n"
static const char widgetDef[] = " widget.group = TQString::fromLatin1(\"%Group\");\n"
"#ifdef EMBED_IMAGES\n"
" widget.iconSet = TQPixmap(%Pixmap);\n"
"#else\n"
" widget.iconSet = TQString::tqfromLatin1(\"%IconSet\");\n"
" widget.iconSet = TQString::fromLatin1(\"%IconSet\");\n"
"#endif\n"
" widget.includeFile = TQString::tqfromLatin1(\"%IncludeFile\");\n"
" widget.toolTip = TQString::tqfromLatin1(\"%ToolTip\");\n"
" widget.whatsThis = TQString::tqfromLatin1(\"%WhatsThis\");\n"
" widget.includeFile = TQString::fromLatin1(\"%IncludeFile\");\n"
" widget.toolTip = TQString::fromLatin1(\"%ToolTip\");\n"
" widget.whatsThis = TQString::fromLatin1(\"%WhatsThis\");\n"
" widget.isContainer = %IsContainer;\n"
" m_widgets.insert(TQString::tqfromLatin1(\"%Class\"), widget);\n";
" m_widgets.insert(TQString::fromLatin1(\"%Class\"), widget);\n";
static const char endCtor[] = " %Init\n"
"}\n"
"%PluginName::~%PluginName()\n"
@@ -100,7 +100,7 @@ static const char endCtor[] = " %Init\n"
"}\n"
"TQWidget *%PluginName::create(const TQString &key, TQWidget *parent, const char *name)\n"
"{\n";
static const char widgetCreate[] = " if (key == TQString::tqfromLatin1(\"%Class\"))\n"
static const char widgetCreate[] = " if (key == TQString::fromLatin1(\"%Class\"))\n"
" return new %ImplClass%ConstructorArgs;\n";
static const char endCreate[] = " return 0;\n"
"}\n"


+ 4
- 4
khtml/css/cssstyleselector.cpp View File

@@ -327,7 +327,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
if ( readbytes >= 0 )
file[readbytes] = '\0';

TQString style = TQString::tqfromLatin1( file.data() );
TQString style = TQString::fromLatin1( file.data() );
if(s)
style += s->settingsToCSS();
DOMString str(style);
@@ -352,7 +352,7 @@ void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *do
if ( readbytes >= 0 )
file[readbytes] = '\0';

TQString style = TQString::tqfromLatin1( file.data() );
TQString style = TQString::fromLatin1( file.data() );
DOMString str(style);

s_quirksSheet = new DOM::CSSStyleSheetImpl(doc);
@@ -1196,14 +1196,14 @@ bool CSSStyleSelector::checkSimpleSelector(DOM::CSSSelector *sel, DOM::ElementIm
//kdDebug( 6080 ) << "checking for beginswith match" << endl;
TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
return val_str.string().tqstartsWith(sel_str.string(), caseSensitive);
return val_str.string().startsWith(sel_str.string(), caseSensitive);
}
case CSSSelector::End:
{
//kdDebug( 6080 ) << "checking for endswith match" << endl;
TQConstString val_str(value->tqunicode(), value->length());
TQConstString sel_str(sel->value.tqunicode(), sel->value.length());
return val_str.string().tqendsWith(sel_str.string(), caseSensitive);
return val_str.string().endsWith(sel_str.string(), caseSensitive);
}
case CSSSelector::Hyphen:
{


+ 2
- 2
khtml/dom/dom_doc.cpp View File

@@ -112,8 +112,8 @@ HTMLDocument DOMImplementation::createHTMLDocument( const DOMString& title )

r->open();

r->write(TQString::tqfromLatin1("<HTML><HEAD><TITLE>") + title.string() +
TQString::tqfromLatin1("</TITLE></HEAD>"));
r->write(TQString::fromLatin1("<HTML><HEAD><TITLE>") + title.string() +
TQString::fromLatin1("</TITLE></HEAD>"));

return r;
}


+ 3
- 3
khtml/ecma/kjs_debugwin.cpp View File

@@ -690,7 +690,7 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)

void KJSDebugWin::disableOtherWindows()
{
TQWidgetList *widgets = TQApplication::tqallWidgets();
TQWidgetList *widgets = TQApplication::allWidgets();
TQWidgetListIt it(*widgets);
for (; it.current(); ++it)
it.current()->installEventFilter(this);
@@ -698,7 +698,7 @@ void KJSDebugWin::disableOtherWindows()

void KJSDebugWin::enableOtherWindows()
{
TQWidgetList *widgets = TQApplication::tqallWidgets();
TQWidgetList *widgets = TQApplication::allWidgets();
TQWidgetListIt it(*widgets);
for (; it.current(); ++it)
it.current()->removeEventFilter(this);
@@ -861,7 +861,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch

if (dontShowAgain) {
KConfig *config = kapp->config();
KConfigGroupSaver saver(config,TQString::tqfromLatin1("Java/JavaScript Settings"));
KConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
config->writeEntry("ReportJavaScriptErrors",TQVariant(false,0));
config->sync();
TQByteArray data;


+ 15
- 15
khtml/ecma/kjs_navigator.cpp View File

@@ -188,14 +188,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
return String("Mozilla");
case AppName:
// If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::tqfromLatin1("compatible")) == -1)
if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::fromLatin1("compatible")) == -1)
{
//kdDebug() << "appName -> Mozilla" << endl;
return String("Netscape");
}
if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
{
//kdDebug() << "appName -> IE" << endl;
return String("Microsoft Internet Explorer");
@@ -207,14 +207,14 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
return String(userAgent.mid(userAgent.find('/') + 1));
case Product:
// We are pretending to be Mozilla or Safari
if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::tqfromLatin1("compatible")) == -1)
if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::fromLatin1("compatible")) == -1)
{
return String("Gecko");
}
// When spoofing as IE, we use Undefined().
if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
{
return Undefined();
}
@@ -245,19 +245,19 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
return String(userAgent);
case Platform:
// yet another evil hack, but necessary to spoof some sites...
if ( (userAgent.find(TQString::tqfromLatin1("Win"),0,false)>=0) )
return String(TQString::tqfromLatin1("Win32"));
else if ( (userAgent.find(TQString::tqfromLatin1("Macintosh"),0,false)>=0) ||
(userAgent.find(TQString::tqfromLatin1("Mac_PowerPC"),0,false)>=0) )
return String(TQString::tqfromLatin1("MacPPC"));
if ( (userAgent.find(TQString::fromLatin1("Win"),0,false)>=0) )
return String(TQString::fromLatin1("Win32"));
else if ( (userAgent.find(TQString::fromLatin1("Macintosh"),0,false)>=0) ||
(userAgent.find(TQString::fromLatin1("Mac_PowerPC"),0,false)>=0) )
return String(TQString::fromLatin1("MacPPC"));
else
{
struct utsname name;
int ret = uname(&name);
if ( ret >= 0 )
return String(TQString(TQString::tqfromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
return String(TQString(TQString::fromLatin1("%1 %1 X11").arg(name.sysname).arg(name.machine)));
else // can't happen
return String(TQString(TQString::tqfromLatin1("Unix X11")));
return String(TQString(TQString::fromLatin1("Unix X11")));
}
case CpuClass:
{


+ 5
- 5
khtml/ecma/kjs_proxy.cpp View File

@@ -343,8 +343,8 @@ void KJSProxyImpl::applyUserAgent()
assert( m_script );
TQString host = m_frame->m_part->url().isLocalFile() ? "localhost" : m_frame->m_part->url().host();
TQString userAgent = KProtocolManager::userAgentForHost(host);
if (userAgent.find(TQString::tqfromLatin1("Microsoft")) >= 0 ||
userAgent.find(TQString::tqfromLatin1("MSIE")) >= 0)
if (userAgent.find(TQString::fromLatin1("Microsoft")) >= 0 ||
userAgent.find(TQString::fromLatin1("MSIE")) >= 0)
{
m_script->setCompatMode(Interpreter::IECompat);
#ifdef KJS_VERBOSE
@@ -353,9 +353,9 @@ void KJSProxyImpl::applyUserAgent()
}
else
// If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
if (userAgent.find(TQString::tqfromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::tqfromLatin1("compatible")) == -1 &&
userAgent.find(TQString::tqfromLatin1("KHTML")) == -1)
if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
userAgent.find(TQString::fromLatin1("KHTML")) == -1)
{
m_script->setCompatMode(Interpreter::NetscapeCompat);
#ifdef KJS_VERBOSE


+ 12
- 12
khtml/ecma/kjs_window.cpp View File

@@ -864,7 +864,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
if (!part->widget())
return Number(0);
KWin::WindowInfo inf = KWin::windowInfo(part->widget()->tqtopLevelWidget()->winId());
KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId());
return Number(entry->value == OuterHeight ?
inf.geometry().height() : inf.geometry().width());
#else
@@ -1446,7 +1446,7 @@ void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
// check if we're allowed to inject javascript
// SYNC check with khtml_part.cpp::slotRedirect!
if ( isSafeScript(exec) ||
dstUrl.find(TQString::tqfromLatin1("javascript:"), 0, false) != 0 )
dstUrl.find(TQString::fromLatin1("javascript:"), 0, false) != 0 )
part->scheduleRedirection(-1,
dstUrl,
lockHistory);
@@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
if (pos >= 0) {
key = s.left(pos).stripWhiteSpace().lower();
val = s.mid(pos + 1).stripWhiteSpace().lower();
TQRect screen = KGlobalSettings::desktopGeometry(widget->tqtopLevelWidget());
TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget());

if (key == "left" || key == "screenx") {
winargs.x = (int)val.toFloat() + screen.x();
@@ -1633,13 +1633,13 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
if (winargs.y < screen.y() || winargs.y > screen.bottom())
winargs.y = screen.y(); // only safe choice until size is determined
} else if (key == "height") {
winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
winargs.height = (int)val.toFloat() + 2*tqApp->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
if (winargs.height > screen.height()) // should actually check workspace
winargs.height = screen.height();
if (winargs.height < 100)
winargs.height = 100;
} else if (key == "width") {
winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
winargs.width = (int)val.toFloat() + 2*tqApp->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) + 2;
if (winargs.width > screen.width()) // should actually check workspace
winargs.width = screen.width();
if (winargs.width < 100)
@@ -1897,8 +1897,8 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
KHTMLSettings::KJSWindowFocusPolicy policy =
part->settings()->windowFocusPolicy(part->url().host());
if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) {
widget->tqtopLevelWidget()->raise();
KWin::deIconifyWindow( widget->tqtopLevelWidget()->winId() );
widget->topLevelWidget()->raise();
KWin::deIconifyWindow( widget->topLevelWidget()->winId() );
widget->setActiveWindow();
emit part->browserExtension()->requestFocus(part);
}
@@ -1950,7 +1950,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
{
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
TQWidget * tl = widget->tqtopLevelWidget();
TQWidget * tl = widget->topLevelWidget();
TQRect sg = KGlobalSettings::desktopGeometry(tl);

TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) );
@@ -1970,7 +1970,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
{
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
TQWidget * tl = widget->tqtopLevelWidget();
TQWidget * tl = widget->topLevelWidget();
TQRect sg = KGlobalSettings::desktopGeometry(tl);

TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() );
@@ -1989,7 +1989,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
if(policy == KHTMLSettings::KJSWindowResizeAllow
&& args.size() == 2 && widget)
{
TQWidget * tl = widget->tqtopLevelWidget();
TQWidget * tl = widget->topLevelWidget();
TQRect geom = tl->frameGeometry();
window->resizeTo( tl,
geom.width() + args[0].toInt32(exec),
@@ -2003,7 +2003,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
if(policy == KHTMLSettings::KJSWindowResizeAllow
&& args.size() == 2 && widget)
{
TQWidget * tl = widget->tqtopLevelWidget();
TQWidget * tl = widget->topLevelWidget();
window->resizeTo( tl, args[0].toInt32(exec), args[1].toInt32(exec) );
}
return Undefined();
@@ -2545,7 +2545,7 @@ Value Location::get(ExecState *exec, const Identifier &p) const
return String("");
return String( url.path().isEmpty() ? TQString("/") : url.path() );
case Port:
return String( url.port() ? TQString::number((int)url.port()) : TQString::tqfromLatin1("") );
return String( url.port() ? TQString::number((int)url.port()) : TQString::fromLatin1("") );
case Protocol:
return String( url.protocol()+":" );
case Search:


+ 1
- 1
khtml/ecma/xmlhttprequest.cpp View File

@@ -487,7 +487,7 @@ void XMLHttpRequest::setRequestHeader(const TQString& _name, const TQString &val
// Reject all banned headers. See BANNED_HTTP_HEADERS above.
// kdDebug() << "Banned HTTP Headers: " << BANNED_HTTP_HEADERS << endl;
TQStringList bannedHeaders = TQStringList::split(',',
TQString::tqfromLatin1(BANNED_HTTP_HEADERS));
TQString::fromLatin1(BANNED_HTTP_HEADERS));

if (bannedHeaders.contains(name))
return; // Denied


+ 4
- 4
khtml/html/html_documentimpl.cpp View File

@@ -110,8 +110,8 @@ DOMString HTMLDocumentImpl::cookie() const
long windowId = 0;
KHTMLView *v = view ();

if ( v && v->tqtopLevelWidget() )
windowId = v->tqtopLevelWidget()->winId();
if ( v && v->topLevelWidget() )
windowId = v->topLevelWidget()->winId();

TQCString replyType;
TQByteArray params, reply;
@@ -142,8 +142,8 @@ void HTMLDocumentImpl::setCookie( const DOMString & value )
long windowId = 0;
KHTMLView *v = view ();

if ( v && v->tqtopLevelWidget() )
windowId = v->tqtopLevelWidget()->winId();
if ( v && v->topLevelWidget() )
windowId = v->topLevelWidget()->winId();

TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);


+ 6
- 6
khtml/html/html_formimpl.cpp View File

@@ -1322,10 +1322,10 @@ TQString HTMLInputElementImpl::state( )
{
switch (m_type) {
case PASSWORD:
return TQString::tqfromLatin1("."); // empty string, avoid restoring
return TQString::fromLatin1("."); // empty string, avoid restoring
case CHECKBOX:
case RADIO:
return TQString::tqfromLatin1(checked() ? "on" : "off");
return TQString::fromLatin1(checked() ? "on" : "off");
case TEXT:
if (autoComplete() && value() != getAttribute(ATTR_VALUE) && getDocument()->view())
getDocument()->view()->addFormCompletionItem(name().string(), value().string());
@@ -1340,7 +1340,7 @@ void HTMLInputElementImpl::restoreState(const TQString &state)
switch (m_type) {
case CHECKBOX:
case RADIO:
setChecked((state == TQString::tqfromLatin1("on")));
setChecked((state == TQString::fromLatin1("on")));
break;
case FILE:
m_value = DOMString(state.left(state.length()-1));
@@ -1566,12 +1566,12 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
if(m_clicked)
{
m_clicked = false;
TQString astr(nme.isEmpty() ? TQString::tqfromLatin1("x") : nme + ".x");
TQString astr(nme.isEmpty() ? TQString::fromLatin1("x") : nme + ".x");

encoding += fixUpfromUnicode(codec, astr);
astr.setNum(KMAX( clickX(), 0 ));
encoding += fixUpfromUnicode(codec, astr);
astr = nme.isEmpty() ? TQString::tqfromLatin1("y") : nme + ".y";
astr = nme.isEmpty() ? TQString::fromLatin1("y") : nme + ".y";
encoding += fixUpfromUnicode(codec, astr);
astr.setNum(KMAX( clickY(), 0 ) );
encoding += fixUpfromUnicode(codec, astr);
@@ -1618,7 +1618,7 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
KIO::UDSEntry filestat;

// can't submit file in www-url-form encoded
TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->tqtopLevelWidget();
TQWidget* const toplevel = static_cast<RenderSubmitButton*>(m_render)->widget()->topLevelWidget();
if (multipart) {
TQCString filearray( "" );
if ( KIO::NetAccess::stat(fileurl, filestat, toplevel)) {


+ 2
- 2
khtml/html/htmltokenizer.cpp View File

@@ -919,7 +919,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
a = khtml::getAttrID(cBuffer, cBufferPos-1);
}
if (!a)
attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data());
attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
}

dest = buffer;
@@ -941,7 +941,7 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
}
if ( cBufferPos == CBUFLEN ) {
cBuffer[cBufferPos] = '\0';
attrName = TQString::tqfromLatin1(TQCString(cBuffer, cBufferPos+1).data());
attrName = TQString::fromLatin1(TQCString(cBuffer, cBufferPos+1).data());
dest = buffer;
*dest++ = 0;
tag = SearchEqual;


+ 8
- 8
khtml/java/kjavaappletcontext.cpp View File

@@ -138,7 +138,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
kdDebug(6100) << "KJavaAppletContext::received, cmd = >>" << cmd << "<<" << endl;
kdDebug(6100) << "arg count = " << arg.count() << endl;

if ( cmd == TQString::tqfromLatin1("showstatus")
if ( cmd == TQString::fromLatin1("showstatus")
&& !arg.empty() )
{
TQString tmp = arg.first();
@@ -146,19 +146,19 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
kdDebug(6100) << "status message = " << tmp << endl;
emit showStatus( tmp );
}
else if ( cmd == TQString::tqfromLatin1( "showurlinframe" )
else if ( cmd == TQString::fromLatin1( "showurlinframe" )
&& arg.count() > 1 )
{
kdDebug(6100) << "url = " << arg[0] << ", frame = " << arg[1] << endl;
emit showDocument( arg[0], arg[1] );
}
else if ( cmd == TQString::tqfromLatin1( "showdocument" )
else if ( cmd == TQString::fromLatin1( "showdocument" )
&& !arg.empty() )
{
kdDebug(6100) << "url = " << arg.first() << endl;
emit showDocument( arg.first(), "_top" );
}
else if ( cmd == TQString::tqfromLatin1( "resizeapplet" )
else if ( cmd == TQString::fromLatin1( "resizeapplet" )
&& arg.count() > 2 )
{
//arg[1] should be appletID
@@ -180,10 +180,10 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
tmp->resizeAppletWidget( width, height );
}
}
else if (cmd.startsWith(TQString::tqfromLatin1("audioclip_"))) {
else if (cmd.startsWith(TQString::fromLatin1("audioclip_"))) {
kdDebug(DEBUGAREA) << "process Audio command (not yet implemented): " << cmd << " " << arg[0] << endl;
}
else if ( cmd == TQString::tqfromLatin1( "JS_Event" )
else if ( cmd == TQString::fromLatin1( "JS_Event" )
&& arg.count() > 2 )
{
bool ok;
@@ -198,7 +198,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
else
kdError(DEBUGAREA) << "parse JS event " << arg[0] << " " << arg[1] << endl;
}
else if ( cmd == TQString::tqfromLatin1( "AppletStateNotification" ) )
else if ( cmd == TQString::fromLatin1( "AppletStateNotification" ) )
{
bool ok;
const int appletID = arg.first().toInt(&ok);
@@ -222,7 +222,7 @@ void KJavaAppletContext::received( const TQString& cmd, const TQStringList& arg
} else
kdError(DEBUGAREA) << "AppletStateNotification: Applet ID is not numerical" << endl;
}
else if ( cmd == TQString::tqfromLatin1( "AppletFailed" ) ) {
else if ( cmd == TQString::fromLatin1( "AppletFailed" ) ) {
bool ok;
const int appletID = arg.first().toInt(&ok);
if (ok)


+ 10
- 10
khtml/java/kjavaappletserver.cpp View File

@@ -531,19 +531,19 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
switch( cmd_code )
{
case KJAS_SHOW_DOCUMENT:
cmd = TQString::tqfromLatin1( "showdocument" );
cmd = TQString::fromLatin1( "showdocument" );
break;

case KJAS_SHOW_URLINFRAME:
cmd = TQString::tqfromLatin1( "showurlinframe" );
cmd = TQString::fromLatin1( "showurlinframe" );
break;

case KJAS_SHOW_STATUS:
cmd = TQString::tqfromLatin1( "showstatus" );
cmd = TQString::fromLatin1( "showstatus" );
break;

case KJAS_RESIZE_APPLET:
cmd = TQString::tqfromLatin1( "resizeapplet" );
cmd = TQString::fromLatin1( "resizeapplet" );
break;

case KJAS_GET_URLDATA:
@@ -573,7 +573,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
kdError(6100) << "KIO Data command error " << ok << " args:" << args.size() << endl;
return;
case KJAS_JAVASCRIPT_EVENT:
cmd = TQString::tqfromLatin1( "JS_Event" );
cmd = TQString::fromLatin1( "JS_Event" );
kdDebug(6100) << "Javascript request: "<< contextID
<< " code: " << args[0] << endl;
break;
@@ -593,24 +593,24 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
return;
}
case KJAS_AUDIOCLIP_PLAY:
cmd = TQString::tqfromLatin1( "audioclip_play" );
cmd = TQString::fromLatin1( "audioclip_play" );
kdDebug(6100) << "Audio Play: url=" << args[0] << endl;
break;
case KJAS_AUDIOCLIP_LOOP:
cmd = TQString::tqfromLatin1( "audioclip_loop" );
cmd = TQString::fromLatin1( "audioclip_loop" );
kdDebug(6100) << "Audio Loop: url=" << args[0] << endl;
break;
case KJAS_AUDIOCLIP_STOP:
cmd = TQString::tqfromLatin1( "audioclip_stop" );
cmd = TQString::fromLatin1( "audioclip_stop" );
kdDebug(6100) << "Audio Stop: url=" << args[0] << endl;
break;
case KJAS_APPLET_STATE:
kdDebug(6100) << "Applet State Notification for Applet " << args[0] << ". New state=" << args[1] << endl;
cmd = TQString::tqfromLatin1( "AppletStateNotification" );
cmd = TQString::fromLatin1( "AppletStateNotification" );
break;
case KJAS_APPLET_FAILED:
kdDebug(6100) << "Applet " << args[0] << " Failed: " << args[1] << endl;
cmd = TQString::tqfromLatin1( "AppletFailed" );
cmd = TQString::fromLatin1( "AppletFailed" );
break;
case KJAS_SECURITY_CONFIRM: {
if (KSSL::doesSSLWork() && !d->kssl)


+ 13
- 13
khtml/java/kjavaappletviewer.cpp View File

@@ -245,27 +245,27 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
baseurl = KURL (KURL (value), TQString (".")).url ();
} else if (name == "__KHTML__CODEBASE")
khtml_codebase = value;
else if (name_lower == TQString::tqfromLatin1("codebase") ||
name_lower == TQString::tqfromLatin1("java_codebase")) {
else if (name_lower == TQString::fromLatin1("codebase") ||
name_lower == TQString::fromLatin1("java_codebase")) {
if (!value.isEmpty ())
codebase = value;
} else if (name == "__KHTML__CLASSID")
//else if (name.lower()==TQString::tqfromLatin1("classid"))
//else if (name.lower()==TQString::fromLatin1("classid"))
classid = value;
else if (name_lower == TQString::tqfromLatin1("code") ||
name_lower == TQString::tqfromLatin1("java_code"))
else if (name_lower == TQString::fromLatin1("code") ||
name_lower == TQString::fromLatin1("java_code"))
classname = value;
else if (name_lower == TQString::tqfromLatin1("src"))
else if (name_lower == TQString::fromLatin1("src"))
src_param = value;
else if (name_lower == TQString::tqfromLatin1("archive") ||
name_lower == TQString::tqfromLatin1("java_archive") ||
else if (name_lower == TQString::fromLatin1("archive") ||
name_lower == TQString::fromLatin1("java_archive") ||
name_lower.startsWith ("cache_archive"))
applet->setArchives (value);
else if (name_lower == TQString::tqfromLatin1("name"))
else if (name_lower == TQString::fromLatin1("name"))
applet->setAppletName (value);
else if (name_lower == TQString::tqfromLatin1("width"))
else if (name_lower == TQString::fromLatin1("width"))
width = value.toInt();
else if (name_lower == TQString::tqfromLatin1("height"))
else if (name_lower == TQString::fromLatin1("height"))
height = value.toInt();
if (!name.startsWith ("__KHTML__")) {
applet->setParameter (name, value);
@@ -327,7 +327,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
info.verifyPath = true;

TQDataStream stream(params, IO_WriteOnly);
stream << info << m_view->tqtopLevelWidget()->winId();
stream << info << m_view->topLevelWidget()->winId();

if (!kapp->dcopClient ()->call( "kded", "kpasswdserver", "checkAuthInfo(KIO::AuthInfo, long int)", params, replyType, reply ) ) {
kdWarning() << "Can't communicate with kded_kpasswdserver!" << endl;
@@ -342,7 +342,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,

/* install event filter for close events */
if (wparent)
wparent->tqtopLevelWidget ()->installEventFilter (this);
wparent->topLevelWidget ()->installEventFilter (this);

setInstance (KJavaAppletViewerFactory::instance ());
KParts::Part::setWidget (m_view);


+ 2
- 2
khtml/khtml_ext.cpp View File

@@ -315,7 +315,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
if ( !m_extensionProxy )
return;

int slot = m_extensionProxy->tqmetaObject()->findSlot( method );
int slot = m_extensionProxy->metaObject()->findSlot( method );
if ( slot == -1 )
return;

@@ -809,7 +809,7 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
const TQString &filter, long cacheId,
const TQString & suggestedFilename )
{
TQString name = TQString::tqfromLatin1( "index.html" );
TQString name = TQString::fromLatin1( "index.html" );
if ( !suggestedFilename.isEmpty() )
name = suggestedFilename;
else if ( !url.fileName().isEmpty() )


+ 65
- 65
khtml/khtml_part.cpp View File

@@ -717,7 +717,7 @@ bool KHTMLPart::openURL( const KURL &url )
}

if (widget())
d->m_job->setWindow(widget()->tqtopLevelWidget());
d->m_job->setWindow(widget()->topLevelWidget());
d->m_job->addMetaData(args.metaData());

connect( d->m_job, TQT_SIGNAL( result( KIO::Job* ) ),
@@ -1722,14 +1722,14 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
d->m_bJScriptForce = false;
d->m_bJScriptOverride = true;
begin();
TQString errText = TQString::tqfromLatin1( "<HTML dir=%1><HEAD><TITLE>" )
TQString errText = TQString::fromLatin1( "<HTML dir=%1><HEAD><TITLE>" )
.arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
errText += i18n( "Error while loading %1" ).arg( reqUrl.htmlURL() );
errText += TQString::tqfromLatin1( "</TITLE></HEAD><BODY><P>" );
errText += TQString::fromLatin1( "</TITLE></HEAD><BODY><P>" );
errText += i18n( "An error occurred while loading <B>%1</B>:" ).arg( reqUrl.htmlURL() );
errText += TQString::tqfromLatin1( "</P>" );
errText += TQString::fromLatin1( "</P>" );
errText += TQStyleSheet::convertFromPlainText( KIO::buildErrorString( errorCode, text ) );
errText += TQString::tqfromLatin1( "</BODY></HTML>" );
errText += TQString::fromLatin1( "</BODY></HTML>" );
write(errText);
end();

@@ -1757,56 +1757,56 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
TQString url, protocol, datetime;
url = reqUrl.prettyURL();
protocol = reqUrl.protocol();
datetime = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(),
datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
false );

TQString doc = TQString::tqfromLatin1( "<html><head><title>" );
TQString doc = TQString::fromLatin1( "<html><head><title>" );
doc += i18n( "Error: " );
doc += errorName;
doc += TQString::tqfromLatin1( " - %1</title></head><body><h1>" ).arg( url );
doc += TQString::fromLatin1( " - %1</title></head><body><h1>" ).arg( url );
doc += i18n( "The requested operation could not be completed" );
doc += TQString::tqfromLatin1( "</h1><h2>" );
doc += TQString::fromLatin1( "</h1><h2>" );
doc += errorName;
doc += TQString::tqfromLatin1( "</h2>" );
doc += TQString::fromLatin1( "</h2>" );
if ( !techName.isNull() ) {
doc += TQString::tqfromLatin1( "<h2>" );
doc += TQString::fromLatin1( "<h2>" );
doc += i18n( "Technical Reason: " );
doc += techName;
doc += TQString::tqfromLatin1( "</h2>" );
doc += TQString::fromLatin1( "</h2>" );
}
doc += TQString::tqfromLatin1( "<h3>" );
doc += TQString::fromLatin1( "<h3>" );
doc += i18n( "Details of the Request:" );
doc += TQString::tqfromLatin1( "</h3><ul><li>" );
doc += TQString::fromLatin1( "</h3><ul><li>" );
doc += i18n( "URL: %1" ).arg( url );
doc += TQString::tqfromLatin1( "</li><li>" );
doc += TQString::fromLatin1( "</li><li>" );
if ( !protocol.isNull() ) {
// uncomment for 3.1... i18n change
// doc += i18n( "Protocol: %1" ).arg( protocol ).arg( protocol );
doc += TQString::tqfromLatin1( "</li><li>" );
doc += TQString::fromLatin1( "</li><li>" );
}
doc += i18n( "Date and Time: %1" ).arg( datetime );
doc += TQString::tqfromLatin1( "</li><li>" );
doc += TQString::fromLatin1( "</li><li>" );
doc += i18n( "Additional Information: %1" ).arg( text );
doc += TQString::tqfromLatin1( "</li></ul><h3>" );
doc += TQString::fromLatin1( "</li></ul><h3>" );
doc += i18n( "Description:" );
doc += TQString::tqfromLatin1( "</h3><p>" );
doc += TQString::fromLatin1( "</h3><p>" );
doc += description;
doc += TQString::tqfromLatin1( "</p>" );
doc += TQString::fromLatin1( "</p>" );
if ( causes.count() ) {
doc += TQString::tqfromLatin1( "<h3>" );
doc += TQString::fromLatin1( "<h3>" );
doc += i18n( "Possible Causes:" );
doc += TQString::tqfromLatin1( "</h3><ul><li>" );
doc += TQString::fromLatin1( "</h3><ul><li>" );
doc += causes.join( "</li><li>" );
doc += TQString::tqfromLatin1( "</li></ul>" );
doc += TQString::fromLatin1( "</li></ul>" );
}
if ( solutions.count() ) {
doc += TQString::tqfromLatin1( "<h3>" );
doc += TQString::fromLatin1( "<h3>" );
doc += i18n( "Possible Solutions:" );
doc += TQString::tqfromLatin1( "</h3><ul><li>" );
doc += TQString::fromLatin1( "</h3><ul><li>" );
doc += solutions.join( "</li><li>" );
doc += TQString::tqfromLatin1( "</li></ul>" );
doc += TQString::fromLatin1( "</li></ul>" );
}
doc += TQString::tqfromLatin1( "</body></html>" );
doc += TQString::fromLatin1( "</body></html>" );

write( doc );
end();
@@ -2402,7 +2402,7 @@ void KHTMLPart::slotRedirect()
d->m_redirectURL = TQString();

// SYNC check with ecma/kjs_window.cpp::goURL !
if ( u.find( TQString::tqfromLatin1( "javascript:" ), 0, false ) == 0 )
if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 )
{
TQString script = KURL::decode_string( u.right( u.length() - 11 ) );
kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl;
@@ -3731,7 +3731,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
return;
}

if (url.find( TQString::tqfromLatin1( "javascript:" ),0, false ) == 0 ) {
if (url.find( TQString::fromLatin1( "javascript:" ),0, false ) == 0 ) {
TQString jscode = KURL::decode_string( url.mid( url.find( "javascript:", 0, false ) ) );
jscode = KStringHandler::rsqueeze( jscode, 80 ); // truncate if too long
if (url.startsWith("javascript:window.open"))
@@ -3838,18 +3838,18 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
extra = i18n(" (In other frame)");
}

if (u.protocol() == TQString::tqfromLatin1("mailto")) {
TQString mailtoMsg /* = TQString::tqfromLatin1("<img src=%1>").arg(locate("icon", TQString::tqfromLatin1("locolor/16x16/actions/mail_send.png")))*/;
if (u.protocol() == TQString::fromLatin1("mailto")) {
TQString mailtoMsg /* = TQString::fromLatin1("<img src=%1>").arg(locate("icon", TQString::fromLatin1("locolor/16x16/actions/mail_send.png")))*/;
mailtoMsg += i18n("Email to: ") + KURL::decode_string(u.path());
TQStringList queries = TQStringList::split('&', u.query().mid(1));
TQStringList::Iterator it = queries.begin();
const TQStringList::Iterator itEnd = queries.end();
for (; it != itEnd; ++it)
if ((*it).startsWith(TQString::tqfromLatin1("subject=")))
if ((*it).startsWith(TQString::fromLatin1("subject=")))
mailtoMsg += i18n(" - Subject: ") + KURL::decode_string((*it).mid(8));
else if ((*it).startsWith(TQString::tqfromLatin1("cc=")))
else if ((*it).startsWith(TQString::fromLatin1("cc=")))
mailtoMsg += i18n(" - CC: ") + KURL::decode_string((*it).mid(3));
else if ((*it).startsWith(TQString::tqfromLatin1("bcc=")))
else if ((*it).startsWith(TQString::fromLatin1("bcc=")))
mailtoMsg += i18n(" - BCC: ") + KURL::decode_string((*it).mid(4));
mailtoMsg = TQStyleSheet::escape(mailtoMsg);
mailtoMsg.replace(TQRegExp("([\n\r\t]|[ ]{10})"), TQString());
@@ -3858,9 +3858,9 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
}