summaryrefslogtreecommitdiffstats
path: root/kword/mailmerge/kabc
diff options
context:
space:
mode:
Diffstat (limited to 'kword/mailmerge/kabc')
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABC.cpp28
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp4
-rw-r--r--kword/mailmerge/kabc/addresspicker.ui12
3 files changed, 22 insertions, 22 deletions
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 1886207c..411ee5e5 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -168,7 +168,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const
if( !uidAvailable )
{
- return ( i18n ( "KAddressbook entry '%1' not available." ).arg( *_UIDIterator ) );
+ return ( i18n ( "KAddressbook entry '%1' not available." ).tqarg( *_UIDIterator ) );
}
@@ -350,16 +350,16 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const
TQString lat;
TQString longi;
if( geo.latitude()<0 )
- lat = TQString( i18n("%1 South") ).arg( -geo.latitude() );
+ lat = TQString( i18n("%1 South") ).tqarg( -geo.latitude() );
else
- lat = TQString( i18n("%1 North") ).arg( geo.latitude() );
+ lat = TQString( i18n("%1 North") ).tqarg( geo.latitude() );
if( geo.longitude()<0 )
// There is something going wrong, because "W" is replaced by "q ".
// Needs fix.
- longi = TQString( i18n("%1 West") ).arg( -geo.longitude() );
+ longi = TQString( i18n("%1 West") ).tqarg( -geo.longitude() );
else
- longi = TQString( i18n("%1 East") ).arg( geo.longitude() );
+ longi = TQString( i18n("%1 East") ).tqarg( geo.longitude() );
return i18n( "Geographic coordinates", "%1, %2" ).arg ( lat, longi );
}
@@ -409,7 +409,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem )
for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull();
recEnt=recEnt.nextSibling().toElement() )
{
- addEntry( recEnt.attribute( TQString::fromLatin1("uid") ) );
+ addEntry( recEnt.attribute( TQString::tqfromLatin1("uid") ) );
}
}
else if( rec.nodeName() == "LIST" )
@@ -417,7 +417,7 @@ void KWMailMergeKABC::load( TQDomElement& parentElem )
for( TQDomElement recEnt=rec.firstChild().toElement(); !recEnt.isNull();
recEnt=recEnt.nextSibling().toElement() )
{
- addList( recEnt.attribute( TQString::fromLatin1("listid") ) );
+ addList( recEnt.attribute( TQString::tqfromLatin1("listid") ) );
}
}
else
@@ -482,26 +482,26 @@ void KWMailMergeKABC::refresh( bool )
void KWMailMergeKABC::save( TQDomDocument& doc, TQDomElement& parent)
{
- TQDomElement cont=doc.createElement(TQString::fromLatin1("CONTENT"));
+ TQDomElement cont=doc.createElement(TQString::tqfromLatin1("CONTENT"));
parent.appendChild(cont);
TQValueList<TQString>::ConstIterator it = _individualUIDs.begin();
for( ; it != _individualUIDs.end(); ++it )
{
- TQDomElement rec=doc.createElement(TQString::fromLatin1("RECORD"));
+ TQDomElement rec=doc.createElement(TQString::tqfromLatin1("RECORD"));
cont.appendChild(rec);
- TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
- recEnt.setAttribute(TQString::fromLatin1("uid"),*it);
+ TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+ recEnt.setAttribute(TQString::tqfromLatin1("uid"),*it);
rec.appendChild(recEnt);
}
it = _lists.begin();
for( ; !(it == _lists.end()); ++it )
{
- TQDomElement rec=doc.createElement(TQString::fromLatin1("LIST"));
+ TQDomElement rec=doc.createElement(TQString::tqfromLatin1("LIST"));
cont.appendChild(rec);
- TQDomElement recEnt=doc.createElement(TQString::fromLatin1("ITEM"));
- recEnt.setAttribute(TQString::fromLatin1("listid"),*it);
+ TQDomElement recEnt=doc.createElement(TQString::tqfromLatin1("ITEM"));
+ recEnt.setAttribute(TQString::tqfromLatin1("listid"),*it);
rec.appendChild(recEnt);
}
}
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index d3f3a21c..d1c03809 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -20,7 +20,7 @@
#include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <kapplication.h>
@@ -376,7 +376,7 @@ void KWMailMergeKABCConfig::saveDistributionList()
KMessageBox::information( 0,
i18n( "<qt>Distribution list with the given name <b>%1</b> "
"already exists. Please select a different name.</qt>" )
- .arg( listName ) );
+ .tqarg( listName ) );
return;
}
KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName );
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui
index af8f5723..c7276c9b 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout10</cstring>
+ <cstring>tqlayout10</cstring>
</property>
<vbox>
<property name="name">
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -76,7 +76,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -101,7 +101,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -217,7 +217,7 @@
<property name="text">
<string>&amp;Address Book</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="buddy" stdset="0">
@@ -236,7 +236,7 @@
<property name="text">
<string>&amp;Selected Addresses</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignCenter</set>
</property>
<property name="buddy" stdset="0">
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 13:06:16 +0000