Rename KApplication to TDEApplication to avoid conflicts with KDE4

8 files changed, 16 insertions, 16 deletions

diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 0084fe86b..09da74d78 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -74,7 +74,7 @@ KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* par
              this, TQT_SLOT( textChanged( const TQString& ) ) );
     layout->addWidget( m_lineEdit );
     m_clearButton = new TQToolButton( this );
-    m_clearButton->setIconSet( KApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
+    m_clearButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
     m_clearButton->setEnabled( false );
     layout->addWidget( m_clearButton );
     connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
@@ -119,7 +119,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin
     }
     // no entry found, create new addressee:
     KABC::Addressee addressee;
-    addressee.setUid( KApplication::randomString( 10 ) );
+    addressee.setUid( TDEApplication::randomString( 10 ) );
     addressee.setFormattedName( name );
     addressee.setEmails( email );
     m_addressBook->insertAddressee( addressee );
@@ -272,7 +272,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk()
     }
 
     KPIM::DistributionList list;
-    list.setUid( d->distListUid.isNull() ? KApplication::randomString( 10 ) :d->distListUid );
+    list.setUid( d->distListUid.isNull() ? TDEApplication::randomString( 10 ) :d->distListUid );
     list.setName( name );
     list.setResource( d->resource );
     typedef TQValueList<KPIM::DistributionListEditor::Line*>::ConstIterator ListIterator;
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index d82dc69f1..d3aef15ee 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -103,7 +103,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
         {
             KPIM::DistributionList list;
             list.setName( name );
-            list.setUid( KApplication::randomString( 10 ) );
+            list.setUid( TDEApplication::randomString( 10 ) );
             m_book->insertAddressee( list );
 
             m_listBox->insertItem( name );
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index 6b4340fdf..ea4a93cec 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -37,7 +37,7 @@ class XXPort::XXPortPrivate
   public:
     TQSignalMapper *mExportMapper;
     TQSignalMapper *mImportMapper;
-    KApplication *mKApp;
+    TDEApplication *mKApp;
 };
 
 XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
@@ -104,7 +104,7 @@ TQWidget *XXPort::parentWidget() const
   return mParentWidget;
 }
 
-void XXPort::setKApplication( KApplication *app )
+void XXPort::setTDEApplication( TDEApplication *app )
 {
   d->mKApp = app;
 }
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index 7307524df..021275d5a 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -34,7 +34,7 @@
 
 #define KAB_XXPORT_PLUGIN_VERSION 1
 
-class KApplication;
+class TDEApplication;
 
 /**
   K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG() creates the stub for a KAddressbook import/export filter.
@@ -87,13 +87,13 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
     virtual bool requiresSorting() const { return false; }
 
     /**
-      set the KApplication pointer.
+      set the TDEApplication pointer.
       @see: processEvents()
      */
-    void setKApplication( KApplication *app );
+    void setTDEApplication( TDEApplication *app );
 
     /**
-      Processes outstanding KApplication events. It should be called
+      Processes outstanding TDEApplication events. It should be called
       occasionally when the import/export filter is busy performing
       a long operation (e.g. reading from slow external devices).
       @see: TQApplication::processEvents()
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 43f5e5bcd..6e3c3510e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -725,7 +725,7 @@ void KABCore::newDistributionList()
     }
   }
   KPIM::DistributionList list;
-  list.setUid( KApplication::randomString( 10 ) );
+  list.setUid( TDEApplication::randomString( 10 ) );
   list.setName( name );
   list.setResource( resource );
   editDistributionList( list );
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 0ba765df3..5a171e53d 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -572,7 +572,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
       const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() );
 
       if ( existing.isEmpty() ) {
-        addr.setUid( KApplication::randomString( 10 ) );
+        addr.setUid( TDEApplication::randomString( 10 ) );
         addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
         addr.setResource( resource );
         mCore->addressBook()->insertAddressee( addr );
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index a249c2953..e781a72e7 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -147,7 +147,7 @@ void PasteCommand::execute()
          We have to set a new uid for the contact, otherwise insertAddressee()
          ignore it.
       */
-      (*it).setUid( KApplication::randomString( 10 ) );
+      (*it).setUid( TDEApplication::randomString( 10 ) );
       uids.append( (*it).uid() );
       addressBook()->insertAddressee( *it );
     }
@@ -337,7 +337,7 @@ void CopyToCommand::execute()
       KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
       // ignored. This is bad for syncing, but unavoidable, afaiks
-      newAddr.setUid( KApplication::randomString( 10 ) );
+      newAddr.setUid( TDEApplication::randomString( 10 ) );
       newAddr.setResource( mResource );
       if ( resourceExist( newAddr.resource() ) )
         addressBook()->insertAddressee( newAddr );
@@ -384,7 +384,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource )
             KABC::Addressee newAddr( addr );
       // We need to set a new uid, otherwise the insert below is
       // ignored. This is bad for syncing, but unavoidable, afaiks
-            TQString uid = KApplication::randomString( 10 );
+            TQString uid = TDEApplication::randomString( 10 );
             newAddr.setUid( uid );
             newAddr.setResource( resource );
             if ( resourceExist( newAddr.resource() ) )
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 3c10fc967..6d6b74e55 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -151,7 +151,7 @@ void XXPortManager::loadPlugins()
       connect( obj, TQT_SIGNAL( importActivated( const TQString&, const TQString& ) ),
                this, TQT_SLOT( slotImport( const TQString&, const TQString& ) ) );
 
-      obj->setKApplication( kapp );
+      obj->setTDEApplication( kapp );
     }
   }
 }