Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

11 files changed, 31 insertions, 31 deletions

diff --git a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
index a6210cabe..a8d48a007 100644
--- a/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
+++ b/certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
@@ -49,7 +49,7 @@
 AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* tqparent,  const char* name, bool modal, WFlags fl )
     : AddDirectoryServiceDialog( tqparent, name, modal, fl )
 {
-    portED->setValidator( new TQIntValidator( 0, 65535, portED ) );
+    portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) );
 }
 
 /*
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index b1a135a9f..d257cc6a8 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -150,7 +150,7 @@ private:
     // second one is implementation name (gpg, gpgsm...)
     const TQString impName = protocol ? protocol->displayName() : i18n( "failed" );
     return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)",
-                 "%1 (%2)" ).arg( protoName, impName );
+                 "%1 (%2)" ).tqarg( protoName, impName );
   }
 
   const CryptoBackend::Protocol* mProtocol; // can be 0
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index dd92b1604..c5ed43b1c 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -124,7 +124,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
       dialogHeight = 400;
     TQSize sz = scrollView->tqsizeHint();
     scrollView->setMinimumSize( sz.width()
-                                + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
+                                + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
                                 TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
   }
   if ( mComponentGUIs.empty() ) {
@@ -134,7 +134,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
                                "properly. It did not return any components. "
                                "Try running \"%1\" on the command line for more "
                                "information.")
-          .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
+          .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
       TQLabel * label = new TQLabel( msg, vbox );
       label->tqsetAlignment( TQt::WordBreak );
       label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
@@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const
 {
   TQString descr = mEntry->description();
   if ( descr.isEmpty() ) // shouldn't happen
-    descr = TQString( "<%1>" ).arg( mName );
+    descr = TQString( "<%1>" ).tqarg( mName );
   return descr;
 }
 
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index 9ecc87f1b..e35e2bb26 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -295,21 +295,21 @@ By clicking this button, you can remove the currently selected directory service
     </connection>
     <connection>
         <sender>x500LV</sender>
-        <signal>returnPressed(QListViewItem*)</signal>
+        <signal>returnPressed(TQListViewItem*)</signal>
         <receiver>DirectoryServicesWidgetBase</receiver>
-        <slot>slotServiceSelected(QListViewItem*)</slot>
+        <slot>slotServiceSelected(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>x500LV</sender>
-        <signal>doubleClicked(QListViewItem*)</signal>
+        <signal>doubleClicked(TQListViewItem*)</signal>
         <receiver>DirectoryServicesWidgetBase</receiver>
-        <slot>slotServiceSelected(QListViewItem*)</slot>
+        <slot>slotServiceSelected(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>x500LV</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>DirectoryServicesWidgetBase</receiver>
-        <slot>slotServiceChanged(QListViewItem*)</slot>
+        <slot>slotServiceChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>addServicePB</sender>
@@ -333,8 +333,8 @@ By clicking this button, you can remove the currently selected directory service
 <Q_SLOTS>
     <slot access="protected">slotAddService()</slot>
     <slot access="protected">slotDeleteService()</slot>
-    <slot access="protected">slotServiceChanged( QListViewItem* )</slot>
-    <slot access="protected">slotServiceSelected( QListViewItem* )</slot>
+    <slot access="protected">slotServiceChanged( TQListViewItem* )</slot>
+    <slot access="protected">slotServiceSelected( TQListViewItem* )</slot>
     <slot access="protected">slotMoveUp()</slot>
     <slot access="protected">slotMoveDown()</slot>
 </Q_SLOTS>
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index 4f212517f..ee809df77 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() {
     qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() );
     if ( mLenVisible ) { // but do we also have a visible label?
       TQRect r = rect();
-      const int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+      const int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
       if( va & AlignVCenter )
         r.setTop( fm.height() / 2 );		// frame rect should be
       else if( va & AlignTop )
@@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
         x = 0;
     }
     TQRect r( x, 0, tw, h );
-    int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+    int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
     if ( va & AlignTop )
       r.moveBy( 0, fm.descent() );
-    const TQColor pen( (TQRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
-    if ( !style().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+    const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+    if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
       va |= NoAccel;
-    style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
+    tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
                       isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
     paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
   }
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 5bdadfd0c..e81adc438 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -139,7 +139,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
     d->selfRequester->setKeys( sender );
     glay->addWidget( d->selfRequester, row, 1 );
     ++row;
-    glay->addMultiCellWidget( new KSeparator( Horizontal, view ), row, row, 0, 1 );
+    glay->addMultiCellWidget( new KSeparator( Qt::Horizontal, view ), row, row, 0, 1 );
   }
 
   const TQStringList prefs = preferencesStrings();
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 7519f7e81..f1641339d 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -261,7 +261,7 @@ void Kleo::KeyListView::deregisterItem( const KeyListViewItem * item ) {
   if ( !item )
     return;
   std::map<TQCString,KeyListViewItem*>::iterator it
-    = d->itemMap.tqfind( item->key().primaryFingerprint() );
+    = d->itemMap.find( item->key().primaryFingerprint() );
   if ( it == d->itemMap.end() )
     return;
   Q_ASSERT( it->second == item );
@@ -324,7 +324,7 @@ void Kleo::KeyListView::scatterGathered( TQListViewItem * start ) {
 Kleo::KeyListViewItem * Kleo::KeyListView::itemByFingerprint( const TQCString & s ) const {
   if ( s.isEmpty() )
     return 0;
-  const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.tqfind( s );
+  const std::map<TQCString,KeyListViewItem*>::const_iterator it = d->itemMap.find( s );
   if ( it == d->itemMap.end() )
     return 0;
   return it->second;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index 7a56ab5af..16efbd46f 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
 
   KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) );
 }
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 22737199e..141e9e989 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -248,7 +248,7 @@ namespace {
 		   "Created: %2\n"
 		   "Expiry: %3\n"
 		   "Fingerprint: %4" )
-	.arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
+	.tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
 	      creation, expiry,
 	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") );
     else
@@ -257,10 +257,10 @@ namespace {
 		   "Expiry: %3\n"
 		   "Fingerprint: %4\n"
 		   "Issuer: %5" )
-	.arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
+	.tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
 	      creation, expiry,
 	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
-	.arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
+	.tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
   }
 
   const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const {
@@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
 
   KMessageBox::error( tqparent, msg, i18n( "Key Listing Failed" ) );
 }
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 824600f17..0cef145b2 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -127,7 +127,7 @@ private:
 
         if ( const int err = file.status() )
             KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2")
-                                .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
+                                .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
                                 i18n("File Save Error") );
     }
     void slotUser2() {
@@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const Job * job, const TQString
 
     if ( err.code() != GPG_ERR_NO_DATA ) {
         KMessageBox::information( tqparent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
-                                  .arg( TQString::fromLocal8Bit( err.asString() ) ),
+                                  .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
                                   i18n("GnuPG Audit Log Error") );
         return;
     }
@@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * tqparent, const TQString & log ) {
 
 static TQString to_information_string( const SigningResult & result ) {
     return result.error()
-        ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
+        ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
         : i18n("Signing successful") ;
 }
 
@@ -204,7 +204,7 @@ static TQString to_error_string( const SigningResult & result ) {
 
 static TQString to_information_string( const EncryptionResult & result ) {
     return result.error()
-        ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
+        ? i18n("Encryption failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
         : i18n("Encryption successful") ;
 }
 
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index d6552922c..e0149b8f3 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -83,7 +83,7 @@ void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int
   else if ( what.isEmpty() )
     setLabelText( mBaseText );
   else
-    setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) );
+    setLabelText( i18n( "%1: %2" ).tqarg( mBaseText, what ) );
   setProgress( current, total );
 }