summaryrefslogtreecommitdiffstats
path: root/kaddressbook/editors
diff options
context:
space:
mode:
Diffstat (limited to 'kaddressbook/editors')
-rw-r--r--kaddressbook/editors/Makefile.am2
-rw-r--r--kaddressbook/editors/imaddressbase.ui4
-rw-r--r--kaddressbook/editors/imeditorbase.ui10
-rw-r--r--kaddressbook/editors/imeditorwidget.cpp22
-rw-r--r--kaddressbook/editors/imeditorwidget.h2
5 files changed, 20 insertions, 20 deletions
diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am
index e611bb5ea..bb39762bd 100644
--- a/kaddressbook/editors/Makefile.am
+++ b/kaddressbook/editors/Makefile.am
@@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp
libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined
-libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS)
+libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC)
noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h
diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui
index f62ac00d7..2f608a083 100644
--- a/kaddressbook/editors/imaddressbase.ui
+++ b/kaddressbook/editors/imaddressbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>IMAddressBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -85,5 +85,5 @@
<slot>slotProtocolChanged( const QString &amp; )</slot>
<slot>slotProtocolChanged()</slot>
</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui
index 24a5696a9..3c8e36010 100644
--- a/kaddressbook/editors/imeditorbase.ui
+++ b/kaddressbook/editors/imeditorbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>IMEditorBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -116,7 +116,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>28</height>
@@ -152,8 +152,8 @@
</widget>
<customwidgets>
</customwidgets>
-<layoutdefaults spacing="6" margin="0"/>
-<layoutfunctions spacing="KDialog::spacingHint"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index ad84505c2..30c3ca981 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -64,7 +64,7 @@ bool IMAddressLVI::preferred() const
}
void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
- int column, int width, int alignment )
+ int column, int width, int tqalignment )
{
if ( mPreferred ) {
TQFont font = p->font();
@@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
p->setFont( font );
}
- KListViewItem::paintCell( p, cg, column, width, alignment );
+ KListViewItem::paintCell( p, cg, column, width, tqalignment );
}
void IMAddressLVI::setAddress( const TQString &address )
@@ -166,8 +166,8 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c
//mWidget->btnUp->setEnabled( false );
//mWidget->btnDown->setEnabled( false );
mPreferred = preferredIM;
- mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
- mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KABC/IMProtocol" ) ) );
+ mPreferred = mPreferred.tqreplace( " on ", TQString( TQChar( 0xE120 ) ), true );
+ mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) );
// order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
TQMap<TQString, KPluginInfo *> protocolMap;
@@ -204,8 +204,8 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr )
TQString app, name, value;
splitField( *it, app, name, value );
- if ( app.startsWith( TQString::fromLatin1( "messaging/" ) ) ) {
- if ( name == TQString::fromLatin1( "All" ) ) {
+ if ( app.startsWith( TQString::tqfromLatin1( "messaging/" ) ) ) {
+ if ( name == TQString::tqfromLatin1( "All" ) ) {
KPluginInfo *protocol = protocolFromString( app );
if ( protocol ) {
TQStringList addresses = TQStringList::split( TQChar( 0xE000 ), value );
@@ -244,9 +244,9 @@ void IMEditorWidget::storeContact( KABC::Addressee *addr )
TQString addrBookField = (*protocolIt)->property( "X-KDE-InstantMessagingKABCField" ).toString();
if ( !lst.isEmpty() )
- addr->insertCustom( addrBookField, TQString::fromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
+ addr->insertCustom( addrBookField, TQString::tqfromLatin1( "All" ), lst.join( TQChar( 0xE000 ) ) );
else
- addr->removeCustom( addrBookField, TQString::fromLatin1( "All" ) );
+ addr->removeCustom( addrBookField, TQString::tqfromLatin1( "All" ) );
}
}
@@ -271,7 +271,7 @@ void IMEditorWidget::slotSetStandard()
return; //Selected is already preferred
else {
item->setPreferred( false );
- mWidget->lvAddresses->repaintItem( item );
+ mWidget->lvAddresses->tqrepaintItem( item );
break;
}
}
@@ -282,7 +282,7 @@ void IMEditorWidget::slotSetStandard()
mPreferred = current->address();
current->setPreferred( true );
setModified( true );
- mWidget->lvAddresses->repaintItem( current );
+ mWidget->lvAddresses->tqrepaintItem( current );
}
}
@@ -457,7 +457,7 @@ void IMEditorWidget::slotDelete()
TQString IMEditorWidget::preferred() const
{
TQString retval( mPreferred );
- return retval.replace( TQChar( 0xE120 ), " on " );
+ return retval.tqreplace( TQChar( 0xE120 ), " on " );
}
diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h
index 0184ccca4..25fd9804d 100644
--- a/kaddressbook/editors/imeditorwidget.h
+++ b/kaddressbook/editors/imeditorwidget.h
@@ -115,7 +115,7 @@ class IMAddressLVI : public KListViewItem
bool preferred() const;
protected:
- virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment );
+ virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment );
private:
KPluginInfo * mProtocol;