Browse Source

Finished remaining porting to new TQt API

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
bab4089069
100 changed files with 598 additions and 594 deletions
  1. +2
    -2
      interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
  2. +1
    -0
      interfaces/ktexteditor/document.h
  3. +1
    -0
      interfaces/ktexteditor/editor.h
  4. +2
    -2
      interfaces/ktexteditor/editorchooser.cpp
  5. +3
    -3
      interfaces/ktexteditor/editorchooser_ui.ui
  6. +3
    -3
      interfaces/ktexteditor/templateinterface.cpp
  7. +1
    -1
      kabc/addresseedialog.cpp
  8. +3
    -3
      kabc/addresseehelper.cpp
  9. +3
    -3
      kabc/addresslineedit.cpp
  10. +2
    -2
      kabc/distributionlistdialog.cpp
  11. +2
    -2
      kabc/distributionlisteditor.cpp
  12. +3
    -3
      kabc/formats/binaryformat.cpp
  13. +3
    -3
      kabc/kab2kabc.cpp
  14. +1
    -1
      kabc/ldapclient.cpp
  15. +2
    -2
      kabc/ldapconfigwidget.cpp
  16. +3
    -2
      kabc/ldapconfigwidget.h
  17. +1
    -1
      kabc/ldapurl.cpp
  18. +2
    -2
      kabc/ldif.cpp
  19. +7
    -7
      kabc/ldifconverter.cpp
  20. +1
    -1
      kabc/plugins/dir/resourcedirconfig.cpp
  21. +1
    -1
      kabc/plugins/file/resourcefileconfig.cpp
  22. +24
    -24
      kabc/plugins/ldapkio/resourceldapkio.cpp
  23. +1
    -1
      kabc/plugins/ldapkio/resourceldapkioconfig.cpp
  24. +1
    -1
      kabc/plugins/net/resourcenetconfig.cpp
  25. +2
    -2
      kabc/resourceselectdialog.cpp
  26. +9
    -9
      kabc/scripts/addressee.src.cpp
  27. +40
    -40
      kabc/scripts/entrylist
  28. +2
    -2
      kabc/scripts/field.src.cpp
  29. +5
    -5
      kabc/scripts/makeaddressee
  30. +2
    -2
      kabc/vcard/ContentLine.cpp
  31. +6
    -6
      kabc/vcard/DateValue.cpp
  32. +1
    -1
      kabc/vcard/Entity.cpp
  33. +2
    -2
      kabc/vcard/Enum.cpp
  34. +2
    -2
      kabc/vcard/LangValue.cpp
  35. +1
    -1
      kabc/vcard/OrgValue.cpp
  36. +2
    -2
      kabc/vcard/Param.cpp
  37. +1
    -1
      kabc/vcard/TextListValue.cpp
  38. +2
    -2
      kabc/vcard/URIValue.cpp
  39. +2
    -2
      kabc/vcard/include/VCardAdrParam.h
  40. +4
    -4
      kabc/vcard/include/VCardContentLine.h
  41. +2
    -2
      kabc/vcard/include/VCardEmailParam.h
  42. +1
    -1
      kabc/vcard/include/VCardVCard.h
  43. +52
    -52
      kabc/vcard21parser.cpp
  44. +7
    -7
      kabc/vcardformatimpl.cpp
  45. +1
    -1
      kabc/vcardparser/vcardline.cpp
  46. +4
    -4
      kabc/vcardparser/vcardparser.cpp
  47. +21
    -21
      kabc/vcardtool.cpp
  48. +2
    -2
      kate/part/katearbitraryhighlight.cpp
  49. +7
    -7
      kate/part/kateautoindent.cpp
  50. +1
    -1
      kate/part/katebuffer.cpp
  51. +4
    -4
      kate/part/katecmds.cpp
  52. +9
    -9
      kate/part/katecodecompletion.cpp
  53. +1
    -1
      kate/part/katecodecompletion.h
  54. +3
    -3
      kate/part/katecodefoldinghelpers.cpp
  55. +1
    -1
      kate/part/katecodefoldinghelpers.h
  56. +4
    -4
      kate/part/katedialogs.cpp
  57. +16
    -16
      kate/part/katedocument.cpp
  58. +7
    -7
      kate/part/katefiletype.cpp
  59. +23
    -23
      kate/part/katehighlight.cpp
  60. +1
    -1
      kate/part/katejscript.cpp
  61. +3
    -3
      kate/part/kateprinter.cpp
  62. +2
    -2
      kate/part/katerenderer.cpp
  63. +9
    -9
      kate/part/kateschema.cpp
  64. +4
    -4
      kate/part/katesearch.cpp
  65. +1
    -1
      kate/part/katespell.cpp
  66. +4
    -4
      kate/part/katesupercursor.cpp
  67. +3
    -3
      kate/part/katetextline.cpp
  68. +98
    -98
      kate/part/kateview.cpp
  69. +8
    -8
      kate/part/kateviewhelpers.cpp
  70. +30
    -30
      kate/part/kateviewinternal.cpp
  71. +2
    -1
      kate/part/kateviewinternal.h
  72. +1
    -1
      kate/plugins/isearch/ISearchPlugin.cpp
  73. +1
    -1
      kate/plugins/kdatatool/kate_kdatatool.cpp
  74. +3
    -3
      kcert/kcertpart.cc
  75. +2
    -2
      kcmshell/main.cpp
  76. +10
    -10
      kdeprint/cups/cupsaddsmb2.cpp
  77. +6
    -6
      kdeprint/cups/cupsaddsmb2.h
  78. +3
    -3
      kdeprint/cups/cupsdconf2/addressdialog.cpp
  79. +2
    -2
      kdeprint/cups/cupsdconf2/addressdialog.h
  80. +6
    -6
      kdeprint/cups/cupsdconf2/browsedialog.cpp
  81. +2
    -2
      kdeprint/cups/cupsdconf2/browsedialog.h
  82. +7
    -7
      kdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
  83. +3
    -3
      kdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
  84. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdcomment.cpp
  85. +16
    -16
      kdeprint/cups/cupsdconf2/cupsdconf.cpp
  86. +8
    -8
      kdeprint/cups/cupsdconf2/cupsdconf.h
  87. +19
    -19
      kdeprint/cups/cupsdconf2/cupsddialog.cpp
  88. +1
    -1
      kdeprint/cups/cupsdconf2/cupsddirpage.cpp
  89. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
  90. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdfilterpage.h
  91. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdjobspage.cpp
  92. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdjobspage.h
  93. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdlogpage.cpp
  94. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdlogpage.h
  95. +3
    -3
      kdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
  96. +2
    -2
      kdeprint/cups/cupsdconf2/cupsdnetworkpage.h
  97. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
  98. +1
    -1
      kdeprint/cups/cupsdconf2/cupsdsecuritypage.h
  99. +4
    -4
      kdeprint/cups/cupsdconf2/cupsdserverpage.cpp
  100. +3
    -3
      kdeprint/cups/cupsdconf2/cupsdserverpage.h

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

@@ -25,7 +25,7 @@ protected:
{
Q_UNUSED(className);
Q_UNUSED(args);
return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name );
return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ));
}
};

@@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate
public:
KFileAudioPreviewPrivate( TQWidget *parent )
{
player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString::null, parent );
player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) );
}

~KFileAudioPreviewPrivate()


+ 1
- 0
interfaces/ktexteditor/document.h View File

@@ -33,6 +33,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor
friend class PrivateDocument;

Q_OBJECT
TQ_OBJECT

public:
Document ( TQObject *parent = 0, const char *name = 0 );


+ 1
- 0
interfaces/ktexteditor/editor.h View File

@@ -41,6 +41,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
friend class PrivateEditor;

Q_OBJECT
TQ_OBJECT

public:
/**


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

@@ -57,7 +57,7 @@ EditorChooser::EditorChooser(TQWidget *parent,const char *name) :
{
if ((*it)->desktopEntryName().contains(editor))
{
d->chooser->editorCombo->insertItem(i18n("System Default (%1)").arg((*it)->name()));
d->chooser->editorCombo->insertItem(TQString(i18n("System Default (%1)").arg((*it)->name())));
break;
}
}
@@ -82,7 +82,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){
if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0);
else
{
int idx=d->elements.findIndex(editor);
int idx=d->elements.tqfindIndex(editor);
idx=idx+1;
d->chooser->editorCombo->setCurrentItem(idx);
}


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

@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EditorChooser_UI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>EditorChooser</cstring>
</property>
@@ -27,7 +27,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -44,7 +44,7 @@
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<property name="name">
<cstring>editorCombo</cstring>
</property>


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

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

TQMap<TQString,TQString>::Iterator it;
for ( it = map.begin(); it != map.end(); ++it )
@@ -173,7 +173,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQStr
}
}
TQString placeholder = rx.cap( 1 );
if ( ! enhancedInitValues.contains( placeholder ) )
if ( ! enhancedInitValues.tqcontains( placeholder ) )
enhancedInitValues[ placeholder ] = "";

pos += rx.matchedLength();


+ 1
- 1
kabc/addresseedialog.cpp View File

@@ -92,7 +92,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
topLayout->addLayout( selectedLayout );
topLayout->setSpacing( spacingHint() );

TQGroupBox *selectedGroup = new TQGroupBox( 1, Horizontal, i18n("Selected"),
TQGroupBox *selectedGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Selected"),
topWidget );
selectedLayout->addWidget( selectedGroup );



+ 3
- 3
kabc/addresseehelper.cpp View File

@@ -92,17 +92,17 @@ void AddresseeHelper::initSettings()

bool AddresseeHelper::containsTitle( const TQString& title ) const
{
return mTitles.tqfind( title ) != mTitles.end();
return mTitles.find( title ) != mTitles.end();
}

bool AddresseeHelper::containsPrefix( const TQString& prefix ) const
{
return mPrefixes.tqfind( prefix ) != mPrefixes.end();
return mPrefixes.find( prefix ) != mPrefixes.end();
}

bool AddresseeHelper::containsSuffix( const TQString& suffix ) const
{
return mSuffixes.tqfind( suffix ) != mSuffixes.end();
return mSuffixes.find( suffix ) != mSuffixes.end();
}

bool AddresseeHelper::tradeAsFamilyName() const


+ 3
- 3
kabc/addresslineedit.cpp View File

@@ -190,7 +190,7 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)

void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e )
{
if (m_useCompletion && (e->button() == MidButton))
if (m_useCompletion && (e->button() == Qt::MidButton))
{
m_smartPaste = true;
KLineEdit::mouseReleaseEvent(e);
@@ -293,7 +293,7 @@ void AddressLineEdit::doCompletion(bool ctrlT)
TQString prevAddr;
TQString s(text());
int n = s.findRev(',');
int n = s.tqfindRev(',');
if (n >= 0)
{
@@ -465,7 +465,7 @@ void AddressLineEdit::startLoadingLDAPEntries()
TQString s( *s_LDAPText );
// TODO cache last?
TQString prevAddr;
int n = s.findRev(',');
int n = s.tqfindRev(',');
if (n>= 0)
{
prevAddr = s.left(n+1) + ' ';


+ 2
- 2
kabc/distributionlistdialog.cpp View File

@@ -66,7 +66,7 @@ EmailSelector::EmailSelector( const TQStringList &emails, const TQString &curren
TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );

mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"),
mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
topFrame );
topLayout->addWidget( mButtonGroup );

@@ -100,7 +100,7 @@ TQString EmailSelector::getEmail( const TQStringList &emails, const TQString &cu
return result;
}

class EntryItem : public QListViewItem
class EntryItem : public TQListViewItem
{
public:
EntryItem( TQListView *parent, const Addressee &addressee,


+ 2
- 2
kabc/distributionlisteditor.cpp View File

@@ -46,7 +46,7 @@ EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString
TQFrame *topFrame = plainPage();
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );

mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Email Addresses"),
mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
topFrame );
mButtonGroup->setRadioButtonExclusive( true );
topLayout->addWidget( mButtonGroup );
@@ -80,7 +80,7 @@ TQString EmailSelectDialog::getEmail( const TQStringList &emails, const TQString
return result;
}

class EditEntryItem : public QListViewItem
class EditEntryItem : public TQListViewItem
{
public:
EditEntryItem( TQListView *parent, const Addressee &addressee,


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

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

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

@@ -140,12 +140,12 @@ bool BinaryFormat::checkHeader( TQDataStream &stream ) const
}

if ( magic != 0x2e93e ) {
kdError() << i18n("File '%1' is not binary format.").arg( file->name() ) << endl;
kdError() << TQString(i18n("File '%1' is not binary format.").arg( file->name() )) << endl;
return false;
}

if ( version != BINARY_FORMAT_VERSION ) {
kdError() << i18n("File '%1' is the wrong version.").arg( file->name() ) << endl;
kdError() << TQString(i18n("File '%1' is the wrong version.").arg( file->name() )) << endl;
return false;
}



+ 3
- 3
kabc/kab2kabc.cpp View File

@@ -58,7 +58,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
TQString comment;

if ( entry.at( entry.length() -1 ) == ')' ) {
int br = entry.findRev( '(' );
int br = entry.tqfindRev( '(' );
if ( br >= 0 ) {
comment = entry.mid( br + 1, entry.length() - br - 2 );
entry.truncate( br );
@@ -68,7 +68,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
}
}

int posSpace = entry.findRev( ' ' );
int posSpace = entry.tqfindRev( ' ' );
if ( posSpace < 0 ) {
email = entry;
if ( !comment.isEmpty() ) {
@@ -91,7 +91,7 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab )
}

if ( name.at( name.length() -1 ) == ')' ) {
int br = name.findRev( '(' );
int br = name.tqfindRev( '(' );
if ( br >= 0 ) {
comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment;
name.truncate( br );


+ 1
- 1
kabc/ldapclient.cpp View File

@@ -408,7 +408,7 @@ void LdapSearch::makeSearchData( TQStringList& ret, LdapResultList& resList )
}

LdapResult sr;
sr.clientNumber = mClients.findIndex( (*it1).client );
sr.clientNumber = mClients.tqfindIndex( (*it1).client );
sr.name = name;
sr.email = mail;
resList.append( sr );


+ 2
- 2
kabc/ldapconfigwidget.cpp View File

@@ -607,8 +607,8 @@ void LdapConfigWidget::setFlags( int flags )

// First delete all the child widgets.
// FIXME: I hope it's correct
const TQObjectList *ch = children();
TQObjectList ch2 = *ch;
const TQObjectList ch = childrenListObject();
TQObjectList ch2 = ch;
TQObject *obj;
TQWidget *widget;



+ 3
- 2
kabc/ldapconfigwidget.h View File

@@ -50,7 +50,8 @@ namespace KABC {
class KABC_EXPORT LdapConfigWidget : public TQWidget
{
Q_OBJECT
Q_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
TQ_OBJECT
TQ_PROPERTY( LCW_Flags flags READ flags WRITE setFlags )
Q_PROPERTY( TQString user READ user WRITE setUser )
Q_PROPERTY( TQString password READ password WRITE setPassword )
Q_PROPERTY( TQString bindDN READ bindDN WRITE setBindDN )
@@ -69,7 +70,7 @@ namespace KABC {
Q_PROPERTY( bool authSASL READ isAuthSASL WRITE setAuthSASL )
Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit )
Q_PROPERTY( int timeLimit READ timeLimit WRITE setTimeLimit )
Q_SETS ( LCW_Flags )
TQ_SETS ( LCW_Flags )
public:


+ 1
- 1
kabc/ldapurl.cpp View File

@@ -58,7 +58,7 @@ void LDAPUrl::setDn( const TQString &dn)

bool LDAPUrl::hasExtension( const TQString &key ) const
{
return m_extensions.contains( key );
return m_extensions.tqcontains( key );
}

LDAPUrl::Extension LDAPUrl::extension( const TQString &key ) const


+ 2
- 2
kabc/ldif.cpp View File

@@ -178,7 +178,7 @@ bool LDIF::splitControl( const TQCString &line, TQString &oid, bool &critical,
critical = false;
bool url = splitLine( line, tmp, value );
kdDebug(5700) << "splitControl: value: " << TQString::fromUtf8(value, value.size()) << endl;
kdDebug(5700) << "splitControl: value: " << TQString(TQString::fromUtf8(value, value.size())) << endl;
if ( tmp.isEmpty() ) {
tmp = TQString::fromUtf8( value, value.size() );
value.resize( 0 );
@@ -211,7 +211,7 @@ LDIF::ParseVal LDIF::processLine()
if ( attrLower == "version" ) {
if ( !mDn.isEmpty() ) retval = Err;
} else if ( attrLower == "dn" ) {
kdDebug(5700) << "ldapentry dn: " << TQString::fromUtf8( mVal, mVal.size() ) << endl;
kdDebug(5700) << "ldapentry dn: " << TQString(TQString::fromUtf8( mVal, mVal.size() )) << endl;
mDn = TQString::fromUtf8( mVal, mVal.size() );
mModType = Mod_None;
retval = NewEntry;


+ 7
- 7
kabc/ldifconverter.cpp View File

@@ -87,11 +87,11 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
const Address workAddr = addr.address( Address::Work );

ldif_out( t, "dn", TQString( "cn=%1,mail=%2" )
.arg( addr.formattedName().simplifyWhiteSpace() )
.arg( TQString(addr.formattedName()).simplifyWhiteSpace() )
.arg( addr.preferredEmail() ) );
ldif_out( t, "givenname", addr.givenName() );
ldif_out( t, "sn", addr.familyName() );
ldif_out( t, "cn", addr.formattedName().simplifyWhiteSpace() );
ldif_out( t, "cn", TQString(addr.formattedName()).simplifyWhiteSpace() );
ldif_out( t, "uid", addr.uid() );
ldif_out( t, "nickname", addr.nickName() );
ldif_out( t, "xmozillanickname", addr.nickName() );
@@ -152,7 +152,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
ldif_out( t, "homeurl", addr.url().prettyURL() );
ldif_out( t, "description", addr.note() );
if (addr.revision().isValid())
ldif_out(t, "modifytimestamp", dateToVCardString( addr.revision()) );
ldif_out(t, "modifytimestamp", dateToVCardString( TQT_TQDATETIME_OBJECT(addr.revision())) );

t << "objectclass: top\n";
t << "objectclass: person\n";
@@ -271,7 +271,7 @@ bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr,
}
if ( fieldname == TQString::tqfromLatin1( "mail" ) ||
fieldname == TQString::tqfromLatin1( "mozillasecondemail" ) ) { // mozilla
if ( a.emails().findIndex( value ) == -1 )
if ( a.emails().tqfindIndex( value ) == -1 )
a.insertEmail( value );
return true;
}
@@ -489,8 +489,8 @@ addComment:
if ( fieldname == TQString::tqfromLatin1( "objectclass" ) ) // ignore
return true;

kdWarning() << TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
.arg(a.formattedName()).arg(fieldname).arg(value);
kdWarning() << TQString(TQString("LDIFConverter: Unknown field for '%1': '%2=%3'\n")
.arg(a.formattedName()).arg(fieldname).arg(value));

return true;
}
@@ -554,7 +554,7 @@ TQString LDIFConverter::makeLDIFfieldString( TQString formatStr, TQString value,
}

// generate the new string and split it to 72 chars/line
TQCString txt = (formatStr.arg(value)).utf8();
TQCString txt = TQString(formatStr.arg(value)).utf8();

if (allowEncode) {
len = txt.length();


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

@@ -82,7 +82,7 @@ void ResourceDirConfig::loadSettings( KRES::Resource *res )
return;
}

mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );

mFileNameEdit->setURL( resource->path() );
if ( mFileNameEdit->url().isEmpty() )


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

@@ -86,7 +86,7 @@ void ResourceFileConfig::loadSettings( KRES::Resource *res )
return;
}

mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );

mFileNameEdit->setURL( resource->fileName() );
if ( mFileNameEdit->url().isEmpty() )


+ 24
- 24
kabc/plugins/ldapkio/resourceldapkio.cpp View File

@@ -122,8 +122,8 @@ ResourceLDAPKIO::~ResourceLDAPKIO()

void ResourceLDAPKIO::enter_loop()
{
TQWidget dummy(0,0,WType_Dialog | WShowModal);
dummy.setFocusPolicy( TQWidget::NoFocus );
TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
dummy.setFocusPolicy( TQ_NoFocus );
qt_enter_modal(&dummy);
tqApp->enter_loop();
qt_leave_modal(&dummy);
@@ -308,7 +308,7 @@ bool ResourceLDAPKIO::AddresseeToLDIF( TQByteArray &ldif, const Addressee &addr,
}
tmp += "\n";
kdDebug(7125) << "ldif: " << TQString::fromUtf8(tmp) << endl;
kdDebug(7125) << "ldif: " << TQString(TQString::fromUtf8(tmp)) << endl;
ldif = tmp;
return true;
}
@@ -330,49 +330,49 @@ void ResourceLDAPKIO::init()
handle them in the load() method below.
These are the default values
*/
if ( !mAttributes.contains("objectClass") )
if ( !mAttributes.tqcontains("objectClass") )
mAttributes.insert( "objectClass", "inetOrgPerson" );
if ( !mAttributes.contains("commonName") )
if ( !mAttributes.tqcontains("commonName") )
mAttributes.insert( "commonName", "cn" );
if ( !mAttributes.contains("formattedName") )
if ( !mAttributes.tqcontains("formattedName") )
mAttributes.insert( "formattedName", "displayName" );
if ( !mAttributes.contains("familyName") )
if ( !mAttributes.tqcontains("familyName") )
mAttributes.insert( "familyName", "sn" );
if ( !mAttributes.contains("givenName") )
if ( !mAttributes.tqcontains("givenName") )
mAttributes.insert( "givenName", "givenName" );
if ( !mAttributes.contains("mail") )
if ( !mAttributes.tqcontains("mail") )
mAttributes.insert( "mail", "mail" );
if ( !mAttributes.contains("mailAlias") )
if ( !mAttributes.tqcontains("mailAlias") )
mAttributes.insert( "mailAlias", "" );
if ( !mAttributes.contains("phoneNumber") )
if ( !mAttributes.tqcontains("phoneNumber") )
mAttributes.insert( "phoneNumber", "homePhone" );
if ( !mAttributes.contains("telephoneNumber") )
if ( !mAttributes.tqcontains("telephoneNumber") )
mAttributes.insert( "telephoneNumber", "telephoneNumber" );
if ( !mAttributes.contains("facsimileTelephoneNumber") )
if ( !mAttributes.tqcontains("facsimileTelephoneNumber") )
mAttributes.insert( "facsimileTelephoneNumber", "facsimileTelephoneNumber" );
if ( !mAttributes.contains("mobile") )
if ( !mAttributes.tqcontains("mobile") )
mAttributes.insert( "mobile", "mobile" );
if ( !mAttributes.contains("pager") )
if ( !mAttributes.tqcontains("pager") )
mAttributes.insert( "pager", "pager" );
if ( !mAttributes.contains("description") )
if ( !mAttributes.tqcontains("description") )
mAttributes.insert( "description", "description" );

if ( !mAttributes.contains("title") )
if ( !mAttributes.tqcontains("title") )
mAttributes.insert( "title", "title" );
if ( !mAttributes.contains("street") )
if ( !mAttributes.tqcontains("street") )
mAttributes.insert( "street", "street" );
if ( !mAttributes.contains("state") )
if ( !mAttributes.tqcontains("state") )
mAttributes.insert( "state", "st" );
if ( !mAttributes.contains("city") )
if ( !mAttributes.tqcontains("city") )
mAttributes.insert( "city", "l" );
if ( !mAttributes.contains("organization") )
if ( !mAttributes.tqcontains("organization") )
mAttributes.insert( "organization", "o" );
if ( !mAttributes.contains("postalcode") )
if ( !mAttributes.tqcontains("postalcode") )
mAttributes.insert( "postalcode", "postalCode" );

if ( !mAttributes.contains("uid") )
if ( !mAttributes.tqcontains("uid") )
mAttributes.insert( "uid", "uid" );
if ( !mAttributes.contains("jpegPhoto") )
if ( !mAttributes.tqcontains("jpegPhoto") )
mAttributes.insert( "jpegPhoto", "jpegPhoto" );

d->mLDAPUrl = KURL();


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

@@ -281,7 +281,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
for ( i = 1; i < mMapCombo->count(); i++ ) {
TQDictIterator<KLineEdit> it2( mLineEditDict );
for ( ; it2.current(); ++it2 ) {
if ( mMapList[ i ].contains( it2.currentKey() ) ) {
if ( mMapList[ i ].tqcontains( it2.currentKey() ) ) {
if ( mMapList[ i ][ it2.currentKey() ] != it2.current()->text() ) break;
} else {
if ( mDefaultMap[ it2.currentKey() ] != it2.current()->text() ) break;


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

@@ -79,7 +79,7 @@ void ResourceNetConfig::loadSettings( KRES::Resource *res )
return;
}

mFormatBox->setCurrentItem( mFormatTypes.findIndex( resource->format() ) );
mFormatBox->setCurrentItem( mFormatTypes.tqfindIndex( resource->format() ) );

mUrlEdit->setURL( resource->url().url() );
}


+ 2
- 2
kabc/resourceselectdialog.cpp View File

@@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
KButtonBox *buttonBox = new KButtonBox( this );

buttonBox->addStretch();
buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) );
buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) );
buttonBox->layout();

mainLayout->addWidget( buttonBox );


+ 9
- 9
kabc/scripts/addressee.src.cpp View File

@@ -212,11 +212,11 @@ void Addressee::setNameFromString( const TQString &s )
setName( str );

// clear all name parts
setPrefix( TQString::null );
setGivenName( TQString::null );
setAdditionalName( TQString::null );
setFamilyName( TQString::null );
setSuffix( TQString::null );
setPrefix( TQString() );
setGivenName( TQString() );
setAdditionalName( TQString() );
setFamilyName( TQString() );
setSuffix( TQString() );

if ( str.isEmpty() )
return;
@@ -391,7 +391,7 @@ TQString Addressee::fullEmail( const TQString &email ) const
} else {
e = email;
}
if ( e.isEmpty() ) return TQString::null;
if ( e.isEmpty() ) return TQString();

TQString text;
if ( realName().isEmpty() )
@@ -444,7 +444,7 @@ void Addressee::removeEmail( const TQString &email )

TQString Addressee::preferredEmail() const
{
if ( mData->emails.count() == 0 ) return TQString::null;
if ( mData->emails.count() == 0 ) return TQString();
else return mData->emails.first();
}

@@ -755,7 +755,7 @@ void Addressee::insertCategory( const TQString &c )
detach();
mData->empty = false;

if ( mData->categories.findIndex( c ) != -1 ) return;
if ( mData->categories.tqfindIndex( c ) != -1 ) return;

mData->categories.append( c );
}
@@ -772,7 +772,7 @@ void Addressee::removeCategory( const TQString &c )

bool Addressee::hasCategory( const TQString &c ) const
{
return ( mData->categories.findIndex( c ) != -1 );
return ( mData->categories.tqfindIndex( c ) != -1 );
}

void Addressee::setCategories( const TQStringList &c )


+ 40
- 40
kabc/scripts/entrylist View File

@@ -13,64 +13,64 @@
# Field Category : Categories the field belongs to (see Field::FieldCategory).
# Output function: Function used to convert type to string for debug output (optional)

ALE,name,,QString,name
ALE,name,,TQString,name

ALFE,formatted name,,QString,formattedName,Frequent
ALFE,formatted name,,TQString,formattedName,Frequent

ALFE,family name,,QString,familyName,Frequent
ALFE,given name,,QString,givenName,Frequent
ALFE,additional names,,QString,additionalName
ALFE,honorific prefixes,,QString,prefix
ALFE,honorific suffixes,,QString,suffix
ALFE,family name,,TQString,familyName,Frequent
ALFE,given name,,TQString,givenName,Frequent
ALFE,additional names,,TQString,additionalName
ALFE,honorific prefixes,,TQString,prefix
ALFE,honorific suffixes,,TQString,suffix

ALFE,nick name,,QString,nickName,Personal
ALFE,nick name,,TQString,nickName,Personal

ALFE,birthday,,QDateTime,birthday,Personal,.toString()
ALFE,birthday,,TQDateTime,birthday,Personal,.toString()

#Address address
LF,home address street,,QString,homeAddressStreet,Address|Personal
LF,home address city,,QString,homeAddressLocality,Address|Personal
LF,home address state,,QString,homeAddressRegion,Address|Personal
LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
LF,home address country,,QString,homeAddressCountry,Address|Personal
LF,home address label,,QString,homeAddressLabel,Address|Personal
LF,business address street,,QString,businessAddressStreet,Address|Organization
LF,business address city,,QString,businessAddressLocality,Address|Organization
LF,business address state,,QString,businessAddressRegion,Address|Organization
LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization
LF,business address country,,QString,businessAddressCountry,Address|Organization
LF,business address label,,QString,businessAddressLabel,Address|Organization
LF,home address street,,TQString,homeAddressStreet,Address|Personal
LF,home address city,,TQString,homeAddressLocality,Address|Personal
LF,home address state,,TQString,homeAddressRegion,Address|Personal
LF,home address zip code,,TQString,homeAddressPostalCode,Address|Personal
LF,home address country,,TQString,homeAddressCountry,Address|Personal
LF,home address label,,TQString,homeAddressLabel,Address|Personal
LF,business address street,,TQString,businessAddressStreet,Address|Organization
LF,business address city,,TQString,businessAddressLocality,Address|Organization
LF,business address state,,TQString,businessAddressRegion,Address|Organization
LF,business address zip code,,TQString,businessAddressPostalCode,Address|Organization
LF,business address country,,TQString,businessAddressCountry,Address|Organization
LF,business address label,,TQString,businessAddressLabel,Address|Organization

#phoneNumbers
LF,home phone,,QString,homePhone,Personal|Frequent
LF,business phone,,QString,businessPhone,Organization|Frequent
LF,mobile phone,,QString,mobilePhone,Frequent
LF,home fax,,QString,homeFax
LF,business fax,,QString,businessFax
LF,car phone,,QString,carPhone
LF,ISDN,,QString,isdn
LF,pager,,QString,pager
LF,home phone,,TQString,homePhone,Personal|Frequent
LF,business phone,,TQString,businessPhone,Organization|Frequent
LF,mobile phone,,TQString,mobilePhone,Frequent
LF,home fax,,TQString,homeFax
LF,business fax,,TQString,businessFax
LF,car phone,,TQString,carPhone
LF,ISDN,,TQString,isdn
LF,pager,,TQString,pager

#emails
LF,email address,,QString,email,Email|Frequent
LF,email address,,TQString,email,Email|Frequent

ALFE,mail client,,QString,mailer,Email
ALFE,mail client,,TQString,mailer,Email

ALE,time zone,,TimeZone,timeZone,,.asString()
ALE,geographic position,,Geo,geo,,.asString()

ALFE,title,person,QString,title,Organization
ALFE,role,person in organization,QString,role,Organization
ALFE,organization,,QString,organization,Organization
ALFE,department,,QString,department,Organization
ALFE,title,person,TQString,title,Organization
ALFE,role,person in organization,TQString,role,Organization
ALFE,organization,,TQString,organization,Organization
ALFE,department,,TQString,department,Organization

ALFE,note,,QString,note
ALFE,note,,TQString,note

ALE,product identifier,,QString,productId
ALE,revision date,,QDateTime,revision,,.toString()
ALE,product identifier,,TQString,productId
ALE,revision date,,TQDateTime,revision,,.toString()

ALE,sort string,,QString,sortString
ALE,sort string,,TQString,sortString

ALF,homepage,,KURL,url,,.url()



+ 2
- 2
kabc/scripts/field.src.cpp View File

@@ -344,7 +344,7 @@ bool Field::setValue( KABC::Addressee &a, const TQString &value )
return true;
}
case FieldImpl::Birthday:
a.setBirthday( TQDate::fromString( value, Qt::ISODate ) );
a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) );
return true;
case FieldImpl::CustomField:
a.insertCustom( mImpl->app(), mImpl->key(), value );
@@ -360,7 +360,7 @@ TQString Field::sortKey( const KABC::Addressee &a )
--CASEVALUE--
case FieldImpl::Birthday:
if ( a.birthday().isValid() ) {
TQDate date = a.birthday().date();
TQDate date = TQT_TQDATE_OBJECT(a.birthday().date());
TQString key;
key.sprintf( "%02d-%02d", date.month(), date.day() );
return key;


+ 5
- 5
kabc/scripts/makeaddressee View File

@@ -55,7 +55,7 @@ if (!open( H_OUT, ">../addressee.h" ) ) {
print H_OUT " /**\n";
print H_OUT " Return translated label for $entryNames[$i] field.\n";
print H_OUT " */\n";
print H_OUT " static QString $entryNames[$i]Label();\n\n";
print H_OUT " static TQString $entryNames[$i]Label();\n\n";
}
} else {
print H_OUT;
@@ -100,7 +100,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
$labelwords[$j] = ucfirst $labelwords[$j];
}
$label = join ' ', @labelwords;
print CPP_OUT "QString Addressee::$entryNames[$i]Label()\n{\n";
print CPP_OUT "TQString Addressee::$entryNames[$i]Label()\n{\n";
if ( $entryComments[$i] ) {
print CPP_OUT " return i18n(\"$entryComments[$i]\",\"$label\");\n";
} else {
@@ -112,7 +112,7 @@ if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] =~ /E/ ) {
if ( $entryNames[$i] !~ "revision" ) {
if ( $entryTypes[$i] =~ "QString" ) {
if ( $entryTypes[$i] =~ "TQString" ) {
print CPP_OUT " if ( mData->$entryNames[$i] != a.mData->$entryNames[$i] &&\n";
print CPP_OUT " !( mData->$entryNames[$i].isEmpty() && a.mData->$entryNames[$i].isEmpty() ) ) {\n";
print CPP_OUT " kdDebug(5700) << \"$entryNames[$i] differs\" << endl;\n";
@@ -184,7 +184,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] !~ /A/ ) { next; }
if ( $entryCtrl[$i] !~ /F/ ) { next; }
if ( $entryTypes[$i] ne "QString" ) { next; }
if ( $entryTypes[$i] ne "TQString" ) { next; }
print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n";
print CPP_OUT " return a.$entryNames[$i]();\n";
}
@@ -192,7 +192,7 @@ if (!open( CPP_OUT, ">../field.cpp" ) ) {
for( $i=0; $i<@entryNames; ++$i ) {
if ( $entryCtrl[$i] !~ /A/ ) { next; }
if ( $entryCtrl[$i] !~ /F/ ) { next; }
if ( $entryTypes[$i] ne "QString" ) { next; }
if ( $entryTypes[$i] ne "TQString" ) { next; }
print CPP_OUT " case FieldImpl::" . ucfirst($entryNames[$i]) . ":\n";
print CPP_OUT " a.set" . ucfirst($entryNames[$i]) . "( value );\n";
print CPP_OUT " return true;\n";


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

@@ -140,7 +140,7 @@ ContentLine::_parse()
vDebug("parse");
// Unqote newlines
strRep_ = strRep_.replace( TQRegExp( "\\\\n" ), "\n" );
strRep_ = strRep_.tqreplace( TQRegExp( "\\\\n" ), "\n" );
int split = strRep_.tqfind(':');
@@ -275,7 +275,7 @@ ContentLine::_assemble()
}

// Quote newlines
line = line.replace( TQRegExp( "\n" ), "\\n" );
line = line.tqreplace( TQRegExp( "\n" ), "\\n" );
// Fold lines longer than 72 chars
const int maxLen = 72;


+ 6
- 6
kabc/vcard/DateValue.cpp View File

@@ -173,7 +173,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// DATE
dateStr.replace(TQRegExp("-"), "");
dateStr.tqreplace(TQRegExp("-"), "");

kdDebug(5710) << "dateStr: " << dateStr << endl;

@@ -208,7 +208,7 @@ DateValue::_parse()

//////////////////////////////////////////////////// SECOND FRACTION
int secFracSep = timeStr.findRev(',');
int secFracSep = timeStr.tqfindRev(',');
if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
TQCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
@@ -217,7 +217,7 @@ DateValue::_parse()
/////////////////////////////////////////////////////////////// HMS

timeStr.replace(TQRegExp(":"), "");
timeStr.tqreplace(TQRegExp(":"), "");
hour_ = timeStr.left(2).toInt();
minute_ = timeStr.mid(2, 2).toInt();
@@ -398,7 +398,7 @@ DateValue::setZoneMinute(unsigned int i)
assembled_ = false;
}

QDate
TQDate
DateValue::qdate()
{
parse();
@@ -406,7 +406,7 @@ DateValue::qdate()
return d;
}

QTime
TQTime
DateValue::qtime()
{
parse();
@@ -415,7 +415,7 @@ DateValue::qtime()
return t;
}

QDateTime
TQDateTime
DateValue::qdt()
{
parse();


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

@@ -99,7 +99,7 @@ Entity::~Entity()
// empty
}
QCString
TQCString
Entity::asString()
{
// vDebug("Entity::asString()");


+ 2
- 2
kabc/vcard/Enum.cpp View File

@@ -31,7 +31,7 @@ using namespace VCARD;
// There are 31 possible types, not including extensions.
// URI is a custom field designed to store the upstream URI for each contact
// in order to handle certain limited CardDAV systems such as Zimbra
const QCString
const TQCString
VCARD::paramNames [] =
{
"NAME",
@@ -228,7 +228,7 @@ VCARD::EntityTypeToValueType(EntityType e)
return t;
}

QCString
TQCString
VCARD::EntityTypeToParamName(EntityType e)
{
if ( e > EntityUnknown ) e = EntityUnknown;


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

@@ -97,14 +97,14 @@ LangValue::_assemble()
strRep_ += TQCString('-') + it.current();
}

QCString
TQCString
LangValue::primary()
{
parse();
return primary_;
}
QStrList
TQStrList
LangValue::subtags()
{
parse();


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

@@ -98,7 +98,7 @@ OrgValue::numValues()
return valueList_.count();
}

QCString
TQCString
OrgValue::value(unsigned int i)
{
parse();


+ 2
- 2
kabc/vcard/Param.cpp View File

@@ -116,13 +116,13 @@ Param::setValue(const TQCString & value)
assembled_ = false;
}

QCString
TQCString
Param::name()
{
return name_;
}

QCString
TQCString
Param::value()
{
return value_;


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

@@ -98,7 +98,7 @@ TextListValue::numValues()
return valueList_.count();
}

QCString
TQCString
TextListValue::value(unsigned int i)
{
parse();


+ 2
- 2
kabc/vcard/URIValue.cpp View File

@@ -103,14 +103,14 @@ URIValue::_assemble()
strRep_ = scheme_ + ':' + schemeSpecificPart_;
}

QCString
TQCString
URIValue::scheme()
{
parse();
return scheme_;
}

QCString
TQCString
URIValue::schemeSpecificPart()
{
parse();


+ 2
- 2
kabc/vcard/include/VCardAdrParam.h View File

@@ -56,8 +56,8 @@ class KVCARD_EXPORT AdrParam : public Param
private:
QStrList adrTypeList_;
QCString textParam_;
TQStrList adrTypeList_;
TQCString textParam_;
};
}



+ 4
- 4
kabc/vcard/include/VCardContentLine.h View File

@@ -39,8 +39,8 @@ class KVCARD_EXPORT ContentLine : public Entity

#include "ContentLine-generated.h"
QCString group() { parse(); return group_; }
QCString name() { parse(); return name_; }
TQCString group() { parse(); return group_; }
TQCString name() { parse(); return name_; }
Value * value() { parse(); return value_; }
ParamList paramList() { parse(); return paramList_; }
ParamType paramType() { parse(); return paramType_; }
@@ -63,8 +63,8 @@ class KVCARD_EXPORT ContentLine : public Entity
private:
QCString group_;
QCString name_;
TQCString group_;
TQCString name_;
TQPtrList<Param> paramList_;
Value * value_;


+ 2
- 2
kabc/vcard/include/VCardEmailParam.h View File

@@ -36,7 +36,7 @@ class KVCARD_EXPORT EmailParam : public Param
#include "EmailParam-generated.h"
QCString emailType() { parse(); return emailType_; }
TQCString emailType() { parse(); return emailType_; }
bool pref() { parse(); return pref_; }
void setEmailType(const TQCString & s)
@@ -47,7 +47,7 @@ class KVCARD_EXPORT EmailParam : public Param
private:
QCString emailType_;
TQCString emailType_;
bool pref_;
};



+ 1
- 1
kabc/vcard/include/VCardVCard.h View File

@@ -54,7 +54,7 @@ class KVCARD_EXPORT VCard : public Entity
private:

QCString group_;
TQCString group_;
TQPtrList<ContentLine> contentLineList_;
};



+ 52
- 52
kabc/vcard21parser.cpp View File

@@ -41,12 +41,12 @@ bool VCardLineX::isValid() const
switch( name[0] ) {
case 'a':
if ( name == VCARD_ADR && qualified &&
(qualifiers.contains(VCARD_ADR_DOM) ||
qualifiers.contains(VCARD_ADR_INTL) ||
qualifiers.contains(VCARD_ADR_POSTAL) ||
qualifiers.contains(VCARD_ADR_HOME) ||
qualifiers.contains(VCARD_ADR_WORK) ||
qualifiers.contains(VCARD_ADR_PREF)
(qualifiers.tqcontains(VCARD_ADR_DOM) ||
qualifiers.tqcontains(VCARD_ADR_INTL) ||
qualifiers.tqcontains(VCARD_ADR_POSTAL) ||
qualifiers.tqcontains(VCARD_ADR_HOME) ||
qualifiers.tqcontains(VCARD_ADR_WORK) ||
qualifiers.tqcontains(VCARD_ADR_PREF)
) )
return true;

@@ -63,18 +63,18 @@ bool VCardLineX::isValid() const
if ( name == VCARD_CATEGORIES )
return true;
if ( name == VCARD_CLASS && qualified &&
(qualifiers.contains(VCARD_CLASS_PUBLIC) ||
qualifiers.contains(VCARD_CLASS_PRIVATE) ||
qualifiers.contains(VCARD_CLASS_CONFIDENTIAL)
(qualifiers.tqcontains(VCARD_CLASS_PUBLIC) ||
qualifiers.tqcontains(VCARD_CLASS_PRIVATE) ||
qualifiers.tqcontains(VCARD_CLASS_CONFIDENTIAL)
) )
return true;
break;

case 'e':
if ( name == VCARD_EMAIL && qualified &&
(qualifiers.contains(VCARD_EMAIL_INTERNET) ||
qualifiers.contains(VCARD_EMAIL_PREF) ||
qualifiers.contains(VCARD_EMAIL_X400)
(qualifiers.tqcontains(VCARD_EMAIL_INTERNET) ||
qualifiers.tqcontains(VCARD_EMAIL_PREF) ||
qualifiers.tqcontains(VCARD_EMAIL_X400)
) )
return true;
break;
@@ -91,8 +91,8 @@ bool VCardLineX::isValid() const

case 'k':
if ( name == VCARD_KEY && qualified &&
(qualifiers.contains(VCARD_KEY_X509) ||
qualifiers.contains(VCARD_KEY_PGP)
(qualifiers.tqcontains(VCARD_KEY_X509) ||
qualifiers.tqcontains(VCARD_KEY_PGP)
) )
return true;
break;
@@ -150,20 +150,20 @@ bool VCardLineX::isValid() const

case 't':
if ( name == VCARD_TEL && qualified &&
(qualifiers.contains(VCARD_TEL_HOME) ||
qualifiers.contains(VCARD_TEL_WORK) ||
qualifiers.contains(VCARD_TEL_PREF) ||
qualifiers.contains(VCARD_TEL_VOICE) ||
qualifiers.contains(VCARD_TEL_FAX) ||
qualifiers.contains(VCARD_TEL_MSG) ||
qualifiers.contains(VCARD_TEL_CELL) ||
qualifiers.contains(VCARD_TEL_PAGER) ||
qualifiers.contains(VCARD_TEL_BBS) ||
qualifiers.contains(VCARD_TEL_MODEM) ||
qualifiers.contains(VCARD_TEL_CAR) ||
qualifiers.contains(VCARD_TEL_ISDN) ||
qualifiers.contains(VCARD_TEL_VIDEO) ||
qualifiers.contains(VCARD_TEL_PCS)
(qualifiers.tqcontains(VCARD_TEL_HOME) ||
qualifiers.tqcontains(VCARD_TEL_WORK) ||
qualifiers.tqcontains(VCARD_TEL_PREF) ||
qualifiers.tqcontains(VCARD_TEL_VOICE) ||
qualifiers.tqcontains(VCARD_TEL_FAX) ||
qualifiers.tqcontains(VCARD_TEL_MSG) ||
qualifiers.tqcontains(VCARD_TEL_CELL) ||
qualifiers.tqcontains(VCARD_TEL_PAGER) ||
qualifiers.tqcontains(VCARD_TEL_BBS) ||
qualifiers.tqcontains(VCARD_TEL_MODEM) ||
qualifiers.tqcontains(VCARD_TEL_CAR) ||
qualifiers.tqcontains(VCARD_TEL_ISDN) ||
qualifiers.tqcontains(VCARD_TEL_VIDEO) ||
qualifiers.tqcontains(VCARD_TEL_PCS)
) )
return true;
if ( name == VCARD_TZ )
@@ -266,33 +266,33 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
if ( (*i).name == VCARD_TEL ) {
int type = 0;
if ( (*i).qualified ) {
if ( (*i).qualifiers.contains( VCARD_TEL_HOME ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_HOME ) )
type |= PhoneNumber::Home;
if ( (*i).qualifiers.contains( VCARD_TEL_WORK ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_WORK ) )
type |= PhoneNumber::Work;
if ( (*i).qualifiers.contains( VCARD_TEL_PREF ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_PREF ) )
type |= PhoneNumber::Pref;
// if ( (*i).qualifiers.contains( VCARD_TEL_VOICE ) )
// if ( (*i).qualifiers.tqcontains( VCARD_TEL_VOICE ) )
// type |= PhoneNumber::Voice;
if ( (*i).qualifiers.contains( VCARD_TEL_FAX ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_FAX ) )
type |= PhoneNumber::Fax;
if ( (*i).qualifiers.contains( VCARD_TEL_MSG ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_MSG ) )
type |= PhoneNumber::Msg;
if ( (*i).qualifiers.contains( VCARD_TEL_CELL ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_CELL ) )
type |= PhoneNumber::Cell;
if ( (*i).qualifiers.contains( VCARD_TEL_PAGER ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_PAGER ) )
type |= PhoneNumber::Pager;
if ( (*i).qualifiers.contains( VCARD_TEL_BBS ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_BBS ) )
type |= PhoneNumber::Bbs;
if ( (*i).qualifiers.contains( VCARD_TEL_MODEM ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_MODEM ) )
type |= PhoneNumber::Modem;
if ( (*i).qualifiers.contains( VCARD_TEL_CAR ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_CAR ) )
type |= PhoneNumber::Car;
if ( (*i).qualifiers.contains( VCARD_TEL_ISDN ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_ISDN ) )
type |= PhoneNumber::Isdn;
if ( (*i).qualifiers.contains( VCARD_TEL_VIDEO ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_VIDEO ) )
type |= PhoneNumber::Video;
if ( (*i).qualifiers.contains( VCARD_TEL_PCS ) )
if ( (*i).qualifiers.tqcontains( VCARD_TEL_PCS ) )
type |= PhoneNumber::Pcs;
}
addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) );
@@ -304,19 +304,19 @@ KABC::Addressee VCard21Parser::readFromString( const TQString &data)
if ( (*i).name == VCARD_ADR ) {
int type = 0;
if ( (*i).qualified ) {
if ( (*i).qualifiers.contains( VCARD_ADR_DOM ) )
if ( (*i).qualifiers.tqcontains( VCARD_ADR_DOM ) )
type |= Address::Dom;
if ( (*i).qualifiers.contains( VCARD_ADR_INTL ) )
if ( (*i).qualifiers.tqcontains( VCARD_ADR_INTL ) )
type |= Address::Intl;
if ( (*i).qualifiers.contains( VCARD_ADR_POSTAL ) )
if ( (*i).qualifiers.tqcontains( VCARD_ADR_POSTAL ) )
type |= Address::Postal;
if ( (*i).qualifiers.contains( VCARD_ADR_PARCEL ) )
if ( (*i).qualifiers.tqcontains( VCARD_ADR_PARCEL ) )
type |= Address::Parcel;
if ( (*i).qualifiers.contains( VCARD_ADR_HOME ) )
if ( (*i).qualifiers.tqcontains( VCARD_ADR_HOME ) )
type |= Address::Home;
if ( (*i).qualifiers.contains( VCARD_ADR_WORK ) )
if ( (*i).qualifiers.tqcontains( VCARD_ADR_WORK ) )
type |= Address::Work;
if ( (*i).qualifiers.contains( VCARD_ADR_PREF ) )
if ( (*i).qualifiers.tqcontains( VCARD_ADR_PREF ) )
type |= Address::Pref;
}
addressee.insertAddress( readAddressFromQStringList( (*i).parameters, type ) );
@@ -492,7 +492,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const TQString& vc, int *err )
_vcl.parameters = TQStringList::split( ';', value, true );
if ( qp ) { // decode the quoted printable
for ( TQStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
*z = KCodecs::quotedPrintableDecode( (*z).latin1() );
*z = KCodecs::quotedPrintableDecode( TQCString((*z).latin1()) );
}
}
} else {
@@ -556,7 +556,7 @@ TQString VCard21ParserImpl::getValue(const TQString& name, const TQString& quali
const TQString lowqualifier = qualifier.lower();

for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier)) {
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.tqcontains(lowqualifier)) {
if ((*i).parameters.count() > 0)
return (*i).parameters[0];
else return failed;
@@ -598,7 +598,7 @@ TQStringList VCard21ParserImpl::getValues(const TQString& name, const TQString&
const TQString lowname = name.lower();
const TQString lowqualifier = qualifier.lower();
for (TQValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier))
if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.tqcontains(lowqualifier))
return (*i).parameters;
}
// failed.


+ 7
- 7
kabc/vcardformatimpl.cpp View File

@@ -331,8 +331,8 @@ void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v

addTextValue( v, EntityCategories, addressee.categories().join(",") );

addDateValue( v, EntityBirthday, addressee.birthday().date() );
addDateTimeValue( v, EntityRevision, addressee.revision() );
addDateValue( v, EntityBirthday, TQT_TQDATE_OBJECT(addressee.birthday().date()) );
addDateTimeValue( v, EntityRevision, TQT_TQDATETIME_OBJECT(addressee.revision()) );
addGeoValue( v, addressee.geo() );
addUTCValue( v, addressee.timeZone() );

@@ -540,11 +540,11 @@ void VCardFormatImpl::addNValue( VCARD::VCard *vcard, const Addressee &a )
ContentLine cl;
cl.setName(EntityTypeToParamName( EntityN ) );
NValue *v = new NValue;
v->setFamily( a.familyName().utf8() );
v->setGiven( a.givenName().utf8() );
v->setMiddle( a.additionalName().utf8() );
v->setPrefix( a.prefix().utf8() );
v->setSuffix( a.suffix().utf8() );
v->setFamily( TQString(a.familyName()).utf8() );
v->setGiven( TQString(a.givenName()).utf8() );
v->setMiddle( TQString(a.additionalName()).utf8() );
v->setPrefix( TQString(a.prefix()).utf8() );
v->setSuffix( TQString(a.suffix()).utf8() );

cl.setValue( v );
vcard->add(cl);


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

@@ -124,7 +124,7 @@ TQStringList VCardLine::parameterList() const
void VCardLine::addParameter( const TQString& param, const TQString& value )
{
TQStringList &list = mParamMap[ param ];
if ( list.findIndex( value ) == -1 ) // not included yet
if ( list.tqfindIndex( value ) == -1 ) // not included yet
list.append( value );
}



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

@@ -134,7 +134,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
bool wasBase64Encoded = false;

params = vCardLine.parameterList();
if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data
if ( params.tqfindIndex( "encoding" ) != -1 ) { // have to decode the data
TQByteArray input;
input = TQCString(value.latin1());
if ( vCardLine.parameter( "encoding" ).lower() == "b" ||
@@ -155,18 +155,18 @@ VCard::List VCardParser::parseVCards( const TQString& text )
output = TQCString(value.latin1());
}

if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data
if ( params.tqfindIndex( "charset" ) != -1 ) { // have to convert the data
TQTextCodec *codec =
TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
if ( codec ) {
vCardLine.setValue( codec->toUnicode( output ) );
} else {
vCardLine.setValue( TQString::fromUtf8( output ) );
vCardLine.setValue( TQString(TQString::fromUtf8( output )) );
}
} else if ( wasBase64Encoded ) {
vCardLine.setValue( output );
} else { // if charset not given, assume it's in UTF-8 (as used in previous KDE versions)
vCardLine.setValue( TQString::fromUtf8( output ) );
vCardLine.setValue( TQString(TQString::fromUtf8( output )) );
}

currentVCard.addLine( vCardLine );


+ 21
- 21
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.at( i ).latin1();
char c = value.tqat( i ).latin1();
if ( (c < 33 || c > 126) && c != ' ' && c != '=' )
return true;
}
@@ -138,7 +138,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( createAgent( version, (*addrIt).agent() ) );

// BDAY
card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday() ) ) );
card.addLine( VCardLine( "BDAY", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).birthday()) ) ) );

// CATEGORIES
if ( version == VCard::v3_0 ) {
@@ -174,7 +174,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
}

// FN
VCardLine fnLine( "FN", (*addrIt).formattedName() );
VCardLine fnLine( "FN", TQString((*addrIt).formattedName()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).formattedName() ) ) {
fnLine.addParameter( "charset", "UTF-8" );
fnLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@@ -199,7 +199,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( createPicture( "LOGO", (*addrIt).logo() ) );

// MAILER
VCardLine mailerLine( "MAILER", (*addrIt).mailer() );
VCardLine mailerLine( "MAILER", TQString((*addrIt).mailer()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).mailer() ) ) {
mailerLine.addParameter( "charset", "UTF-8" );
mailerLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@@ -222,7 +222,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
card.addLine( nLine );

// NAME
VCardLine nameLine( "NAME", (*addrIt).name() );
VCardLine nameLine( "NAME", TQString((*addrIt).name()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).name() ) ) {
nameLine.addParameter( "charset", "UTF-8" );
nameLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@@ -231,10 +231,10 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )

// NICKNAME
if ( version == VCard::v3_0 )
card.addLine( VCardLine( "NICKNAME", (*addrIt).nickName() ) );
card.addLine( VCardLine( "NICKNAME", TQString((*addrIt).nickName()) ) );

// NOTE
VCardLine noteLine( "NOTE", (*addrIt).note() );
VCardLine noteLine( "NOTE", TQString((*addrIt).note()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).note() ) ) {
noteLine.addParameter( "charset", "UTF-8" );
noteLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@@ -258,13 +258,13 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )

// PROID
if ( version == VCard::v3_0 )
card.addLine( VCardLine( "PRODID", (*addrIt).productId() ) );
card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) );

// REV
card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision() ) ) );
card.addLine( VCardLine( "REV", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).revision()) ) ) );

// ROLE
VCardLine roleLine( "ROLE", (*addrIt).role() );
VCardLine roleLine( "ROLE", TQString((*addrIt).role()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).role() ) ) {
roleLine.addParameter( "charset", "UTF-8" );
roleLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@@ -273,7 +273,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )

// SORT-STRING
if ( version == VCard::v3_0 )
card.addLine( VCardLine( "SORT-STRING", (*addrIt).sortString() ) );
card.addLine( VCardLine( "SORT-STRING", TQString((*addrIt).sortString()) ) );

// SOUND
card.addLine( createSound( (*addrIt).sound() ) );
@@ -294,7 +294,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
}

// TITLE
VCardLine titleLine( "TITLE", (*addrIt).title() );
VCardLine titleLine( "TITLE", TQString((*addrIt).title()) );
if ( version == VCard::v2_1 && needsEncoding( (*addrIt).title() ) ) {
titleLine.addParameter( "charset", "UTF-8" );
titleLine.addParameter( "encoding", "QUOTED-PRINTABLE" );
@@ -428,7 +428,7 @@ Addressee::List VCardTool::parseVCards( const TQString& vcard )
// EMAIL
else if ( identifier == "email" ) {
const TQStringList types = (*lineIt).parameters( "type" );
addr.insertEmail( (*lineIt).value().asString(), types.findIndex( "PREF" ) != -1 );
addr.insertEmail( (*lineIt).value().asString(), types.tqfindIndex( "PREF" ) != -1 );
}

// FN
@@ -653,16 +653,16 @@ Picture VCardTool::parsePicture( const VCardLine &line )
Picture pic;

const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 ) {
if ( params.tqfindIndex( "encoding" ) != -1 ) {
TQImage img;
img.loadFromData( line.value().asByteArray() );
pic.setData( img );
} else if ( params.findIndex( "value" ) != -1 ) {
} else if ( params.tqfindIndex( "value" ) != -1 ) {
if ( line.parameter( "value" ).lower() == "uri" )
pic.setUrl( line.value().asString() );
}

if ( params.findIndex( "type" ) != -1 )
if ( params.tqfindIndex( "type" ) != -1 )
pic.setType( line.parameter( "type" ) );

return pic;
@@ -700,9 +700,9 @@ Sound VCardTool::parseSound( const VCardLine &line )
Sound snd;

const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 )
if ( params.tqfindIndex( "encoding" ) != -1 )
snd.setData( line.value().asByteArray() );
else if ( params.findIndex( "value" ) != -1 ) {
else if ( params.tqfindIndex( "value" ) != -1 ) {
if ( line.parameter( "value" ).lower() == "uri" )
snd.setUrl( line.value().asString() );
}
@@ -738,12 +738,12 @@ Key VCardTool::parseKey( const VCardLine &line )
Key key;

const TQStringList params = line.parameterList();
if ( params.findIndex( "encoding" ) != -1 )
if ( params.tqfindIndex( "encoding" ) != -1 )
key.setBinaryData( line.value().asByteArray() );
else
key.setTextData( line.value().asString() );

if ( params.findIndex( "type" ) != -1 ) {
if ( params.tqfindIndex( "type" ) != -1 ) {
if ( line.parameter( "type" ).lower() == "x509" )
key.setType( Key::X509 );
else if ( line.parameter( "type" ).lower() == "pgp" )
@@ -814,7 +814,7 @@ Agent VCardTool::parseAgent( const VCardLine &line )
Agent agent;

const TQStringList params = line.parameterList();
if ( params.findIndex( "value" ) != -1 ) {
if ( params.tqfindIndex( "value" ) != -1 ) {
if ( line.parameter( "value" ).lower() == "uri" )
agent.setUrl( line.value().asString() );
} else {


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

@@ -90,7 +90,7 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi
}

void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) {
int id=m_docHLs.findRef(static_cast<KateSuperRangeList*>(obj));
int id=m_docHLs.tqfindRef(static_cast<KateSuperRangeList*>(obj));
if (id>=0) m_docHLs.take(id);
for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it)
@@ -152,7 +152,7 @@ KateView* KateArbitraryHighlight::viewForRange(KateSuperRange* range)
{
for (TQMap<KateView*, TQPtrList<KateSuperRangeList>* >::Iterator it = m_viewHLs.begin(); it != m_viewHLs.end(); ++it)
for (KateSuperRangeList* l = (*it)->first(); l; l = (*it)->next())
if (l->contains(range))
if (l->tqcontains(range))
return it.key();

// This must belong to a document-global highlight


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

@@ -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.at(pos).tqunicode();
int ch = text.tqat(pos).tqunicode();
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.at(++attrCol).tqunicode();
lastCh = text.tqat(++attrCol).tqunicode();
}while(lastCh && lastCh != ' ' && lastCh != '\t');

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

attrCol = prevLine->cursorX(attrCol, tabWidth);
@@ -1606,7 +1606,7 @@ TQString KateCSAndSIndent::findOpeningCommentIndentation(const KateDocCursor &st
{
KateTextLine::Ptr textLine = doc->plainKateTextLine(cur.line());

int pos = textLine->string().findRev("/*");
int pos = textLine->string().tqfindRev("/*");
// FIXME: /* inside /* is possible. This screws up in that case...
if (pos >= 0)
return initialWhitespace(textLine, pos);
@@ -2372,9 +2372,9 @@ void KateVarIndent::slotVariableChanged( const TQString &var, const TQString &va
{
d->couples = 0;
TQStringList l = TQStringList::split( " ", val );
if ( l.contains("parens") ) d->couples |= Parens;
if ( l.contains("braces") ) d->couples |= Braces;
if ( l.contains("brackets") ) d->couples |= Brackets;
if ( l.tqcontains("parens") ) d->couples |= Parens;
if ( l.tqcontains("braces") ) d->couples |= Braces;
if ( l.tqcontains("brackets") ) d->couples |= Brackets;
}
else if ( var == "var-indent-couple-attribute" )
{


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

@@ -86,7 +86,7 @@ class KateFileLoader
public:
KateFileLoader (const TQString &filename, TQTextCodec *codec, bool removeTrailingSpaces)
: m_file (filename)
, m_buffer (kMin (m_file.size(), KATE_FILE_LOADER_BS))
, m_buffer (kMin ((TQ_ULONG)m_file.size(), KATE_FILE_LOADER_BS))
, m_codec (codec)
, m_decoder (m_codec->makeDecoder())
, m_position (0)


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

@@ -157,7 +157,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view,
}
else if ( cmd == "set-highlight" )
{
TQString val = _cmd.section( ' ', 1 ).lower();
TQString val = TQString(_cmd.section( ' ', 1 )).lower();
for ( uint i=0; i < v->doc()->hlModeCount(); i++ )
{
if ( v->doc()->hlModeName( i ).lower() == val )
@@ -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.capturedTexts();
TQStringList backrefs=matcher.tqcapturedTexts();
int refnum=1;

TQStringList::Iterator i = backrefs.begin();
@@ -442,7 +442,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
// TODO if replace contains \n,
// change the line number and
// check for text that needs be searched behind the last inserted newline.
int lns = rep.contains('\n');
int lns = rep.tqcontains('\n');
if ( lns )
{
line += lns;
@@ -451,7 +451,7 @@ int KateCommands::SedReplace::sedMagic( KateDocument *doc, int &line,
{
// if ( endcol >= startcol + len )
endcol -= (startcol + len);
uint sc = rep.length() - rep.findRev('\n') - 1;
uint sc = rep.length() - rep.tqfindRev('\n') - 1;
matches += sedMagic( doc, line, find, repOld, delim, noCase, repeat, sc, endcol );
}
}


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

@@ -51,7 +51,7 @@
*@short Listbox showing codecompletion
*@author Jonas B. Jacobi <j.jacobi@gmx.de>
*/
class KateCCListBox : public QListBox
class KateCCListBox : public TQListBox
{
public:
/**
@@ -90,7 +90,7 @@ class KateCCListBox : public QListBox
}
};

class KateCompletionItem : public QListBoxText
class KateCompletionItem : public TQListBoxText
{
public:
KateCompletionItem( TQListBox* lb, KTextEditor::CompletionEntry entry )
@@ -113,7 +113,7 @@ KateCodeCompletion::KateCodeCompletion( KateView* view )
, m_view( view )
, m_commentLabel( 0 )
{
m_completionPopup = new TQVBox( 0, 0, WType_Popup );
m_completionPopup = new TQVBox( 0, 0, (WFlags)WType_Popup );
m_completionPopup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
m_completionPopup->setLineWidth( 1 );

@@ -163,9 +163,9 @@ void KateCodeCompletion::showCompletionBox(

bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e )
{
if ( o != m_completionPopup &&
o != m_completionListBox &&
o != m_completionListBox->viewport() )
if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionPopup) &&
TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox) &&
TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox->viewport()) )
return false;

if( e->type() == TQEvent::Hide )
@@ -392,7 +392,7 @@ void KateCodeCompletion::showComment()
}

KateArgHint::KateArgHint( KateView* parent, const char* name )
: TQFrame( parent, name, WType_Popup )
: TQFrame( parent, name, (WFlags)WType_Popup )
{
setBackgroundColor( black );
setPaletteForegroundColor( Qt::black );
@@ -404,7 +404,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name )

m_markCurrentFunction = true;

setFocusPolicy( StrongFocus );
setFocusPolicy( TQ_StrongFocus );
setFocusProxy( parent );

reset( -1, -1 );
@@ -533,7 +533,7 @@ void KateArgHint::show()
bool KateArgHint::eventFilter( TQObject*, TQEvent* e )
{
if( isVisible() && e->type() == TQEvent::KeyPress ){
TQKeyEvent* ke = static_cast<TQKeyEvent*>( e );
TQKeyEvent* ke = TQT_TQKEYEVENT( e );
if( (ke->state() & ControlButton) && ke->key() == Key_Left ){
setCurrentFunction( currentFunction() - 1 );
ke->accept();


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

@@ -50,7 +50,7 @@ class KateCodeCompletionCommentLabel : public TQLabel

public:
KateCodeCompletionCommentLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip",
WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM )
(WFlags)(WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM) )
{
setMargin(1);
setIndent(0);


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

@@ -363,9 +363,9 @@ void KateCodeFoldingTree::debugDump()
void KateCodeFoldingTree::dumpNode(KateCodeFoldingNode *node, const TQString &prefix)
{
//output node properties
kdDebug(13000)<<prefix<<TQString("Type: %1, startLineValid %2, startLineRel %3, endLineValid %4, endLineRel %5, visible %6").
kdDebug(13000)<<prefix<<TQString(TQString("Type: %1, startLineValid %2, startLineRel %3, endLineValid %4, endLineRel %5, visible %6").
arg(node->type).arg(node->startLineValid).arg(node->startLineRel).arg(node->endLineValid).
arg(node->endLineRel).arg(node->visible)<<endl;
arg(node->endLineRel).arg(node->visible))<<endl;

//output child node properties recursive
if (node->noChildren())
@@ -1330,7 +1330,7 @@ void KateCodeFoldingTree::toggleRegionVisibility(unsigned int line)

lineMapping.clear();
hiddenLinesCountCacheValid = false;
kdDebug(13000)<<TQString("KateCodeFoldingTree::toggleRegionVisibility() %1").arg(line)<<endl;
kdDebug(13000)<<TQString(TQString("KateCodeFoldingTree::toggleRegionVisibility() %1").arg(line))<<endl;

findAllNodesOpenedOrClosedAt(line);
for (int i=0; i<(int)nodesForLine.count(); i++)


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

@@ -79,7 +79,7 @@ class KateCodeFoldingNode

inline KateCodeFoldingNode *child (uint index) const { return m_children[index]; }

inline int findChild (KateCodeFoldingNode *node, uint start = 0) const { return m_children.find (node, start); }
inline int findChild (KateCodeFoldingNode *node, uint start = 0) const { return m_children.tqfind (node, start); }

inline void appendChild (KateCodeFoldingNode *node) { m_children.resize(m_children.size()+1); m_children[m_children.size()-1] = node; }



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

@@ -1062,7 +1062,7 @@ void KateSaveConfigTab::defaults()
//END KateSaveConfigTab

//BEGIN PluginListItem
class KatePartPluginListItem : public QCheckListItem
class KatePartPluginListItem : public TQCheckListItem
{
public:
KatePartPluginListItem(bool checked, uint i, const TQString &name, TQListView *parent);
@@ -1284,7 +1284,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
TQHBox *hb1 = new TQHBox( gbInfo);
new TQLabel( i18n("Author:"), hb1 );
author = new TQLabel (hb1);
author->setTextFormat (Qt::RichText);
author->setTextFormat (TQt::RichText);

// license
TQHBox *hb2 = new TQHBox( gbInfo);
@@ -1476,8 +1476,8 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)

listData+=TQString(data);
kdDebug(13000)<<TQString("CurrentListData: ")<<listData<<endl<<endl;
kdDebug(13000)<<TQString("Data length: %1").arg(data.size())<<endl;
kdDebug(13000)<<TQString("listData length: %1").arg(listData.length())<<endl;
kdDebug(13000)<<TQString(TQString("Data length: %1").arg(data.size()))<<endl;
kdDebug(13000)<<TQString(TQString("listData length: %1").arg(listData.length()))<<endl;
if (data.size()==0)
{
if (listData.length()>0)


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